@xgjktech/xg_cwork_im 1.17.38 → 1.17.40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +489 -484
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/src/account-connection.d.ts.map +1 -1
- package/dist/src/account-connection.js +8 -9
- package/dist/src/account-connection.js.map +1 -1
- package/dist/src/build-project-prompt.test.js +18 -18
- package/dist/src/channel-config.d.ts +31 -0
- package/dist/src/channel-config.d.ts.map +1 -1
- package/dist/src/channel-config.js +27 -3
- package/dist/src/channel-config.js.map +1 -1
- package/dist/src/channel-config.test.js +58 -1
- package/dist/src/channel-config.test.js.map +1 -1
- package/dist/src/connection-workspace-event.test.d.ts +2 -0
- package/dist/src/connection-workspace-event.test.d.ts.map +1 -0
- package/dist/src/connection-workspace-event.test.js +74 -0
- package/dist/src/connection-workspace-event.test.js.map +1 -0
- package/dist/src/connection.d.ts +4 -0
- package/dist/src/connection.d.ts.map +1 -1
- package/dist/src/connection.js +32 -0
- package/dist/src/connection.js.map +1 -1
- package/dist/src/gateway-session-queue.d.ts +3 -0
- package/dist/src/gateway-session-queue.d.ts.map +1 -1
- package/dist/src/gateway-session-queue.js +1 -0
- package/dist/src/gateway-session-queue.js.map +1 -1
- package/dist/src/nas-site.d.ts +16 -0
- package/dist/src/nas-site.d.ts.map +1 -0
- package/dist/src/nas-site.js +17 -0
- package/dist/src/nas-site.js.map +1 -0
- package/dist/src/nas-volumes.d.ts +8 -0
- package/dist/src/nas-volumes.d.ts.map +1 -1
- package/dist/src/nas-volumes.js +66 -0
- package/dist/src/nas-volumes.js.map +1 -1
- package/dist/src/register-exec-env-hook.d.ts +4 -0
- package/dist/src/register-exec-env-hook.d.ts.map +1 -1
- package/dist/src/register-exec-env-hook.js +21 -1
- package/dist/src/register-exec-env-hook.js.map +1 -1
- package/dist/src/register-exec-env-hook.test.js +26 -10
- package/dist/src/register-exec-env-hook.test.js.map +1 -1
- package/dist/src/session-env-store.d.ts +11 -1
- package/dist/src/session-env-store.d.ts.map +1 -1
- package/dist/src/session-env-store.js +147 -1
- package/dist/src/session-env-store.js.map +1 -1
- package/dist/src/session-env-store.test.js +76 -1
- package/dist/src/session-env-store.test.js.map +1 -1
- package/dist/src/single-chat-no-reply-fallback.d.ts +14 -0
- package/dist/src/single-chat-no-reply-fallback.d.ts.map +1 -0
- package/dist/src/single-chat-no-reply-fallback.js +20 -0
- package/dist/src/single-chat-no-reply-fallback.js.map +1 -0
- package/dist/src/subagent-progress-hooks.d.ts +11 -0
- package/dist/src/subagent-progress-hooks.d.ts.map +1 -0
- package/dist/src/subagent-progress-hooks.js +41 -0
- package/dist/src/subagent-progress-hooks.js.map +1 -0
- package/dist/src/types.d.ts +15 -0
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/types.js.map +1 -1
- package/dist/src/workspace-event-protocol.d.ts +3 -0
- package/dist/src/workspace-event-protocol.d.ts.map +1 -0
- package/dist/src/workspace-event-protocol.js +3 -0
- package/dist/src/workspace-event-protocol.js.map +1 -0
- package/dist/src/workspace-event-scheduler.d.ts +54 -0
- package/dist/src/workspace-event-scheduler.d.ts.map +1 -0
- package/dist/src/workspace-event-scheduler.js +131 -0
- package/dist/src/workspace-event-scheduler.js.map +1 -0
- package/dist/src/workspace-event-scheduler.test.d.ts +2 -0
- package/dist/src/workspace-event-scheduler.test.d.ts.map +1 -0
- package/dist/src/workspace-event-scheduler.test.js +157 -0
- package/dist/src/workspace-event-scheduler.test.js.map +1 -0
- package/dist/src/workspace-event.d.ts +28 -0
- package/dist/src/workspace-event.d.ts.map +1 -0
- package/dist/src/workspace-event.js +674 -0
- package/dist/src/workspace-event.js.map +1 -0
- package/dist/src/workspace-event.test.d.ts +2 -0
- package/dist/src/workspace-event.test.d.ts.map +1 -0
- package/dist/src/workspace-event.test.js +265 -0
- package/dist/src/workspace-event.test.js.map +1 -0
- package/package.json +2 -2
|
@@ -1,10 +1,21 @@
|
|
|
1
1
|
import assert from "node:assert/strict";
|
|
2
2
|
import { afterEach, beforeEach, describe, it } from "node:test";
|
|
3
|
-
import { registerExecEnvHook } from "./register-exec-env-hook.js";
|
|
4
|
-
import { __resetSessionEnvStoreForTests, linkChildSession, setSessionEnvEntry, XG_OPENAPI_APP_KEY,
|
|
3
|
+
import { registerExecEnvHook, XG_OPENAPI_BASE_URL } from "./register-exec-env-hook.js";
|
|
4
|
+
import { __resetSessionEnvStoreForTests, linkChildSession, setSessionEnvEntry, XG_OPENAPI_APP_KEY, } from "./session-env-store.js";
|
|
5
5
|
let registeredHandler;
|
|
6
|
-
function captureApi() {
|
|
6
|
+
function captureApi(cfg) {
|
|
7
7
|
return {
|
|
8
|
+
runtime: {
|
|
9
|
+
config: {
|
|
10
|
+
current: () => ({
|
|
11
|
+
channels: {
|
|
12
|
+
xg_cwork_im: cfg?.baseUrl
|
|
13
|
+
? { baseUrl: cfg.baseUrl }
|
|
14
|
+
: {},
|
|
15
|
+
},
|
|
16
|
+
}),
|
|
17
|
+
},
|
|
18
|
+
},
|
|
8
19
|
on: (_name, handler) => {
|
|
9
20
|
registeredHandler = handler;
|
|
10
21
|
},
|
|
@@ -21,27 +32,25 @@ describe("register-exec-env-hook", () => {
|
|
|
21
32
|
assert.equal(typeof registeredHandler, "function");
|
|
22
33
|
});
|
|
23
34
|
it("非 exec 工具不注入", () => {
|
|
24
|
-
registerExecEnvHook(captureApi());
|
|
35
|
+
registerExecEnvHook(captureApi({ baseUrl: "https://api.example.com" }));
|
|
25
36
|
setSessionEnvEntry("session-a", XG_OPENAPI_APP_KEY, "k");
|
|
26
37
|
const result = registeredHandler({ toolName: "read", params: {} }, { sessionKey: "session-a" });
|
|
27
38
|
assert.equal(result, undefined);
|
|
28
39
|
});
|
|
29
|
-
it("无 appKey 时返回 undefined(不动作)", () => {
|
|
40
|
+
it("无 appKey 且无 baseUrl 时返回 undefined(不动作)", () => {
|
|
30
41
|
registerExecEnvHook(captureApi());
|
|
31
42
|
const result = registeredHandler({ toolName: "exec", params: { command: "echo hi" } }, { sessionKey: "session-empty" });
|
|
32
43
|
assert.equal(result, undefined);
|
|
33
44
|
});
|
|
34
|
-
it("只有 baseUrl
|
|
35
|
-
registerExecEnvHook(captureApi());
|
|
36
|
-
setSessionEnvEntry("session-a", XG_OPENAPI_BASE_URL, "https://api.example.com");
|
|
45
|
+
it("只有 baseUrl(配置)时也注入", () => {
|
|
46
|
+
registerExecEnvHook(captureApi({ baseUrl: "https://api.example.com" }));
|
|
37
47
|
const result = registeredHandler({ toolName: "exec", params: { command: "echo hi" } }, { sessionKey: "session-a" });
|
|
38
48
|
const resultParams = result.params;
|
|
39
49
|
assert.deepEqual(resultParams.env, { [XG_OPENAPI_BASE_URL]: "https://api.example.com" });
|
|
40
50
|
});
|
|
41
51
|
it("appKey 与 baseUrl 同时注入", () => {
|
|
42
|
-
registerExecEnvHook(captureApi());
|
|
52
|
+
registerExecEnvHook(captureApi({ baseUrl: "https://api.example.com" }));
|
|
43
53
|
setSessionEnvEntry("session-a", XG_OPENAPI_APP_KEY, "key-a");
|
|
44
|
-
setSessionEnvEntry("session-a", XG_OPENAPI_BASE_URL, "https://api.example.com");
|
|
45
54
|
const result = registeredHandler({ toolName: "exec", params: { command: "echo hi" } }, { sessionKey: "session-a" });
|
|
46
55
|
const resultParams = result.params;
|
|
47
56
|
assert.deepEqual(resultParams.env, {
|
|
@@ -49,6 +58,13 @@ describe("register-exec-env-hook", () => {
|
|
|
49
58
|
[XG_OPENAPI_BASE_URL]: "https://api.example.com",
|
|
50
59
|
});
|
|
51
60
|
});
|
|
61
|
+
it("有 appKey 但无 baseUrl 配置时只注入 appKey", () => {
|
|
62
|
+
registerExecEnvHook(captureApi());
|
|
63
|
+
setSessionEnvEntry("session-a", XG_OPENAPI_APP_KEY, "key-a");
|
|
64
|
+
const result = registeredHandler({ toolName: "exec", params: { command: "echo hi" } }, { sessionKey: "session-a" });
|
|
65
|
+
const resultParams = result.params;
|
|
66
|
+
assert.deepEqual(resultParams.env, { [XG_OPENAPI_APP_KEY]: "key-a" });
|
|
67
|
+
});
|
|
52
68
|
it("exec 且本会话有 appKey:注入 env,保留原 env 并覆盖同 key", () => {
|
|
53
69
|
registerExecEnvHook(captureApi());
|
|
54
70
|
setSessionEnvEntry("session-a", XG_OPENAPI_APP_KEY, "key-a");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-exec-env-hook.test.js","sourceRoot":"","sources":["../../src/register-exec-env-hook.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"register-exec-env-hook.test.js","sourceRoot":"","sources":["../../src/register-exec-env-hook.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,22 @@
|
|
|
4
4
|
*
|
|
5
5
|
* 语义:同一群内多人先后触发时按「最后触发者」覆盖写入;subagent 通过
|
|
6
6
|
* linkChildSession 沿父子链反查父会话的 env。
|
|
7
|
+
*
|
|
8
|
+
* 持久化:仅持久化会话级 env(当前为 XG_OPENAPI_APP_KEY)。写入后防抖落盘到
|
|
9
|
+
* stateDir/xgjktech/session-env.json,openclaw 重启后恢复;subagent 父子链是
|
|
10
|
+
* 运行时关系,不持久化。baseUrl 等配置值不在此存储(hook 侧直接读配置)。
|
|
7
11
|
*/
|
|
8
12
|
export declare const XG_OPENAPI_APP_KEY = "XG_OPENAPI_APP_KEY";
|
|
9
|
-
export declare const XG_OPENAPI_BASE_URL = "XG_OPENAPI_BASE_URL";
|
|
10
13
|
/** 过滤非法/危险 env 键值对(key 命名、长度、null 字节)。 */
|
|
11
14
|
export declare function sanitizeSessionEnv(env: Record<string, string>): Record<string, string>;
|
|
12
15
|
export declare function isRecord(value: unknown): value is Record<string, unknown>;
|
|
16
|
+
/**
|
|
17
|
+
* 初始化持久化(register(api) 时调用一次,传入 api.runtime.state.resolveStateDir())。
|
|
18
|
+
* 读盘加载到内存;失败降级为纯内存模式,绝不抛。
|
|
19
|
+
*/
|
|
20
|
+
export declare function initSessionEnvPersistence(stateDir: string): void;
|
|
21
|
+
/** 立即落盘(测试 / 进程退出钩子使用)。 */
|
|
22
|
+
export declare function flushSessionEnvPersistence(): void;
|
|
13
23
|
/** 合并写入某个会话的 env(覆盖同 key;空/非法值会被过滤)。 */
|
|
14
24
|
export declare function setSessionEnv(sessionKey: string, env: Record<string, string>): void;
|
|
15
25
|
/** 设置/删除某个会话的单个 env 键;value 为 undefined 时删除。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-env-store.d.ts","sourceRoot":"","sources":["../../src/session-env-store.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"session-env-store.d.ts","sourceRoot":"","sources":["../../src/session-env-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAkCvD,0CAA0C;AAC1C,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQtF;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEzE;AA8GD;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAKhE;AAED,2BAA2B;AAC3B,wBAAgB,0BAA0B,IAAI,IAAI,CASjD;AAED,wCAAwC;AACxC,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CASnF;AAED,gDAAgD;AAChD,wBAAgB,kBAAkB,CAC9B,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,GAAG,SAAS,GAC1B,IAAI,CAqBN;AAED,2BAA2B;AAC3B,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAMpF;AAED,yBAAyB;AACzB,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAOxD;AAED,uBAAuB;AACvB,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAEzE;AAED,+CAA+C;AAC/C,wBAAgB,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAIxF;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAc3F;AAED,wBAAgB,8BAA8B,IAAI,IAAI,CAgBrD"}
|
|
@@ -4,15 +4,32 @@
|
|
|
4
4
|
*
|
|
5
5
|
* 语义:同一群内多人先后触发时按「最后触发者」覆盖写入;subagent 通过
|
|
6
6
|
* linkChildSession 沿父子链反查父会话的 env。
|
|
7
|
+
*
|
|
8
|
+
* 持久化:仅持久化会话级 env(当前为 XG_OPENAPI_APP_KEY)。写入后防抖落盘到
|
|
9
|
+
* stateDir/xgjktech/session-env.json,openclaw 重启后恢复;subagent 父子链是
|
|
10
|
+
* 运行时关系,不持久化。baseUrl 等配置值不在此存储(hook 侧直接读配置)。
|
|
7
11
|
*/
|
|
12
|
+
import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
|
|
13
|
+
import { dirname, join } from "node:path";
|
|
8
14
|
export const XG_OPENAPI_APP_KEY = "XG_OPENAPI_APP_KEY";
|
|
9
|
-
export const XG_OPENAPI_BASE_URL = "XG_OPENAPI_BASE_URL";
|
|
10
15
|
const MAX_ENV_VALUE_LENGTH = 256;
|
|
11
16
|
const CHILD_LINK_MAX_DEPTH = 8;
|
|
12
17
|
const CLEANUP_DELAY_MS = 60 * 60 * 1000;
|
|
18
|
+
/** 持久化条目超过该时间未写入则加载时清理(不随运行时 TTL)。 */
|
|
19
|
+
const PERSIST_TTL_MS = 24 * 60 * 60 * 1000;
|
|
20
|
+
/** 落盘防抖窗口。 */
|
|
21
|
+
const PERSIST_DEBOUNCE_MS = 300;
|
|
22
|
+
const PERSIST_FILE_NAME = "session-env.json";
|
|
23
|
+
const LOG_PREFIX = "[xg_cwork_im] [session-env]";
|
|
13
24
|
const sessionEnvMap = new Map();
|
|
25
|
+
const sessionUpdatedAt = new Map();
|
|
14
26
|
const sessionChildLinks = new Map();
|
|
15
27
|
const cleanupTimers = new Map();
|
|
28
|
+
let persistStateDir;
|
|
29
|
+
let persistPath;
|
|
30
|
+
let persistTimer;
|
|
31
|
+
let persistDirty = false;
|
|
32
|
+
let warnedPersistError = false;
|
|
16
33
|
function isValidEnvKey(key) {
|
|
17
34
|
return /^[A-Za-z_][A-Za-z0-9_]*$/.test(key);
|
|
18
35
|
}
|
|
@@ -47,6 +64,7 @@ function scheduleCleanup(sessionKey) {
|
|
|
47
64
|
clearCleanupTimer(sessionKey);
|
|
48
65
|
cleanupTimers.set(sessionKey, setTimeout(() => {
|
|
49
66
|
sessionEnvMap.delete(sessionKey);
|
|
67
|
+
sessionUpdatedAt.delete(sessionKey);
|
|
50
68
|
sessionChildLinks.delete(sessionKey);
|
|
51
69
|
cleanupTimers.delete(sessionKey);
|
|
52
70
|
}, CLEANUP_DELAY_MS).unref?.());
|
|
@@ -56,6 +74,116 @@ function touch(sessionKey) {
|
|
|
56
74
|
scheduleCleanup(sessionKey);
|
|
57
75
|
}
|
|
58
76
|
}
|
|
77
|
+
function warnPersistError(message, cause) {
|
|
78
|
+
if (!warnedPersistError) {
|
|
79
|
+
warnedPersistError = true;
|
|
80
|
+
console.warn(`${LOG_PREFIX} ${message} 原因=${String(cause)};本次进程降级为纯内存模式`);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
function resolvePersistPath(stateDir) {
|
|
84
|
+
return join(stateDir, "xgjktech", PERSIST_FILE_NAME);
|
|
85
|
+
}
|
|
86
|
+
function persistNow() {
|
|
87
|
+
if (!persistPath)
|
|
88
|
+
return;
|
|
89
|
+
try {
|
|
90
|
+
const entries = {};
|
|
91
|
+
for (const [sessionKey, env] of sessionEnvMap) {
|
|
92
|
+
entries[sessionKey] = {
|
|
93
|
+
...env,
|
|
94
|
+
updatedAt: sessionUpdatedAt.get(sessionKey) ?? Date.now(),
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
const payload = JSON.stringify({ version: 1, entries });
|
|
98
|
+
mkdirSync(dirname(persistPath), { recursive: true });
|
|
99
|
+
const tmpPath = `${persistPath}.tmp`;
|
|
100
|
+
writeFileSync(tmpPath, payload, "utf8");
|
|
101
|
+
renameSync(tmpPath, persistPath);
|
|
102
|
+
}
|
|
103
|
+
catch (cause) {
|
|
104
|
+
warnPersistError(`写入 ${persistPath ?? "<unset>"} 失败`, cause);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
function markPersistDirty() {
|
|
108
|
+
if (!persistPath)
|
|
109
|
+
return;
|
|
110
|
+
persistDirty = true;
|
|
111
|
+
if (persistTimer)
|
|
112
|
+
return;
|
|
113
|
+
persistTimer = setTimeout(() => {
|
|
114
|
+
persistTimer = undefined;
|
|
115
|
+
if (persistDirty) {
|
|
116
|
+
persistDirty = false;
|
|
117
|
+
persistNow();
|
|
118
|
+
}
|
|
119
|
+
}, PERSIST_DEBOUNCE_MS).unref?.();
|
|
120
|
+
}
|
|
121
|
+
function loadPersistedEntries() {
|
|
122
|
+
if (!persistPath)
|
|
123
|
+
return;
|
|
124
|
+
let raw;
|
|
125
|
+
try {
|
|
126
|
+
raw = readFileSync(persistPath, "utf8");
|
|
127
|
+
}
|
|
128
|
+
catch (cause) {
|
|
129
|
+
if (cause.code !== "ENOENT") {
|
|
130
|
+
warnPersistError(`读取 ${persistPath} 失败`, cause);
|
|
131
|
+
}
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
134
|
+
try {
|
|
135
|
+
const parsed = JSON.parse(raw);
|
|
136
|
+
const entries = isRecord(parsed) ? parsed.entries : undefined;
|
|
137
|
+
if (!isRecord(entries))
|
|
138
|
+
return;
|
|
139
|
+
const now = Date.now();
|
|
140
|
+
for (const [sessionKey, value] of Object.entries(entries)) {
|
|
141
|
+
if (!isRecord(value))
|
|
142
|
+
continue;
|
|
143
|
+
const rawUpdatedAt = value.updatedAt;
|
|
144
|
+
const updatedAt = typeof rawUpdatedAt === "number" ? rawUpdatedAt : 0;
|
|
145
|
+
if (now - updatedAt > PERSIST_TTL_MS)
|
|
146
|
+
continue;
|
|
147
|
+
const env = {};
|
|
148
|
+
for (const [key, val] of Object.entries(value)) {
|
|
149
|
+
if (key === "updatedAt")
|
|
150
|
+
continue;
|
|
151
|
+
if (typeof val === "string")
|
|
152
|
+
env[key] = val;
|
|
153
|
+
}
|
|
154
|
+
const sanitized = sanitizeSessionEnv(env);
|
|
155
|
+
if (Object.keys(sanitized).length === 0)
|
|
156
|
+
continue;
|
|
157
|
+
sessionEnvMap.set(sessionKey, sanitized);
|
|
158
|
+
sessionUpdatedAt.set(sessionKey, updatedAt || now);
|
|
159
|
+
scheduleCleanup(sessionKey);
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
catch (cause) {
|
|
163
|
+
warnPersistError(`解析 ${persistPath} 失败`, cause);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
/**
|
|
167
|
+
* 初始化持久化(register(api) 时调用一次,传入 api.runtime.state.resolveStateDir())。
|
|
168
|
+
* 读盘加载到内存;失败降级为纯内存模式,绝不抛。
|
|
169
|
+
*/
|
|
170
|
+
export function initSessionEnvPersistence(stateDir) {
|
|
171
|
+
persistStateDir = stateDir;
|
|
172
|
+
persistPath = resolvePersistPath(stateDir);
|
|
173
|
+
warnedPersistError = false;
|
|
174
|
+
loadPersistedEntries();
|
|
175
|
+
}
|
|
176
|
+
/** 立即落盘(测试 / 进程退出钩子使用)。 */
|
|
177
|
+
export function flushSessionEnvPersistence() {
|
|
178
|
+
if (persistTimer) {
|
|
179
|
+
clearTimeout(persistTimer);
|
|
180
|
+
persistTimer = undefined;
|
|
181
|
+
}
|
|
182
|
+
if (persistDirty) {
|
|
183
|
+
persistDirty = false;
|
|
184
|
+
persistNow();
|
|
185
|
+
}
|
|
186
|
+
}
|
|
59
187
|
/** 合并写入某个会话的 env(覆盖同 key;空/非法值会被过滤)。 */
|
|
60
188
|
export function setSessionEnv(sessionKey, env) {
|
|
61
189
|
if (!sessionKey)
|
|
@@ -65,7 +193,9 @@ export function setSessionEnv(sessionKey, env) {
|
|
|
65
193
|
return;
|
|
66
194
|
const current = sessionEnvMap.get(sessionKey) ?? {};
|
|
67
195
|
sessionEnvMap.set(sessionKey, { ...current, ...sanitized });
|
|
196
|
+
sessionUpdatedAt.set(sessionKey, Date.now());
|
|
68
197
|
scheduleCleanup(sessionKey);
|
|
198
|
+
markPersistDirty();
|
|
69
199
|
}
|
|
70
200
|
/** 设置/删除某个会话的单个 env 键;value 为 undefined 时删除。 */
|
|
71
201
|
export function setSessionEnvEntry(sessionKey, key, value) {
|
|
@@ -76,16 +206,21 @@ export function setSessionEnvEntry(sessionKey, key, value) {
|
|
|
76
206
|
if (!current)
|
|
77
207
|
return;
|
|
78
208
|
delete current[key];
|
|
209
|
+
sessionUpdatedAt.set(sessionKey, Date.now());
|
|
79
210
|
if (Object.keys(current).length === 0) {
|
|
80
211
|
sessionEnvMap.delete(sessionKey);
|
|
212
|
+
sessionUpdatedAt.delete(sessionKey);
|
|
81
213
|
clearCleanupTimer(sessionKey);
|
|
82
214
|
}
|
|
215
|
+
markPersistDirty();
|
|
83
216
|
return;
|
|
84
217
|
}
|
|
85
218
|
const current = sessionEnvMap.get(sessionKey) ?? {};
|
|
86
219
|
current[key] = value;
|
|
87
220
|
sessionEnvMap.set(sessionKey, current);
|
|
221
|
+
sessionUpdatedAt.set(sessionKey, Date.now());
|
|
88
222
|
scheduleCleanup(sessionKey);
|
|
223
|
+
markPersistDirty();
|
|
89
224
|
}
|
|
90
225
|
/** 读取某个会话的 env 快照(浅拷贝)。 */
|
|
91
226
|
export function getSessionEnv(sessionKey) {
|
|
@@ -102,8 +237,10 @@ export function clearSessionEnv(sessionKey) {
|
|
|
102
237
|
if (!sessionKey)
|
|
103
238
|
return;
|
|
104
239
|
sessionEnvMap.delete(sessionKey);
|
|
240
|
+
sessionUpdatedAt.delete(sessionKey);
|
|
105
241
|
sessionChildLinks.delete(sessionKey);
|
|
106
242
|
clearCleanupTimer(sessionKey);
|
|
243
|
+
markPersistDirty();
|
|
107
244
|
}
|
|
108
245
|
/** 删除某个会话的单个 env 键。 */
|
|
109
246
|
export function removeSessionEnvKey(sessionKey, key) {
|
|
@@ -140,10 +277,19 @@ export function resolveEnvForSession(sessionKey) {
|
|
|
140
277
|
}
|
|
141
278
|
export function __resetSessionEnvStoreForTests() {
|
|
142
279
|
sessionEnvMap.clear();
|
|
280
|
+
sessionUpdatedAt.clear();
|
|
143
281
|
sessionChildLinks.clear();
|
|
144
282
|
for (const timer of cleanupTimers.values()) {
|
|
145
283
|
clearTimeout(timer);
|
|
146
284
|
}
|
|
147
285
|
cleanupTimers.clear();
|
|
286
|
+
if (persistTimer) {
|
|
287
|
+
clearTimeout(persistTimer);
|
|
288
|
+
persistTimer = undefined;
|
|
289
|
+
}
|
|
290
|
+
persistDirty = false;
|
|
291
|
+
persistStateDir = undefined;
|
|
292
|
+
persistPath = undefined;
|
|
293
|
+
warnedPersistError = false;
|
|
148
294
|
}
|
|
149
295
|
//# sourceMappingURL=session-env-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-env-store.js","sourceRoot":"","sources":["../../src/session-env-store.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"session-env-store.js","sourceRoot":"","sources":["../../src/session-env-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import assert from "node:assert/strict";
|
|
2
|
+
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
3
|
+
import { mkdtempSync } from "node:fs";
|
|
4
|
+
import { tmpdir } from "node:os";
|
|
5
|
+
import { join } from "node:path";
|
|
2
6
|
import { afterEach, describe, it } from "node:test";
|
|
3
|
-
import { __resetSessionEnvStoreForTests, clearSessionEnv, getSessionEnv, linkChildSession, removeSessionEnvKey, resolveEnvForSession, sanitizeSessionEnv, setSessionEnv, setSessionEnvEntry, XG_OPENAPI_APP_KEY, } from "./session-env-store.js";
|
|
7
|
+
import { __resetSessionEnvStoreForTests, clearSessionEnv, flushSessionEnvPersistence, getSessionEnv, initSessionEnvPersistence, linkChildSession, removeSessionEnvKey, resolveEnvForSession, sanitizeSessionEnv, setSessionEnv, setSessionEnvEntry, XG_OPENAPI_APP_KEY, } from "./session-env-store.js";
|
|
4
8
|
afterEach(() => __resetSessionEnvStoreForTests());
|
|
5
9
|
describe("session env store", () => {
|
|
6
10
|
it("按 sessionKey 读写并合并覆盖", () => {
|
|
@@ -71,4 +75,75 @@ describe("session env store", () => {
|
|
|
71
75
|
assert.deepEqual(getSessionEnv(""), undefined);
|
|
72
76
|
});
|
|
73
77
|
});
|
|
78
|
+
describe("session env store persistence", () => {
|
|
79
|
+
function makeStateDir() {
|
|
80
|
+
return mkdtempSync(join(tmpdir(), "xg-session-env-test-"));
|
|
81
|
+
}
|
|
82
|
+
function persistFileFor(stateDir) {
|
|
83
|
+
return join(stateDir, "xgjktech", "session-env.json");
|
|
84
|
+
}
|
|
85
|
+
it("flush 落盘后 reset + init 同目录可恢复", () => {
|
|
86
|
+
const stateDir = makeStateDir();
|
|
87
|
+
initSessionEnvPersistence(stateDir);
|
|
88
|
+
setSessionEnvEntry("session-a", XG_OPENAPI_APP_KEY, "key-a");
|
|
89
|
+
setSessionEnvEntry("session-b", XG_OPENAPI_APP_KEY, "key-b");
|
|
90
|
+
flushSessionEnvPersistence();
|
|
91
|
+
assert.equal(existsSync(persistFileFor(stateDir)), true);
|
|
92
|
+
__resetSessionEnvStoreForTests();
|
|
93
|
+
initSessionEnvPersistence(stateDir);
|
|
94
|
+
assert.deepEqual(getSessionEnv("session-a"), { [XG_OPENAPI_APP_KEY]: "key-a" });
|
|
95
|
+
assert.deepEqual(getSessionEnv("session-b"), { [XG_OPENAPI_APP_KEY]: "key-b" });
|
|
96
|
+
});
|
|
97
|
+
it("删除键后 flush 不再含该键;清空会话后文件同步清空", () => {
|
|
98
|
+
const stateDir = makeStateDir();
|
|
99
|
+
initSessionEnvPersistence(stateDir);
|
|
100
|
+
setSessionEnvEntry("session-a", XG_OPENAPI_APP_KEY, "key-a");
|
|
101
|
+
setSessionEnvEntry("session-b", XG_OPENAPI_APP_KEY, "key-b");
|
|
102
|
+
removeSessionEnvKey("session-a", XG_OPENAPI_APP_KEY);
|
|
103
|
+
clearSessionEnv("session-b");
|
|
104
|
+
flushSessionEnvPersistence();
|
|
105
|
+
__resetSessionEnvStoreForTests();
|
|
106
|
+
initSessionEnvPersistence(stateDir);
|
|
107
|
+
assert.deepEqual(getSessionEnv("session-a"), undefined);
|
|
108
|
+
assert.deepEqual(getSessionEnv("session-b"), undefined);
|
|
109
|
+
});
|
|
110
|
+
it("加载时清理超过持久化 TTL 的过期条目", () => {
|
|
111
|
+
const stateDir = makeStateDir();
|
|
112
|
+
const file = persistFileFor(stateDir);
|
|
113
|
+
mkdirSync(join(stateDir, "xgjktech"), { recursive: true });
|
|
114
|
+
const stale = Date.now() - 25 * 60 * 60 * 1000;
|
|
115
|
+
writeFileSync(file, JSON.stringify({
|
|
116
|
+
version: 1,
|
|
117
|
+
entries: {
|
|
118
|
+
stale: { [XG_OPENAPI_APP_KEY]: "old", updatedAt: stale },
|
|
119
|
+
fresh: { [XG_OPENAPI_APP_KEY]: "new", updatedAt: Date.now() },
|
|
120
|
+
},
|
|
121
|
+
}), "utf8");
|
|
122
|
+
__resetSessionEnvStoreForTests();
|
|
123
|
+
initSessionEnvPersistence(stateDir);
|
|
124
|
+
assert.deepEqual(getSessionEnv("stale"), undefined);
|
|
125
|
+
assert.deepEqual(getSessionEnv("fresh"), { [XG_OPENAPI_APP_KEY]: "new" });
|
|
126
|
+
});
|
|
127
|
+
it("持久化目录被普通文件占据时读失败降级为纯内存,不抛", () => {
|
|
128
|
+
const stateDir = makeStateDir();
|
|
129
|
+
const namespace = join(stateDir, "xgjktech");
|
|
130
|
+
writeFileSync(namespace, "i am a file", "utf8");
|
|
131
|
+
__resetSessionEnvStoreForTests();
|
|
132
|
+
assert.doesNotThrow(() => initSessionEnvPersistence(stateDir));
|
|
133
|
+
setSessionEnvEntry("session-a", XG_OPENAPI_APP_KEY, "key-a");
|
|
134
|
+
assert.deepEqual(getSessionEnv("session-a"), { [XG_OPENAPI_APP_KEY]: "key-a" });
|
|
135
|
+
});
|
|
136
|
+
it("防抖自动落盘", async () => {
|
|
137
|
+
const stateDir = makeStateDir();
|
|
138
|
+
initSessionEnvPersistence(stateDir);
|
|
139
|
+
setSessionEnvEntry("session-a", XG_OPENAPI_APP_KEY, "key-a");
|
|
140
|
+
await new Promise((resolve) => setTimeout(resolve, 450));
|
|
141
|
+
assert.equal(existsSync(persistFileFor(stateDir)), true);
|
|
142
|
+
const parsed = JSON.parse(readFileSync(persistFileFor(stateDir), "utf8"));
|
|
143
|
+
assert.deepEqual(parsed.entries["session-a"], {
|
|
144
|
+
[XG_OPENAPI_APP_KEY]: "key-a",
|
|
145
|
+
updatedAt: parsed.entries["session-a"].updatedAt,
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
});
|
|
74
149
|
//# sourceMappingURL=session-env-store.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-env-store.test.js","sourceRoot":"","sources":["../../src/session-env-store.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session-env-store.test.js","sourceRoot":"","sources":["../../src/session-env-store.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 单聊轮次结束但未向 IM 发出正文时的兜底话术(如模型输出 NO_REPLY、deliver 未被调用)。
|
|
3
|
+
*/
|
|
4
|
+
import type { WsMessageParams } from "./types.js";
|
|
5
|
+
export declare function shouldSendSingleChatNoReplyFallback(args: {
|
|
6
|
+
params: WsMessageParams;
|
|
7
|
+
hasFirstReply: boolean;
|
|
8
|
+
deliverCallCount: number;
|
|
9
|
+
dispatchError?: unknown;
|
|
10
|
+
lastDeliverError?: unknown;
|
|
11
|
+
}): boolean;
|
|
12
|
+
/** 单聊静默轮次兜底:简短告知并引导重试。 */
|
|
13
|
+
export declare function buildSingleChatNoReplyFallbackText(): string;
|
|
14
|
+
//# sourceMappingURL=single-chat-no-reply-fallback.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"single-chat-no-reply-fallback.d.ts","sourceRoot":"","sources":["../../src/single-chat-no-reply-fallback.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,wBAAgB,mCAAmC,CAAC,IAAI,EAAE;IACtD,MAAM,EAAE,eAAe,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC9B,GAAG,OAAO,CAMV;AAED,0BAA0B;AAC1B,wBAAgB,kCAAkC,IAAI,MAAM,CAE3D"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 单聊轮次结束但未向 IM 发出正文时的兜底话术(如模型输出 NO_REPLY、deliver 未被调用)。
|
|
3
|
+
*/
|
|
4
|
+
import { isImSingleChat } from "./inbound-chat-type.js";
|
|
5
|
+
export function shouldSendSingleChatNoReplyFallback(args) {
|
|
6
|
+
if (args.hasFirstReply)
|
|
7
|
+
return false;
|
|
8
|
+
if (args.dispatchError !== undefined || args.lastDeliverError !== undefined)
|
|
9
|
+
return false;
|
|
10
|
+
if (!isImSingleChat(args.params))
|
|
11
|
+
return false;
|
|
12
|
+
if (args.deliverCallCount > 0)
|
|
13
|
+
return false;
|
|
14
|
+
return true;
|
|
15
|
+
}
|
|
16
|
+
/** 单聊静默轮次兜底:简短告知并引导重试。 */
|
|
17
|
+
export function buildSingleChatNoReplyFallbackText() {
|
|
18
|
+
return "消息已收到,但这一轮没有生成回复。请换个说法或把需求说具体一些后再试。";
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=single-chat-no-reply-fallback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"single-chat-no-reply-fallback.js","sourceRoot":"","sources":["../../src/single-chat-no-reply-fallback.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,MAAM,UAAU,mCAAmC,CAAC,IAMnD;IACG,IAAI,IAAI,CAAC,aAAa;QAAE,OAAO,KAAK,CAAC;IACrC,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,IAAI,IAAI,CAAC,gBAAgB,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC1F,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAC/C,IAAI,IAAI,CAAC,gBAAgB,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5C,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,kCAAkC;IAC9C,OAAO,qCAAqC,CAAC;AACjD,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
|
|
2
|
+
import type { ImStreamClient } from "./connection.js";
|
|
3
|
+
interface SubagentWsTarget {
|
|
4
|
+
streamClient: ImStreamClient;
|
|
5
|
+
groupId: string;
|
|
6
|
+
replyToMsgId: string;
|
|
7
|
+
}
|
|
8
|
+
export declare function registerSubagentProgressHooks(api: OpenClawPluginApi): void;
|
|
9
|
+
export declare function setSubagentWsTarget(childSessionKey: string, target: SubagentWsTarget): void;
|
|
10
|
+
export {};
|
|
11
|
+
//# sourceMappingURL=subagent-progress-hooks.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subagent-progress-hooks.d.ts","sourceRoot":"","sources":["../../src/subagent-progress-hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,UAAU,gBAAgB;IACtB,YAAY,EAAE,cAAc,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACxB;AAYD,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAqC1E;AAED,wBAAgB,mBAAmB,CAC/B,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,gBAAgB,GACzB,IAAI,CAEN"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
const subagentWsTargets = new Map();
|
|
2
|
+
export function registerSubagentProgressHooks(api) {
|
|
3
|
+
// subagent_progress is not in the installed SDK's PluginHookName type union,
|
|
4
|
+
// but the runtime supports it. Cast to bypass the type check.
|
|
5
|
+
api.on("subagent_progress", async (event) => {
|
|
6
|
+
const childSessionKey = event.childSessionKey;
|
|
7
|
+
if (!childSessionKey)
|
|
8
|
+
return;
|
|
9
|
+
const target = subagentWsTargets.get(childSessionKey);
|
|
10
|
+
if (!target)
|
|
11
|
+
return;
|
|
12
|
+
let displayText;
|
|
13
|
+
if (event.phase === "started") {
|
|
14
|
+
displayText = "子任务已启动";
|
|
15
|
+
}
|
|
16
|
+
else if (event.phase === "ended") {
|
|
17
|
+
displayText = event.outcome === "ok" ? "子任务已完成" : `子任务异常: ${event.outcome ?? "unknown"}`;
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
displayText = "子任务状态更新";
|
|
21
|
+
}
|
|
22
|
+
try {
|
|
23
|
+
await target.streamClient.streamProgress({
|
|
24
|
+
groupId: target.groupId,
|
|
25
|
+
replyToMsgId: target.replyToMsgId,
|
|
26
|
+
event: "RUN_EVENT",
|
|
27
|
+
displayText,
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
// WS best-effort: don't propagate errors from progress events
|
|
32
|
+
}
|
|
33
|
+
if (event.phase === "ended") {
|
|
34
|
+
subagentWsTargets.delete(childSessionKey);
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
export function setSubagentWsTarget(childSessionKey, target) {
|
|
39
|
+
subagentWsTargets.set(childSessionKey, target);
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=subagent-progress-hooks.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subagent-progress-hooks.js","sourceRoot":"","sources":["../../src/subagent-progress-hooks.ts"],"names":[],"mappings":"AAiBA,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAA4B,CAAC;AAE9D,MAAM,UAAU,6BAA6B,CAAC,GAAsB;IAChE,6EAA6E;IAC7E,8DAA8D;IAC7D,GAAG,CAAC,EAA8F,CAC/F,mBAAmB,EACnB,KAAK,EAAE,KAA4B,EAAE,EAAE;QACnC,MAAM,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;QAC9C,IAAI,CAAC,eAAe;YAAE,OAAO;QAE7B,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM;YAAE,OAAO;QAEpB,IAAI,WAAmB,CAAC;QACxB,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAC5B,WAAW,GAAG,QAAQ,CAAC;QAC3B,CAAC;aAAM,IAAI,KAAK,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;YACjC,WAAW,GAAG,KAAK,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,KAAK,CAAC,OAAO,IAAI,SAAS,EAAE,CAAC;QAC7F,CAAC;aAAM,CAAC;YACJ,WAAW,GAAG,SAAS,CAAC;QAC5B,CAAC;QAED,IAAI,CAAC;YACD,MAAM,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC;gBACrC,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,KAAK,EAAE,WAAW;gBAClB,WAAW;aACd,CAAC,CAAC;QACP,CAAC;QAAC,MAAM,CAAC;YACL,8DAA8D;QAClE,CAAC;QAED,IAAI,KAAK,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;YAC1B,iBAAiB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC9C,CAAC;IACL,CAAC,CACJ,CAAC;AACN,CAAC;AAED,MAAM,UAAU,mBAAmB,CAC/B,eAAuB,EACvB,MAAwB;IAExB,iBAAiB,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;AACnD,CAAC"}
|
package/dist/src/types.d.ts
CHANGED
|
@@ -30,7 +30,9 @@ export interface AutoModelRoutingConfig {
|
|
|
30
30
|
}
|
|
31
31
|
/** IM 逻辑 NAS 根到当前 OpenClaw 宿主机真实根目录的映射。 */
|
|
32
32
|
export interface NasVolumeRootMapping {
|
|
33
|
+
/** 跨机器一致的绝对逻辑根,例如 /data/touqian。 */
|
|
33
34
|
logicalRoot: string;
|
|
35
|
+
/** 当前机器的真实 NAS 挂载根;仅插件内部可见,不得发送给 IM 客户端。 */
|
|
34
36
|
hostRoot: string;
|
|
35
37
|
}
|
|
36
38
|
/** 单个机器人账户配置 */
|
|
@@ -164,8 +166,21 @@ export interface XgImConfig extends OpenClawConfig {
|
|
|
164
166
|
syncServiceBaseUrl?: string;
|
|
165
167
|
/** `agentContext.background` 与 `userInfo.background` 单段最大字符数(默认 15000) */
|
|
166
168
|
projectPromptMaxChars?: number;
|
|
169
|
+
/**
|
|
170
|
+
* 当前 OpenClaw 服务所挂载 NAS 的站点编码。
|
|
171
|
+
* 配置路径为 channels.xg_cwork_im.nasSiteCode,默认 SZ_PRIMARY;该值会随 NAS 工作区结果回传客户端。
|
|
172
|
+
*/
|
|
173
|
+
nasSiteCode?: string;
|
|
167
174
|
/** 将 IM 的逻辑 realDir 根映射为当前 OpenClaw 宿主机上的真实根目录。 */
|
|
168
175
|
nasVolumeRootMappings?: NasVolumeRootMapping[];
|
|
176
|
+
/** 单个插件进程中所有 Agent 共享的工作区活动请求上限,默认 32。 */
|
|
177
|
+
workspaceEventMaxConcurrency?: number;
|
|
178
|
+
/** 工作区活动请求中 FILE_REQUEST 的上限,默认 8。 */
|
|
179
|
+
workspaceEventMaxFileConcurrency?: number;
|
|
180
|
+
/** 同一个 agentId 同时执行的工作区请求上限,默认 2。 */
|
|
181
|
+
workspaceEventPerAgentConcurrency?: number;
|
|
182
|
+
/** 达到活动请求上限后允许等待的全局请求数,默认 64;设为 0 表示不排队。 */
|
|
183
|
+
workspaceEventQueueLimit?: number;
|
|
169
184
|
/**
|
|
170
185
|
* 是否在 assistant 每个 text 块结束(tool 调用前)通过 HTTP 发送中间正文。
|
|
171
186
|
* 默认开启;设为 `false` 恢复「整轮结束才 deliver 一次」。
|