@xgjktech/xg_cwork_im 1.17.40 → 1.17.42
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.d.ts.map +1 -1
- package/dist/index.js +5 -2
- package/dist/index.js.map +1 -1
- package/dist/src/account-connection.d.ts +1 -1
- package/dist/src/account-connection.d.ts.map +1 -1
- package/dist/src/account-connection.js +2 -1
- package/dist/src/account-connection.js.map +1 -1
- package/dist/src/account-reconciler.d.ts +1 -1
- package/dist/src/account-reconciler.d.ts.map +1 -1
- package/dist/src/apply-sync-mapping.d.ts +1 -1
- package/dist/src/apply-sync-mapping.d.ts.map +1 -1
- package/dist/src/channel-config.d.ts +1 -1
- package/dist/src/channel-config.d.ts.map +1 -1
- package/dist/src/cron-appkey-binding-store.d.ts +26 -0
- package/dist/src/cron-appkey-binding-store.d.ts.map +1 -0
- package/dist/src/cron-appkey-binding-store.js +179 -0
- package/dist/src/cron-appkey-binding-store.js.map +1 -0
- package/dist/src/cron-appkey-binding-store.test.d.ts +2 -0
- package/dist/src/cron-appkey-binding-store.test.d.ts.map +1 -0
- package/dist/src/cron-appkey-binding-store.test.js +84 -0
- package/dist/src/cron-appkey-binding-store.test.js.map +1 -0
- package/dist/src/dispatch-mentioned-reply.d.ts +1 -1
- package/dist/src/dispatch-mentioned-reply.d.ts.map +1 -1
- package/dist/src/group-history-tool.d.ts +1 -1
- package/dist/src/group-history-tool.d.ts.map +1 -1
- package/dist/src/inbound-input-media.d.ts +1 -1
- package/dist/src/inbound-input-media.d.ts.map +1 -1
- package/dist/src/inbound-media-local.d.ts +1 -1
- package/dist/src/inbound-media-local.d.ts.map +1 -1
- package/dist/src/nas-volumes.d.ts +1 -1
- package/dist/src/nas-volumes.d.ts.map +1 -1
- package/dist/src/plan-event-subscription.d.ts +1 -1
- package/dist/src/plan-event-subscription.d.ts.map +1 -1
- package/dist/src/plan-tool-middleware.d.ts +1 -1
- package/dist/src/plan-tool-middleware.d.ts.map +1 -1
- package/dist/src/register-exec-env-hook.d.ts +14 -1
- package/dist/src/register-exec-env-hook.d.ts.map +1 -1
- package/dist/src/register-exec-env-hook.js +167 -3
- package/dist/src/register-exec-env-hook.js.map +1 -1
- package/dist/src/register-per-message-model-hook.d.ts +1 -1
- package/dist/src/register-per-message-model-hook.d.ts.map +1 -1
- package/dist/src/resolve-inbound-group-prompt.d.ts +1 -1
- package/dist/src/resolve-inbound-group-prompt.d.ts.map +1 -1
- package/dist/src/send-file-tool.d.ts +1 -1
- package/dist/src/send-file-tool.d.ts.map +1 -1
- package/dist/src/send-group-message-tool.d.ts +1 -1
- package/dist/src/send-group-message-tool.d.ts.map +1 -1
- package/dist/src/session-env-store.d.ts +6 -0
- package/dist/src/session-env-store.d.ts.map +1 -1
- package/dist/src/session-env-store.js +12 -0
- package/dist/src/session-env-store.js.map +1 -1
- package/dist/src/subagent-monitor.d.ts +1 -1
- package/dist/src/subagent-monitor.d.ts.map +1 -1
- package/dist/src/tool-json-result.d.ts +1 -1
- package/dist/src/tool-json-result.d.ts.map +1 -1
- package/dist/src/types.d.ts +4 -1
- package/dist/src/types.d.ts.map +1 -1
- package/package.json +2 -2
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA0BH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA0BH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAK5D,OAAO,EAAE,uCAAuC,EAAE,MAAM,oCAAoC,CAAC;AAoC7F,QAAA,MAAM,MAAM,EAAE,qBAkLb,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -3,11 +3,11 @@
|
|
|
3
3
|
*
|
|
4
4
|
* 插件入口：注册 XG-IM channel，并注入 PluginRuntime 供消息路由使用
|
|
5
5
|
*/
|
|
6
|
-
import { emptyPluginConfigSchema } from "openclaw/plugin-sdk";
|
|
6
|
+
import { emptyPluginConfigSchema } from "openclaw/plugin-sdk/core";
|
|
7
7
|
import { setXgImRuntime, xgCworkImChannelPlugin } from "./src/channel.js";
|
|
8
8
|
import { buildGroupHistoryTool, extractXgCworkImConfig } from "./src/group-history-tool.js";
|
|
9
9
|
import { registerPerMessageModelHook } from "./src/register-per-message-model-hook.js";
|
|
10
|
-
import { registerExecEnvHook } from "./src/register-exec-env-hook.js";
|
|
10
|
+
import { registerCronAppKeyBindingHook, registerExecEnvHook } from "./src/register-exec-env-hook.js";
|
|
11
11
|
import { initSessionEnvPersistence, linkChildSession } from "./src/session-env-store.js";
|
|
12
12
|
import { buildSendFileTool } from "./src/send-file-tool.js";
|
|
13
13
|
import { buildSendGroupMessageTool } from "./src/send-group-message-tool.js";
|
|
@@ -23,6 +23,7 @@ import { sendPlanStat } from "./src/plan-stat-event.js";
|
|
|
23
23
|
import { sendActionRunEvent } from "./src/action-run-event.js";
|
|
24
24
|
import { accountReconciler } from "./src/account-reconciler.js";
|
|
25
25
|
import { findActiveRoundForSubagent } from "./src/active-round-registry.js";
|
|
26
|
+
import { initCronAppKeyBindingStore } from "./src/cron-appkey-binding-store.js";
|
|
26
27
|
export { XG_IM_RECOMMENDED_CHANNEL_SYSTEM_PROMPT } from "./src/recommended-system-prompt.js";
|
|
27
28
|
/**
|
|
28
29
|
* 判断插件是否运行在 openclaw gateway 进程内。
|
|
@@ -50,6 +51,7 @@ const plugin = {
|
|
|
50
51
|
setPluginApi(api);
|
|
51
52
|
registerPerMessageModelHook(api);
|
|
52
53
|
registerExecEnvHook(api);
|
|
54
|
+
registerCronAppKeyBindingHook(api);
|
|
53
55
|
api.registerChannel({ plugin: xgCworkImChannelPlugin });
|
|
54
56
|
// 通道配置变更：hot 提交运行时快照，但不重启通道（账号启停由 Reconciler 按账号处理）。
|
|
55
57
|
// 注意不能用 noopPrefixes：6.x 的 isNoopReloadPlan 会把 noop 计划提前 return，运行时快照不更新，
|
|
@@ -140,6 +142,7 @@ const plugin = {
|
|
|
140
142
|
setPlanStateDir(api.runtime.state.resolveStateDir());
|
|
141
143
|
setActionStateDir(api.runtime.state.resolveStateDir());
|
|
142
144
|
initSessionEnvPersistence(api.runtime.state.resolveStateDir());
|
|
145
|
+
initCronAppKeyBindingStore(api.runtime.state.resolveStateDir());
|
|
143
146
|
}
|
|
144
147
|
catch (err) {
|
|
145
148
|
console.warn(`[xg_cwork_im] [plan] setPlanStateDir failed: ${String(err)}`);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* 每次入站消息重新读取最新 cfg/config（rt.config.current()），
|
|
9
9
|
* 使非连接类字段（systemPrompt、groupPolicy、bindings 等）变更无需断连即生效。
|
|
10
10
|
*/
|
|
11
|
-
import type { OpenClawConfig } from "openclaw/plugin-sdk";
|
|
11
|
+
import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
|
|
12
12
|
import type { Logger } from "./channel-log.js";
|
|
13
13
|
import { type ImStreamClient } from "./connection.js";
|
|
14
14
|
import type { ResolvedAccount, XgImConfig } from "./types.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-connection.d.ts","sourceRoot":"","sources":["../../src/account-connection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"account-connection.d.ts","sourceRoot":"","sources":["../../src/account-connection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAa/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAqCtE,OAAO,KAAK,EAAE,eAAe,EAAa,UAAU,EAAE,MAAM,YAAY,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACpC,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,YAAY,EAAE,cAAc,CAAC;IAC7B,oBAAoB,EAAE,MAAM,OAAO,CAAC;CACvC;AAED,MAAM,WAAW,4BAA4B;IACzC,0CAA0C;IAC1C,GAAG,EAAE,cAAc,CAAC;IACpB,OAAO,EAAE,eAAe,CAAC;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,iDAAiD;IAEjD,EAAE,EAAE,GAAG,CAAC;IACR,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,6CAA6C;IAC7C,WAAW,CAAC,EAAE,MAAM,cAAc,CAAC;CACtC;AA8BD;;;GAGG;AACH,wBAAsB,sBAAsB,CACxC,MAAM,EAAE,4BAA4B,GACrC,OAAO,CAAC,uBAAuB,CAAC,CA4clC"}
|
|
@@ -24,7 +24,7 @@ import { buildInboundAttachmentsPayload, buildInboundDisplayText, buildUntrusted
|
|
|
24
24
|
import { extractInboundModelSelection, hasUserThinkDirective, } from "./inbound-model.js";
|
|
25
25
|
import { saveInboundFilesToInputDir } from "./inbound-input-media.js";
|
|
26
26
|
import { handleWorkspaceEvent } from "./workspace-event.js";
|
|
27
|
-
import { removeSessionEnvKey, setSessionEnvEntry, XG_OPENAPI_APP_KEY, } from "./session-env-store.js";
|
|
27
|
+
import { removeSessionEnvKey, setSessionUserContext, setSessionEnvEntry, XG_OPENAPI_APP_KEY, } from "./session-env-store.js";
|
|
28
28
|
import { resolveAutoModelRoute, resolveModelThinkingDefault, } from "./auto-model-router.js";
|
|
29
29
|
/**
|
|
30
30
|
* 用户显式 /think 是否生效（优先级高于 Auto Router / 模型默认的 thinking）。
|
|
@@ -123,6 +123,7 @@ export async function startAccountConnection(params) {
|
|
|
123
123
|
peer: { kind: "group", id: params.groupId },
|
|
124
124
|
});
|
|
125
125
|
log.info(`${logPrefix} [route] agentId=${route.agentId} sessionKey=${route.sessionKey}`);
|
|
126
|
+
setSessionUserContext(route.sessionKey, senderId, senderName);
|
|
126
127
|
const agentContextParsed = parseRobotMentionAgentContextDetailed(params);
|
|
127
128
|
const agentContext = agentContextParsed.agentContext;
|
|
128
129
|
if (params.agentContext != null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-connection.js","sourceRoot":"","sources":["../../src/account-connection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"account-connection.js","sourceRoot":"","sources":["../../src/account-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
* - 指纹变化 → 重启
|
|
13
13
|
* - 指纹不变 → 空转（非连接字段由每次入站重读最新 config 生效）
|
|
14
14
|
*/
|
|
15
|
-
import type { OpenClawConfig, PluginRuntime } from "openclaw/plugin-sdk";
|
|
15
|
+
import type { OpenClawConfig, PluginRuntime } from "openclaw/plugin-sdk/core";
|
|
16
16
|
import { type Logger } from "./channel-log.js";
|
|
17
17
|
import type { GatewayStartContext, XgImConfig } from "./types.js";
|
|
18
18
|
export declare function fingerprintOf(config: XgImConfig): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-reconciler.d.ts","sourceRoot":"","sources":["../../src/account-reconciler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"account-reconciler.d.ts","sourceRoot":"","sources":["../../src/account-reconciler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAG9E,OAAO,EAAY,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAKlE,wBAAgB,aAAa,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CASxD;AAMD,sEAAsE;AACtE,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAwBnF;AAYD,MAAM,WAAW,wBAAwB;IACrC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,qBAAa,iBAAiB;IAQd,OAAO,CAAC,QAAQ,CAAC,OAAO;IAPpC,OAAO,CAAC,EAAE,CAA8B;IACxC,OAAO,CAAC,IAAI,CAAiC;IAC7C,OAAO,CAAC,SAAS,CAA+C;IAChE,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,OAAO,CAAS;gBAEK,OAAO,GAAE,wBAA6B;IAEnE,OAAO,KAAK,cAAc,GAEzB;IAED,OAAO,KAAK,UAAU,GAErB;IAED,UAAU,CAAC,EAAE,EAAE,aAAa,GAAG,IAAI;IAInC,KAAK,IAAI,IAAI;IAQP,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B,kEAAkE;IAC5D,qBAAqB,CAAC,GAAG,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BpE,yCAAyC;IACnC,WAAW,CACb,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,UAAU,EAClB,WAAW,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC;IAgChB,OAAO,CAAC,QAAQ;IAwChB,OAAO,CAAC,OAAO;IAUf,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,SAAS;IAUjB,OAAO,CAAC,IAAI;YAaE,SAAS;IAyBvB,OAAO,CAAC,eAAe;CAU1B;AAED,0CAA0C;AAC1C,eAAO,MAAM,iBAAiB,mBAA0B,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* 处理 IM WebSocket 下发的 openclawApplySyncMapping 信令。
|
|
3
3
|
*/
|
|
4
|
-
import type { OpenClawConfig } from "openclaw/plugin-sdk";
|
|
4
|
+
import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
|
|
5
5
|
import type { Log } from "./auth.js";
|
|
6
6
|
import type { XgImConfig } from "./types.js";
|
|
7
7
|
export interface ApplySyncMappingContext {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply-sync-mapping.d.ts","sourceRoot":"","sources":["../../src/apply-sync-mapping.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"apply-sync-mapping.d.ts","sourceRoot":"","sources":["../../src/apply-sync-mapping.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAIrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAK7C,MAAM,WAAW,uBAAuB;IACpC,MAAM,EAAE,UAAU,CAAC;IACnB,GAAG,EAAE,cAAc,CAAC;IACpB,EAAE,EAAE,OAAO,CAAC;IACZ,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,wBAAsB,4BAA4B,CAC9C,GAAG,EAAE,uBAAuB,EAC5B,SAAS,EAAE,OAAO,GACnB,OAAO,CAAC,IAAI,CAAC,CA4Bf"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* channels.xg_cwork_im：Zod schema、账户合并、群 systemPrompt、命令门控（allowFrom / resolveControlCommandGate）。
|
|
3
3
|
*/
|
|
4
|
-
import type { OpenClawConfig } from "openclaw/plugin-sdk";
|
|
4
|
+
import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
|
|
5
5
|
import { z } from "zod";
|
|
6
6
|
import type { OpenClawChatType } from "./inbound-chat-type.js";
|
|
7
7
|
import type { XgImConfig, AutoModelRoutingConfig } from "./types.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel-config.d.ts","sourceRoot":"","sources":["../../src/channel-config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"channel-config.d.ts","sourceRoot":"","sources":["../../src/channel-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
export declare const CRON_BINDING_SCHEMA_VERSION = 1;
|
|
2
|
+
export type CronAppKeyBinding = {
|
|
3
|
+
agentId: string;
|
|
4
|
+
jobId: string;
|
|
5
|
+
userId?: string;
|
|
6
|
+
userName?: string;
|
|
7
|
+
ownerSessionKey?: string;
|
|
8
|
+
appKey: string;
|
|
9
|
+
source: string;
|
|
10
|
+
createdAt: string;
|
|
11
|
+
updatedAt: string;
|
|
12
|
+
enabled: boolean;
|
|
13
|
+
};
|
|
14
|
+
export declare function initCronAppKeyBindingStore(stateDir: string): void;
|
|
15
|
+
export declare function getCronAppKeyBinding(agentId: string, jobId: string): CronAppKeyBinding | undefined;
|
|
16
|
+
export declare function bindCronAppKey(input: {
|
|
17
|
+
agentId: string;
|
|
18
|
+
jobId: string;
|
|
19
|
+
appKey: string;
|
|
20
|
+
userId?: string;
|
|
21
|
+
userName?: string;
|
|
22
|
+
ownerSessionKey?: string;
|
|
23
|
+
source?: string;
|
|
24
|
+
}): CronAppKeyBinding | undefined;
|
|
25
|
+
export declare function __resetCronAppKeyBindingStoreForTests(): void;
|
|
26
|
+
//# sourceMappingURL=cron-appkey-binding-store.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cron-appkey-binding-store.d.ts","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAK7C,MAAM,MAAM,iBAAiB,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AAkFF,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAKjE;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAKlG;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,iBAAiB,GAAG,SAAS,CAgDhC;AAED,wBAAgB,qCAAqC,IAAI,IAAI,CAI5D"}
|
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
/** Persistent Cron job -> user OpenAPI AppKey bindings. */
|
|
2
|
+
import { closeSync, existsSync, fsyncSync, mkdirSync, openSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync, } from "node:fs";
|
|
3
|
+
import { dirname, join } from "node:path";
|
|
4
|
+
export const CRON_BINDING_SCHEMA_VERSION = 1;
|
|
5
|
+
const MAX_APP_KEY_LENGTH = 256;
|
|
6
|
+
const LOCK_RETRIES = 20;
|
|
7
|
+
const LOCK_RETRY_MS = 10;
|
|
8
|
+
let bindingPath;
|
|
9
|
+
let bindingMtimeMs = -1;
|
|
10
|
+
let bindings = new Map();
|
|
11
|
+
function key(agentId, jobId) {
|
|
12
|
+
return `${agentId}\u0000${jobId}`;
|
|
13
|
+
}
|
|
14
|
+
function validText(value) {
|
|
15
|
+
return typeof value === "string" && value.trim().length > 0 && value.length <= MAX_APP_KEY_LENGTH &&
|
|
16
|
+
!/[\0\r\n]/.test(value);
|
|
17
|
+
}
|
|
18
|
+
function validBinding(value) {
|
|
19
|
+
if (!value || typeof value !== "object")
|
|
20
|
+
return false;
|
|
21
|
+
const b = value;
|
|
22
|
+
return validText(b.agentId) && validText(b.jobId) && validText(b.appKey) && validText(b.source) &&
|
|
23
|
+
validText(b.createdAt) && validText(b.updatedAt) && b.enabled === true;
|
|
24
|
+
}
|
|
25
|
+
function resolvePath(stateDir) {
|
|
26
|
+
// resolveStateDir() normally points at ~/.openclaw/state; keep bindings in
|
|
27
|
+
// the documented sibling ~/.openclaw/xg-cwork-im directory.
|
|
28
|
+
const normalized = stateDir.replace(/[\\/]+$/, "");
|
|
29
|
+
const root = /[\\/]state$/i.test(normalized) ? dirname(normalized) : normalized;
|
|
30
|
+
return join(root, "xg-cwork-im", "cron-appkey-bindings.json");
|
|
31
|
+
}
|
|
32
|
+
function load(force = false) {
|
|
33
|
+
if (!bindingPath)
|
|
34
|
+
return;
|
|
35
|
+
let mtime = -1;
|
|
36
|
+
try {
|
|
37
|
+
mtime = statSync(bindingPath).mtimeMs;
|
|
38
|
+
}
|
|
39
|
+
catch (err) {
|
|
40
|
+
if (err.code !== "ENOENT")
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
if (!force && mtime === bindingMtimeMs)
|
|
44
|
+
return;
|
|
45
|
+
if (mtime < 0) {
|
|
46
|
+
bindingMtimeMs = -1;
|
|
47
|
+
bindings = new Map();
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
try {
|
|
51
|
+
const parsed = JSON.parse(readFileSync(bindingPath, "utf8"));
|
|
52
|
+
if (parsed.schemaVersion !== CRON_BINDING_SCHEMA_VERSION)
|
|
53
|
+
return;
|
|
54
|
+
if (!Array.isArray(parsed.bindings))
|
|
55
|
+
return;
|
|
56
|
+
const next = new Map();
|
|
57
|
+
for (const raw of parsed.bindings) {
|
|
58
|
+
if (!validBinding(raw))
|
|
59
|
+
continue;
|
|
60
|
+
const b = { ...raw, agentId: raw.agentId.trim(), jobId: raw.jobId.trim(), appKey: raw.appKey.trim() };
|
|
61
|
+
const k = key(b.agentId, b.jobId);
|
|
62
|
+
const previous = next.get(k);
|
|
63
|
+
if (!previous || b.updatedAt >= previous.updatedAt)
|
|
64
|
+
next.set(k, b);
|
|
65
|
+
}
|
|
66
|
+
bindings = next;
|
|
67
|
+
bindingMtimeMs = mtime;
|
|
68
|
+
}
|
|
69
|
+
catch {
|
|
70
|
+
// Keep the last valid cache when a file is temporarily malformed.
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
function acquireLock(lockPath) {
|
|
74
|
+
for (let i = 0; i < LOCK_RETRIES; i += 1) {
|
|
75
|
+
try {
|
|
76
|
+
return openSync(lockPath, "wx");
|
|
77
|
+
}
|
|
78
|
+
catch (err) {
|
|
79
|
+
if (err.code !== "EEXIST")
|
|
80
|
+
return undefined;
|
|
81
|
+
const end = Date.now() + LOCK_RETRY_MS;
|
|
82
|
+
while (Date.now() < end) { /* synchronous, bounded lock wait */ }
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
return undefined;
|
|
86
|
+
}
|
|
87
|
+
export function initCronAppKeyBindingStore(stateDir) {
|
|
88
|
+
bindingPath = resolvePath(stateDir);
|
|
89
|
+
bindingMtimeMs = -1;
|
|
90
|
+
bindings = new Map();
|
|
91
|
+
load(true);
|
|
92
|
+
}
|
|
93
|
+
export function getCronAppKeyBinding(agentId, jobId) {
|
|
94
|
+
if (!agentId || !jobId)
|
|
95
|
+
return undefined;
|
|
96
|
+
load();
|
|
97
|
+
const b = bindings.get(key(agentId, jobId));
|
|
98
|
+
return b?.enabled ? { ...b } : undefined;
|
|
99
|
+
}
|
|
100
|
+
export function bindCronAppKey(input) {
|
|
101
|
+
if (!bindingPath || !validText(input.agentId) || !validText(input.jobId) || !validText(input.appKey))
|
|
102
|
+
return undefined;
|
|
103
|
+
const dir = dirname(bindingPath);
|
|
104
|
+
const lockPath = `${bindingPath}.lock`;
|
|
105
|
+
mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
106
|
+
const lockFd = acquireLock(lockPath);
|
|
107
|
+
if (lockFd === undefined)
|
|
108
|
+
return undefined;
|
|
109
|
+
let tmpPath;
|
|
110
|
+
try {
|
|
111
|
+
load(true);
|
|
112
|
+
const now = new Date().toISOString();
|
|
113
|
+
const existing = bindings.get(key(input.agentId.trim(), input.jobId.trim()));
|
|
114
|
+
const binding = {
|
|
115
|
+
agentId: input.agentId.trim(),
|
|
116
|
+
jobId: input.jobId.trim(),
|
|
117
|
+
appKey: input.appKey.trim(),
|
|
118
|
+
...(input.userId ? { userId: input.userId } : existing?.userId ? { userId: existing.userId } : {}),
|
|
119
|
+
...(input.userName ? { userName: input.userName } : existing?.userName ? { userName: existing.userName } : {}),
|
|
120
|
+
...(input.ownerSessionKey ? { ownerSessionKey: input.ownerSessionKey } : existing?.ownerSessionKey ? { ownerSessionKey: existing.ownerSessionKey } : {}),
|
|
121
|
+
source: input.source ?? existing?.source ?? "im",
|
|
122
|
+
createdAt: existing?.createdAt ?? now,
|
|
123
|
+
updatedAt: now,
|
|
124
|
+
enabled: true,
|
|
125
|
+
};
|
|
126
|
+
const next = new Map(bindings);
|
|
127
|
+
next.set(key(binding.agentId, binding.jobId), binding);
|
|
128
|
+
const payload = {
|
|
129
|
+
schemaVersion: CRON_BINDING_SCHEMA_VERSION,
|
|
130
|
+
updatedAt: now,
|
|
131
|
+
bindings: [...next.values()],
|
|
132
|
+
};
|
|
133
|
+
tmpPath = `${bindingPath}.${process.pid}.${Date.now()}.tmp`;
|
|
134
|
+
writeFileSync(tmpPath, JSON.stringify(payload, null, 2), { encoding: "utf8", mode: 0o600 });
|
|
135
|
+
const tmpFd = openSync(tmpPath, "r+");
|
|
136
|
+
try {
|
|
137
|
+
fsyncSync(tmpFd);
|
|
138
|
+
}
|
|
139
|
+
finally {
|
|
140
|
+
closeSync(tmpFd);
|
|
141
|
+
}
|
|
142
|
+
renameSync(tmpPath, bindingPath);
|
|
143
|
+
bindings = next;
|
|
144
|
+
try {
|
|
145
|
+
bindingMtimeMs = statSync(bindingPath).mtimeMs;
|
|
146
|
+
}
|
|
147
|
+
catch {
|
|
148
|
+
bindingMtimeMs = -1;
|
|
149
|
+
}
|
|
150
|
+
return { ...binding };
|
|
151
|
+
}
|
|
152
|
+
catch {
|
|
153
|
+
if (tmpPath) {
|
|
154
|
+
try {
|
|
155
|
+
if (existsSync(tmpPath))
|
|
156
|
+
unlinkSync(tmpPath);
|
|
157
|
+
}
|
|
158
|
+
catch { /* ignore */ }
|
|
159
|
+
}
|
|
160
|
+
return undefined;
|
|
161
|
+
}
|
|
162
|
+
finally {
|
|
163
|
+
try {
|
|
164
|
+
closeSync(lockFd);
|
|
165
|
+
}
|
|
166
|
+
catch { /* ignore */ }
|
|
167
|
+
try {
|
|
168
|
+
if (existsSync(lockPath))
|
|
169
|
+
unlinkSync(lockPath);
|
|
170
|
+
}
|
|
171
|
+
catch { /* ignore */ }
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
export function __resetCronAppKeyBindingStoreForTests() {
|
|
175
|
+
bindingPath = undefined;
|
|
176
|
+
bindingMtimeMs = -1;
|
|
177
|
+
bindings = new Map();
|
|
178
|
+
}
|
|
179
|
+
//# sourceMappingURL=cron-appkey-binding-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cron-appkey-binding-store.js","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cron-appkey-binding-store.test.d.ts","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
|
|
3
|
+
import { tmpdir } from "node:os";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
import { afterEach, describe, it } from "node:test";
|
|
6
|
+
import { __resetCronAppKeyBindingStoreForTests, bindCronAppKey, getCronAppKeyBinding, initCronAppKeyBindingStore, } from "./cron-appkey-binding-store.js";
|
|
7
|
+
import { extractCronJobIdFromResult, isCronCreateCommand, registerCronAppKeyBindingHook, registerExecEnvHook } from "./register-exec-env-hook.js";
|
|
8
|
+
import { setSessionEnvEntry, setSessionUserContext, XG_OPENAPI_APP_KEY } from "./session-env-store.js";
|
|
9
|
+
let dirs = [];
|
|
10
|
+
afterEach(() => {
|
|
11
|
+
__resetCronAppKeyBindingStoreForTests();
|
|
12
|
+
for (const dir of dirs.splice(0))
|
|
13
|
+
rmSync(dir, { recursive: true, force: true });
|
|
14
|
+
});
|
|
15
|
+
describe("cron appKey binding store", () => {
|
|
16
|
+
it("persists and reloads an agent + job binding", () => {
|
|
17
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
18
|
+
dirs.push(dir);
|
|
19
|
+
initCronAppKeyBindingStore(join(dir, "state"));
|
|
20
|
+
const created = bindCronAppKey({ agentId: "agent-a", jobId: "job-1", appKey: "key-1", userId: "u1" });
|
|
21
|
+
assert.equal(created?.appKey, "key-1");
|
|
22
|
+
assert.equal(getCronAppKeyBinding("agent-a", "job-1")?.userId, "u1");
|
|
23
|
+
__resetCronAppKeyBindingStoreForTests();
|
|
24
|
+
initCronAppKeyBindingStore(join(dir, "state"));
|
|
25
|
+
assert.equal(getCronAppKeyBinding("agent-a", "job-1")?.appKey, "key-1");
|
|
26
|
+
});
|
|
27
|
+
it("rejects invalid values and ignores malformed records", () => {
|
|
28
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
29
|
+
dirs.push(dir);
|
|
30
|
+
initCronAppKeyBindingStore(join(dir, "state"));
|
|
31
|
+
assert.equal(bindCronAppKey({ agentId: "a", jobId: "j", appKey: "bad\nkey" }), undefined);
|
|
32
|
+
const path = join(dir, "xg-cwork-im", "cron-appkey-bindings.json");
|
|
33
|
+
mkdirSync(join(dir, "xg-cwork-im"), { recursive: true });
|
|
34
|
+
writeFileSync(path, JSON.stringify({ schemaVersion: 1, bindings: [{ agentId: "a" }] }));
|
|
35
|
+
assert.equal(getCronAppKeyBinding("a", "j"), undefined);
|
|
36
|
+
assert.equal(readFileSync(path, "utf8").includes("bad"), false);
|
|
37
|
+
});
|
|
38
|
+
it("binds the authoritative job id from a successful cron tool result", () => {
|
|
39
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
40
|
+
dirs.push(dir);
|
|
41
|
+
initCronAppKeyBindingStore(join(dir, "state"));
|
|
42
|
+
const sessionKey = "agent:agent-a:main";
|
|
43
|
+
setSessionEnvEntry(sessionKey, XG_OPENAPI_APP_KEY, "key-1");
|
|
44
|
+
setSessionUserContext(sessionKey, "u1", "User");
|
|
45
|
+
let after;
|
|
46
|
+
registerCronAppKeyBindingHook({ on: (name, handler) => { if (name === "after_tool_call")
|
|
47
|
+
after = handler; } });
|
|
48
|
+
after?.({ toolName: "cron", params: { action: "add" }, result: { details: { id: "job-1" } } }, { sessionKey, agentId: "agent-a" });
|
|
49
|
+
assert.equal(getCronAppKeyBinding("agent-a", "job-1")?.appKey, "key-1");
|
|
50
|
+
});
|
|
51
|
+
it("recognizes the IM-exposed Cron CLI and binds its JSON result", () => {
|
|
52
|
+
assert.equal(isCronCreateCommand("openclaw cron add --every 5m --json"), true);
|
|
53
|
+
assert.equal(isCronCreateCommand("openclaw gateway call cron.create --json"), true);
|
|
54
|
+
assert.equal(isCronCreateCommand("openclaw cron list --json"), false);
|
|
55
|
+
assert.equal(extractCronJobIdFromResult({ content: [{ type: "text", text: '{"id":"10d05140-09a8-4354-93f0-dd7fd0ff5e9"}' }] }), "10d05140-09a8-4354-93f0-dd7fd0ff5e9");
|
|
56
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
57
|
+
dirs.push(dir);
|
|
58
|
+
initCronAppKeyBindingStore(join(dir, "state"));
|
|
59
|
+
const sessionKey = "agent:agent-a:main";
|
|
60
|
+
setSessionEnvEntry(sessionKey, XG_OPENAPI_APP_KEY, "key-cli");
|
|
61
|
+
let after;
|
|
62
|
+
registerCronAppKeyBindingHook({ on: (name, handler) => { if (name === "after_tool_call")
|
|
63
|
+
after = handler; } });
|
|
64
|
+
after?.({ toolName: "exec", params: { command: "openclaw cron add --every 5m --json" }, result: { content: [{ text: "{\"id\":\"10d05140-09a8-4354-93f0-dd7fd0ff5e9\"}" }] } }, { sessionKey, agentId: "agent-a" });
|
|
65
|
+
assert.equal(getCronAppKeyBinding("agent-a", "10d05140-09a8-4354-93f0-dd7fd0ff5e9")?.appKey, "key-cli");
|
|
66
|
+
});
|
|
67
|
+
it("injects only the matching agent/job binding and strips unbound values", () => {
|
|
68
|
+
const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
|
|
69
|
+
dirs.push(dir);
|
|
70
|
+
initCronAppKeyBindingStore(join(dir, "state"));
|
|
71
|
+
bindCronAppKey({ agentId: "agent-a", jobId: "job-1", appKey: "key-1" });
|
|
72
|
+
let before;
|
|
73
|
+
registerExecEnvHook({
|
|
74
|
+
runtime: { config: { current: () => ({ channels: { xg_cwork_im: {} } }) } },
|
|
75
|
+
on: (name, handler) => { if (name === "before_tool_call")
|
|
76
|
+
before = handler; },
|
|
77
|
+
});
|
|
78
|
+
const bound = before?.({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "***", KEEP: "1" } } }, { sessionKey: "agent:agent-a:cron:job-1:run:r" });
|
|
79
|
+
assert.equal(bound.params.env.XG_OPENAPI_APP_KEY, "key-1");
|
|
80
|
+
const unbound = before?.({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "***" } } }, { sessionKey: "agent:agent-b:cron:job-1:run:r" });
|
|
81
|
+
assert.deepEqual(unbound.params.env, {});
|
|
82
|
+
});
|
|
83
|
+
});
|
|
84
|
+
//# sourceMappingURL=cron-appkey-binding-store.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cron-appkey-binding-store.test.js","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @ 触发的单轮回复：WebSocket BEGIN、OpenClaw dispatchReplyWithBufferedBlockDispatcher、HTTP deliver、RUN_USAGE、FINISHED。
|
|
3
3
|
*/
|
|
4
|
-
import type { OpenClawConfig } from "openclaw/plugin-sdk";
|
|
4
|
+
import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
|
|
5
5
|
import type { ImStreamClient } from "./connection.js";
|
|
6
6
|
import type { Logger } from "./channel-log.js";
|
|
7
7
|
import { type InboundTrigger } from "./inbound-chat-type.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch-mentioned-reply.d.ts","sourceRoot":"","sources":["../../src/dispatch-mentioned-reply.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"dispatch-mentioned-reply.d.ts","sourceRoot":"","sources":["../../src/dispatch-mentioned-reply.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAA2C,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAqBtG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AA4B9D,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AA8B1D,4EAA4E;AAC5E,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,GAAG,CAAC;IACR,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,UAAU,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC;IACxB,eAAe,EAAE,WAAW,CAAC;IAC7B,YAAY,EAAE,cAAc,CAAC;IAC7B,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,uEAAuE;IACvE,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;IACzB,4EAA4E;IAC5E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uDAAuD;IACvD,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,gDAAgD;IAChD,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,qCAAqC;IACrC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,gEAAgE;IAChE,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B,GAAG,OAAO,CAAC,IAAI,CAAC,CAk+BhB"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* 通过 OpenClaw 的 api.registerTool() 注入，让 AI 在感知到需要上下文时
|
|
5
5
|
* 主动拉取群聊最近 N 条历史消息，而不是每次收到 @ 都强行拉取。
|
|
6
6
|
*/
|
|
7
|
-
import type { AnyAgentTool } from "openclaw/plugin-sdk";
|
|
7
|
+
import type { AnyAgentTool } from "openclaw/plugin-sdk/agent-harness-runtime";
|
|
8
8
|
import type { XgImConfig } from "./types.js";
|
|
9
9
|
/** 由 OpenClaw 在每回合注入的信任上下文节选（工厂模式下传入 execute 闭包） */
|
|
10
10
|
export type XgImToolSessionHints = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-history-tool.d.ts","sourceRoot":"","sources":["../../src/group-history-tool.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"group-history-tool.d.ts","sourceRoot":"","sources":["../../src/group-history-tool.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAK9E,OAAO,KAAK,EAAgC,UAAU,EAAE,MAAM,YAAY,CAAC;AAE3E,oDAAoD;AACpD,MAAM,MAAM,oBAAoB,GAAG;IAC/B,6CAA6C;IAC7C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,yBAAyB;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAgCF,6DAA6D;AAC7D,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI,CAItE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,UAAU,CAgB5F;AAuCD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,oBAAoB,GAAG,YAAY,CAgGpG"}
|