@yach.zhiyinlou.com/yach 2.16.1-beta.2 → 2.16.1-beta.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 +1 -0
- package/dist/index.js.map +1 -1
- package/dist/src/commands/index.js +8 -2
- package/dist/src/commands/index.js.map +1 -1
- package/dist/src/commands/web-auth-test.js +65 -0
- package/dist/src/commands/web-auth-test.js.map +1 -0
- package/dist/src/core/device-flow.js +23 -0
- package/dist/src/core/device-flow.js.map +1 -1
- package/dist/src/core/web-sender.js +36 -8
- package/dist/src/core/web-sender.js.map +1 -1
- package/dist/src/core/webchat-reply.js +33 -4
- package/dist/src/core/webchat-reply.js.map +1 -1
- package/dist/src/core/yach-ticket.js +31 -5
- package/dist/src/core/yach-ticket.js.map +1 -1
- package/dist/src/tools/auto-auth.js +19 -0
- package/dist/src/tools/auto-auth.js.map +1 -1
- package/dist/src/tools/index.js +16 -7
- package/dist/src/tools/index.js.map +1 -1
- package/package.json +2 -2
package/dist/index.js
CHANGED
|
@@ -10,6 +10,7 @@ export default {
|
|
|
10
10
|
configSchema: emptyPluginConfigSchema(),
|
|
11
11
|
register(api) {
|
|
12
12
|
setYachRuntime(api.runtime);
|
|
13
|
+
api.logger.info(`[auth-chain] plugin.registered 插件版本=${api.version ?? "未知"};组织虾授权详细日志=/tmp/openclaw-plugin-yach-logs/`);
|
|
13
14
|
api.registerChannel({ plugin: yachPlugin });
|
|
14
15
|
registerYachTools(api);
|
|
15
16
|
registerYachCommands(api);
|
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;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"}
|
|
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,MAAM,CAAC,IAAI,CAAC,uCAAuC,GAAG,CAAC,OAAO,IAAI,IAAI,4CAA4C,CAAC,CAAC;QACxH,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"}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
import * as os from "node:os";
|
|
9
9
|
import { listYachAccountIds, resolveYachAccount } from "../accounts/index.js";
|
|
10
10
|
import { getAccessToken } from "../core/app-token.js";
|
|
11
|
+
import { runWebAuthTest } from "./web-auth-test.js";
|
|
11
12
|
import { configManager } from "../core/config.js";
|
|
12
13
|
// ---------------------------------------------------------------------------
|
|
13
14
|
// Version
|
|
@@ -135,7 +136,9 @@ function getHelp() {
|
|
|
135
136
|
` /yach start — 快速检查账号配置\n` +
|
|
136
137
|
` /yach doctor — 完整诊断(账号 + API 连通性)\n` +
|
|
137
138
|
` /yach config — 配置管理(show、set、reload)\n` +
|
|
138
|
-
` /yach help —
|
|
139
|
+
` /yach help — 显示此帮助\n` +
|
|
140
|
+
` /yach test-notify — 仅Web:测试原会话通知\n` +
|
|
141
|
+
` /yach test-retry — 仅Web:测试主动恢复(禁用业务工具)`);
|
|
139
142
|
}
|
|
140
143
|
// ---------------------------------------------------------------------------
|
|
141
144
|
// 注册命令
|
|
@@ -143,12 +146,15 @@ function getHelp() {
|
|
|
143
146
|
export function registerYachCommands(api) {
|
|
144
147
|
api.registerCommand({
|
|
145
148
|
name: "yach",
|
|
146
|
-
description: "
|
|
149
|
+
description: "知音楼插件命令(start、doctor、config、help;Web自测:test-notify、test-retry)",
|
|
147
150
|
acceptsArgs: true,
|
|
148
151
|
requireAuth: true,
|
|
149
152
|
async handler(ctx) {
|
|
150
153
|
const sub = ctx.args?.trim().split(/\s+/)[0]?.toLowerCase();
|
|
151
154
|
try {
|
|
155
|
+
if (sub === "test-notify" || sub === "test-retry") {
|
|
156
|
+
return await runWebAuthTest(ctx, sub === "test-notify" ? "notify" : "retry");
|
|
157
|
+
}
|
|
152
158
|
if (sub === "start") {
|
|
153
159
|
return { text: runYachStart(ctx.config) };
|
|
154
160
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { getYachRuntime } from "../core/runtime.js";
|
|
3
|
+
import { notifyWebSession, resumeWebSession } from "../core/webchat-reply.js";
|
|
4
|
+
import { yachLogger } from "../core/yach-logger.js";
|
|
5
|
+
const log = yachLogger("commands/web-auth-test");
|
|
6
|
+
export const WEB_AUTH_TEST_REPLY = "插件主动恢复链路测试成功";
|
|
7
|
+
const TEST_PROMPT = `【重试自测】本轮只验证模型回复链路。请仅回复“${WEB_AUTH_TEST_REPLY}”。不要继续此前业务任务,不要调用工具。`;
|
|
8
|
+
/**
|
|
9
|
+
* 仅供Web手工自测后半段链路:不查询UUID、不发送授权卡片、不保存授权Token。
|
|
10
|
+
* 会话身份由命令上下文提供;deps只用于本地测试替身,生产使用当前Gateway运行时。
|
|
11
|
+
*/
|
|
12
|
+
export async function runWebAuthTest(ctx, action, deps = {}) {
|
|
13
|
+
if (ctx.channel !== "webchat")
|
|
14
|
+
return { text: "此自测命令仅支持组织虾 Web 聊天,请在 Web 对话中发送。" };
|
|
15
|
+
if (!ctx.agentId || !ctx.sessionKey || !ctx.sessionId) {
|
|
16
|
+
log.warn("[auth-chain] self-test.context.missing", {
|
|
17
|
+
channel: ctx.channel, hasAgentId: !!ctx.agentId, hasSessionKey: !!ctx.sessionKey, hasSessionId: !!ctx.sessionId,
|
|
18
|
+
});
|
|
19
|
+
return { text: "无法获取当前 Web 会话信息。请先在这段对话发送一句普通消息,再执行自测。" };
|
|
20
|
+
}
|
|
21
|
+
const id = `web-auth-test:${randomUUID()}`;
|
|
22
|
+
const ticket = {
|
|
23
|
+
source: "orgclaw-zxl", agentId: ctx.agentId, sessionKey: ctx.sessionKey, sessionId: ctx.sessionId,
|
|
24
|
+
accountId: ctx.accountId ?? "default", conversationType: "1", msgId: id, startTime: Date.now(),
|
|
25
|
+
// 自测标记不是业务UUID,不参与授权或用户API;重试测试硬性禁用所有工具。
|
|
26
|
+
senderId: "web-auth-self-test", toId: "web-auth-self-test",
|
|
27
|
+
};
|
|
28
|
+
log.info("[auth-chain] self-test.start", { testId: id, action, sessionKey: ctx.sessionKey });
|
|
29
|
+
if (action === "notify") {
|
|
30
|
+
await notifyWebSession(ticket, "【通知自测】这是插件通过会话 SDK 写入的测试通知,不代表已经完成平台授权。", ctx.config, id, deps);
|
|
31
|
+
log.info("[auth-chain] self-test.notify.done", { testId: id });
|
|
32
|
+
return { text: "通知自测已完成。请确认带【通知自测】的消息出现在当前对话,并在刷新后仍能看到;本次未调用开放平台。" };
|
|
33
|
+
}
|
|
34
|
+
const runtime = deps.runtime ?? getYachRuntime();
|
|
35
|
+
const testRuntime = {
|
|
36
|
+
...runtime,
|
|
37
|
+
channel: {
|
|
38
|
+
...runtime.channel,
|
|
39
|
+
reply: {
|
|
40
|
+
...runtime.channel.reply,
|
|
41
|
+
// 复用生产恢复函数,只在自测入口替换输入并禁用工具,不改变真实运行时对象。
|
|
42
|
+
dispatchReplyWithBufferedBlockDispatcher: (params) => runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
|
|
43
|
+
...params,
|
|
44
|
+
ctx: runtime.channel.reply.finalizeInboundContext({
|
|
45
|
+
...params.ctx, Body: TEST_PROMPT, BodyForAgent: TEST_PROMPT, RawBody: TEST_PROMPT, CommandBody: TEST_PROMPT,
|
|
46
|
+
}),
|
|
47
|
+
toolsAllow: [],
|
|
48
|
+
replyOptions: { ...params.replyOptions, disableTools: true },
|
|
49
|
+
}),
|
|
50
|
+
},
|
|
51
|
+
},
|
|
52
|
+
};
|
|
53
|
+
// 命令立即返回回执,让原命令结算;模型自测在下一事件轮启动,避免等待自己所在会话。
|
|
54
|
+
setImmediate(() => {
|
|
55
|
+
void resumeWebSession(ticket, ctx.config, id, { ...deps, runtime: testRuntime }).then(() => {
|
|
56
|
+
log.info("[auth-chain] self-test.retry.returned", { testId: id });
|
|
57
|
+
}).catch(async (error) => {
|
|
58
|
+
log.warn("[auth-chain] self-test.retry.failed", { testId: id, errorType: error instanceof Error ? error.name : typeof error });
|
|
59
|
+
await notifyWebSession(ticket, "【重试自测】运行或消息回传失败,请查看插件日志中的 self-test 和 web.model/web.reply 阶段。", ctx.config, `${id}:failed`, deps)
|
|
60
|
+
.catch(() => undefined);
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
return { text: `重试自测已启动,稍后应看到“${WEB_AUTH_TEST_REPLY}”。本次禁用工具,不代表真实业务已经获得授权。` };
|
|
64
|
+
}
|
|
65
|
+
//# sourceMappingURL=web-auth-test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"web-auth-test.js","sourceRoot":"","sources":["../../../src/commands/web-auth-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,12 @@ export class YachAppScopeError extends Error {
|
|
|
23
23
|
}
|
|
24
24
|
export async function sendYachAuthCard(params) {
|
|
25
25
|
const { baseUrl, appKey, appSecret, deviceCode, toUserId, groupTid, conversationType, sourceType } = params;
|
|
26
|
+
log.info("[auth-chain] card.prepare", {
|
|
27
|
+
source: sourceType ?? "yach", path: "/openapi/v2/auth/apply/send",
|
|
28
|
+
conversationType, toUserId, hasAuthCode: !!deviceCode,
|
|
29
|
+
});
|
|
26
30
|
const appToken = await getAccessToken(baseUrl, { appKey, appSecret });
|
|
31
|
+
log.info("[auth-chain] card.request", { source: sourceType ?? "yach", method: "POST", path: "/openapi/v2/auth/apply/send" });
|
|
27
32
|
const body = {
|
|
28
33
|
access_token: appToken,
|
|
29
34
|
auth_code: deviceCode,
|
|
@@ -40,7 +45,12 @@ export async function sendYachAuthCard(params) {
|
|
|
40
45
|
headers: { "Content-Type": "application/json" },
|
|
41
46
|
body: JSON.stringify(body),
|
|
42
47
|
});
|
|
48
|
+
log.info("[auth-chain] card.http.response", { source: sourceType ?? "yach", httpStatus: resp.status, ok: resp.ok });
|
|
43
49
|
const data = (await resp.json());
|
|
50
|
+
log.info("[auth-chain] card.response", {
|
|
51
|
+
source: sourceType ?? "yach", httpStatus: resp.status, code: data.code,
|
|
52
|
+
status: data.status ?? data.obj?.status, success: data.code === 200 || data.code === 0,
|
|
53
|
+
});
|
|
44
54
|
const senderId = toUserId;
|
|
45
55
|
if (data.code === 69300014) {
|
|
46
56
|
reportError("oauth.device-flow", "auth card failed: app missing scope", { appKey, senderId });
|
|
@@ -137,6 +147,7 @@ export async function pollYachDeviceToken(params) {
|
|
|
137
147
|
const tokenUrl = `${baseUrl}/openapi/v2/auth/token`;
|
|
138
148
|
const deadline = Date.now() + expiresIn * 1000;
|
|
139
149
|
let attempts = 0;
|
|
150
|
+
let lastLoggedStatus = ""; // 仅日志节流:状态变化或每十轮输出,不改变轮询行为。
|
|
140
151
|
while (Date.now() < deadline && attempts < MAX_POLL_ATTEMPTS) {
|
|
141
152
|
attempts++;
|
|
142
153
|
if (signal?.aborted) {
|
|
@@ -150,8 +161,20 @@ export async function pollYachDeviceToken(params) {
|
|
|
150
161
|
const pollBody = { access_token: appToken, grant_type: "device_code", "auth_code": deviceCode };
|
|
151
162
|
const resp = await oapiFetch(tokenUrl, { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(pollBody) }, { ignoreBizCodes: [20064] });
|
|
152
163
|
data = (await resp.json());
|
|
164
|
+
const status = `${resp.status}:${data.code}`;
|
|
165
|
+
if (status !== lastLoggedStatus || attempts % 10 === 0) {
|
|
166
|
+
log.info("[auth-chain] poll.http.response", {
|
|
167
|
+
attempts, httpStatus: resp.status, code: data.code,
|
|
168
|
+
hasUserToken: !!data.obj?.access_token,
|
|
169
|
+
});
|
|
170
|
+
lastLoggedStatus = status;
|
|
171
|
+
}
|
|
153
172
|
}
|
|
154
173
|
catch (err) {
|
|
174
|
+
if (lastLoggedStatus !== "request_failed" || attempts % 10 === 0) {
|
|
175
|
+
log.warn("[auth-chain] poll.request.failed", { attempts, interval, errorType: err instanceof Error ? err.name : typeof err });
|
|
176
|
+
lastLoggedStatus = "request_failed";
|
|
177
|
+
}
|
|
155
178
|
log.warn(`poll network error: ${err}`);
|
|
156
179
|
interval = Math.min(interval + 1, MAX_POLL_INTERVAL);
|
|
157
180
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-flow.js","sourceRoot":"","sources":["../../../src/core/device-flow.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEzD,MAAM,GAAG,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;AAEtC,2CAA2C;AAC3C,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IAC1C,YAAY,GAAW;QACrB,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AAaD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,MAatC;IACC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAC5G,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"device-flow.js","sourceRoot":"","sources":["../../../src/core/device-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { getAccessToken } from "./app-token.js";
|
|
2
2
|
import { oapiFetch } from "./fetch.js";
|
|
3
|
+
import { yachLogger } from "./yach-logger.js";
|
|
4
|
+
const log = yachLogger("web-sender");
|
|
5
|
+
const UUID_API_PATH = "/openapi/v2/openclaw/plugin/get_uuid/by/token";
|
|
3
6
|
// 主人属于应用账号;缓存和并发去重只减少重复 HTTP请求,不依赖 Channel SDK。
|
|
4
7
|
const CACHE_TTL_MS = 5 * 60 * 1000;
|
|
5
8
|
// key为[接口地址,账号ID,appKey];senderId是主人业务UUID,expiresAt是缓存失效时间戳。
|
|
@@ -12,28 +15,47 @@ const inFlight = new Map();
|
|
|
12
15
|
*/
|
|
13
16
|
async function querySenderId(account, baseUrl) {
|
|
14
17
|
let appToken;
|
|
18
|
+
log.info("[auth-chain] uuid.app-token.resolve", { accountId: account.accountId });
|
|
15
19
|
try {
|
|
16
20
|
appToken = await getAccessToken(baseUrl, { appKey: account.appKey, appSecret: account.appSecret });
|
|
21
|
+
log.info("[auth-chain] uuid.app-token.ready", { accountId: account.accountId });
|
|
17
22
|
}
|
|
18
23
|
catch {
|
|
24
|
+
log.warn("[auth-chain] uuid.app-token.failed", { accountId: account.accountId });
|
|
19
25
|
throw new Error("获取应用访问凭证失败,请稍后重试。");
|
|
20
26
|
}
|
|
21
27
|
let response;
|
|
28
|
+
log.info("[auth-chain] uuid.request", { accountId: account.accountId, method: "GET", path: UUID_API_PATH });
|
|
22
29
|
try {
|
|
23
|
-
response = await oapiFetch(`${baseUrl}
|
|
30
|
+
response = await oapiFetch(`${baseUrl}${UUID_API_PATH}?access_token=${encodeURIComponent(appToken)}`, { method: "GET" }, { omitQueryFromLog: true });
|
|
24
31
|
}
|
|
25
32
|
catch {
|
|
26
|
-
// 请求异常可能包含 URL
|
|
33
|
+
// 请求异常可能包含 URL,只记录阶段,不回显含Token的原异常。
|
|
34
|
+
log.warn("[auth-chain] uuid.request.failed", { accountId: account.accountId, path: UUID_API_PATH });
|
|
27
35
|
throw new Error("无法获取用户 ID,请稍后重试。");
|
|
28
36
|
}
|
|
29
|
-
if (!response.ok)
|
|
37
|
+
if (!response.ok) {
|
|
38
|
+
log.warn("[auth-chain] uuid.response.failed", { accountId: account.accountId, httpStatus: response.status });
|
|
30
39
|
throw new Error(`无法获取用户 ID(HTTP ${response.status}),请稍后重试。`);
|
|
31
|
-
|
|
32
|
-
|
|
40
|
+
}
|
|
41
|
+
let data;
|
|
42
|
+
try {
|
|
43
|
+
data = await response.json();
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
log.warn("[auth-chain] uuid.response.invalid-json", { accountId: account.accountId, httpStatus: response.status });
|
|
33
47
|
throw new Error("无法获取用户 ID,授权失败。");
|
|
34
48
|
}
|
|
49
|
+
const senderId = data?.obj?.sender_id;
|
|
50
|
+
const success = data?.code === 200 && typeof senderId === "string" && !!senderId.trim();
|
|
51
|
+
log.info("[auth-chain] uuid.response", {
|
|
52
|
+
accountId: account.accountId, httpStatus: response.status, code: data?.code, success,
|
|
53
|
+
senderId: success ? senderId : undefined,
|
|
54
|
+
});
|
|
55
|
+
if (!success || typeof senderId !== "string")
|
|
56
|
+
throw new Error("无法获取用户 ID,授权失败。");
|
|
35
57
|
// 业务 UUID是opaque字符串,可能是大整数字符串,不能转成 Number。
|
|
36
|
-
return
|
|
58
|
+
return senderId;
|
|
37
59
|
}
|
|
38
60
|
/**
|
|
39
61
|
* 从Control UI已选定的应用账号获取主人UUID,复用短缓存/并发请求。
|
|
@@ -41,16 +63,22 @@ async function querySenderId(account, baseUrl) {
|
|
|
41
63
|
*/
|
|
42
64
|
export async function resolveWebSenderId(account) {
|
|
43
65
|
if (!account.configured || !account.appKey || !account.appSecret) {
|
|
66
|
+
log.warn("[auth-chain] uuid.skipped", { accountId: account.accountId, reason: "account_not_configured" });
|
|
44
67
|
throw new Error(`账号 ${account.accountId} 未配置,无法发起授权。`);
|
|
45
68
|
}
|
|
46
69
|
const baseUrl = account.baseUrl.replace(/\/+$/, "");
|
|
47
70
|
const key = JSON.stringify([baseUrl, account.accountId, account.appKey]);
|
|
48
71
|
const saved = cache.get(key);
|
|
49
|
-
if (saved && saved.expiresAt > Date.now())
|
|
72
|
+
if (saved && saved.expiresAt > Date.now()) {
|
|
73
|
+
log.info("[auth-chain] uuid.cache.hit", { accountId: account.accountId, senderId: saved.senderId, httpRequest: false });
|
|
50
74
|
return saved.senderId;
|
|
75
|
+
}
|
|
51
76
|
const pending = inFlight.get(key);
|
|
52
|
-
if (pending)
|
|
77
|
+
if (pending) {
|
|
78
|
+
log.info("[auth-chain] uuid.request.shared", { accountId: account.accountId, httpRequest: false });
|
|
53
79
|
return pending;
|
|
80
|
+
}
|
|
81
|
+
log.info("[auth-chain] uuid.cache.miss", { accountId: account.accountId });
|
|
54
82
|
const request = querySenderId(account, baseUrl).then((senderId) => {
|
|
55
83
|
cache.set(key, { senderId, expiresAt: Date.now() + CACHE_TTL_MS });
|
|
56
84
|
return senderId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-sender.js","sourceRoot":"","sources":["../../../src/core/web-sender.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"web-sender.js","sourceRoot":"","sources":["../../../src/core/web-sender.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,GAAG,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;AACrC,MAAM,aAAa,GAAG,+CAA+C,CAAC;AAEtE,gDAAgD;AAChD,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AACnC,8DAA8D;AAC9D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAmD,CAAC;AACzE,8CAA8C;AAC9C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA2B,CAAC;AAEpD;;;GAGG;AACH,KAAK,UAAU,aAAa,CAAC,OAA4B,EAAE,OAAe;IACxE,IAAI,QAAgB,CAAC;IACrB,GAAG,CAAC,IAAI,CAAC,qCAAqC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IAClF,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAO,EAAE,SAAS,EAAE,OAAO,CAAC,SAAU,EAAE,CAAC,CAAC;QACrG,GAAG,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IAClF,CAAC;IAAC,MAAM,CAAC;QACP,GAAG,CAAC,IAAI,CAAC,oCAAoC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;QACjF,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,QAAkB,CAAC;IACvB,GAAG,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;IAC5G,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,SAAS,CACxB,GAAG,OAAO,GAAG,aAAa,iBAAiB,kBAAkB,CAAC,QAAQ,CAAC,EAAE,EACzE,EAAE,MAAM,EAAE,KAAK,EAAE,EACjB,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,oCAAoC;QACpC,GAAG,CAAC,IAAI,CAAC,kCAAkC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;QACpG,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,GAAG,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7G,MAAM,IAAI,KAAK,CAAC,kBAAkB,QAAQ,CAAC,MAAM,UAAU,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,IAA4D,CAAC;IACjE,IAAI,CAAC;QAAC,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAAC,CAAC;IACrC,MAAM,CAAC;QACL,GAAG,CAAC,IAAI,CAAC,yCAAyC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QACnH,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,EAAE,GAAG,EAAE,SAAS,CAAC;IACtC,MAAM,OAAO,GAAG,IAAI,EAAE,IAAI,KAAK,GAAG,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACxF,GAAG,CAAC,IAAI,CAAC,4BAA4B,EAAE;QACrC,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO;QACpF,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;KACzC,CAAC,CAAC;IACH,IAAI,CAAC,OAAO,IAAI,OAAO,QAAQ,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACjF,2CAA2C;IAC3C,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAA4B;IACnE,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QACjE,GAAG,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAC;QAC1G,MAAM,IAAI,KAAK,CAAC,MAAM,OAAO,CAAC,SAAS,cAAc,CAAC,CAAC;IACzD,CAAC;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACpD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACzE,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,KAAK,IAAI,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QAC1C,GAAG,CAAC,IAAI,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QACxH,OAAO,KAAK,CAAC,QAAQ,CAAC;IACxB,CAAC;IACD,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,OAAO,EAAE,CAAC;QACZ,GAAG,CAAC,IAAI,CAAC,kCAAkC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QACnG,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,8BAA8B,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QAChE,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,EAAE,CAAC,CAAC;QACnE,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC3B,IAAI,CAAC;QAAC,OAAO,MAAM,OAAO,CAAC;IAAC,CAAC;YACrB,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAAC,CAAC;AACnC,CAAC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { getYachRuntime } from "./runtime.js";
|
|
2
2
|
import { enqueueChatTask } from "../messaging/outbound/chat-queue.js";
|
|
3
|
+
import { yachLogger } from "./yach-logger.js";
|
|
4
|
+
const log = yachLogger("webchat-reply");
|
|
3
5
|
// 模块加载Promise:只加载一次SDK,多个通知/恢复共用,不是授权任务状态。
|
|
4
6
|
let sdkPromise;
|
|
5
7
|
/** 动态加载并确认三个公开函数可用;当前安装包缺types声明,不能静态导入其类型。 */
|
|
@@ -7,12 +9,17 @@ export function loadWebTranscriptSdk() {
|
|
|
7
9
|
if (!sdkPromise) {
|
|
8
10
|
// 此 SDK子路径只有 JS导出,动态加载避免依赖缺失的类型声明。
|
|
9
11
|
const specifier = "openclaw/plugin-sdk/session-transcript-runtime";
|
|
12
|
+
log.info("[auth-chain] web.sdk.load", { module: specifier });
|
|
10
13
|
sdkPromise = import(specifier).then((sdk) => {
|
|
11
14
|
for (const name of ["appendAssistantMirrorMessageByIdentity", "readSessionTranscriptEvents", "publishSessionTranscriptUpdateByIdentity"]) {
|
|
12
15
|
if (typeof sdk[name] !== "function")
|
|
13
16
|
throw new Error(`OpenClaw SDK 不支持 Web 会话:${name}`);
|
|
14
17
|
}
|
|
18
|
+
log.info("[auth-chain] web.sdk.ready");
|
|
15
19
|
return sdk;
|
|
20
|
+
}).catch((error) => {
|
|
21
|
+
log.warn("[auth-chain] web.sdk.failed", { errorType: error instanceof Error ? error.name : typeof error });
|
|
22
|
+
throw error;
|
|
16
23
|
});
|
|
17
24
|
}
|
|
18
25
|
return sdkPromise;
|
|
@@ -33,13 +40,17 @@ function sessionIdentity(ticket) {
|
|
|
33
40
|
* @param deps 测试依赖;生产调用省略。
|
|
34
41
|
*/
|
|
35
42
|
export async function notifyWebSession(ticket, text, cfg, messageId, deps = {}) {
|
|
43
|
+
log.info("[auth-chain] web.notify.start", { messageId, sessionKey: ticket.sessionKey, sessionId: ticket.sessionId, agentId: ticket.agentId });
|
|
36
44
|
const sdk = deps.sdk ?? await loadWebTranscriptSdk();
|
|
37
45
|
const result = await sdk.appendAssistantMirrorMessageByIdentity({
|
|
38
46
|
...sessionIdentity(ticket), config: cfg, text, idempotencyKey: messageId,
|
|
39
47
|
deliveryMirror: { kind: "channel-final", sourceMessageId: messageId }, updateMode: "inline",
|
|
40
48
|
});
|
|
41
|
-
if (!result.ok)
|
|
49
|
+
if (!result.ok) {
|
|
50
|
+
log.warn("[auth-chain] web.notify.failed", { messageId, reason: result.reason });
|
|
42
51
|
throw new Error(`Web 会话通知写入失败:${result.reason}`);
|
|
52
|
+
}
|
|
53
|
+
log.info("[auth-chain] web.notify.written", { messageId, transcriptMessageId: result.messageId, sessionKey: ticket.sessionKey });
|
|
43
54
|
}
|
|
44
55
|
/** 只保留有消息ID的assistant事件,用户消息和工具调用不作为助手答案发布。 */
|
|
45
56
|
function entries(events) {
|
|
@@ -68,9 +79,11 @@ export async function resumeWebSession(ticket, cfg, messageId, deps = {}) {
|
|
|
68
79
|
const identity = sessionIdentity(ticket);
|
|
69
80
|
const sdk = deps.sdk ?? await loadWebTranscriptSdk();
|
|
70
81
|
const runtime = deps.runtime ?? getYachRuntime();
|
|
82
|
+
log.info("[auth-chain] web.resume.enqueue", { messageId, ...identity, toolName: ticket.toolName, toolCallId: ticket.toolCallId });
|
|
71
83
|
const { promise } = enqueueChatTask({
|
|
72
84
|
accountId: ticket.accountId, chatId: `webchat:${identity.sessionKey}`,
|
|
73
85
|
task: async () => {
|
|
86
|
+
log.info("[auth-chain] web.resume.task.start", { messageId, ...identity });
|
|
74
87
|
// 本轮开始前的消息基线,用于识别模型后来写入的回答,不能拿它作“已发布”集合。
|
|
75
88
|
const beforeIds = new Set(entries(await sdk.readSessionTranscriptEvents(identity)).map((entry) => entry.id));
|
|
76
89
|
// 仅本轮的消息ID→已发布正文,避免多个block重复刷新不变的内容;不是任务状态。
|
|
@@ -83,6 +96,7 @@ export async function resumeWebSession(ticket, cfg, messageId, deps = {}) {
|
|
|
83
96
|
...identity, update: { message: { ...entry.message, content: [{ type: "text", text }] }, messageId: entry.id },
|
|
84
97
|
});
|
|
85
98
|
publishedText.set(entry.id, text);
|
|
99
|
+
log.info("[auth-chain] web.reply.published", { messageId, transcriptMessageId: entry.id, textLength: text.length, sessionKey: identity.sessionKey });
|
|
86
100
|
};
|
|
87
101
|
// 最终/直接回复:复用本轮已存的模型消息,仅补写未保存的文字或附件。
|
|
88
102
|
const deliver = async (reply) => {
|
|
@@ -118,8 +132,11 @@ export async function resumeWebSession(ticket, cfg, messageId, deps = {}) {
|
|
|
118
132
|
...identity, config: cfg, text, mediaUrls,
|
|
119
133
|
idempotencyKey: `${messageId}:reply:${replyNumber++}`, updateMode: "inline",
|
|
120
134
|
});
|
|
121
|
-
if (!result.ok)
|
|
135
|
+
if (!result.ok) {
|
|
136
|
+
log.warn("[auth-chain] web.reply.failed", { messageId, reason: result.reason });
|
|
122
137
|
throw new Error(`Web 回复写入失败:${result.reason}`);
|
|
138
|
+
}
|
|
139
|
+
log.info("[auth-chain] web.reply.appended", { messageId, transcriptMessageId: result.messageId, textLength: text?.length ?? 0, mediaCount: mediaUrls?.length ?? 0 });
|
|
123
140
|
// 新消息的 inline追加已发布;只有 SDK复用了旧 ID才需要刷新,避免双重事件。
|
|
124
141
|
if (beforeIds.has(result.messageId)) {
|
|
125
142
|
const existing = entries(await sdk.readSessionTranscriptEvents(identity)).find((row) => row.id === result.messageId);
|
|
@@ -140,13 +157,21 @@ export async function resumeWebSession(ticket, cfg, messageId, deps = {}) {
|
|
|
140
157
|
From: ticket.senderId, To: identity.sessionKey, Provider: "webchat", Surface: "webchat", ChatType: "direct",
|
|
141
158
|
OriginatingChannel: "webchat", OriginatingTo: identity.sessionKey, MessageSid: messageId, Timestamp: Date.now(),
|
|
142
159
|
});
|
|
143
|
-
|
|
160
|
+
let loggedBlock = false; // 每轮只记录首次流式块,避免逐token刷日志。
|
|
161
|
+
log.info("[auth-chain] web.model.dispatch", { messageId, ...identity, senderId: ticket.senderId });
|
|
162
|
+
const dispatchResult = await runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
|
|
144
163
|
ctx, cfg,
|
|
145
164
|
replyOptions: {
|
|
146
165
|
suppressTyping: true, sourceReplyDeliveryMode: "automatic",
|
|
166
|
+
onAgentRunStart: (runId) => log.info("[auth-chain] web.model.started", { messageId, runId, sessionKey: identity.sessionKey }),
|
|
147
167
|
},
|
|
148
168
|
dispatcherOptions: {
|
|
149
169
|
deliver: async (payload, info) => {
|
|
170
|
+
if (info.kind !== "block" || !loggedBlock) {
|
|
171
|
+
log.info("[auth-chain] web.reply.received", { messageId, kind: info.kind, textLength: payload.text?.length ?? 0, mediaCount: (payload.mediaUrls?.length ?? 0) + (payload.mediaUrl ? 1 : 0), isError: payload.isError === true });
|
|
172
|
+
if (info.kind === "block")
|
|
173
|
+
loggedBlock = true;
|
|
174
|
+
}
|
|
150
175
|
if (info.kind === "block") {
|
|
151
176
|
// 流式文字由原生Agent事件展示,只刷新已经落盘的模型消息,不插入每个文本块。
|
|
152
177
|
for (const entry of entries(await sdk.readSessionTranscriptEvents(identity))) {
|
|
@@ -164,9 +189,13 @@ export async function resumeWebSession(ticket, cfg, messageId, deps = {}) {
|
|
|
164
189
|
return;
|
|
165
190
|
await deliver(payload);
|
|
166
191
|
},
|
|
167
|
-
onError: (error) => {
|
|
192
|
+
onError: (error, info) => {
|
|
193
|
+
deliveryError = error;
|
|
194
|
+
log.warn("[auth-chain] web.reply.delivery.failed", { messageId, kind: info.kind, errorType: error instanceof Error ? error.name : typeof error });
|
|
195
|
+
},
|
|
168
196
|
},
|
|
169
197
|
});
|
|
198
|
+
log.info("[auth-chain] web.model.dispatch.returned", { messageId, queuedFinal: dispatchResult.queuedFinal, counts: dispatchResult.counts, deliveryFailed: !!deliveryError });
|
|
170
199
|
// SDK负责会话排队和实际模型运行;返回不代表业务成功,用户看原会话的真实回复。
|
|
171
200
|
if (deliveryError)
|
|
172
201
|
throw deliveryError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webchat-reply.js","sourceRoot":"","sources":["../../../src/core/webchat-reply.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"webchat-reply.js","sourceRoot":"","sources":["../../../src/core/webchat-reply.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,8 @@ import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/acco
|
|
|
13
13
|
import { getYachConfig } from "./runtime.js";
|
|
14
14
|
import { listYachAccountIds, resolveYachAccount } from "../accounts/index.js";
|
|
15
15
|
import { resolveWebSenderId } from "./web-sender.js";
|
|
16
|
+
import { yachLogger } from "./yach-logger.js";
|
|
17
|
+
const log = yachLogger("tool-context");
|
|
16
18
|
// ── AsyncLocalStorage ─────────────────────────────────────────────────────
|
|
17
19
|
const store = new AsyncLocalStorage();
|
|
18
20
|
// ── 公开 API ──────────────────────────────────────────────────────────────
|
|
@@ -87,6 +89,7 @@ function resolveWebAccountForToolContext(ctx) {
|
|
|
87
89
|
.filter((account) => account.configured);
|
|
88
90
|
}
|
|
89
91
|
catch {
|
|
92
|
+
log.warn("[auth-chain] context.account.failed", { reason: "runtime_config_unavailable" });
|
|
90
93
|
return undefined;
|
|
91
94
|
}
|
|
92
95
|
if (accounts.length === 1)
|
|
@@ -95,8 +98,12 @@ function resolveWebAccountForToolContext(ctx) {
|
|
|
95
98
|
const matches = raw
|
|
96
99
|
? accounts.filter((account) => account.appKey === raw || account.accountId === normalizeAccountId(raw))
|
|
97
100
|
: accounts;
|
|
98
|
-
if (matches.length !== 1)
|
|
101
|
+
if (matches.length !== 1) {
|
|
102
|
+
log.warn("[auth-chain] context.account.failed", {
|
|
103
|
+
reason: "no_unique_configured_account", configuredAccountIds: accounts.map((account) => account.accountId), accountHint: raw,
|
|
104
|
+
});
|
|
99
105
|
return undefined;
|
|
106
|
+
}
|
|
100
107
|
return matches[0];
|
|
101
108
|
}
|
|
102
109
|
/**
|
|
@@ -105,21 +112,33 @@ function resolveWebAccountForToolContext(ctx) {
|
|
|
105
112
|
* Yach 必须有真实 requesterSenderId,始终保留原 ID,绝不查询 UUID。
|
|
106
113
|
*/
|
|
107
114
|
export async function rebuildTicketFromToolContext(ctx) {
|
|
108
|
-
if (!ctx)
|
|
115
|
+
if (!ctx) {
|
|
116
|
+
log.warn("[auth-chain] context.skipped", { reason: "missing_tool_context" });
|
|
109
117
|
return undefined;
|
|
118
|
+
}
|
|
110
119
|
const delivery = ctx.deliveryContext;
|
|
111
120
|
// 新SDK优先取本轮来源;旧SDK仅给deliveryContext.channel时兼容明确的webchat。
|
|
112
121
|
const messageChannel = ctx.messageChannel ?? delivery?.channel;
|
|
122
|
+
log.info("[auth-chain] context.route", {
|
|
123
|
+
messageChannel: ctx.messageChannel ?? null, deliveryChannel: delivery?.channel ?? null,
|
|
124
|
+
resolvedChannel: messageChannel ?? "unknown", sessionKey: ctx.sessionKey, sessionId: ctx.sessionId, agentId: ctx.agentId,
|
|
125
|
+
});
|
|
113
126
|
if (messageChannel === "webchat") {
|
|
114
127
|
const { sessionKey, sessionId, agentId } = ctx;
|
|
115
128
|
if (!isNonEmptyString(sessionKey) || !isNonEmptyString(sessionId) || !isNonEmptyString(agentId)) {
|
|
129
|
+
log.warn("[auth-chain] context.web.skipped", {
|
|
130
|
+
reason: "missing_session_identity", hasSessionKey: isNonEmptyString(sessionKey),
|
|
131
|
+
hasSessionId: isNonEmptyString(sessionId), hasAgentId: isNonEmptyString(agentId),
|
|
132
|
+
});
|
|
116
133
|
return undefined;
|
|
117
134
|
}
|
|
118
135
|
const account = resolveWebAccountForToolContext(ctx);
|
|
119
136
|
if (!account)
|
|
120
137
|
return undefined;
|
|
138
|
+
log.info("[auth-chain] context.uuid.resolve", { source: "orgclaw-zxl", accountId: account.accountId, sessionKey });
|
|
121
139
|
// 组织虾使用应用主人 UUID;恢复轮复用缓存,不把 SDK客户端标识当业务用户。
|
|
122
140
|
const senderId = await resolveWebSenderId(account);
|
|
141
|
+
log.info("[auth-chain] context.web.ready", { source: "orgclaw-zxl", accountId: account.accountId, senderId, sessionKey, sessionId, agentId });
|
|
123
142
|
return {
|
|
124
143
|
source: "orgclaw-zxl",
|
|
125
144
|
sessionKey,
|
|
@@ -134,12 +153,16 @@ export async function rebuildTicketFromToolContext(ctx) {
|
|
|
134
153
|
startTime: Date.now(),
|
|
135
154
|
};
|
|
136
155
|
}
|
|
137
|
-
if (delivery?.channel && delivery.channel !== "yach")
|
|
156
|
+
if (delivery?.channel && delivery.channel !== "yach") {
|
|
157
|
+
log.info("[auth-chain] context.skipped", { reason: "not_yach_or_webchat", channel: delivery.channel });
|
|
138
158
|
return undefined;
|
|
159
|
+
}
|
|
139
160
|
// 缺失(cron/subagent/heartbeat)时不猜发送者,也不映射为 Web。
|
|
140
161
|
const senderId = ctx.requesterSenderId;
|
|
141
|
-
if (!senderId)
|
|
162
|
+
if (!senderId) {
|
|
163
|
+
log.info("[auth-chain] context.skipped", { reason: "missing_yach_sender", uuidRequest: false });
|
|
142
164
|
return undefined;
|
|
165
|
+
}
|
|
143
166
|
const to = delivery?.to ?? "";
|
|
144
167
|
const isGroup = to.startsWith("group:");
|
|
145
168
|
const toId = isGroup ? to.replace(/^group:/, "") : senderId;
|
|
@@ -159,8 +182,11 @@ export async function rebuildTicketFromToolContext(ctx) {
|
|
|
159
182
|
* 否则用 ToolContext 重建并注入,使工具内部 getYachTicket() 始终有值。
|
|
160
183
|
*/
|
|
161
184
|
export async function runToolWithContext(ctx, fn) {
|
|
162
|
-
|
|
185
|
+
const existing = getYachTicket();
|
|
186
|
+
if (existing) {
|
|
187
|
+
log.info("[auth-chain] context.ticket.reused", { source: existing.source ?? "yach", accountId: existing.accountId, uuidRequest: false });
|
|
163
188
|
return fn();
|
|
189
|
+
}
|
|
164
190
|
const ticket = await rebuildTicketFromToolContext(ctx);
|
|
165
191
|
if (!ticket) {
|
|
166
192
|
// 仅记录重建失败的核心字段,便于排查Docker版本差异;不能打印含密钥的完整ctx/config。
|
|
@@ -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;AAGrD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAExF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"yach-ticket.js","sourceRoot":"","sources":["../../../src/core/yach-ticket.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,6 +75,10 @@ export async function executeYachAuthorize(params) {
|
|
|
75
75
|
const isOrgclaw = sourceType !== undefined;
|
|
76
76
|
// 此次授权通知/恢复的消息编号,不是用户UUID或会话ID;Yach仍用原消息编号。
|
|
77
77
|
const authId = isOrgclaw ? randomUUID() : "";
|
|
78
|
+
log.info("[auth-chain] auth.begin", {
|
|
79
|
+
authId: authId || ticket.msgId, source: ticket.source ?? "yach", accountId: ticket.accountId,
|
|
80
|
+
senderId, scopes, sessionKey: ticket.sessionKey, sessionId: ticket.sessionId, toolCallId: ticket.toolCallId,
|
|
81
|
+
});
|
|
78
82
|
if (isOrgclaw) {
|
|
79
83
|
if (!ticket.sessionKey || !ticket.sessionId || !ticket.agentId) {
|
|
80
84
|
return jsonResult({ error: "missing_web_session", message: "无法确定原 Web 会话,不能发起授权。" });
|
|
@@ -86,11 +90,13 @@ export async function executeYachAuthorize(params) {
|
|
|
86
90
|
const existing = await getStoredToken(appKey, senderId);
|
|
87
91
|
if (existing && tokenStatus(existing) !== "expired") {
|
|
88
92
|
if (scopes.length === 0) {
|
|
93
|
+
log.info("[auth-chain] auth.local-token.hit", { authId: authId || ticket.msgId, reason: "no_scope_required" });
|
|
89
94
|
return jsonResult({ success: true, message: "用户已授权,无需重复授权。" });
|
|
90
95
|
}
|
|
91
96
|
const grantedScopes = new Set((existing.scope ?? "").split(/[\s,]+/).filter(Boolean));
|
|
92
97
|
const missing = scopes.filter((s) => !grantedScopes.has(s));
|
|
93
98
|
if (missing.length === 0) {
|
|
99
|
+
log.info("[auth-chain] auth.local-token.hit", { authId: authId || ticket.msgId, reason: "scope_covered" });
|
|
94
100
|
return jsonResult({ success: true, message: "用户已授权,scope 已覆盖。" });
|
|
95
101
|
}
|
|
96
102
|
}
|
|
@@ -101,9 +107,11 @@ export async function executeYachAuthorize(params) {
|
|
|
101
107
|
? `${sourceType}:${appKey}:${senderId}:${ticket.sessionKey}:${ticket.sessionId}:${scopeKey}`
|
|
102
108
|
: `${appKey}:${senderId}:${scopeKey}`;
|
|
103
109
|
if (isOrgclaw && pendingFlows.get(flowKey)?.retrying) {
|
|
110
|
+
log.warn("[auth-chain] auth.retry.blocked", { sessionKey: ticket.sessionKey, scopes });
|
|
104
111
|
return jsonResult({ error: "authorization_retry_failed", message: "授权后操作仍缺少同一权限,请检查权限或重新发起操作。" });
|
|
105
112
|
}
|
|
106
113
|
if (pendingFlows.has(flowKey)) {
|
|
114
|
+
log.info("[auth-chain] auth.pending.reused", { source: ticket.source ?? "yach", sessionKey: ticket.sessionKey, scopes });
|
|
107
115
|
// 已有 in-flight flow,本次请求复用,不重复发送卡片
|
|
108
116
|
return jsonResult({
|
|
109
117
|
awaiting_authorization: true,
|
|
@@ -130,8 +138,10 @@ export async function executeYachAuthorize(params) {
|
|
|
130
138
|
};
|
|
131
139
|
// ── 3. 请求 Device Authorization ──────────────────────────────────────
|
|
132
140
|
let deviceAuth;
|
|
141
|
+
log.info("[auth-chain] auth.device.request", { authId: authId || ticket.msgId, path: "/openapi/v2/auth_device/code" });
|
|
133
142
|
try {
|
|
134
143
|
deviceAuth = await requestYachDeviceAuthorization({ appKey, appSecret, baseUrl, scopes });
|
|
144
|
+
log.info("[auth-chain] auth.device.ready", { authId: authId || ticket.msgId, expiresIn: deviceAuth.expiresIn, interval: deviceAuth.interval, hasDeviceCode: !!deviceAuth.deviceCode });
|
|
135
145
|
// 兜底:device_code 过期后 + 30s 余量,自动清理,防止异常路径泄漏
|
|
136
146
|
flowTimeout = setTimeout(cleanupFlow, (deviceAuth.expiresIn + 30) * 1000);
|
|
137
147
|
}
|
|
@@ -145,6 +155,7 @@ export async function executeYachAuthorize(params) {
|
|
|
145
155
|
}
|
|
146
156
|
// ── 4. 向用户发送授权卡片(若后端返回 already_authorized 则静默换票,不推卡片/消息) ──
|
|
147
157
|
let sendOutcome = "card_sent";
|
|
158
|
+
log.info("[auth-chain] auth.card.start", { authId: authId || ticket.msgId, source: sourceType ?? "yach", toUserId: senderId });
|
|
148
159
|
try {
|
|
149
160
|
sendOutcome = await sendYachAuthCard({
|
|
150
161
|
baseUrl,
|
|
@@ -156,8 +167,10 @@ export async function executeYachAuthorize(params) {
|
|
|
156
167
|
// Yach不传,保持平台默认推送;只有Control UI传组织虾来源。
|
|
157
168
|
sourceType,
|
|
158
169
|
});
|
|
170
|
+
log.info("[auth-chain] auth.card.result", { authId: authId || ticket.msgId, source: sourceType ?? "yach", outcome: sendOutcome });
|
|
159
171
|
}
|
|
160
172
|
catch (err) {
|
|
173
|
+
log.warn("[auth-chain] auth.card.failed", { authId: authId || ticket.msgId, errorType: err instanceof Error ? err.name : typeof err });
|
|
161
174
|
if (err instanceof YachAppScopeError) {
|
|
162
175
|
log.warn(`app missing scope permission, aborting flow: ${err.message}`);
|
|
163
176
|
cleanupFlow();
|
|
@@ -193,6 +206,7 @@ export async function executeYachAuthorize(params) {
|
|
|
193
206
|
const controller = flow.controller;
|
|
194
207
|
void (async () => {
|
|
195
208
|
try {
|
|
209
|
+
log.info("[auth-chain] auth.poll.start", { authId: authId || ticket.msgId, path: "/openapi/v2/auth/token", interval: deviceAuth.interval, expiresIn: deviceAuth.expiresIn, silent: silentNoUserIm });
|
|
196
210
|
const result = await pollYachDeviceToken({
|
|
197
211
|
appKey,
|
|
198
212
|
appSecret,
|
|
@@ -204,6 +218,7 @@ export async function executeYachAuthorize(params) {
|
|
|
204
218
|
requestedScopes: scopes,
|
|
205
219
|
skipInitialSleep: silentNoUserIm,
|
|
206
220
|
});
|
|
221
|
+
log.info("[auth-chain] auth.poll.result", { authId: authId || ticket.msgId, success: result.ok, error: result.ok ? undefined : result.error });
|
|
207
222
|
if (flow.superseded) {
|
|
208
223
|
return;
|
|
209
224
|
}
|
|
@@ -230,7 +245,9 @@ export async function executeYachAuthorize(params) {
|
|
|
230
245
|
}
|
|
231
246
|
return;
|
|
232
247
|
}
|
|
248
|
+
log.info("[auth-chain] auth.token.save.start", { authId: authId || ticket.msgId, senderId, scope: result.token.scope });
|
|
233
249
|
await persistMergedDeviceToken(appKey, senderId, result.token, !isOrgclaw);
|
|
250
|
+
log.info("[auth-chain] auth.token.saved", { authId: authId || ticket.msgId, senderId });
|
|
234
251
|
reportEvent("oauth.device-flow", "token obtained", { appKey, senderId, scope: result.token.scope });
|
|
235
252
|
const successMsg = "✅ 授权成功!正在为您重试之前的操作...";
|
|
236
253
|
if (isOrgclaw) {
|
|
@@ -259,6 +276,7 @@ export async function executeYachAuthorize(params) {
|
|
|
259
276
|
else {
|
|
260
277
|
await sendSyntheticMessage({ ticket, account, cfg });
|
|
261
278
|
}
|
|
279
|
+
log.info("[auth-chain] auth.resume.returned", { authId: authId || ticket.msgId, source: sourceType ?? "yach" });
|
|
262
280
|
// 延迟清理 guard:合成消息可能立即触起重试,
|
|
263
281
|
// 如果 guard 已删除,重试会走完整 OAuth 再发一张卡
|
|
264
282
|
setTimeout(() => cleanupFlow(), 30_000); // 30 秒后清理
|
|
@@ -266,6 +284,7 @@ export async function executeYachAuthorize(params) {
|
|
|
266
284
|
catch (err) {
|
|
267
285
|
if (err?.name === "AbortError")
|
|
268
286
|
return; // 正常取消
|
|
287
|
+
log.warn("[auth-chain] auth.flow.failed", { authId: authId || ticket.msgId, errorType: err instanceof Error ? err.name : typeof err });
|
|
269
288
|
log.error(`polling error: ${err}`);
|
|
270
289
|
cleanupFlow();
|
|
271
290
|
if (isOrgclaw) {
|
|
@@ -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
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { getYachTicket, runToolWithContext, withYachTicket } from "../core/yach-ticket.js";
|
|
2
|
+
import { yachLogger } from "../core/yach-logger.js";
|
|
3
|
+
const log = yachLogger("tools/registry");
|
|
2
4
|
import { registerCalendarTools } from "./calendar/index.js";
|
|
3
5
|
import { registerDocTools } from "./doc/index.js";
|
|
4
6
|
import { registerSpaceTools } from "./space/space-node.js";
|
|
@@ -33,13 +35,20 @@ function withToolContext(ctx, tool) {
|
|
|
33
35
|
// 多会话并发 run 会互相覆盖 execute 闭包导致 ctx 串台。
|
|
34
36
|
return {
|
|
35
37
|
...tool,
|
|
36
|
-
execute: (async (...args) =>
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
38
|
+
execute: (async (...args) => {
|
|
39
|
+
// 工厂包装确实执行的标记;不记录可能含业务内容/凭证的原工具参数。
|
|
40
|
+
log.info("[auth-chain] tool.enter", {
|
|
41
|
+
toolName: tool.name, toolCallId: args[0], messageChannel: ctx?.messageChannel ?? null,
|
|
42
|
+
deliveryChannel: ctx?.deliveryContext?.channel ?? null, sessionKey: ctx?.sessionKey,
|
|
43
|
+
});
|
|
44
|
+
return runToolWithContext(ctx, async () => {
|
|
45
|
+
const ticket = getYachTicket();
|
|
46
|
+
if (ticket?.source !== "orgclaw-zxl")
|
|
47
|
+
return execute(...args);
|
|
48
|
+
// 只给Web保存恢复参考;args[0]是工具调用ID,args[1]是原参数,旧Yach ticket不变。
|
|
49
|
+
return withYachTicket({ ...ticket, toolName: tool.name, toolCallId: args[0], toolInput: args[1] }, () => execute(...args));
|
|
50
|
+
});
|
|
51
|
+
}),
|
|
43
52
|
};
|
|
44
53
|
}
|
|
45
54
|
export function registerYachTools(api) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/index.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/index.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.3",
|
|
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.3",
|
|
71
71
|
"defaultChoice": "npm",
|
|
72
72
|
"minHostVersion": ">=2026.3.22"
|
|
73
73
|
}
|