@yach.zhiyinlou.com/yach 2.16.1-beta.1 → 2.16.1-beta.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.
|
@@ -74,8 +74,8 @@ function isNonEmptyString(value) {
|
|
|
74
74
|
return typeof value === "string" && value.trim().length > 0;
|
|
75
75
|
}
|
|
76
76
|
/**
|
|
77
|
-
* 选择Control UI
|
|
78
|
-
*
|
|
77
|
+
* 选择Control UI对应的应用账号：个人虾只有一个配置时直接使用；多个账号才做ID/appKey匹配。
|
|
78
|
+
* SDK账号标识可能是网关内部名称，单账号不因此拒绝；旧Yach默认账号兜底函数不变。
|
|
79
79
|
*/
|
|
80
80
|
function resolveWebAccountForToolContext(ctx) {
|
|
81
81
|
let accounts;
|
|
@@ -89,6 +89,8 @@ function resolveWebAccountForToolContext(ctx) {
|
|
|
89
89
|
catch {
|
|
90
90
|
return undefined;
|
|
91
91
|
}
|
|
92
|
+
if (accounts.length === 1)
|
|
93
|
+
return accounts[0];
|
|
92
94
|
const raw = ctx.deliveryContext?.accountId?.trim() || ctx.agentAccountId?.trim();
|
|
93
95
|
const matches = raw
|
|
94
96
|
? accounts.filter((account) => account.appKey === raw || account.accountId === normalizeAccountId(raw))
|
|
@@ -105,8 +107,9 @@ function resolveWebAccountForToolContext(ctx) {
|
|
|
105
107
|
export async function rebuildTicketFromToolContext(ctx) {
|
|
106
108
|
if (!ctx)
|
|
107
109
|
return undefined;
|
|
108
|
-
const messageChannel = ctx.messageChannel;
|
|
109
110
|
const delivery = ctx.deliveryContext;
|
|
111
|
+
// 新SDK优先取本轮来源；旧SDK仅给deliveryContext.channel时兼容明确的webchat。
|
|
112
|
+
const messageChannel = ctx.messageChannel ?? delivery?.channel;
|
|
110
113
|
if (messageChannel === "webchat") {
|
|
111
114
|
const { sessionKey, sessionId, agentId } = ctx;
|
|
112
115
|
if (!isNonEmptyString(sessionKey) || !isNonEmptyString(sessionId) || !isNonEmptyString(agentId)) {
|
|
@@ -159,8 +162,22 @@ export async function runToolWithContext(ctx, fn) {
|
|
|
159
162
|
if (getYachTicket())
|
|
160
163
|
return fn();
|
|
161
164
|
const ticket = await rebuildTicketFromToolContext(ctx);
|
|
162
|
-
if (!ticket)
|
|
165
|
+
if (!ticket) {
|
|
166
|
+
// 仅记录重建失败的核心字段，便于排查Docker版本差异；不能打印含密钥的完整ctx/config。
|
|
167
|
+
console.warn("[yach] tool-context-unavailable", JSON.stringify({
|
|
168
|
+
hasContext: !!ctx,
|
|
169
|
+
fields: Object.keys(ctx ?? {}),
|
|
170
|
+
messageChannel: ctx?.messageChannel ?? null,
|
|
171
|
+
deliveryChannel: ctx?.deliveryContext?.channel ?? null,
|
|
172
|
+
sessionKey: ctx?.sessionKey ?? null,
|
|
173
|
+
sessionId: ctx?.sessionId ?? null,
|
|
174
|
+
agentId: ctx?.agentId ?? null,
|
|
175
|
+
agentAccountId: ctx?.agentAccountId ?? null,
|
|
176
|
+
deliveryAccountId: ctx?.deliveryContext?.accountId ?? null,
|
|
177
|
+
hasSenderId: !!ctx?.requesterSenderId,
|
|
178
|
+
}));
|
|
163
179
|
return fn();
|
|
180
|
+
}
|
|
164
181
|
return withYachTicket(ticket, fn);
|
|
165
182
|
}
|
|
166
183
|
//# sourceMappingURL=yach-ticket.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yach-ticket.js","sourceRoot":"","sources":["../../../src/core/yach-ticket.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"yach-ticket.js","sourceRoot":"","sources":["../../../src/core/yach-ticket.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@yach.zhiyinlou.com/yach",
|
|
3
|
-
"version": "2.16.1-beta.
|
|
3
|
+
"version": "2.16.1-beta.2",
|
|
4
4
|
"description": "OpenClaw Yach (知音楼) channel plugin",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
"order": 80
|
|
68
68
|
},
|
|
69
69
|
"install": {
|
|
70
|
-
"npmSpec": "@yach.zhiyinlou.com/yach@2.16.1-beta.
|
|
70
|
+
"npmSpec": "@yach.zhiyinlou.com/yach@2.16.1-beta.2",
|
|
71
71
|
"defaultChoice": "npm",
|
|
72
72
|
"minHostVersion": ">=2026.3.22"
|
|
73
73
|
}
|