@yach.zhiyinlou.com/yach 2.14.6 → 2.15.0-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +15 -0
- package/dist/src/channel/plugin.js +3 -0
- package/dist/src/channel/plugin.js.map +1 -1
- package/dist/src/core/aes.js +23 -3
- package/dist/src/core/aes.js.map +1 -1
- package/dist/src/core/yach-ticket.js +81 -0
- package/dist/src/core/yach-ticket.js.map +1 -1
- package/dist/src/messaging/inbound/dispatcher.js +1 -0
- package/dist/src/messaging/inbound/dispatcher.js.map +1 -1
- package/dist/src/messaging/inbound/handler.js +100 -2
- package/dist/src/messaging/inbound/handler.js.map +1 -1
- package/dist/src/messaging/outbound/reply-dispatcher.js +45 -1
- package/dist/src/messaging/outbound/reply-dispatcher.js.map +1 -1
- package/dist/src/messaging/question-runtime.js +507 -0
- package/dist/src/messaging/question-runtime.js.map +1 -0
- package/dist/src/tools/index.js +28 -0
- package/dist/src/tools/index.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -172,6 +172,21 @@ Agent ID 自动生成规则:
|
|
|
172
172
|
- **自动轮换**:卡片有效期 10 分钟,9 分钟时自动切换新卡片
|
|
173
173
|
- **显式关闭**:AI 输出完成后关闭卡片,客户端不再显示等待状态
|
|
174
174
|
|
|
175
|
+
## ask_user 问题(Agent 询问模式)兼容
|
|
176
|
+
|
|
177
|
+
兼容 **openclaw ≥ 2026.3.22**(`peerDependencies` 下限)。`question-gateway-runtime` / `agent-harness-runtime` 是 2026.8.1 才引入的 SDK 子路径,插件全部**懒加载**(动态 import + 缓存),旧版核心自动降级、不崩溃:
|
|
178
|
+
|
|
179
|
+
- **2026.8.1+**:完整能力——选项渲染为可点击折叠链接(`questionFoldLinks`)、入站拦截走 SDK RPC resolve / claim(answered 语义),见下方三种回答路径。
|
|
180
|
+
- **2026.3.22 ~ 2026.8.0**:降级为纯文本路径——问题以 markdown 送达(自带编号选项与回答指引),选项/自由文本/多题回答以**用户身份注入合成消息**(飞书 ask-user 模式),AI 在新一轮收到答案;无 fold 链接、无 pending/claim 增强,插件整体不受影响。
|
|
181
|
+
|
|
182
|
+
新版本 Agent 在需要用户选择(如回答模式、工具确认等)时会发送 ask_user 问题。Yach 插件原生兼容,按优先级提供三种回答路径:
|
|
183
|
+
|
|
184
|
+
- **纯文本回答(始终可用)**:问题以 markdown 消息送达,文本自带编号选项(`1. xxx` / `2. xxx`)和回答指引。用户直接回复编号、选项文字或自定义答案均可,插件在入站拦截 pending 问题后**直接解析为回答**,不依赖 OpenClaw 核心的纯文本 claim 机制(8.1 的 auto-reply 管线没有该机制,9.4 才有且带 caller 指纹校验)。
|
|
185
|
+
- **点击选项链接(默认开启,`questionFoldLinks`)**:单题单选(2~4 个干净选项)时,选项渲染为「有序列表 + 可点击折叠链接」,并附「跳过」链接。点击后客户端自动把选项文本作为消息发送,插件拦截后走 SDK RPC 直接解析为回答(「跳过」则取消该问题)。
|
|
186
|
+
- **手动输入自由文本 / 分步多题(自动生效,无需配置)**:当问题允许自定义答案(`Other`/无选项)或 Agent 一次提出多个问题(分步询问)时,用户输入的任何文本都会被采纳为该问题的答案。插件**优先走核心 claim 通道**(`claimPendingAgentQuestionAnswer`,answered 语义)——AI 的 ask_user 直接收到解析后的答案(支持 `问题标题: 答案` 逐行格式与按问题顺序逐行回复),**不会出现「用户取消了/被跳过」的误导回复**;claim 不可用(旧版核心无 pending 机制)时降级为取消问题 + 以用户身份注入合成消息(飞书 ask-user 模式),AI 在新一轮收到答案。
|
|
187
|
+
|
|
188
|
+
回答处理规则:单题选项类问题仅拦截「选项 label / 编号」文本,其它文本(闲聊)照常进入 Agent;允许自定义或分步多题的问题会拦截「任何文本」作为答案。所有增强均为尽力而为(try/catch + 配置开关),任何失败都不影响问题文本本身送达。
|
|
189
|
+
|
|
175
190
|
## 支持的消息类型
|
|
176
191
|
|
|
177
192
|
| msgtype | 处理方式 |
|
|
@@ -56,6 +56,7 @@ export const yachPlugin = {
|
|
|
56
56
|
baseUrl: { type: "string", description: "知音楼 OAPI 基础 URL,例如 https://yach-oapi.zhiyinlou.com" },
|
|
57
57
|
webhookPath: { type: "string", description: "自定义 Webhook 接收路径,例如 /my-bot/hook。默认为 /yach/{accountId}/messages" },
|
|
58
58
|
typingExpression: { type: "string", description: "输入状态表情,例如 [思考]。配置后 bot 处理时贴表情,回复完成后自动撤销" },
|
|
59
|
+
questionFoldLinks: { type: "boolean", description: "ask_user 问题是否渲染「有序列表 + 可点击折叠链接」选项(默认 true,含底部「跳过」链接)" },
|
|
59
60
|
markdownTableMode: { type: "string", enum: ["code", "table"], description: "表格模式:code=代码块,table=表格" },
|
|
60
61
|
textChunkLimit: { type: "integer", minimum: 1 },
|
|
61
62
|
chunkMode: { type: "string", enum: ["length", "newline"] },
|
|
@@ -105,6 +106,8 @@ export const yachPlugin = {
|
|
|
105
106
|
baseUrl: { type: "string" },
|
|
106
107
|
webhookPath: { type: "string" },
|
|
107
108
|
connectionMode: { type: "string", enum: ["webhook", "channel"] },
|
|
109
|
+
typingExpression: { type: "string" },
|
|
110
|
+
questionFoldLinks: { type: "boolean", description: "ask_user 问题是否渲染「有序列表 + 可点击折叠链接」选项(默认 true,含底部「跳过」链接)" },
|
|
108
111
|
},
|
|
109
112
|
},
|
|
110
113
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/channel/plugin.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/channel/plugin.ts"],"names":[],"mappings":"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"}
|
package/dist/src/core/aes.js
CHANGED
|
@@ -1,12 +1,32 @@
|
|
|
1
|
-
import { createDecipheriv } from "node:crypto";
|
|
1
|
+
import { createCipheriv, createDecipheriv } from "node:crypto";
|
|
2
|
+
/** 构造 16 字节 AES key(右填 \x00) */
|
|
3
|
+
function buildKey(appKey) {
|
|
4
|
+
const keyBuf = Buffer.alloc(16, 0);
|
|
5
|
+
Buffer.from(appKey, "utf-8").copy(keyBuf, 0, 0, Math.min(appKey.length, 16));
|
|
6
|
+
return keyBuf;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* 用 AES-128-ECB 加密知音楼字段(senderId / conversationId / msgId 等)。
|
|
10
|
+
* 与 aesDecrypt 互逆:PKCS7 padding,base64 输出。
|
|
11
|
+
* 用于合成消息(synthetic message)注入时构造入站消息字段。
|
|
12
|
+
*/
|
|
13
|
+
export function aesEncrypt(plain, appKey) {
|
|
14
|
+
const keyBuf = buildKey(appKey);
|
|
15
|
+
const plainBuf = Buffer.from(plain, "utf-8");
|
|
16
|
+
// PKCS7 pad(16 字节块;整块时补一个完整块)
|
|
17
|
+
const padLen = 16 - (plainBuf.length % 16);
|
|
18
|
+
const padded = Buffer.concat([plainBuf, Buffer.alloc(padLen, padLen)]);
|
|
19
|
+
const cipher = createCipheriv("aes-128-ecb", keyBuf, null);
|
|
20
|
+
cipher.setAutoPadding(false);
|
|
21
|
+
return Buffer.concat([cipher.update(padded), cipher.final()]).toString("base64");
|
|
22
|
+
}
|
|
2
23
|
/**
|
|
3
24
|
* 用 AES-128-ECB 解密知音楼加密字段(senderId / conversationId / msgId 等)
|
|
4
25
|
* 密钥不足 16 字节时右填 \x00
|
|
5
26
|
*/
|
|
6
27
|
export function aesDecrypt(encBase64, appKey) {
|
|
7
28
|
// 构造 16 字节 key(右填充 \x00)
|
|
8
|
-
const keyBuf =
|
|
9
|
-
Buffer.from(appKey, "utf-8").copy(keyBuf, 0, 0, Math.min(appKey.length, 16));
|
|
29
|
+
const keyBuf = buildKey(appKey);
|
|
10
30
|
const encBuf = Buffer.from(encBase64, "base64");
|
|
11
31
|
// AES-128-ECB,关闭自动 padding 后手动 PKCS7 unpad
|
|
12
32
|
const decipher = createDecipheriv("aes-128-ecb", keyBuf, null);
|
package/dist/src/core/aes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aes.js","sourceRoot":"","sources":["../../../src/core/aes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/
|
|
1
|
+
{"version":3,"file":"aes.js","sourceRoot":"","sources":["../../../src/core/aes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/D,gCAAgC;AAChC,SAAS,QAAQ,CAAC,MAAc;IAC9B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IACnC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;IAC7E,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,KAAa,EAAE,MAAc;IACtD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAChC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC7C,8BAA8B;IAC9B,MAAM,MAAM,GAAG,EAAE,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC7B,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACnF,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,SAAiB,EAAE,MAAc;IAC1D,yBAAyB;IACzB,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAEhD,2CAA2C;IAC3C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/D,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAE7E,cAAc;IACd,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/C,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACzE,CAAC"}
|
|
@@ -9,6 +9,8 @@
|
|
|
9
9
|
* - 工具层:无需显式传参即可感知当前对话上下文
|
|
10
10
|
*/
|
|
11
11
|
import { AsyncLocalStorage } from "node:async_hooks";
|
|
12
|
+
import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
|
|
13
|
+
import { getYachConfig } from "./runtime.js";
|
|
12
14
|
// ── AsyncLocalStorage ─────────────────────────────────────────────────────
|
|
13
15
|
const store = new AsyncLocalStorage();
|
|
14
16
|
// ── 公开 API ──────────────────────────────────────────────────────────────
|
|
@@ -28,4 +30,83 @@ export function ticketElapsed() {
|
|
|
28
30
|
const t = store.getStore();
|
|
29
31
|
return t ? Date.now() - t.startTime : 0;
|
|
30
32
|
}
|
|
33
|
+
// ── ToolContext 兜底 ──────────────────────────────────────────────────────
|
|
34
|
+
//
|
|
35
|
+
// 9.5 起核心在独立异步上下文中执行插件工具,handler 里 withYachTicket() 注入的
|
|
36
|
+
// ALS 上下文在工具 execute 时已不可见(实测 hasTicket=false)。核心同时把会话
|
|
37
|
+
// 身份经 OpenClawPluginToolContext(工厂形式注册时下发)带给插件:
|
|
38
|
+
// requesterSenderId → 发送方 yach userId
|
|
39
|
+
// deliveryContext.{channel,to,accountId} → 渠道 / 目标 / 账号
|
|
40
|
+
// sessionKey → agent:main:yach:{account}:{direct|group}:{peer}
|
|
41
|
+
// 因此工具执行时若 ALS 无 ticket,就用该 ctx 重建一个。
|
|
42
|
+
//
|
|
43
|
+
// 注意:仅限「用户消息触发的工具调用」——requesterSenderId 来自核心入站的
|
|
44
|
+
// 真实发送者。cron / subagent / heartbeat 触发的 run 核心明确不设置 senderId
|
|
45
|
+
// (requesterSenderId 为 undefined),此时不重建(返回 undefined),工具走
|
|
46
|
+
// 现有「不在消息上下文中」降级路径,绝不伪造发送者身份。
|
|
47
|
+
/**
|
|
48
|
+
* 把核心下发的账号标识(appKey / accountId)解析为插件侧账号 ID:
|
|
49
|
+
* 先按 appKey 匹配 channels.yach.accounts,命中返回其 ID;否则原样归一化。
|
|
50
|
+
*/
|
|
51
|
+
function resolveAccountIdForToolContext(ctx) {
|
|
52
|
+
const raw = ctx.deliveryContext?.accountId ?? ctx.agentAccountId;
|
|
53
|
+
if (!raw)
|
|
54
|
+
return DEFAULT_ACCOUNT_ID;
|
|
55
|
+
try {
|
|
56
|
+
const cfg = getYachConfig();
|
|
57
|
+
const accounts = cfg?.channels?.yach?.accounts;
|
|
58
|
+
if (accounts && typeof accounts === "object") {
|
|
59
|
+
for (const [id, acct] of Object.entries(accounts)) {
|
|
60
|
+
if (acct?.appKey && acct.appKey === raw)
|
|
61
|
+
return normalizeAccountId(id);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
catch {
|
|
66
|
+
// config 不可用(runtime 未初始化)时降级为原样归一化
|
|
67
|
+
}
|
|
68
|
+
return normalizeAccountId(raw);
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* 用 OpenClawPluginToolContext 重建 YachTicket(ALS 兜底)。
|
|
72
|
+
*
|
|
73
|
+
* 仅当 ctx 明确属于 yach 渠道且 requesterSenderId 存在(真实用户消息触发)时
|
|
74
|
+
* 重建;cron/subagent 等无发送者场景返回 undefined,不伪造发送者身份。
|
|
75
|
+
*/
|
|
76
|
+
export function rebuildTicketFromToolContext(ctx) {
|
|
77
|
+
if (!ctx)
|
|
78
|
+
return undefined;
|
|
79
|
+
const delivery = ctx.deliveryContext;
|
|
80
|
+
if (delivery?.channel && delivery.channel !== "yach")
|
|
81
|
+
return undefined;
|
|
82
|
+
// 发送者必须来自核心入站的真实 requesterSenderId;
|
|
83
|
+
// 缺失(cron/subagent/heartbeat)时不从 sessionKey 猜测,避免误用会话归属用户。
|
|
84
|
+
const senderId = ctx.requesterSenderId;
|
|
85
|
+
if (!senderId)
|
|
86
|
+
return undefined;
|
|
87
|
+
const to = delivery?.to ?? "";
|
|
88
|
+
const isGroup = to.startsWith("group:");
|
|
89
|
+
const toId = isGroup ? to.replace(/^group:/, "") : senderId;
|
|
90
|
+
return {
|
|
91
|
+
// msgId 无来源时用 sessionId 保证唯一性(仅用于日志关联/合成消息前缀)
|
|
92
|
+
msgId: ctx.sessionId ?? "tool-ctx",
|
|
93
|
+
toId,
|
|
94
|
+
senderId,
|
|
95
|
+
accountId: resolveAccountIdForToolContext(ctx),
|
|
96
|
+
conversationType: isGroup ? "2" : "1",
|
|
97
|
+
startTime: Date.now(),
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* 工具执行上下文兜底包装:ALS 已有 ticket 则直接执行;
|
|
102
|
+
* 否则用 ToolContext 重建并注入,使工具内部 getYachTicket() 始终有值。
|
|
103
|
+
*/
|
|
104
|
+
export async function runToolWithContext(ctx, fn) {
|
|
105
|
+
if (getYachTicket())
|
|
106
|
+
return fn();
|
|
107
|
+
const ticket = rebuildTicketFromToolContext(ctx);
|
|
108
|
+
if (!ticket)
|
|
109
|
+
return fn();
|
|
110
|
+
return withYachTicket(ticket, fn);
|
|
111
|
+
}
|
|
31
112
|
//# sourceMappingURL=yach-ticket.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yach-ticket.js","sourceRoot":"","sources":["../../../src/core/yach-ticket.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"yach-ticket.js","sourceRoot":"","sources":["../../../src/core/yach-ticket.ts"],"names":[],"mappings":"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"}
|
|
@@ -165,6 +165,7 @@ export async function processMessage(params) {
|
|
|
165
165
|
replyToMessageId: message.quoteMsgId ?? message.msgIdClient,
|
|
166
166
|
accountId: account.appKey,
|
|
167
167
|
fromUserId: senderId,
|
|
168
|
+
sessionKey: route.sessionKey,
|
|
168
169
|
});
|
|
169
170
|
try {
|
|
170
171
|
const { queuedFinal, counts } = await core.channel.reply.withReplyDispatcher({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatcher.js","sourceRoot":"","sources":["../../../../src/messaging/inbound/dispatcher.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"dispatcher.js","sourceRoot":"","sources":["../../../../src/messaging/inbound/dispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { aesDecrypt } from "../../core/aes.js";
|
|
1
|
+
import { aesDecrypt, aesEncrypt } from "../../core/aes.js";
|
|
2
2
|
import { processMessage } from "./dispatcher.js";
|
|
3
3
|
import { YachClient } from "../../core/yach-client.js";
|
|
4
4
|
import { getYachRuntime } from "../../core/runtime.js";
|
|
@@ -9,6 +9,8 @@ import { getAccountBotCfg } from "../../accounts/index.js";
|
|
|
9
9
|
import { withYachTicket } from "../../core/yach-ticket.js";
|
|
10
10
|
import { handleCallbackMessage } from "./callback-handler.js";
|
|
11
11
|
import { reportError } from "../../core/reporter.js";
|
|
12
|
+
import { tryResolveQuestionFoldText } from "../question-runtime.js";
|
|
13
|
+
import { resolveMessageBody } from "./parse.js";
|
|
12
14
|
// ── 消息类型白名单 ────────────────────────────────────────────────────────────
|
|
13
15
|
export function shouldHandle(msgtype) {
|
|
14
16
|
if (!msgtype)
|
|
@@ -20,12 +22,15 @@ export function shouldHandle(msgtype) {
|
|
|
20
22
|
]);
|
|
21
23
|
return HANDLED.has(msgtype);
|
|
22
24
|
}
|
|
25
|
+
/** 表情/回复事件:不承载 agent 消息,入站直接忽略(不做普通分发)。 */
|
|
26
|
+
const REACTION_MSGTYPES = new Set(["expression", "reaction"]);
|
|
23
27
|
// ── 入站消息主处理 ────────────────────────────────────────────────────────────
|
|
24
28
|
export async function handleInboundMessage(params) {
|
|
25
29
|
const { message, account, cfg, logger } = params;
|
|
26
30
|
const msgtype = message?.msgtype;
|
|
27
31
|
logger.info("yach[" + account.accountId + "]: received " + msgtype + " from " + message?.senderId);
|
|
28
|
-
|
|
32
|
+
// 未知类型直接忽略(reaction 类型在解密后单独处理,不在此拦截)
|
|
33
|
+
if (!shouldHandle(msgtype) && !REACTION_MSGTYPES.has(msgtype))
|
|
29
34
|
return;
|
|
30
35
|
if (!account.configured || !account.appKey || !account.appSecret) {
|
|
31
36
|
logger.error("[yach] account " + account.accountId + " appKey/appSecret not configured");
|
|
@@ -61,6 +66,11 @@ export async function handleInboundMessage(params) {
|
|
|
61
66
|
reportError("inbound.handler", "decrypt failed", { err: String(err), accountId: account.accountId, msgType: msgtype });
|
|
62
67
|
return;
|
|
63
68
|
}
|
|
69
|
+
// ── 表情/回复事件(不承载 agent 消息,直接忽略,不做普通分发)──
|
|
70
|
+
if (REACTION_MSGTYPES.has(msgtype))
|
|
71
|
+
return;
|
|
72
|
+
if (!shouldHandle(msgtype))
|
|
73
|
+
return;
|
|
64
74
|
// P0: 消息去重
|
|
65
75
|
const dedupKey = msgId || message.msgIdClient;
|
|
66
76
|
if (dedupKey) {
|
|
@@ -173,6 +183,51 @@ export async function handleInboundMessage(params) {
|
|
|
173
183
|
senderId, conversationId, msgId, senderName, senderTag,
|
|
174
184
|
conversationType, isGroup, chatId, toId, message,
|
|
175
185
|
};
|
|
186
|
+
// ── fold 链接点击 / 手动输入解析:文本命中 pending ask_user 时消费并解析 ──
|
|
187
|
+
// 知音楼 fold 链接(session/robot?reply=)点击后,客户端自动把 reply 文本作为
|
|
188
|
+
// 普通 text 消息发送到会话;此处拦截:
|
|
189
|
+
// - 命中选项 label/编号 → 直接 resolve(与表情路径一致,绕开核心纯文本 claim
|
|
190
|
+
// 的 caller 指纹校验);
|
|
191
|
+
// - 问题允许自由文本 / 多问题时,未命中选项的文本按「手动输入答案」采纳,
|
|
192
|
+
// 以用户身份注入合成消息(synthetic message,参考飞书插件 ask-user 的
|
|
193
|
+
// 实现),让 AI 在新一轮收到答案 —— 不依赖核心纯文本 claim。
|
|
194
|
+
if (msgtype === "text" || msgtype === "fold" || msgtype === "reply") {
|
|
195
|
+
const foldBody = resolveMessageBody(message).trim();
|
|
196
|
+
if (foldBody) {
|
|
197
|
+
const resolved = await tryResolveQuestionFoldText({
|
|
198
|
+
cfg,
|
|
199
|
+
senderId,
|
|
200
|
+
chatId,
|
|
201
|
+
text: foldBody,
|
|
202
|
+
logDebug: (m) => logger.info("[yach-question-fold] " + m),
|
|
203
|
+
}).catch((err) => {
|
|
204
|
+
logger.error("[yach-question-fold] resolve failed: " + String(err));
|
|
205
|
+
return { handled: false };
|
|
206
|
+
});
|
|
207
|
+
if (resolved.handled) {
|
|
208
|
+
logger.info("yach[" + account.accountId + "]: fold text consumed as question answer sender=" + senderId +
|
|
209
|
+
" text=" + JSON.stringify(foldBody) + ("inject" in resolved ? " (inject synthetic)" : ""));
|
|
210
|
+
if ("inject" in resolved && resolved.inject) {
|
|
211
|
+
// 自由文本 / 多问题答案:注入合成消息让 AI 在新一轮收到(飞书 ask-user 模式)
|
|
212
|
+
await injectSyntheticAnswer({
|
|
213
|
+
cfg,
|
|
214
|
+
account,
|
|
215
|
+
senderId,
|
|
216
|
+
conversationId,
|
|
217
|
+
isGroup,
|
|
218
|
+
chatId,
|
|
219
|
+
toId,
|
|
220
|
+
senderName,
|
|
221
|
+
text: resolved.inject,
|
|
222
|
+
logger,
|
|
223
|
+
}).catch((err) => {
|
|
224
|
+
logger.error("[yach-question-fold] synthetic answer inject failed: " + String(err));
|
|
225
|
+
});
|
|
226
|
+
}
|
|
227
|
+
return;
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
}
|
|
176
231
|
const ticket = {
|
|
177
232
|
msgId,
|
|
178
233
|
msgIdClient: message.msgIdClient,
|
|
@@ -212,4 +267,47 @@ export async function handleInboundMessage(params) {
|
|
|
212
267
|
logger.info("yach[" + account.accountId + "]: message queued for chat=" + chatId + " (queue not empty)");
|
|
213
268
|
}
|
|
214
269
|
}
|
|
270
|
+
/**
|
|
271
|
+
* 把一段文本以「用户身份」的合成消息注入会话(synthetic message)。
|
|
272
|
+
*
|
|
273
|
+
* 参考飞书插件(@lark-apaas/openclaw-lark)ask-user 的实现:用户提交的自由文本 /
|
|
274
|
+
* 多问题答案不依赖核心纯文本 claim(8.1 的 auto-reply 管线根本没有 claim 机制,
|
|
275
|
+
* 9.4 才有且带 caller 指纹校验),而是构造一条以用户身份发送的 text 消息走
|
|
276
|
+
* 正常 dispatch,AI 在新一轮收到答案。
|
|
277
|
+
*
|
|
278
|
+
* 字段与 webhook/sdk 推送格式一致:敏感字段(senderId/conversationId/msgId)
|
|
279
|
+
* 用 appKey 做 AES 加密,processMessage 内会统一解密。
|
|
280
|
+
*/
|
|
281
|
+
async function injectSyntheticAnswer(params) {
|
|
282
|
+
const { cfg, account, senderId, conversationId, isGroup, chatId, toId, senderName, text, logger, } = params;
|
|
283
|
+
const botCfg = getAccountBotCfg(account);
|
|
284
|
+
const conversationType = isGroup ? "2" : "1";
|
|
285
|
+
const msgId = `yach-inject-answer-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
|
|
286
|
+
const synthetic = {
|
|
287
|
+
msgtype: "text",
|
|
288
|
+
content: text,
|
|
289
|
+
appID: account.appKey ?? "",
|
|
290
|
+
msgId: aesEncrypt(msgId, botCfg.appKey),
|
|
291
|
+
conversationId: isGroup ? aesEncrypt(conversationId, botCfg.appKey) : "",
|
|
292
|
+
conversationType,
|
|
293
|
+
senderId: aesEncrypt(senderId, botCfg.appKey),
|
|
294
|
+
senderNick: senderName,
|
|
295
|
+
senderNickName: senderName,
|
|
296
|
+
createAt: String(Date.now()),
|
|
297
|
+
};
|
|
298
|
+
const syntheticCtx = {
|
|
299
|
+
senderId,
|
|
300
|
+
conversationId,
|
|
301
|
+
msgId,
|
|
302
|
+
senderName,
|
|
303
|
+
conversationType,
|
|
304
|
+
isGroup,
|
|
305
|
+
chatId,
|
|
306
|
+
toId,
|
|
307
|
+
message: synthetic,
|
|
308
|
+
};
|
|
309
|
+
logger.info("yach[" + account.accountId + "]: injecting synthetic answer sender=" + senderId +
|
|
310
|
+
" chat=" + chatId + " text=" + JSON.stringify(text.slice(0, 120)));
|
|
311
|
+
await processMessage({ ctx: syntheticCtx, account, cfg });
|
|
312
|
+
}
|
|
215
313
|
//# sourceMappingURL=handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../../src/messaging/inbound/handler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../../src/messaging/inbound/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import { YachStreamingCard } from "../../card/streaming-card.js";
|
|
|
7
7
|
import { YachClient } from "../../core/yach-client.js";
|
|
8
8
|
import { yachOutbound } from "./outbound.js";
|
|
9
9
|
import { reportEvent } from "../../core/reporter.js";
|
|
10
|
+
import { extractQuestionTitle, prepareQuestionText, readAskUserQuestionId, readQuestionAllowsCustomInput, registerChatPendingQuestion, } from "../question-runtime.js";
|
|
10
11
|
const log = yachLogger("messaging/outbound");
|
|
11
12
|
function resolveTarget(chatId) {
|
|
12
13
|
if (chatId.startsWith("group:")) {
|
|
@@ -16,7 +17,7 @@ function resolveTarget(chatId) {
|
|
|
16
17
|
}
|
|
17
18
|
export function createYachReplyDispatcher(params) {
|
|
18
19
|
const core = getYachRuntime();
|
|
19
|
-
const { cfg, agentId, chatId, accountId, replyToMessageId, fromUserId } = params;
|
|
20
|
+
const { cfg, agentId, chatId, accountId, replyToMessageId, fromUserId, sessionKey } = params;
|
|
20
21
|
const account = resolveYachAccountByBotId({ cfg, botId: accountId });
|
|
21
22
|
const prefixContext = createReplyPrefixContext({ cfg, agentId });
|
|
22
23
|
const client = YachClient.fromAccount(account);
|
|
@@ -134,6 +135,49 @@ export function createYachReplyDispatcher(params) {
|
|
|
134
135
|
typingCallbacks.onCleanup?.();
|
|
135
136
|
},
|
|
136
137
|
deliver: async (payload, info) => {
|
|
138
|
+
// ── ask_user 问题(Gateway Question)───────────────────────────────
|
|
139
|
+
// 问题必须作为独立 markdown 消息直接送达:绕过流式卡片与 streaming-skip 判断
|
|
140
|
+
// (流式已完成时原逻辑会静默丢弃问题文本),并登记 chatId 级 pending 供
|
|
141
|
+
// 入站解析(选项 fold 链接 / 手动输入 / 自由文本 / 分步多题)。
|
|
142
|
+
const questionId = await readAskUserQuestionId(payload);
|
|
143
|
+
if (questionId !== undefined) {
|
|
144
|
+
const prepared = await prepareQuestionText(payload, { foldLinks: account.config.questionFoldLinks !== false });
|
|
145
|
+
const qText = prepared.text ?? "";
|
|
146
|
+
let replyMsgId;
|
|
147
|
+
if (qText.trim()) {
|
|
148
|
+
const converted = core.channel.text.convertMarkdownTables(qText, tableMode);
|
|
149
|
+
for (const chunk of core.channel.text.chunkTextWithMode(converted, textChunkLimit, chunkMode)) {
|
|
150
|
+
const mid = await client.im.sendMessage({
|
|
151
|
+
toId,
|
|
152
|
+
conversationType,
|
|
153
|
+
payload: { msgtype: "markdown", markdown: { title: chunk.slice(0, 50), text: chunk } },
|
|
154
|
+
});
|
|
155
|
+
if (mid)
|
|
156
|
+
replyMsgId = mid;
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
if (replyMsgId) {
|
|
160
|
+
// 只要问题已发出(单题或多题/分步)都登记 chatId 级 pending:
|
|
161
|
+
// - 单题:入站命中选项 label/编号 → RPC resolve
|
|
162
|
+
// - 多题 / 允许自定义:未命中选项的文本按自由文本答案采纳并注入
|
|
163
|
+
// 合成消息(synthetic message,参考飞书插件 ask-user 实现),
|
|
164
|
+
// 让 AI 在新一轮收到答案
|
|
165
|
+
registerChatPendingQuestion({
|
|
166
|
+
chatId,
|
|
167
|
+
questionId,
|
|
168
|
+
sessionKey,
|
|
169
|
+
optionValues: prepared.binding?.optionValues ?? [],
|
|
170
|
+
labels: prepared.labels ?? [],
|
|
171
|
+
allowCustomInput: readQuestionAllowsCustomInput(payload) ?? !prepared.binding,
|
|
172
|
+
multi: !prepared.binding,
|
|
173
|
+
questionText: extractQuestionTitle(payload.text ?? ""),
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
reportEvent("outbound.reply", "ask_user question sent", {
|
|
177
|
+
chatId, accountId, agentId, conversationType, msgType: "question", questionId, replyMsgId,
|
|
178
|
+
});
|
|
179
|
+
return;
|
|
180
|
+
}
|
|
137
181
|
const rawText = payload.text ?? "";
|
|
138
182
|
const text = transformModelTextToFoldLinks(rawText) ?? rawText;
|
|
139
183
|
const mediaUrls = payload.mediaUrls ?? [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reply-dispatcher.js","sourceRoot":"","sources":["../../../../src/messaging/outbound/reply-dispatcher.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"reply-dispatcher.js","sourceRoot":"","sources":["../../../../src/messaging/outbound/reply-dispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,507 @@
|
|
|
1
|
+
import { buildFoldUrl } from "../card/model-fold-links.js";
|
|
2
|
+
/** 「跳过」选项的固定 label(渲染在选项链接末尾,点击后取消 pending question)。 */
|
|
3
|
+
const QUESTION_SKIP_LABEL = "跳过";
|
|
4
|
+
/** 懒加载缓存:undefined=未加载,null=旧版核心无此子路径(降级),对象=已加载。 */
|
|
5
|
+
let questionGatewayRuntimeCache;
|
|
6
|
+
/**
|
|
7
|
+
* 懒加载 question-gateway-runtime(2026.8.1+ 才有)。
|
|
8
|
+
* 旧版(<2026.8.1)import 失败时缓存 null,ask_user 增强整体降级为纯文本路径。
|
|
9
|
+
*/
|
|
10
|
+
async function loadQuestionGatewayRuntime() {
|
|
11
|
+
if (questionGatewayRuntimeCache === undefined) {
|
|
12
|
+
try {
|
|
13
|
+
questionGatewayRuntimeCache = (await import("openclaw/plugin-sdk/question-gateway-runtime"))
|
|
14
|
+
.questionGatewayRuntime;
|
|
15
|
+
}
|
|
16
|
+
catch {
|
|
17
|
+
questionGatewayRuntimeCache = null;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
return questionGatewayRuntimeCache;
|
|
21
|
+
}
|
|
22
|
+
/** 读取 payload 中的 ask_user questionId(无则 undefined;旧版核心恒为 undefined)。 */
|
|
23
|
+
export async function readAskUserQuestionId(payload) {
|
|
24
|
+
const rt = await loadQuestionGatewayRuntime();
|
|
25
|
+
return rt?.readAskUserQuestionId(payload);
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* 从 payload presentation 中读取 ask_user 的选项 label 与 description。
|
|
29
|
+
* 与 SDK 的 prepareReactionPayloadForDelivery 共用同一提取逻辑(buttons block)。
|
|
30
|
+
* 注意:核心(8.1/9.3/9.4)的 buttons block **不含 description**,description 只在
|
|
31
|
+
* payload.text 的编号选项行(`1. label - description`,与多题解析同一分隔符)里,
|
|
32
|
+
* 因此按钮无 description 时回退到从 text 行按 label 匹配提取。
|
|
33
|
+
*/
|
|
34
|
+
function readQuestionOptionLabels(payload) {
|
|
35
|
+
try {
|
|
36
|
+
const presentation = payload.presentation;
|
|
37
|
+
const buttonBlock = presentation?.blocks?.find((b) => b.type === "buttons");
|
|
38
|
+
if (!buttonBlock?.buttons?.length)
|
|
39
|
+
return undefined;
|
|
40
|
+
const items = buttonBlock.buttons
|
|
41
|
+
.filter((b) => b.action?.type === "question" && typeof b.action.optionValue === "string")
|
|
42
|
+
.map((b) => ({
|
|
43
|
+
label: typeof b.label === "string" ? b.label : "",
|
|
44
|
+
description: typeof b.description === "string" ? b.description : undefined,
|
|
45
|
+
}))
|
|
46
|
+
.filter((it) => it.label.length > 0);
|
|
47
|
+
if (!items.length)
|
|
48
|
+
return undefined;
|
|
49
|
+
const labels = items.map((it) => it.label);
|
|
50
|
+
const fromText = extractOptionDescriptions(payload.text, labels);
|
|
51
|
+
return {
|
|
52
|
+
labels,
|
|
53
|
+
descriptions: items.map((it, i) => it.description ?? fromText[i]),
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
catch {
|
|
57
|
+
return undefined;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* 从 payload.text 的编号选项行(`1. label - description`)解析每个 label 的 description。
|
|
62
|
+
* 只在按钮无 description 时作 fallback;label 匹配失败的行忽略(header/question 行
|
|
63
|
+
* 即使带编号也因无 ` - ` 分隔符或 label 不匹配而跳过)。
|
|
64
|
+
*/
|
|
65
|
+
function extractOptionDescriptions(text, labels) {
|
|
66
|
+
const result = labels.map(() => undefined);
|
|
67
|
+
if (!text)
|
|
68
|
+
return result;
|
|
69
|
+
for (const line of text.split("\n")) {
|
|
70
|
+
const m = NUMBERED_PATTERN.exec(line.trim());
|
|
71
|
+
if (!m)
|
|
72
|
+
continue;
|
|
73
|
+
const rest = m[2];
|
|
74
|
+
const sepIdx = rest.indexOf(OPTION_DESC_SEPARATOR);
|
|
75
|
+
if (sepIdx < 0)
|
|
76
|
+
continue;
|
|
77
|
+
const label = rest.slice(0, sepIdx).trim();
|
|
78
|
+
const idx = labels.findIndex((l) => l === label);
|
|
79
|
+
if (idx < 0)
|
|
80
|
+
continue;
|
|
81
|
+
const desc = rest.slice(sepIdx + OPTION_DESC_SEPARATOR.length).trim();
|
|
82
|
+
if (desc)
|
|
83
|
+
result[idx] = desc;
|
|
84
|
+
}
|
|
85
|
+
return result;
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* 渲染问题文本:构建「选项有序列表 + fold 链接」格式。
|
|
89
|
+
*
|
|
90
|
+
* 每个选项渲染为一行有序列表 + 可点击 fold 链接:
|
|
91
|
+
* 1. [中式快餐(推荐)](yach://...session/robot?type=fold&reply=中式快餐(推荐))
|
|
92
|
+
* 末尾追加一行「跳过」链接(点击后取消 pending question)。
|
|
93
|
+
* 点击任意链接后知音楼客户端自动把 reply 值(= 选项 label)作为消息发送
|
|
94
|
+
* 到当前会话,插件入站拦截后走 SDK RPC resolve 解析为回答。
|
|
95
|
+
*/
|
|
96
|
+
export async function prepareQuestionText(payload, opts) {
|
|
97
|
+
const foldLinks = opts?.foldLinks !== false;
|
|
98
|
+
const options = readQuestionOptionLabels(payload);
|
|
99
|
+
let binding;
|
|
100
|
+
const rt = await loadQuestionGatewayRuntime();
|
|
101
|
+
if (rt) {
|
|
102
|
+
try {
|
|
103
|
+
const prepared = rt.prepareReactionPayloadForDelivery({ payload });
|
|
104
|
+
if (prepared)
|
|
105
|
+
binding = rt.readReactionBinding(prepared);
|
|
106
|
+
}
|
|
107
|
+
catch {
|
|
108
|
+
// 绑定读取失败不影响文本渲染
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
const rawText = payload.text ?? "";
|
|
112
|
+
// 多问题 / multiSelect / 无选项场景:SDK 不生成 presentation.buttons,
|
|
113
|
+
// payload.text 是 formatAgentHarnessUserInputPrompt 拼出的多问题原文(英文包装)。
|
|
114
|
+
// 这里尝试重新解析并渲染为中文友好格式(不渲染 fold 链接,让用户按编号回复)。
|
|
115
|
+
if (foldLinks && !options) {
|
|
116
|
+
const multi = parseMultiQuestionPrompt(rawText);
|
|
117
|
+
if (multi) {
|
|
118
|
+
return { text: buildMultiQuestionText(multi), binding };
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
// 单问题且有 options:从 rawText 中提取干净的问题标题(去掉 SDK 英文包装 + 选项行 + Other + 引导),
|
|
122
|
+
// 只保留 header 与 question 行(避免用户同时看到两套问题:自己的选项 + 在原始文本里)。
|
|
123
|
+
return {
|
|
124
|
+
text: foldLinks && options ? buildQuestionText(rawText, options.labels, options.descriptions) : rawText,
|
|
125
|
+
binding,
|
|
126
|
+
labels: options?.labels,
|
|
127
|
+
descriptions: options?.descriptions,
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
/** 从 SDK 包装文本中提取干净的问题标题(header + question)。 */
|
|
131
|
+
export function extractQuestionTitle(rawText) {
|
|
132
|
+
try {
|
|
133
|
+
const lines = rawText.split("\n").map((l) => l.replace(/\s+$/, ""));
|
|
134
|
+
const out = [];
|
|
135
|
+
let i = 0;
|
|
136
|
+
// 跳过开头英文标题
|
|
137
|
+
while (i < lines.length && (INTRO_PATTERN.test(lines[i]) || !lines[i]))
|
|
138
|
+
i++;
|
|
139
|
+
// 收集 header + question(直到空行或"数字. ..."选项行或"Other:"或引导行)
|
|
140
|
+
while (i < lines.length) {
|
|
141
|
+
const line = lines[i];
|
|
142
|
+
if (!line) {
|
|
143
|
+
if (out.length)
|
|
144
|
+
break;
|
|
145
|
+
i++;
|
|
146
|
+
continue;
|
|
147
|
+
}
|
|
148
|
+
if (OTHER_PATTERN.test(line))
|
|
149
|
+
break;
|
|
150
|
+
if (TRAILING_GUIDANCE_PATTERN.test(line))
|
|
151
|
+
break;
|
|
152
|
+
// 选项行("数字. xxx")开头就停
|
|
153
|
+
if (NUMBERED_PATTERN.test(line))
|
|
154
|
+
break;
|
|
155
|
+
out.push(line);
|
|
156
|
+
i++;
|
|
157
|
+
}
|
|
158
|
+
return out.join("\n").trim() || (rawText.split("\n")[0] ?? "");
|
|
159
|
+
}
|
|
160
|
+
catch {
|
|
161
|
+
return rawText;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
/** 构建「问题 + 选项有序列表(label + description)+ 跳过链接 + 自由输入提示」的问题文本。 */
|
|
165
|
+
function buildQuestionText(text, labels, descriptions) {
|
|
166
|
+
const title = extractQuestionTitle(text);
|
|
167
|
+
const lines = labels.map((label, i) => {
|
|
168
|
+
const desc = descriptions[i];
|
|
169
|
+
const link = `[${label}](${buildFoldUrl(label)})`;
|
|
170
|
+
return desc ? `${i + 1}. **${link}** — ${desc}` : `${i + 1}. ${link}`;
|
|
171
|
+
});
|
|
172
|
+
return [
|
|
173
|
+
title ? `**${title}**` : "",
|
|
174
|
+
"",
|
|
175
|
+
lines.join("\n"),
|
|
176
|
+
"",
|
|
177
|
+
`[${QUESTION_SKIP_LABEL}](${buildFoldUrl(QUESTION_SKIP_LABEL)})`,
|
|
178
|
+
"",
|
|
179
|
+
"---",
|
|
180
|
+
"",
|
|
181
|
+
`💬 **您也可以直接输入您的答案**`,
|
|
182
|
+
].filter(Boolean).join("\n");
|
|
183
|
+
}
|
|
184
|
+
const INTRO_PATTERN = /^(Agent needs input|Question for you):?\s*$/;
|
|
185
|
+
const NUMBERED_PATTERN = /^(\d+)\.\s+(.+)$/;
|
|
186
|
+
const OPTION_DESC_SEPARATOR = " - ";
|
|
187
|
+
const OTHER_PATTERN = /^Other:/i;
|
|
188
|
+
const TRAILING_GUIDANCE_PATTERN = /^Reply (by|with)/i;
|
|
189
|
+
function parseMultiQuestionPrompt(text) {
|
|
190
|
+
try {
|
|
191
|
+
const lines = text.split("\n");
|
|
192
|
+
const out = [];
|
|
193
|
+
let i = 0;
|
|
194
|
+
let current = null;
|
|
195
|
+
const flush = () => {
|
|
196
|
+
if (current && (current.options.length > 0 || current.question || current.isOther)) {
|
|
197
|
+
out.push(current);
|
|
198
|
+
}
|
|
199
|
+
current = null;
|
|
200
|
+
};
|
|
201
|
+
for (; i < lines.length; i++) {
|
|
202
|
+
const raw = lines[i];
|
|
203
|
+
const line = raw.replace(/\s+$/, "");
|
|
204
|
+
if (!line) {
|
|
205
|
+
// 空行:当前 question 结束
|
|
206
|
+
flush();
|
|
207
|
+
continue;
|
|
208
|
+
}
|
|
209
|
+
// 开头英文标题("Agent needs input:" / "Question for you:")跳过
|
|
210
|
+
if (INTRO_PATTERN.test(line))
|
|
211
|
+
continue;
|
|
212
|
+
// 末尾英文引导跳过
|
|
213
|
+
if (TRAILING_GUIDANCE_PATTERN.test(line))
|
|
214
|
+
continue;
|
|
215
|
+
// "Other: ..." 标记
|
|
216
|
+
if (OTHER_PATTERN.test(line)) {
|
|
217
|
+
if (current)
|
|
218
|
+
current.isOther = true;
|
|
219
|
+
continue;
|
|
220
|
+
}
|
|
221
|
+
// 多问题 header 行(`1. 风格口味`)—— 只在当前没有 question 文本时才算
|
|
222
|
+
if (!current) {
|
|
223
|
+
const m = NUMBERED_PATTERN.exec(line);
|
|
224
|
+
if (m) {
|
|
225
|
+
current = { header: m[2], question: "", options: [], isOther: false };
|
|
226
|
+
continue;
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
// 选项行(`1. 辣的开胃 - 麻辣...`)—— 仅在当前已有 question 文本时
|
|
230
|
+
if (current) {
|
|
231
|
+
const optMatch = NUMBERED_PATTERN.exec(line);
|
|
232
|
+
if (optMatch) {
|
|
233
|
+
const rest = optMatch[2];
|
|
234
|
+
const sepIdx = rest.indexOf(OPTION_DESC_SEPARATOR);
|
|
235
|
+
if (sepIdx >= 0) {
|
|
236
|
+
current.options.push({
|
|
237
|
+
label: rest.slice(0, sepIdx).trim(),
|
|
238
|
+
description: rest.slice(sepIdx + OPTION_DESC_SEPARATOR.length).trim(),
|
|
239
|
+
});
|
|
240
|
+
}
|
|
241
|
+
else {
|
|
242
|
+
current.options.push({ label: rest.trim() });
|
|
243
|
+
}
|
|
244
|
+
continue;
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
// 否则视为 question 文本(可能是多行拼接成一行)
|
|
248
|
+
if (current && !current.question) {
|
|
249
|
+
current.question = line;
|
|
250
|
+
}
|
|
251
|
+
else if (current) {
|
|
252
|
+
current.question = current.question + "\n" + line;
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
flush();
|
|
256
|
+
return out.length >= 2 || (out.length === 1 && (out[0].options.length > 0 || out[0].isOther))
|
|
257
|
+
? out
|
|
258
|
+
: undefined;
|
|
259
|
+
}
|
|
260
|
+
catch {
|
|
261
|
+
return undefined;
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
/** 渲染多问题文本:每个问题一组(标题 + 问题 + 选项 + 自由输入),末尾给出回复引导。 */
|
|
265
|
+
function buildMultiQuestionText(questions) {
|
|
266
|
+
const sections = [];
|
|
267
|
+
questions.forEach((q, idx) => {
|
|
268
|
+
const lines = [];
|
|
269
|
+
lines.push(`**问题 ${idx + 1}:${q.header}**`);
|
|
270
|
+
if (q.question) {
|
|
271
|
+
lines.push(q.question);
|
|
272
|
+
}
|
|
273
|
+
lines.push("");
|
|
274
|
+
q.options.forEach((opt, j) => {
|
|
275
|
+
lines.push(opt.description
|
|
276
|
+
? `${j + 1}. **${opt.label}** — ${opt.description}`
|
|
277
|
+
: `${j + 1}. ${opt.label}`);
|
|
278
|
+
});
|
|
279
|
+
if (q.isOther) {
|
|
280
|
+
lines.push("");
|
|
281
|
+
lines.push(`💬 **您也可以直接输入您的答案**`);
|
|
282
|
+
}
|
|
283
|
+
sections.push(lines.join("\n"));
|
|
284
|
+
});
|
|
285
|
+
// 回复引导(中文):核心 buildAgentHarnessUserInputAnswers 支持两种格式:
|
|
286
|
+
// 1) 行格式:每行一个问题答案,按问题顺序
|
|
287
|
+
// 2) keyed 格式:每行 "header: option_index" 或 "header: label"
|
|
288
|
+
const guidance = questions.length > 1
|
|
289
|
+
? `💡 **请按以下格式回复(任选一种)**:
|
|
290
|
+
|
|
291
|
+
每行一个问题答案(按问题顺序):
|
|
292
|
+
\`\`\`
|
|
293
|
+
${questions.map((_q, i) => i + 1).join("\n")}
|
|
294
|
+
\`\`\`
|
|
295
|
+
|
|
296
|
+
或带问题标题:
|
|
297
|
+
\`\`\`
|
|
298
|
+
${questions.map((q) => `${q.header}: ${q.options.length > 0 ? 1 : ""}`).join("\n")}
|
|
299
|
+
\`\`\`
|
|
300
|
+
|
|
301
|
+
也可以回复纯文本让 Agent 理解。`
|
|
302
|
+
: `💡 **请回复选项编号**(如 \`2\`),或直接输入文字。`;
|
|
303
|
+
return [sections.join("\n\n---\n\n"), "", guidance].join("\n");
|
|
304
|
+
}
|
|
305
|
+
const chatPendingQuestions = new Map();
|
|
306
|
+
const CHAT_PENDING_TTL_MS = 60 * 60 * 1000;
|
|
307
|
+
/** 登记一个 chatId 的 pending question(出站发送 ask_user 后调用)。 */
|
|
308
|
+
export function registerChatPendingQuestion(params) {
|
|
309
|
+
try {
|
|
310
|
+
if (!params.chatId || !params.questionId)
|
|
311
|
+
return;
|
|
312
|
+
const record = {
|
|
313
|
+
questionId: params.questionId,
|
|
314
|
+
sessionKey: params.sessionKey,
|
|
315
|
+
optionValues: params.optionValues,
|
|
316
|
+
labels: params.labels,
|
|
317
|
+
allowCustomInput: params.allowCustomInput,
|
|
318
|
+
multi: params.multi,
|
|
319
|
+
questionText: params.questionText,
|
|
320
|
+
expiresAtMs: Date.now() + CHAT_PENDING_TTL_MS,
|
|
321
|
+
};
|
|
322
|
+
chatPendingQuestions.set(params.chatId, record);
|
|
323
|
+
}
|
|
324
|
+
catch {
|
|
325
|
+
// 尽力而为
|
|
326
|
+
}
|
|
327
|
+
}
|
|
328
|
+
/**
|
|
329
|
+
* 读取问题是否允许自定义文本答案(presentation.buttons 中存在
|
|
330
|
+
* intent === "custom-input" 的按钮)。读取失败返回 undefined。
|
|
331
|
+
*/
|
|
332
|
+
export function readQuestionAllowsCustomInput(payload) {
|
|
333
|
+
try {
|
|
334
|
+
const presentation = payload.presentation;
|
|
335
|
+
const buttonBlock = presentation?.blocks?.find((b) => b.type === "buttons");
|
|
336
|
+
if (!buttonBlock?.buttons?.length)
|
|
337
|
+
return undefined;
|
|
338
|
+
return buttonBlock.buttons.some((b) => b.action?.type === "question" && b.action.intent === "custom-input");
|
|
339
|
+
}
|
|
340
|
+
catch {
|
|
341
|
+
return undefined;
|
|
342
|
+
}
|
|
343
|
+
}
|
|
344
|
+
/** 构造注入 AI 的答案文本(飞书 ask-user synthetic message 风格)。 */
|
|
345
|
+
function buildInjectedAnswerText(record, userText) {
|
|
346
|
+
if (record.multi) {
|
|
347
|
+
// 多问题:用户输入即完整答案块(位置行 / keyed 行 / 纯文本均可)
|
|
348
|
+
return `用户回答了你的问题:\n${userText}`;
|
|
349
|
+
}
|
|
350
|
+
const question = record.questionText?.trim() || "刚才的问题";
|
|
351
|
+
return `用户回答了你的问题:\n- ${question}: ${userText}`;
|
|
352
|
+
}
|
|
353
|
+
/** 入站文本 → 尝试解析为 chatId 的 pending question 回答(fold 链接点击 / 手动输入路径)。 */
|
|
354
|
+
export async function tryResolveQuestionFoldText(params) {
|
|
355
|
+
const { cfg, senderId, chatId, text, logDebug } = params;
|
|
356
|
+
const record = chatPendingQuestions.get(chatId);
|
|
357
|
+
if (!record)
|
|
358
|
+
return { handled: false };
|
|
359
|
+
if (record.expiresAtMs <= Date.now()) {
|
|
360
|
+
chatPendingQuestions.delete(chatId);
|
|
361
|
+
return { handled: false };
|
|
362
|
+
}
|
|
363
|
+
const trimmed = (text || "").trim();
|
|
364
|
+
if (!trimmed)
|
|
365
|
+
return { handled: false };
|
|
366
|
+
// 「跳过」:取消 pending question,不解析为回答。
|
|
367
|
+
if (trimmed === QUESTION_SKIP_LABEL) {
|
|
368
|
+
chatPendingQuestions.delete(chatId);
|
|
369
|
+
if (record.sessionKey) {
|
|
370
|
+
try {
|
|
371
|
+
const { cancelPendingAgentQuestionForSession } = await import("openclaw/plugin-sdk/agent-harness-runtime");
|
|
372
|
+
await cancelPendingAgentQuestionForSession({
|
|
373
|
+
sessionKey: record.sessionKey,
|
|
374
|
+
resolvedBy: `yach:${senderId}`,
|
|
375
|
+
});
|
|
376
|
+
}
|
|
377
|
+
catch (err) {
|
|
378
|
+
logDebug?.(`question skip cancel failed: ${String(err)}`);
|
|
379
|
+
}
|
|
380
|
+
}
|
|
381
|
+
return { handled: true };
|
|
382
|
+
}
|
|
383
|
+
// 选项匹配:优先 label 精确匹配(忽略大小写),再按 optionValue,再按数字索引
|
|
384
|
+
let optionIndex;
|
|
385
|
+
const labelIdx = record.labels.findIndex((l) => l.toLowerCase() === trimmed.toLowerCase());
|
|
386
|
+
if (labelIdx >= 0) {
|
|
387
|
+
optionIndex = labelIdx;
|
|
388
|
+
}
|
|
389
|
+
else {
|
|
390
|
+
const valueIdx = record.optionValues.findIndex((v) => v === trimmed);
|
|
391
|
+
if (valueIdx >= 0)
|
|
392
|
+
optionIndex = valueIdx;
|
|
393
|
+
}
|
|
394
|
+
if (optionIndex === undefined) {
|
|
395
|
+
const digit = trimmed;
|
|
396
|
+
if (/^[1-9]$/.test(digit) && Number(digit) - 1 < record.optionValues.length) {
|
|
397
|
+
optionIndex = Number(digit) - 1;
|
|
398
|
+
}
|
|
399
|
+
}
|
|
400
|
+
// 包含匹配:手动输入自然语言(如「我选A」「选 B 模式」)时,若恰好只有
|
|
401
|
+
// 一个选项 label 被包含(或包含输入文本),视为选择了该选项。
|
|
402
|
+
if (optionIndex === undefined && record.labels.length > 0) {
|
|
403
|
+
const trimmedLower = trimmed.toLowerCase();
|
|
404
|
+
const contained = [];
|
|
405
|
+
record.labels.forEach((l, i) => {
|
|
406
|
+
const ll = (l || "").toLowerCase();
|
|
407
|
+
if (!ll)
|
|
408
|
+
return;
|
|
409
|
+
if (trimmedLower.includes(ll) || ll.includes(trimmedLower))
|
|
410
|
+
contained.push(i);
|
|
411
|
+
});
|
|
412
|
+
if (contained.length === 1)
|
|
413
|
+
optionIndex = contained[0];
|
|
414
|
+
}
|
|
415
|
+
// 自由文本答案:问题接受自定义输入(isOther / 无选项 / 多问题)时,未命中选项的
|
|
416
|
+
// 文本直接采纳为答案。
|
|
417
|
+
if (optionIndex === undefined && (record.allowCustomInput || record.multi)) {
|
|
418
|
+
chatPendingQuestions.delete(chatId);
|
|
419
|
+
// 优先走核心 claim(answered 语义):AI 的 ask_user 直接收到答案
|
|
420
|
+
// (status=answered + 解析后的答案),不会出现「用户取消了/被跳过」的误导回复,
|
|
421
|
+
// 也无需注入合成消息。8.1/9.3/9.4 的 agent-harness-runtime 均暴露
|
|
422
|
+
// claimPendingAgentQuestionAnswer 且 authority 可选;失败(无 pending 记录 /
|
|
423
|
+
// resolving / 核心不支持)时降级为 cancel + 注入合成消息(飞书 ask-user 模式,
|
|
424
|
+
// AI 在新一轮收到答案)。
|
|
425
|
+
if (record.sessionKey) {
|
|
426
|
+
try {
|
|
427
|
+
const { claimPendingAgentQuestionAnswer } = await import("openclaw/plugin-sdk/agent-harness-runtime");
|
|
428
|
+
const claimed = await claimPendingAgentQuestionAnswer({
|
|
429
|
+
sessionKey: record.sessionKey,
|
|
430
|
+
text: trimmed,
|
|
431
|
+
});
|
|
432
|
+
if (claimed === true) {
|
|
433
|
+
logDebug?.(`question manual input claimed as answer (multi=${!!record.multi})`);
|
|
434
|
+
return { handled: true };
|
|
435
|
+
}
|
|
436
|
+
logDebug?.("question claim returned false, falling back to cancel+inject");
|
|
437
|
+
}
|
|
438
|
+
catch (err) {
|
|
439
|
+
logDebug?.(`question claim failed, falling back to cancel+inject: ${String(err)}`);
|
|
440
|
+
}
|
|
441
|
+
}
|
|
442
|
+
// 降级:尽力取消 gateway pending question,让阻塞中的 ask_user 工具尽快返回,
|
|
443
|
+
// 再注入答案消息触发 AI 新 turn(cancel 失败也无妨,注入的答案仍会生效)。
|
|
444
|
+
if (record.sessionKey) {
|
|
445
|
+
try {
|
|
446
|
+
const { cancelPendingAgentQuestionForSession } = await import("openclaw/plugin-sdk/agent-harness-runtime");
|
|
447
|
+
await cancelPendingAgentQuestionForSession({
|
|
448
|
+
sessionKey: record.sessionKey,
|
|
449
|
+
resolvedBy: `yach:${senderId}`,
|
|
450
|
+
});
|
|
451
|
+
}
|
|
452
|
+
catch (err) {
|
|
453
|
+
logDebug?.(`question free-text cancel failed: ${String(err)}`);
|
|
454
|
+
}
|
|
455
|
+
}
|
|
456
|
+
logDebug?.(`question manual input adopted as free-text answer (multi=${!!record.multi})`);
|
|
457
|
+
return { handled: true, inject: buildInjectedAnswerText(record, trimmed) };
|
|
458
|
+
}
|
|
459
|
+
if (optionIndex === undefined)
|
|
460
|
+
return { handled: false };
|
|
461
|
+
const optionValue = record.optionValues[optionIndex];
|
|
462
|
+
if (!optionValue)
|
|
463
|
+
return { handled: false };
|
|
464
|
+
// 直接走 gateway 解析(与表情路径一致,绕开核心纯文本 claim 的 caller 指纹校验)。
|
|
465
|
+
// 关键:只有本次回答真正被问题消费(status === "answered")才拦截消息;
|
|
466
|
+
// already-terminal / not-found(问题已被其他路径回答/取消,例如用户先前已用
|
|
467
|
+
// 表情或核心纯文本路径回答过)时**不消费**,让该文本按普通消息继续进入 agent,
|
|
468
|
+
// 避免 pending 登记残留导致用户后续消息被静默吞掉。
|
|
469
|
+
const rt = await loadQuestionGatewayRuntime();
|
|
470
|
+
if (!rt) {
|
|
471
|
+
// 旧版核心(<2026.8.1):无 resolveOption RPC → 降级为 cancel + 注入合成消息
|
|
472
|
+
// (与自由文本分支一致,AI 在新一轮收到「用户选择了 X」)。
|
|
473
|
+
chatPendingQuestions.delete(chatId);
|
|
474
|
+
if (record.sessionKey) {
|
|
475
|
+
try {
|
|
476
|
+
const { cancelPendingAgentQuestionForSession } = await import("openclaw/plugin-sdk/agent-harness-runtime");
|
|
477
|
+
await cancelPendingAgentQuestionForSession({
|
|
478
|
+
sessionKey: record.sessionKey,
|
|
479
|
+
resolvedBy: `yach:${senderId}`,
|
|
480
|
+
});
|
|
481
|
+
}
|
|
482
|
+
catch (err) {
|
|
483
|
+
logDebug?.(`question option cancel failed (legacy core): ${String(err)}`);
|
|
484
|
+
}
|
|
485
|
+
}
|
|
486
|
+
logDebug?.(`question option resolved via fallback inject (legacy core)`);
|
|
487
|
+
return { handled: true, inject: buildInjectedAnswerText(record, trimmed) };
|
|
488
|
+
}
|
|
489
|
+
try {
|
|
490
|
+
const result = await rt.resolveOption({
|
|
491
|
+
cfg,
|
|
492
|
+
questionId: record.questionId,
|
|
493
|
+
optionValue,
|
|
494
|
+
senderId,
|
|
495
|
+
gatewayUrl: params.gatewayUrl,
|
|
496
|
+
});
|
|
497
|
+
// 无论 answered 还是 already-terminal,问题都已终结:清理 chatId 级 pending,
|
|
498
|
+
// 后续同样文本不会再被拦截。
|
|
499
|
+
chatPendingQuestions.delete(chatId);
|
|
500
|
+
return result.status === "answered" ? { handled: true } : { handled: false };
|
|
501
|
+
}
|
|
502
|
+
catch (err) {
|
|
503
|
+
logDebug?.(`question fold resolve failed: ${String(err)}`);
|
|
504
|
+
return { handled: false };
|
|
505
|
+
}
|
|
506
|
+
}
|
|
507
|
+
//# sourceMappingURL=question-runtime.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"question-runtime.js","sourceRoot":"","sources":["../../../src/messaging/question-runtime.ts"],"names":[],"mappings":"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"}
|
package/dist/src/tools/index.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { runToolWithContext } from "../core/yach-ticket.js";
|
|
1
2
|
import { registerCalendarTools } from "./calendar/index.js";
|
|
2
3
|
import { registerDocTools } from "./doc/index.js";
|
|
3
4
|
import { registerSpaceTools } from "./space/space-node.js";
|
|
@@ -9,7 +10,34 @@ import { registerOkrTools } from "./okr/index.js";
|
|
|
9
10
|
import { registerTopicTools } from "./topic/index.js";
|
|
10
11
|
import { registerGroupTools } from "./group/index.js";
|
|
11
12
|
import { registerMeetingTools } from "./meeting/index.js";
|
|
13
|
+
/**
|
|
14
|
+
* 直注册工具 → 工厂形式 + ToolContext 兜底包装。
|
|
15
|
+
* 9.5 核心仅通过工厂形式(api.registerTool((ctx) => tool))下发会话身份,
|
|
16
|
+
* 直注册拿不到 ctx。此处统一包装,域内注册代码无需改动。
|
|
17
|
+
*/
|
|
18
|
+
function wrapToolContext(api) {
|
|
19
|
+
const originalRegisterTool = api.registerTool.bind(api);
|
|
20
|
+
api.registerTool = (tool, opts) => {
|
|
21
|
+
if (typeof tool === "function") {
|
|
22
|
+
// 已是工厂形式,保持原样
|
|
23
|
+
originalRegisterTool(tool, opts);
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
originalRegisterTool((ctx) => withToolContext(ctx, tool), opts);
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
function withToolContext(ctx, tool) {
|
|
30
|
+
const execute = tool.execute;
|
|
31
|
+
// 返回新实例(浅拷贝 + 替换 execute),绝不动原 tool 对象:
|
|
32
|
+
// 核心每次 run 装配工具时都会调用工厂并传入该 run 的 ctx,若修改共享的原对象,
|
|
33
|
+
// 多会话并发 run 会互相覆盖 execute 闭包导致 ctx 串台。
|
|
34
|
+
return {
|
|
35
|
+
...tool,
|
|
36
|
+
execute: (async (...args) => runToolWithContext(ctx, () => execute(...args))),
|
|
37
|
+
};
|
|
38
|
+
}
|
|
12
39
|
export function registerYachTools(api) {
|
|
40
|
+
wrapToolContext(api);
|
|
13
41
|
registerCalendarTools(api);
|
|
14
42
|
registerDocTools(api);
|
|
15
43
|
registerSpaceTools(api);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/index.ts"],"names":[],"mappings":"
|
|
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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@yach.zhiyinlou.com/yach",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.15.0-alpha.2",
|
|
4
4
|
"description": "OpenClaw Yach (知音楼) channel plugin",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"order": 80
|
|
65
65
|
},
|
|
66
66
|
"install": {
|
|
67
|
-
"npmSpec": "@yach.zhiyinlou.com/yach@2.
|
|
67
|
+
"npmSpec": "@yach.zhiyinlou.com/yach@2.15.0-alpha.2",
|
|
68
68
|
"defaultChoice": "npm",
|
|
69
69
|
"minHostVersion": ">=2026.3.22"
|
|
70
70
|
}
|