@yach.zhiyinlou.com/yach 2.13.2 → 2.13.3
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/dist/index.js +0 -63
- package/dist/index.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/winston-logger.js +2 -2
- package/dist/src/core/winston-logger.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.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 +0 -101
- package/dist/src/tools/index.js.map +1 -1
- package/package.json +3 -4
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_spawning", (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,qBAAqB,CAAC;AAC9D,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,qBAAqB,CAAC;AAC9D,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"}
|
|
@@ -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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"}
|
|
@@ -12,8 +12,8 @@ const rotateTransport = new DailyRotateFile({
|
|
|
12
12
|
extension: ".log",
|
|
13
13
|
// 按天滚动，每天零点生成新文件
|
|
14
14
|
datePattern: "YYYY-MM-DD",
|
|
15
|
-
// 保留最近
|
|
16
|
-
maxFiles: "
|
|
15
|
+
// 保留最近 30 天的日志文件，超出自动删除
|
|
16
|
+
maxFiles: "30d",
|
|
17
17
|
// 单文件最大 20 MB，单天超出后继续滚动（如 yach-2026-06-30.1.log）
|
|
18
18
|
maxSize: "20m",
|
|
19
19
|
// 不创建指向当前日志的软链接
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"winston-logger.js","sourceRoot":"","sources":["../../../src/core/winston-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAGxD,wEAAwE;AACxE,MAAM,OAAO,GAAG,gCAAgC,CAAC;AAEjD,oBAAoB;AACpB,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC;IAC1C,WAAW;IACX,OAAO,EAAE,OAAO;IAChB,2DAA2D;IAC3D,QAAQ,EAAE,aAAa;IACvB,oCAAoC;IACpC,SAAS,EAAE,MAAM;IACjB,iBAAiB;IACjB,WAAW,EAAE,YAAY;IACzB,
|
|
1
|
+
{"version":3,"file":"winston-logger.js","sourceRoot":"","sources":["../../../src/core/winston-logger.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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"}
|
|
@@ -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":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAgCrD,6EAA6E;AAE7E,MAAM,KAAK,GAAG,IAAI,iBAAiB,EAAc,CAAC;AAElD,2EAA2E;AAE3E;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAI,MAAkB,EAAE,EAAwB;IAC5E,OAAO,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAC/B,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,aAAa;IAC3B,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;AAC1B,CAAC;AAED,qCAAqC;AACrC,MAAM,UAAU,aAAa;IAC3B,MAAM,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC3B,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -18,8 +18,7 @@ import { getYachTicket, withYachTicket } from "../core/yach-ticket.js";
|
|
|
18
18
|
import { NeedUserAuthorizationError } from "../core/user-token-errors.js";
|
|
19
19
|
import { requestYachDeviceAuthorization, pollYachDeviceToken, sendYachAuthCard, YachAppScopeError, } from "../core/device-flow.js";
|
|
20
20
|
import { setStoredToken, getStoredToken, tokenStatus } from "../core/user-token-store.js";
|
|
21
|
-
import {
|
|
22
|
-
import { resolveYachAccount, resolveDefaultYachAccountId } from "../accounts/index.js";
|
|
21
|
+
import { resolveYachAccount } from "../accounts/index.js";
|
|
23
22
|
import { YachClient } from "../core/yach-client.js";
|
|
24
23
|
import { getYachConfig } from "../core/runtime.js";
|
|
25
24
|
import { yachLogger } from "../core/yach-logger.js";
|
|
@@ -63,43 +62,18 @@ const pendingFlows = new Map();
|
|
|
63
62
|
* - 失败：非静默时发文本通知用户
|
|
64
63
|
*/
|
|
65
64
|
export async function executeYachAuthorize(params) {
|
|
66
|
-
const { account, senderId, scopes, cfg, ticket
|
|
65
|
+
const { account, senderId, scopes, cfg, ticket } = params;
|
|
67
66
|
const { appKey, appSecret, baseUrl } = account;
|
|
68
67
|
// ── 1. 检查已有 token 是否覆盖所需 scope ──────────────────────────────
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
existing = await getStoredToken(appKey, senderId);
|
|
79
|
-
}
|
|
80
|
-
if (existing && tokenStatus(existing) === "valid") {
|
|
81
|
-
if (scopes.length === 0 || scopes.every((s) => new Set((existing.scope ?? "").split(/[\s,]+/).filter(Boolean)).has(s))) {
|
|
82
|
-
// PATCH: subagent/cron fallback 路径下，token 有效但不能直接返回 success（否则 tool 不重试）
|
|
83
|
-
// 改为返回 awaiting_authorization + _retry_ticket，让 tools/index.ts 的 wrap 用 fallback ticket 包 ALS 重试
|
|
84
|
-
if (skipSyntheticMessage) {
|
|
85
|
-
return jsonResult({
|
|
86
|
-
awaiting_authorization: true,
|
|
87
|
-
_retry_ticket: {
|
|
88
|
-
msgId: ticket.msgId,
|
|
89
|
-
toId: senderId,
|
|
90
|
-
senderId,
|
|
91
|
-
accountId: ticket.accountId,
|
|
92
|
-
conversationType: ticket.conversationType,
|
|
93
|
-
startTime: Date.now(),
|
|
94
|
-
chatbotUserId: ticket.chatbotUserId,
|
|
95
|
-
senderNick: ticket.senderNick,
|
|
96
|
-
senderNickName: ticket.senderNickName,
|
|
97
|
-
origin: "cron",
|
|
98
|
-
},
|
|
99
|
-
message: "token 已就绪，正在自动重试...",
|
|
100
|
-
});
|
|
101
|
-
}
|
|
102
|
-
return jsonResult({ success: true, message: scopes.length === 0 ? "用户已授权，无需重复授权。" : "用户已授权，scope 已覆盖。" });
|
|
68
|
+
const existing = await getStoredToken(appKey, senderId);
|
|
69
|
+
if (existing && tokenStatus(existing) !== "expired") {
|
|
70
|
+
if (scopes.length === 0) {
|
|
71
|
+
return jsonResult({ success: true, message: "用户已授权，无需重复授权。" });
|
|
72
|
+
}
|
|
73
|
+
const grantedScopes = new Set((existing.scope ?? "").split(/[\s,]+/).filter(Boolean));
|
|
74
|
+
const missing = scopes.filter((s) => !grantedScopes.has(s));
|
|
75
|
+
if (missing.length === 0) {
|
|
76
|
+
return jsonResult({ success: true, message: "用户已授权，scope 已覆盖。" });
|
|
103
77
|
}
|
|
104
78
|
}
|
|
105
79
|
// ── 2. Guard：防止同一用户+相同scope并发触发授权 ────────────────────────
|
|
@@ -156,7 +130,6 @@ export async function executeYachAuthorize(params) {
|
|
|
156
130
|
toUserId: senderId,
|
|
157
131
|
conversationType: "1", // 始终发 DM，授权消息应私密
|
|
158
132
|
});
|
|
159
|
-
log.info(`[auth card] sent toUserId=${senderId} appKey=${appKey} conversationType=1 outcome=${sendOutcome}`);
|
|
160
133
|
}
|
|
161
134
|
catch (err) {
|
|
162
135
|
if (err instanceof YachAppScopeError) {
|
|
@@ -172,13 +145,10 @@ export async function executeYachAuthorize(params) {
|
|
|
172
145
|
log.error(`failed to send auth card: ${err}`);
|
|
173
146
|
// auth card 发送失败但非 scope 错误，继续走轮询流程（可能 card 已发出但响应异常）
|
|
174
147
|
}
|
|
175
|
-
/**
|
|
176
|
-
* apply/send 返回 already_authorized：不推卡片，但必须立即给 user 发 IM 提醒（否则 user 不知道要重新授权）
|
|
177
|
-
* PATCH 2026-07-17 v3：原版 silent 完全不通知 user，导致 user 长期不知道 silent 流程。改为立即发 IM。
|
|
178
|
-
*/
|
|
148
|
+
/** apply/send 返回 already_authorized：不推卡片/消息，但保留与常规路径相同的后台轮询换票 */
|
|
179
149
|
const silentNoUserIm = sendOutcome === "already_authorized";
|
|
180
150
|
if (silentNoUserIm) {
|
|
181
|
-
log.info("auth apply/send returned already_authorized:
|
|
151
|
+
log.info("auth apply/send returned already_authorized: background poll, no user-facing IM/card");
|
|
182
152
|
}
|
|
183
153
|
// ── 4b. 群聊时在群里推送提示消息 ──────────────────────────────────────────
|
|
184
154
|
if (!silentNoUserIm && params.conversationType === "2" && ticket.chatbotUserId) {
|
|
@@ -211,14 +181,19 @@ export async function executeYachAuthorize(params) {
|
|
|
211
181
|
if (!result.ok) {
|
|
212
182
|
cleanupFlow();
|
|
213
183
|
reportError("oauth.device-flow", "polling failed", { appKey, senderId, error: result.error });
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
184
|
+
if (silentNoUserIm) {
|
|
185
|
+
log.warn(`silent auth poll finished without token: ${result.error} ${result.message}`);
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
const failMsg = result.error === "access_denied"
|
|
189
|
+
? "❌ 您拒绝了授权请求。如需使用相关功能，请重新发起操作。"
|
|
190
|
+
: `❌ 授权超时或失败（${result.message}）。请重新发起操作。`;
|
|
191
|
+
await new YachClient({ baseUrl, appKey, appSecret }).im.sendMessage({
|
|
192
|
+
toId: senderId,
|
|
193
|
+
conversationType: "1",
|
|
194
|
+
payload: { msgtype: "text", text: { content: failMsg } },
|
|
195
|
+
}).catch((e) => log.warn(`fail notify error: ${e}`));
|
|
196
|
+
}
|
|
222
197
|
return;
|
|
223
198
|
}
|
|
224
199
|
await persistMergedDeviceToken(appKey, senderId, result.token);
|
|
@@ -238,10 +213,8 @@ export async function executeYachAuthorize(params) {
|
|
|
238
213
|
}).catch((e) => log.warn(`group success notify error: ${e}`));
|
|
239
214
|
}
|
|
240
215
|
}
|
|
241
|
-
// 发送合成消息触发 AI
|
|
242
|
-
|
|
243
|
-
await sendSyntheticMessage({ ticket, account, cfg });
|
|
244
|
-
}
|
|
216
|
+
// 发送合成消息触发 AI 重试
|
|
217
|
+
await sendSyntheticMessage({ ticket, account, cfg });
|
|
245
218
|
// 延迟清理 guard：合成消息可能立即触起重试，
|
|
246
219
|
// 如果 guard 已删除，重试会走完整 OAuth 再发一张卡
|
|
247
220
|
setTimeout(() => cleanupFlow(), 30_000); // 30 秒后清理
|
|
@@ -324,96 +297,12 @@ export async function handleInvokeErrorWithAutoAuth(err, cfg, context) {
|
|
|
324
297
|
const resolvedCfg = cfg ?? getYachConfig();
|
|
325
298
|
const ticket = getYachTicket();
|
|
326
299
|
if (err instanceof NeedUserAuthorizationError) {
|
|
327
|
-
// ✅ PATCH 2026-07-16 + 2026-07-17: cron/subagent 场景无 ticket，通过 by_app_info 接口反查应用管理者作为兜底
|
|
328
|
-
// 2026-07-28: 简化配置，移除 cronFallbackAccountId，永远用 default account
|
|
329
|
-
// 2026-08-03: 移除 appManagerUserId 配置项，改为调用 /openapi/v2/chat/user/query/by_app_info 实时查询
|
|
330
|
-
// 2026-08-04 (方案A): 把 fallback accountId 解析和跨账号 warn 移到 !ticket 守卫**之前**，
|
|
331
|
-
// 让 warn 在 propagated cron（ticket 有 accountId != default）时也能触发；
|
|
332
|
-
// fallback 块内直接用 pre-computed 的 fallbackAccountId，不再各自重新解析
|
|
333
|
-
const defaultAccountId = resolveDefaultYachAccountId(resolvedCfg);
|
|
334
|
-
const propagatedAccountId = ticket?.accountId;
|
|
335
|
-
const fallbackAccountId = propagatedAccountId ?? defaultAccountId;
|
|
336
|
-
if (propagatedAccountId && propagatedAccountId !== defaultAccountId) {
|
|
337
|
-
log.warn(`[cron fallback] cron 真实账号 ${propagatedAccountId} ≠ default ${defaultAccountId}，` +
|
|
338
|
-
`fallback 链将按 ${fallbackAccountId} 的 by_app_info 走（card 推给其 owner）`);
|
|
339
|
-
}
|
|
340
300
|
if (!ticket) {
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
return jsonResult({
|
|
346
|
-
error: "need_user_authorization",
|
|
347
|
-
message: "账号 fallback 未配置，无法发起兜底授权",
|
|
348
|
-
});
|
|
349
|
-
}
|
|
350
|
-
// 通过 by_app_info 接口查询应用管理者（取代原先读取 config.appManagerUserId）
|
|
351
|
-
let appManagerUuid;
|
|
352
|
-
let appManagerName;
|
|
353
|
-
try {
|
|
354
|
-
const mgr = await YachClient.fromAccount(fallbackAccount).chat.getAppManagerByAppInfo();
|
|
355
|
-
if (!mgr || !mgr.uuid) {
|
|
356
|
-
log.error(`[cron fallback] by_app_info 返回空，accountId=${fallbackAccount.accountId}`);
|
|
357
|
-
return jsonResult({
|
|
358
|
-
error: "need_user_authorization",
|
|
359
|
-
message: "cron 场景授权失败：by_app_info 接口未返回应用管理者（user_id 为空或用户不存在）",
|
|
360
|
-
});
|
|
361
|
-
}
|
|
362
|
-
appManagerUuid = mgr.uuid;
|
|
363
|
-
appManagerName = mgr.name;
|
|
364
|
-
}
|
|
365
|
-
catch (queryErr) {
|
|
366
|
-
log.error(`[cron fallback] by_app_info 查询失败: ${queryErr}`);
|
|
367
|
-
return jsonResult({
|
|
368
|
-
error: "need_user_authorization",
|
|
369
|
-
message: "cron 场景授权失败：by_app_info 接口调用失败",
|
|
370
|
-
});
|
|
371
|
-
}
|
|
372
|
-
// 校验 userId 格式（yach* 前缀 或 ≥6 位纯数字长串）
|
|
373
|
-
const fallbackUserId = appManagerUuid;
|
|
374
|
-
const looksLikeUserId = fallbackUserId.startsWith("yach") || /^\d{6,}$/.test(fallbackUserId);
|
|
375
|
-
if (!looksLikeUserId) {
|
|
376
|
-
log.warn(`[cron fallback] app manager uuid "${fallbackUserId}" 不是标准 userId 格式（应为 yach* 前缀或 ≥6 位纯数字长串），可能推卡片会失败`);
|
|
377
|
-
}
|
|
378
|
-
reportEvent("tools.auto-auth", "cron fallback auth flow triggered", {
|
|
379
|
-
accountId: fallbackAccount.accountId,
|
|
380
|
-
appKey: fallbackAccount.appKey,
|
|
381
|
-
channelAppId,
|
|
382
|
-
fallbackUserId,
|
|
383
|
-
appManagerName,
|
|
384
|
-
fallbackUserIdLooksLikeUserId: String(looksLikeUserId),
|
|
385
|
-
scopes: err.requiredScopes.join(","),
|
|
301
|
+
log.warn("NeedUserAuthorizationError but no ticket, returning error");
|
|
302
|
+
return jsonResult({
|
|
303
|
+
error: "need_user_authorization",
|
|
304
|
+
message: "需要用户授权，但当前不在消息上下文中，无法自动发起授权。",
|
|
386
305
|
});
|
|
387
|
-
try {
|
|
388
|
-
return await executeYachAuthorize({
|
|
389
|
-
account: fallbackAccount,
|
|
390
|
-
senderId: fallbackUserId,
|
|
391
|
-
toId: fallbackUserId,
|
|
392
|
-
conversationType: "1",
|
|
393
|
-
scopes: err.requiredScopes,
|
|
394
|
-
cfg: resolvedCfg,
|
|
395
|
-
ticket: {
|
|
396
|
-
accountId: fallbackAccount.accountId,
|
|
397
|
-
senderId: fallbackUserId,
|
|
398
|
-
toId: fallbackUserId,
|
|
399
|
-
conversationType: "1",
|
|
400
|
-
msgId: `cron-fallback:${Date.now()}`,
|
|
401
|
-
senderNick: appManagerName || "app-manager",
|
|
402
|
-
senderNickName: appManagerName || "app-manager",
|
|
403
|
-
msgIdClient: "cron-fallback",
|
|
404
|
-
chatbotUserId: "",
|
|
405
|
-
startTime: Date.now(),
|
|
406
|
-
},
|
|
407
|
-
skipSyntheticMessage: true,
|
|
408
|
-
});
|
|
409
|
-
}
|
|
410
|
-
catch (autoAuthErr) {
|
|
411
|
-
log.error(`cron fallback executeYachAuthorize failed: ${autoAuthErr}`);
|
|
412
|
-
return jsonResult({
|
|
413
|
-
error: "need_user_authorization",
|
|
414
|
-
message: "兜底授权流程启动失败，请联系数字伙伴 owner 排查 by_app_info 接口。",
|
|
415
|
-
});
|
|
416
|
-
}
|
|
417
306
|
}
|
|
418
307
|
const senderId = ticket.senderId;
|
|
419
308
|
if (!senderId) {
|
|
@@ -428,8 +317,6 @@ export async function handleInvokeErrorWithAutoAuth(err, cfg, context) {
|
|
|
428
317
|
}
|
|
429
318
|
const typedAccount = account;
|
|
430
319
|
reportEvent("tools.auto-auth", "auth flow triggered", { senderId, accountId: ticket?.accountId, scopes: err.requiredScopes.join(",") });
|
|
431
|
-
// subagent/cron 上下文里合成消息重试无意义（subagent 已失败，cron 会下次自然重试）
|
|
432
|
-
const skipSyntheticMessage = ticket.origin === "subagent" || ticket.origin === "cron";
|
|
433
320
|
try {
|
|
434
321
|
return await executeYachAuthorize({
|
|
435
322
|
account: typedAccount,
|
|
@@ -439,7 +326,6 @@ export async function handleInvokeErrorWithAutoAuth(err, cfg, context) {
|
|
|
439
326
|
scopes: err.requiredScopes,
|
|
440
327
|
cfg: resolvedCfg,
|
|
441
328
|
ticket,
|
|
442
|
-
skipSyntheticMessage,
|
|
443
329
|
});
|
|
444
330
|
}
|
|
445
331
|
catch (autoAuthErr) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-auth.js","sourceRoot":"","sources":["../../../src/tools/auto-auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"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
CHANGED
|
@@ -9,108 +9,7 @@ import { registerOkrTools } from "./okr/index.js";
|
|
|
9
9
|
import { registerTopicTools } from "./topic/index.js";
|
|
10
10
|
import { registerGroupTools } from "./group/index.js";
|
|
11
11
|
import { registerMeetingTools } from "./meeting/index.js";
|
|
12
|
-
import { withPropagatedTicket } from "../core/ticket-propagation.js";
|
|
13
|
-
import { bridgeGet, bridgeDelete } from "../core/session-key-bridge.js";
|
|
14
|
-
import { getYachTicket, withYachTicket } from "../core/yach-ticket.js";
|
|
15
|
-
import { yachLogger } from "../core/yach-logger.js";
|
|
16
|
-
const log = yachLogger("tools/wrap");
|
|
17
|
-
// subagent/cron 路径：tool 返回 awaiting_authorization 时自动重试
|
|
18
|
-
const MAX_RETRIES = 3;
|
|
19
|
-
const RETRY_INTERVAL_MS = 5000;
|
|
20
|
-
function sleep(ms, signal) {
|
|
21
|
-
return new Promise((resolve) => {
|
|
22
|
-
if (signal?.aborted) {
|
|
23
|
-
resolve();
|
|
24
|
-
return;
|
|
25
|
-
}
|
|
26
|
-
const t = setTimeout(resolve, ms);
|
|
27
|
-
signal?.addEventListener("abort", () => {
|
|
28
|
-
clearTimeout(t);
|
|
29
|
-
resolve();
|
|
30
|
-
}, { once: true });
|
|
31
|
-
});
|
|
32
|
-
}
|
|
33
|
-
/** 检测 tool 结果是否为 awaiting_authorization（OAuth 卡已推、等用户授权） */
|
|
34
|
-
function isAwaitingAuthorization(result) {
|
|
35
|
-
if (!result || typeof result !== "object")
|
|
36
|
-
return false;
|
|
37
|
-
const details = result.details;
|
|
38
|
-
if (!details || typeof details !== "object")
|
|
39
|
-
return false;
|
|
40
|
-
const flag = details.awaiting_authorization;
|
|
41
|
-
return flag === true;
|
|
42
|
-
}
|
|
43
|
-
/** 提取 fallback retry ticket（auto-auth 在 fallback 路径 token 有效时返回） */
|
|
44
|
-
function extractRetryTicket(result) {
|
|
45
|
-
if (!result || typeof result !== "object")
|
|
46
|
-
return undefined;
|
|
47
|
-
const details = result.details;
|
|
48
|
-
if (!details || typeof details !== "object")
|
|
49
|
-
return undefined;
|
|
50
|
-
const ticket = details._retry_ticket;
|
|
51
|
-
if (!ticket || typeof ticket !== "object")
|
|
52
|
-
return undefined;
|
|
53
|
-
return ticket;
|
|
54
|
-
}
|
|
55
|
-
export function wrapToolWithTicketPropagation(tool) {
|
|
56
|
-
const realExecute = tool.execute;
|
|
57
|
-
const wrappedExecute = async (toolCallId, params, signal, onUpdate) => {
|
|
58
|
-
const sessionKey = bridgeGet(toolCallId);
|
|
59
|
-
try {
|
|
60
|
-
return await withPropagatedTicket(sessionKey, async () => {
|
|
61
|
-
const ticket = getYachTicket();
|
|
62
|
-
// subagent / cron / 无 ticket(fallback) 路径都走重试逻辑；live chat 走合成消息重试
|
|
63
|
-
const shouldRetry = ticket?.origin === "subagent" || ticket?.origin === "cron" || !ticket;
|
|
64
|
-
if (!shouldRetry) {
|
|
65
|
-
return await realExecute(toolCallId, params, signal, onUpdate);
|
|
66
|
-
}
|
|
67
|
-
// tool 返回 awaiting_authorization 时重试。最多 3 次（共 4 次尝试）。
|
|
68
|
-
// 特殊：如果 result 带 _retry_ticket（fallback 路径 token 已有效但 tool 未用对 userId），
|
|
69
|
-
// 立即用 retry_ticket 包 withYachTicket 重试，不走 5s sleep。
|
|
70
|
-
let result;
|
|
71
|
-
let retryTicket;
|
|
72
|
-
for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
|
|
73
|
-
if (signal?.aborted)
|
|
74
|
-
return result;
|
|
75
|
-
if (retryTicket) {
|
|
76
|
-
// 用上一次返回的 _retry_ticket 包 ALS 重试
|
|
77
|
-
result = await withYachTicket(retryTicket, () => realExecute(toolCallId, params, signal, onUpdate));
|
|
78
|
-
retryTicket = undefined;
|
|
79
|
-
}
|
|
80
|
-
else {
|
|
81
|
-
result = await realExecute(toolCallId, params, signal, onUpdate);
|
|
82
|
-
}
|
|
83
|
-
if (!isAwaitingAuthorization(result)) {
|
|
84
|
-
return result;
|
|
85
|
-
}
|
|
86
|
-
// 检查是否带 _retry_ticket（fallback 路径），有就立即重试不等 5s
|
|
87
|
-
const rt = extractRetryTicket(result);
|
|
88
|
-
if (rt) {
|
|
89
|
-
retryTicket = rt;
|
|
90
|
-
log.info(`[ticket-prop] retry with fallback ticket (senderId=${rt.senderId}, toolCallId=${toolCallId})`);
|
|
91
|
-
continue; // 立即重试，不 sleep
|
|
92
|
-
}
|
|
93
|
-
if (attempt < MAX_RETRIES) {
|
|
94
|
-
log.info(`[ticket-prop] retry ${attempt + 1}/${MAX_RETRIES} after awaiting_authorization (origin=${ticket?.origin ?? "none"}, toolCallId=${toolCallId})`);
|
|
95
|
-
await sleep(RETRY_INTERVAL_MS, signal);
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
log.warn(`[ticket-prop] exhausted ${MAX_RETRIES} retries, returning awaiting_authorization (toolCallId=${toolCallId})`);
|
|
99
|
-
return result;
|
|
100
|
-
});
|
|
101
|
-
}
|
|
102
|
-
finally {
|
|
103
|
-
bridgeDelete(toolCallId);
|
|
104
|
-
}
|
|
105
|
-
};
|
|
106
|
-
return { ...tool, execute: wrappedExecute };
|
|
107
|
-
}
|
|
108
12
|
export function registerYachTools(api) {
|
|
109
|
-
const origRegister = api.registerTool.bind(api);
|
|
110
|
-
// monkey-patch api.registerTool：所有后续 register 调用自动包一层
|
|
111
|
-
api.registerTool = ((tool, opts) => {
|
|
112
|
-
origRegister(wrapToolWithTicketPropagation(tool), opts);
|
|
113
|
-
});
|
|
114
13
|
registerCalendarTools(api);
|
|
115
14
|
registerDocTools(api);
|
|
116
15
|
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":"AASA,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,MAAM,UAAU,iBAAiB,CAAC,GAAsB;IACtD,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.13.
|
|
3
|
+
"version": "2.13.3",
|
|
4
4
|
"description": "OpenClaw Yach (知音楼) channel plugin",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -23,8 +23,7 @@
|
|
|
23
23
|
"test:config": "npx tsx scripts/test-config.js",
|
|
24
24
|
"npm:publish": "npm run build && npm publish --tag latest",
|
|
25
25
|
"npm:publish:beta": "npm run build && npm publish --tag beta",
|
|
26
|
-
"tag": "bash scripts/tag.sh"
|
|
27
|
-
"test:ticket-propagation": "npm run build && node scripts/test-ticket-propagation.mjs"
|
|
26
|
+
"tag": "bash scripts/tag.sh"
|
|
28
27
|
},
|
|
29
28
|
"publishConfig": {
|
|
30
29
|
"access": "public"
|
|
@@ -65,7 +64,7 @@
|
|
|
65
64
|
"order": 80
|
|
66
65
|
},
|
|
67
66
|
"install": {
|
|
68
|
-
"npmSpec": "@yach.zhiyinlou.com/yach@2.13.
|
|
67
|
+
"npmSpec": "@yach.zhiyinlou.com/yach@2.13.3",
|
|
69
68
|
"defaultChoice": "npm",
|
|
70
69
|
"minHostVersion": ">=2026.3.22"
|
|
71
70
|
}
|