@yach.zhiyinlou.com/yach 2.14.5 → 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/index.js +0 -63
- package/dist/index.js.map +1 -1
- 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/device-flow.js +3 -5
- package/dist/src/core/device-flow.js.map +1 -1
- package/dist/src/core/tool-client.js +1 -5
- package/dist/src/core/tool-client.js.map +1 -1
- package/dist/src/core/yach-client.js +0 -3
- package/dist/src/core/yach-client.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/oapi/topic.js +7 -1
- package/dist/src/oapi/topic.js.map +1 -1
- package/dist/src/tools/auto-auth.js +32 -146
- package/dist/src/tools/auto-auth.js.map +1 -1
- package/dist/src/tools/index.js +23 -96
- package/dist/src/tools/index.js.map +1 -1
- package/dist/src/tools/topic/publish-post.js +6 -1
- package/dist/src/tools/topic/publish-post.js.map +1 -1
- package/package.json +3 -4
- package/skills/yach-topic/SKILL.md +10 -0
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 | 处理方式 |
|
package/dist/index.js
CHANGED
|
@@ -3,12 +3,6 @@ import { yachPlugin } from "./src/channel/plugin.js";
|
|
|
3
3
|
import { setYachRuntime } from "./src/core/runtime.js";
|
|
4
4
|
import { registerYachTools } from "./src/tools/index.js";
|
|
5
5
|
import { registerYachCommands } from "./src/commands/index.js";
|
|
6
|
-
import { getYachTicket } from "./src/core/yach-ticket.js";
|
|
7
|
-
import { setSubagentTicket, deleteSubagentTicket } from "./src/core/subagent-ticket-store.js";
|
|
8
|
-
import { setCronTicket, deleteCronTicket } from "./src/core/cron-ticket-store.js";
|
|
9
|
-
import { bridgeSet } from "./src/core/session-key-bridge.js";
|
|
10
|
-
import { yachLogger } from "./src/core/yach-logger.js";
|
|
11
|
-
const log = yachLogger("plugin-entry");
|
|
12
6
|
export default {
|
|
13
7
|
id: "yach",
|
|
14
8
|
name: "Yach",
|
|
@@ -19,63 +13,6 @@ export default {
|
|
|
19
13
|
api.registerChannel({ plugin: yachPlugin });
|
|
20
14
|
registerYachTools(api);
|
|
21
15
|
registerYachCommands(api);
|
|
22
|
-
// ── Subagent ticket 传递 ─────────────────────────────────────────────
|
|
23
|
-
// hook 在父 agent 的 async context 里同步触发，能读到父 ticket。
|
|
24
|
-
api.on("subagent_spawned", (event) => {
|
|
25
|
-
const ticket = getYachTicket();
|
|
26
|
-
if (ticket && event.childSessionKey) {
|
|
27
|
-
setSubagentTicket(event.childSessionKey, { ...ticket, origin: "subagent" });
|
|
28
|
-
log.info(`[ticket-prop] subagent_spawning: stored ticket for child=${event.childSessionKey} senderId=${ticket.senderId}`);
|
|
29
|
-
}
|
|
30
|
-
});
|
|
31
|
-
api.on("subagent_ended", (event) => {
|
|
32
|
-
if (event.targetSessionKey) {
|
|
33
|
-
deleteSubagentTicket(event.targetSessionKey);
|
|
34
|
-
log.info(`[ticket-prop] subagent_ended: cleared ticket for ${event.targetSessionKey}`);
|
|
35
|
-
}
|
|
36
|
-
});
|
|
37
|
-
// ── before_tool_call: 桥接 toolCallId -> sessionKey ──────────────────
|
|
38
|
-
// execute 拿不到 ctx.sessionKey，只能拿 toolCallId；hook 里把映射存进 bridge，
|
|
39
|
-
// wrap 后的 execute 用 toolCallId 反查。
|
|
40
|
-
api.on("before_tool_call", (event, ctx) => {
|
|
41
|
-
if (event.toolCallId && ctx.sessionKey) {
|
|
42
|
-
bridgeSet(event.toolCallId, ctx.sessionKey);
|
|
43
|
-
}
|
|
44
|
-
});
|
|
45
|
-
// ── cron_changed: cron 删除时清理 cron-ticket-store ──────────────────
|
|
46
|
-
// 注意：此 hook 在 CronService 的 async context 里触发，不在父 chat 上下文里，
|
|
47
|
-
// 所以不能用来捕获父 ticket（已在 scheduleSessionTurn wrap 里解决）。
|
|
48
|
-
// 只用来响应 `removed` 事件清理持久化的 cron ticket。
|
|
49
|
-
api.on("cron_changed", async (event) => {
|
|
50
|
-
if (event.action === "removed" && event.sessionKey) {
|
|
51
|
-
try {
|
|
52
|
-
await deleteCronTicket(event.sessionKey);
|
|
53
|
-
log.info(`[ticket-prop] cron_changed removed: cleared cron ticket for sessionKey=${event.sessionKey}`);
|
|
54
|
-
}
|
|
55
|
-
catch (err) {
|
|
56
|
-
log.warn(`[ticket-prop] cron_changed removed: failed to clear cron ticket for ${event.sessionKey}: ${err}`);
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
});
|
|
60
|
-
// ── Cron ticket 捕获：wrap scheduleSessionTurn ──────────────────────
|
|
61
|
-
// cron_changed hook 不在父 chat 的 async context 里，getYachTicket() 拿不到。
|
|
62
|
-
// 但 scheduleSessionTurn 是从父 chat 调用的（plugin tool / openclaw built-in
|
|
63
|
-
// schedule tool 都走这个 API），wrap 这里能同步拿到父 ticket。
|
|
64
|
-
const origSchedule = api.session.workflow.scheduleSessionTurn.bind(api.session.workflow);
|
|
65
|
-
api.session.workflow.scheduleSessionTurn = async (params) => {
|
|
66
|
-
const parentTicket = getYachTicket();
|
|
67
|
-
const result = await origSchedule(params);
|
|
68
|
-
if (result?.sessionKey && parentTicket) {
|
|
69
|
-
try {
|
|
70
|
-
await setCronTicket(result.sessionKey, { ...parentTicket, origin: "cron" });
|
|
71
|
-
log.info(`[ticket-prop] scheduleSessionTurn: stored cron ticket for sessionKey=${result.sessionKey} senderId=${parentTicket.senderId}`);
|
|
72
|
-
}
|
|
73
|
-
catch (err) {
|
|
74
|
-
log.warn(`[ticket-prop] scheduleSessionTurn: failed to persist cron ticket: ${err}`);
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
return result;
|
|
78
|
-
};
|
|
79
16
|
},
|
|
80
17
|
};
|
|
81
18
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE/D,eAAe;IACb,EAAE,EAAE,MAAM;IACV,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,qBAAqB;IAClC,YAAY,EAAE,uBAAuB,EAAE;IACvC,QAAQ,CAAC,GAAsB;QAC7B,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC5B,GAAG,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAC5C,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACvB,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;CACF,CAAC"}
|
|
@@ -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"}
|
|
@@ -73,11 +73,9 @@ export async function requestYachDeviceAuthorization(params) {
|
|
|
73
73
|
const appToken = await getAccessToken(baseUrl, { appKey, appSecret });
|
|
74
74
|
const deviceAuthUrl = `${baseUrl}/openapi/v2/auth_device/code`;
|
|
75
75
|
const scopes = params.scopes ?? [];
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
// 服务端契约：scopes 字段必须为 string，统一为逗号分隔字符串。
|
|
80
|
-
const requestBody = { access_token: appToken, scopes: scopes.join(",") };
|
|
76
|
+
const requestBody = { access_token: appToken };
|
|
77
|
+
if (scopes.length > 0)
|
|
78
|
+
requestBody.scopes = scopes.join(",");
|
|
81
79
|
const resp = await oapiFetch(deviceAuthUrl, {
|
|
82
80
|
method: "POST",
|
|
83
81
|
headers: { "Content-Type": "application/json" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-flow.js","sourceRoot":"","sources":["../../../src/core/device-flow.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"device-flow.js","sourceRoot":"","sources":["../../../src/core/device-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,11 +94,7 @@ export class YachToolClient {
|
|
|
94
94
|
}
|
|
95
95
|
const userId = this.senderUserId;
|
|
96
96
|
if (!userId) {
|
|
97
|
-
|
|
98
|
-
// 抛出去的 error 是"unknown + 空 scopes"，传到 device flow 时 body.scopes=""
|
|
99
|
-
// 触发服务端 10001 参数错误。
|
|
100
|
-
// 解决：!userId 时也把工具要求的 scope 一起带上，让 device flow 能正确申请。
|
|
101
|
-
throw new NeedUserAuthorizationError("unknown", getRequiredScopes(toolAction));
|
|
97
|
+
throw new NeedUserAuthorizationError("unknown");
|
|
102
98
|
}
|
|
103
99
|
// ── scope 预检 ──────────────────────────────────────────────────────
|
|
104
100
|
const requiredScopes = getRequiredScopes(toolAction);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-client.js","sourceRoot":"","sources":["../../../src/core/tool-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAIH,OAAO,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,EAA0B,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,0BAA0B,EAAE,CAAC;AActC,6EAA6E;AAE7E,MAAM,OAAO,cAAc;IAGd;IAKA;IAKQ;IAZnB;IACE,yBAAyB;IAChB,OAA4B;IACrC;;;OAGG;IACM,YAAgC;IACzC;;;OAGG;IACc,UAAmB;QAV3B,YAAO,GAAP,OAAO,CAAqB;QAK5B,iBAAY,GAAZ,YAAY,CAAoB;QAKxB,eAAU,GAAV,UAAU,CAAS;IACnC,CAAC;IAEJ;;;;;;;;;;;;OAYG;IACH,KAAK,CAAC,MAAM,CACV,UAA6B,EAC7B,EAAsC,EACtC,OAA2B;QAE3B,4CAA4C;QAC5C,MAAM,IAAI,GAAG,OAAO,EAAE,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,IAAI,KAAK,CAAC;QAEtE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YACpD,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;QAC5F,CAAC;QAED,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,oEAAoE;IAE5D,KAAK,CAAC,WAAW,CAAI,EAAsC;QACjE,MAAM,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,OAAO,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACtE,CAAC;IAED,oEAAoE;IAE5D,KAAK,CAAC,YAAY,CACxB,UAA6B,EAC7B,EAAsC;QAEtC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,OAAO,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7E,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC;QACjC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,
|
|
1
|
+
{"version":3,"file":"tool-client.js","sourceRoot":"","sources":["../../../src/core/tool-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,6 @@ import { YachOkrApi } from "../oapi/okr.js";
|
|
|
13
13
|
import { YachTeamApi } from "../oapi/team.js";
|
|
14
14
|
import { YachTopicApi } from "../oapi/topic.js";
|
|
15
15
|
import { YachMeetingApi } from "../oapi/meeting.js";
|
|
16
|
-
import { YachChatApi } from "../oapi/chat.js";
|
|
17
16
|
export class YachClient {
|
|
18
17
|
baseUrl;
|
|
19
18
|
appKey;
|
|
@@ -32,7 +31,6 @@ export class YachClient {
|
|
|
32
31
|
team;
|
|
33
32
|
topic;
|
|
34
33
|
meeting;
|
|
35
|
-
chat;
|
|
36
34
|
fixedToken;
|
|
37
35
|
constructor(params) {
|
|
38
36
|
this.baseUrl = params.baseUrl;
|
|
@@ -54,7 +52,6 @@ export class YachClient {
|
|
|
54
52
|
this.team = new YachTeamApi(params.baseUrl, getToken);
|
|
55
53
|
this.topic = new YachTopicApi(params.baseUrl, getToken);
|
|
56
54
|
this.meeting = new YachMeetingApi(params.baseUrl, getToken);
|
|
57
|
-
this.chat = new YachChatApi(params.baseUrl, getToken);
|
|
58
55
|
}
|
|
59
56
|
static fromAccount(account) {
|
|
60
57
|
if (!account.appKey || !account.appSecret) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yach-client.js","sourceRoot":"","sources":["../../../src/core/yach-client.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"yach-client.js","sourceRoot":"","sources":["../../../src/core/yach-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|