@xgjktech/xg_cwork_im 1.17.48 → 1.17.49

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.
Files changed (34) hide show
  1. package/README.md +489 -489
  2. package/dist/src/build-project-prompt.test.js +18 -18
  3. package/dist/src/cron-appkey-binding-store.d.ts.map +1 -1
  4. package/dist/src/cron-appkey-binding-store.js +28 -10
  5. package/dist/src/cron-appkey-binding-store.js.map +1 -1
  6. package/dist/src/cron-appkey-binding-store.test.js +69 -1
  7. package/dist/src/cron-appkey-binding-store.test.js.map +1 -1
  8. package/dist/src/gateway-session-queue.d.ts +3 -0
  9. package/dist/src/gateway-session-queue.d.ts.map +1 -1
  10. package/dist/src/gateway-session-queue.js +1 -0
  11. package/dist/src/gateway-session-queue.js.map +1 -1
  12. package/dist/src/register-exec-env-hook.d.ts.map +1 -1
  13. package/dist/src/register-exec-env-hook.js +174 -33
  14. package/dist/src/register-exec-env-hook.js.map +1 -1
  15. package/dist/src/register-exec-env-hook.test.js +32 -0
  16. package/dist/src/register-exec-env-hook.test.js.map +1 -1
  17. package/dist/src/session-env-store.d.ts +4 -2
  18. package/dist/src/session-env-store.d.ts.map +1 -1
  19. package/dist/src/session-env-store.js +7 -3
  20. package/dist/src/session-env-store.js.map +1 -1
  21. package/dist/src/session-env-store.test.js +3 -1
  22. package/dist/src/session-env-store.test.js.map +1 -1
  23. package/dist/src/single-chat-no-reply-fallback.d.ts +14 -0
  24. package/dist/src/single-chat-no-reply-fallback.d.ts.map +1 -0
  25. package/dist/src/single-chat-no-reply-fallback.js +20 -0
  26. package/dist/src/single-chat-no-reply-fallback.js.map +1 -0
  27. package/dist/src/subagent-monitor.d.ts.map +1 -1
  28. package/dist/src/subagent-monitor.js +1 -13
  29. package/dist/src/subagent-monitor.js.map +1 -1
  30. package/dist/src/subagent-progress-hooks.d.ts +11 -0
  31. package/dist/src/subagent-progress-hooks.d.ts.map +1 -0
  32. package/dist/src/subagent-progress-hooks.js +41 -0
  33. package/dist/src/subagent-progress-hooks.js.map +1 -0
  34. package/package.json +1 -1
@@ -76,24 +76,24 @@ describe("buildAgentContextPromptBlock nasVolumes", () => {
76
76
  background,
77
77
  },
78
78
  });
79
- assert.equal(result.block, `## 当前项目
80
-
81
- ### 本次会话文件目录
82
- 本次会话需要读取的文件位于以下已授权目录:
83
- - \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/deliverables\`(只读)
84
- - \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0000\`(只读)
85
- - \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\`(可读写)
86
- - 首选文件写入目录:\`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\`
87
-
88
- ### 目录用途
89
- - **项目产出**:项目相关文件优先保存到可写目录 \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\` 或其子目录。
90
-
91
- ### 操作约束
92
- - 仅在上述已授权 NAS 目录下读取或处理项目文件;不要在 workspace 其他位置查找类似目录。
93
- - 对用户统一称为「本项目」,不要提及 OpenClaw workspace 等实现细节。
94
-
95
- ## 项目背景
96
-
79
+ assert.equal(result.block, `## 当前项目
80
+
81
+ ### 本次会话文件目录
82
+ 本次会话需要读取的文件位于以下已授权目录:
83
+ - \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/deliverables\`(只读)
84
+ - \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0000\`(只读)
85
+ - \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\`(可读写)
86
+ - 首选文件写入目录:\`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\`
87
+
88
+ ### 目录用途
89
+ - **项目产出**:项目相关文件优先保存到可写目录 \`/workspace/touqian/2026/08/3090270000000000307/CP202205250005/sequences/0001/input\` 或其子目录。
90
+
91
+ ### 操作约束
92
+ - 仅在上述已授权 NAS 目录下读取或处理项目文件;不要在 workspace 其他位置查找类似目录。
93
+ - 对用户统一称为「本项目」,不要提及 OpenClaw workspace 等实现细节。
94
+
95
+ ## 项目背景
96
+
97
97
  ${background}`);
98
98
  });
99
99
  });
@@ -1 +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;AAqFF,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,CAE5D;AAED,mCAAmC;AACnC,wBAAgB,6BAA6B,IAAI,IAAI,CAIpD"}
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;AAyGF,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,CAE5D;AAED,mCAAmC;AACnC,wBAAgB,6BAA6B,IAAI,IAAI,CAIpD"}
@@ -9,7 +9,10 @@ let bindingPath;
9
9
  let bindingMtimeMs = -1;
10
10
  let bindings = new Map();
11
11
  function key(agentId, jobId) {
12
- return `${agentId}\u0000${jobId}`;
12
+ // OpenClaw canonicalizes agent/job segments case-insensitively in Cron
13
+ // SessionKeys. Normalize lookup keys the same way while preserving the
14
+ // original values in the persisted record for diagnostics.
15
+ return `${agentId.trim().toLowerCase()}\u0000${jobId.trim().toLowerCase()}`;
13
16
  }
14
17
  function validText(value) {
15
18
  return typeof value === "string" && value.trim().length > 0 && value.length <= MAX_APP_KEY_LENGTH &&
@@ -19,11 +22,10 @@ function validBinding(value) {
19
22
  if (!value || typeof value !== "object")
20
23
  return false;
21
24
  const b = value;
22
- // Migration records may intentionally have an empty appKey placeholder.
23
- // They remain non-injectable until a real key is bound.
25
+ // Only the lookup identity and AppKey are required. Metadata fields are
26
+ // optional so older/minimal binding files remain usable after restart.
24
27
  return validText(b.agentId) && validText(b.jobId) &&
25
- (b.appKey === "" || validText(b.appKey)) && validText(b.source) &&
26
- validText(b.createdAt) && validText(b.updatedAt) && typeof b.enabled === "boolean";
28
+ (b.appKey === "" || validText(b.appKey));
27
29
  }
28
30
  function resolvePath(stateDir) {
29
31
  // resolveStateDir() normally points at ~/.openclaw/state; keep bindings in
@@ -52,15 +54,28 @@ function load(force = false) {
52
54
  }
53
55
  try {
54
56
  const parsed = JSON.parse(readFileSync(bindingPath, "utf8"));
55
- if (parsed.schemaVersion !== CRON_BINDING_SCHEMA_VERSION)
56
- return;
57
- if (!Array.isArray(parsed.bindings))
57
+ if (parsed.schemaVersion !== CRON_BINDING_SCHEMA_VERSION || !Array.isArray(parsed.bindings)) {
58
+ // Fail closed on an unreadable/incompatible file; do not retain a
59
+ // stale AppKey cache whose ownership can no longer be verified.
60
+ bindings = new Map();
61
+ bindingMtimeMs = mtime;
58
62
  return;
63
+ }
59
64
  const next = new Map();
60
65
  for (const raw of parsed.bindings) {
61
66
  if (!validBinding(raw))
62
67
  continue;
63
- const b = { ...raw, agentId: raw.agentId.trim(), jobId: raw.jobId.trim(), appKey: raw.appKey.trim() };
68
+ const now = new Date().toISOString();
69
+ const b = {
70
+ ...raw,
71
+ agentId: raw.agentId.trim(),
72
+ jobId: raw.jobId.trim(),
73
+ appKey: raw.appKey.trim(),
74
+ source: validText(raw.source) ? raw.source : "legacy",
75
+ createdAt: validText(raw.createdAt) ? raw.createdAt : now,
76
+ updatedAt: validText(raw.updatedAt) ? raw.updatedAt : now,
77
+ enabled: raw.enabled !== false,
78
+ };
64
79
  const k = key(b.agentId, b.jobId);
65
80
  const previous = next.get(k);
66
81
  if (!previous || b.updatedAt >= previous.updatedAt)
@@ -70,7 +85,10 @@ function load(force = false) {
70
85
  bindingMtimeMs = mtime;
71
86
  }
72
87
  catch {
73
- // Keep the last valid cache when a file is temporarily malformed.
88
+ // Fail closed when the file is temporarily malformed. A later mtime
89
+ // change will cause a fresh load.
90
+ bindings = new Map();
91
+ bindingMtimeMs = mtime;
74
92
  }
75
93
  }
76
94
  function acquireLock(lockPath) {
@@ -1 +1 @@
1
- {"version":3,"file":"cron-appkey-binding-store.js","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cron-appkey-binding-store.js","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ import { tmpdir } from "node:os";
4
4
  import { join } from "node:path";
5
5
  import { afterEach, describe, it } from "node:test";
6
6
  import { __resetCronAppKeyBindingStoreForTests, bindCronAppKey, getCronAppKeyBinding, initCronAppKeyBindingStore, } from "./cron-appkey-binding-store.js";
7
- import { extractCronJobIdFromResult, isCronCreateCommand, registerCronAppKeyBindingHook, registerExecEnvHook } from "./register-exec-env-hook.js";
7
+ import { extractCronJobIdFromResult, isCronCreateCommand, parseCronSessionKey, registerCronAppKeyBindingHook, registerExecEnvHook } from "./register-exec-env-hook.js";
8
8
  import { setSessionEnvEntry, setSessionUserContext, XG_OPENAPI_APP_KEY } from "./session-env-store.js";
9
9
  let dirs = [];
10
10
  afterEach(() => {
@@ -73,6 +73,24 @@ describe("cron appKey binding store", () => {
73
73
  after?.({ toolName: "exec", params: { command: "openclaw cron add --every 5m --json" }, result: { content: [{ text: "{\"id\":\"10d05140-09a8-4354-93f0-dd7fd0ff5e9\"}" }] } }, { sessionKey, agentId: "agent-a" });
74
74
  assert.equal(getCronAppKeyBinding("agent-a", "10d05140-09a8-4354-93f0-dd7fd0ff5e9")?.appKey, "key-cli");
75
75
  });
76
+ it("accepts isolated Cron session keys and non-UUID structured job ids", () => {
77
+ assert.deepEqual(parseCronSessionKey("agent:agent-a:cron:daily-report"), {
78
+ agentId: "agent-a",
79
+ jobId: "daily-report",
80
+ runId: "",
81
+ });
82
+ assert.equal(extractCronJobIdFromResult({ details: { jobId: "daily-report" } }), "daily-report");
83
+ assert.equal(extractCronJobIdFromResult({ content: [{ type: "text", text: '{"id":"daily-report"}' }] }), "daily-report");
84
+ });
85
+ it("loads a minimal persisted binding without optional metadata", () => {
86
+ const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
87
+ dirs.push(dir);
88
+ initCronAppKeyBindingStore(join(dir, "state"));
89
+ const path = join(dir, "xg-cwork-im", "cron-appkey-bindings.json");
90
+ mkdirSync(join(dir, "xg-cwork-im"), { recursive: true });
91
+ writeFileSync(path, JSON.stringify({ schemaVersion: 1, bindings: [{ agentId: "agent-a", jobId: "daily-report", appKey: "key-1" }] }));
92
+ assert.equal(getCronAppKeyBinding("agent-a", "daily-report")?.appKey, "key-1");
93
+ });
76
94
  it("injects only the matching agent/job binding and strips unbound values", () => {
77
95
  const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
78
96
  dirs.push(dir);
@@ -86,8 +104,58 @@ describe("cron appKey binding store", () => {
86
104
  });
87
105
  const bound = before?.({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "***", KEEP: "1" } } }, { sessionKey: "agent:agent-a:cron:job-1:run:r" });
88
106
  assert.equal(bound.params.env.XG_OPENAPI_APP_KEY, "key-1");
107
+ const isolated = before?.({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "***" } } }, { sessionKey: "agent:agent-a:cron:job-1" });
108
+ assert.equal(isolated.params.env.XG_OPENAPI_APP_KEY, "key-1");
89
109
  const unbound = before?.({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "***" } } }, { sessionKey: "agent:agent-b:cron:job-1:run:r" });
90
110
  assert.deepEqual(unbound.params.env, {});
91
111
  });
112
+ it("Cron 子 Agent 沿 OpenClaw 父链按 agentId + jobId 恢复绑定", () => {
113
+ const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
114
+ dirs.push(dir);
115
+ initCronAppKeyBindingStore(join(dir, "state"));
116
+ bindCronAppKey({ agentId: "agent-a", jobId: "job-1", appKey: "key-1" });
117
+ let before;
118
+ registerExecEnvHook({
119
+ runtime: {
120
+ config: { current: () => ({ channels: { xg_cwork_im: {} } }) },
121
+ agent: {
122
+ session: {
123
+ resolveStorePath: () => "test-store",
124
+ getSessionEntry: ({ sessionKey }) => sessionKey === "agent:agent-a:child" ? { spawnedBy: "agent:agent-a:cron:job-1:run:old" } : undefined,
125
+ },
126
+ },
127
+ },
128
+ on: (name, handler) => { if (name === "before_tool_call")
129
+ before = handler; },
130
+ });
131
+ const result = before?.({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "ai-wrong" } } }, { sessionKey: "agent:agent-a:child", agentId: "agent-a" });
132
+ assert.equal(result.params.env.XG_OPENAPI_APP_KEY, "key-1");
133
+ });
134
+ it("Cron 绑定缺失时不回退到普通父 Session 的 AppKey", () => {
135
+ const dir = mkdtempSync(join(tmpdir(), "xg-cron-binding-"));
136
+ dirs.push(dir);
137
+ initCronAppKeyBindingStore(join(dir, "state"));
138
+ setSessionEnvEntry("agent:agent-a:root", XG_OPENAPI_APP_KEY, "ordinary-key");
139
+ let before;
140
+ registerExecEnvHook({
141
+ runtime: {
142
+ config: { current: () => ({ channels: { xg_cwork_im: {} } }) },
143
+ agent: { session: {
144
+ resolveStorePath: () => "test-store",
145
+ getSessionEntry: ({ sessionKey }) => {
146
+ if (sessionKey === "agent:agent-a:child")
147
+ return { spawnedBy: "agent:agent-a:cron:job-missing:run:r" };
148
+ if (sessionKey === "agent:agent-a:cron:job-missing:run:r")
149
+ return { spawnedBy: "agent:agent-a:root" };
150
+ return undefined;
151
+ },
152
+ } },
153
+ },
154
+ on: (name, handler) => { if (name === "before_tool_call")
155
+ before = handler; },
156
+ });
157
+ const result = before?.({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "ai-wrong" } } }, { sessionKey: "agent:agent-a:child", agentId: "agent-a" });
158
+ assert.deepEqual(result.params.env, {});
159
+ });
92
160
  });
93
161
  //# sourceMappingURL=cron-appkey-binding-store.test.js.map
@@ -1 +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
+ {"version":3,"file":"cron-appkey-binding-store.test.js","sourceRoot":"","sources":["../../src/cron-appkey-binding-store.test.ts"],"names":[],"mappings":"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"}
@@ -7,6 +7,7 @@ import type { ImStreamClient } from "./connection.js";
7
7
  import type { BotIdentity, WsMessageParams, XgImConfig } from "./types.js";
8
8
  import type { AutoRouteResult } from "./auto-model-router.js";
9
9
  import type { InboundTrigger } from "./inbound-terminal-state.js";
10
+ import type { NasVolume } from "./agent-context-types.js";
10
11
  export interface PendingDispatch {
11
12
  route: {
12
13
  sessionKey: string;
@@ -16,6 +17,8 @@ export interface PendingDispatch {
16
17
  params: WsMessageParams;
17
18
  currentIdentity: BotIdentity;
18
19
  agentWorkspaceDir?: string;
20
+ /** 本会话 NAS 挂载声明;同一 sessionKey 下必须保持不变。 */
21
+ nasVolumes?: NasVolume[];
19
22
  /** 本条消息单轮模型(OpenClaw replyOptions.modelOverride) */
20
23
  modelOverride?: string;
21
24
  /** 本条消息单轮推理等级(OpenClaw replyOptions.thinkingLevelOverride;用户显式 /think 时不设) */
@@ -1 +1 @@
1
- {"version":3,"file":"gateway-session-queue.d.ts","sourceRoot":"","sources":["../../src/gateway-session-queue.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,MAAM,WAAW,eAAe;IAC5B,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,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oDAAoD;IACpD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,8EAA8E;IAC9E,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,gDAAgD;IAChD,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,YAAY;IACZ,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,yCAAyC;IACzC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IAC/C,cAAc,EAAE,MAAM,UAAU,CAAC;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,GAAG,CAAC;IACR,WAAW,EAAE,MAAM,cAAc,CAAC;CACrC,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CA6GhG"}
1
+ {"version":3,"file":"gateway-session-queue.d.ts","sourceRoot":"","sources":["../../src/gateway-session-queue.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D,MAAM,WAAW,eAAe;IAC5B,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,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,0CAA0C;IAC1C,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;IACzB,oDAAoD;IACpD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,8EAA8E;IAC9E,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,gDAAgD;IAChD,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,YAAY;IACZ,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,yCAAyC;IACzC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IAC/C,cAAc,EAAE,MAAM,UAAU,CAAC;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,GAAG,CAAC;IACR,WAAW,EAAE,MAAM,cAAc,CAAC;CACrC,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CA8GhG"}
@@ -57,6 +57,7 @@ export function createRunWithSessionQueue(options) {
57
57
  currentIdentity: pending.currentIdentity,
58
58
  streamClient,
59
59
  agentWorkspaceDir: pending.agentWorkspaceDir,
60
+ nasVolumes: pending.nasVolumes,
60
61
  modelOverride: pending.modelOverride,
61
62
  thinkingLevelOverride: pending.thinkingLevelOverride,
62
63
  autoRouteMeta: pending.autoRouteMeta,
@@ -1 +1 @@
1
- {"version":3,"file":"gateway-session-queue.js","sourceRoot":"","sources":["../../src/gateway-session-queue.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"gateway-session-queue.js","sourceRoot":"","sources":["../../src/gateway-session-queue.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"register-exec-env-hook.d.ts","sourceRoot":"","sources":["../../src/register-exec-env-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAKnF,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AAEzD,MAAM,MAAM,cAAc,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAM/E,+EAA+E;AAC/E,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAKxE;AAwBD,4EAA4E;AAC5E,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAM9E;AAED,oEAAoE;AACpE,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAa9F;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAiDhE;AAED,gFAAgF;AAChF,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAqE1E"}
1
+ {"version":3,"file":"register-exec-env-hook.d.ts","sourceRoot":"","sources":["../../src/register-exec-env-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAUnF,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AAEzD,MAAM,MAAM,cAAc,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAyI/E,+EAA+E;AAC/E,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAKxE;AA0CD,4EAA4E;AAC5E,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAkB9E;AAED,oEAAoE;AACpE,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAkB9F;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAgDhE;AAED,gFAAgF;AAChF,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAqE1E"}
@@ -8,13 +8,116 @@
8
8
  * event.params.env(优先级低于 resolve_exec_env 的 pluginEnv,但本插件
9
9
  * 不注册 resolve_exec_env,因此 params.env 即最终生效值)。不碰 process.env。
10
10
  */
11
+ import { createHash } from "node:crypto";
11
12
  import { getXgImConfig } from "./channel-config.js";
12
- import { getSessionUserContext, isRecord, resolveEnvForSession } from "./session-env-store.js";
13
+ import { getLinkedParentSessionKey, getSessionEnv, getSessionUserContext, isRecord, } from "./session-env-store.js";
13
14
  import { bindCronAppKey as persistCronBinding, getCronAppKeyBinding as readCronBinding } from "./cron-appkey-binding-store.js";
14
15
  export const XG_OPENAPI_BASE_URL = "XG_OPENAPI_BASE_URL";
15
- // OpenClaw job ids are UUID-like, but some released versions emit an
16
- // 11-character final segment. Keep the shape strict while accepting both.
16
+ // UUID matching is retained only as a fallback for unstructured CLI text.
17
+ // Structured result fields accept any non-empty job id.
17
18
  const CRON_JOB_ID_PATTERN = /\b[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{8,16}\b/i;
19
+ const APPKEY_MAX_PARENT_DEPTH = 8;
20
+ function parseAgentIdFromSessionKey(sessionKey) {
21
+ if (!sessionKey?.startsWith("agent:"))
22
+ return undefined;
23
+ const rest = sessionKey.slice("agent:".length);
24
+ const end = rest.indexOf(":");
25
+ return (end > 0 ? rest.slice(0, end) : rest).trim() || undefined;
26
+ }
27
+ function appKeyFingerprint(appKey) {
28
+ if (!appKey)
29
+ return undefined;
30
+ return createHash("sha256").update(appKey).digest("hex").slice(0, 12);
31
+ }
32
+ function validAppKey(value) {
33
+ return typeof value === "string" && value.trim().length > 0 && value.length <= 256 && !/[\0\r\n]/.test(value);
34
+ }
35
+ function parentAgentMatches(parentSessionKey, agentId) {
36
+ if (!agentId)
37
+ return true;
38
+ const parentAgentId = parseAgentIdFromSessionKey(parentSessionKey);
39
+ // An opaque/legacy parent key is not evidence of a cross-agent link.
40
+ // Reject only when both sides are known and explicitly different.
41
+ return !parentAgentId || parentAgentId === agentId;
42
+ }
43
+ /**
44
+ * Resolve the AppKey from the current Session and OpenClaw's persisted parent
45
+ * metadata. The in-memory child link is only a compatibility fallback for
46
+ * older hosts/tests; authentication never depends on subagent_spawned.
47
+ */
48
+ function resolveAppKeyForSession(api, sessionKey, agentIdHint) {
49
+ if (!sessionKey)
50
+ return { source: "none", reason: "SESSION_KEY_MISSING" };
51
+ const agentId = agentIdHint?.trim() || parseAgentIdFromSessionKey(sessionKey);
52
+ const sessionAgentId = parseAgentIdFromSessionKey(sessionKey);
53
+ if (agentIdHint && sessionAgentId && sessionAgentId !== agentIdHint.trim()) {
54
+ return { source: "none", sessionKey, agentId, reason: "SESSION_AGENT_MISMATCH" };
55
+ }
56
+ const getEntry = (key) => {
57
+ try {
58
+ const runtime = api.runtime;
59
+ const sessionApi = runtime.agent?.session;
60
+ if (!sessionApi?.getSessionEntry)
61
+ return undefined;
62
+ const cfg = api.runtime.config.current();
63
+ const storePath = sessionApi.resolveStorePath?.(cfg.session?.store, agentId ? { agentId } : undefined);
64
+ return sessionApi.getSessionEntry({ sessionKey: key, ...(agentId ? { agentId } : {}), ...(storePath ? { storePath } : {}) });
65
+ }
66
+ catch {
67
+ return undefined;
68
+ }
69
+ };
70
+ let currentKey = sessionKey;
71
+ const visited = new Set();
72
+ let sawEntryRead = false;
73
+ let cronLineageSeen = false;
74
+ for (let depth = 0; depth <= APPKEY_MAX_PARENT_DEPTH && currentKey; depth += 1) {
75
+ if (visited.has(currentKey)) {
76
+ return { source: "none", sessionKey, agentId, reason: "PARENT_CHAIN_CYCLE" };
77
+ }
78
+ visited.add(currentKey);
79
+ const cron = parseCronSessionKey(currentKey);
80
+ if (cron) {
81
+ if (!agentId || cron.agentId === agentId) {
82
+ cronLineageSeen = true;
83
+ const binding = readCronBinding(cron.agentId, cron.jobId);
84
+ if (binding?.appKey && validAppKey(binding.appKey)) {
85
+ return {
86
+ appKey: binding.appKey,
87
+ source: "cron",
88
+ sessionKey,
89
+ agentId: cron.agentId,
90
+ jobId: cron.jobId,
91
+ parentSessionKey: depth > 0 ? currentKey : undefined,
92
+ };
93
+ }
94
+ }
95
+ }
96
+ // Once a Cron Session is in the lineage, never fall through to an
97
+ // ordinary IM parent, which could carry a stale user AppKey.
98
+ if (!cronLineageSeen) {
99
+ const ownEnv = getSessionEnv(currentKey);
100
+ const ownAppKey = ownEnv?.XG_OPENAPI_APP_KEY;
101
+ if (validAppKey(ownAppKey)) {
102
+ return { appKey: ownAppKey, source: depth === 0 ? "own" : "parent", sessionKey, agentId, parentSessionKey: depth > 0 ? currentKey : undefined };
103
+ }
104
+ }
105
+ const entry = getEntry(currentKey);
106
+ if (entry)
107
+ sawEntryRead = true;
108
+ const metadataParent = entry?.parentSessionKey || entry?.spawnedBy;
109
+ const fallbackParent = getLinkedParentSessionKey(currentKey);
110
+ const parentKey = metadataParent || fallbackParent;
111
+ if (!parentKey) {
112
+ return { source: "none", sessionKey, agentId, reason: sawEntryRead ? "AUTH_CONTEXT_MISSING" : "SESSION_ENTRY_MISSING" };
113
+ }
114
+ if (!parentAgentMatches(parentKey, agentId)) {
115
+ return { source: "none", sessionKey, agentId, parentSessionKey: parentKey, reason: "PARENT_AGENT_MISMATCH" };
116
+ }
117
+ currentKey = parentKey;
118
+ }
119
+ return { source: "none", sessionKey, agentId, reason: "PARENT_CHAIN_LIMIT" };
120
+ }
18
121
  /** Return true only for the supported CLI/API forms that create a Cron job. */
19
122
  export function isCronCreateCommand(command) {
20
123
  if (!command)
@@ -23,6 +126,27 @@ export function isCronCreateCommand(command) {
23
126
  return /\bopenclaw(?:\.cmd)?\s+cron\s+(?:add|create)\b/.test(normalized) ||
24
127
  /\bopenclaw(?:\.cmd)?\s+gateway\s+call\s+cron\.create\b/.test(normalized);
25
128
  }
129
+ function isUsableCronJobId(value) {
130
+ return typeof value === "string" && value.trim().length > 0 && value.length <= 256 && !/[\0\r\n]/.test(value);
131
+ }
132
+ function collectStructuredCronJobIds(value, out = [], seen = new Set()) {
133
+ if (value == null || seen.has(value) || typeof value !== "object")
134
+ return out;
135
+ seen.add(value);
136
+ if (Array.isArray(value)) {
137
+ for (const item of value)
138
+ collectStructuredCronJobIds(item, out, seen);
139
+ }
140
+ else {
141
+ for (const [key, item] of Object.entries(value)) {
142
+ if ((key === "id" || key === "jobId") && isUsableCronJobId(item))
143
+ out.push(item.trim());
144
+ else
145
+ collectStructuredCronJobIds(item, out, seen);
146
+ }
147
+ }
148
+ return out;
149
+ }
26
150
  function collectText(value, out = [], seen = new Set()) {
27
151
  if (value == null || seen.has(value))
28
152
  return out;
@@ -52,7 +176,21 @@ function collectText(value, out = [], seen = new Set()) {
52
176
  }
53
177
  /** Extract the authoritative UUID printed by `openclaw cron add --json`. */
54
178
  export function extractCronJobIdFromResult(result) {
179
+ // Prefer authoritative structured fields and accept non-UUID ids.
180
+ const structured = collectStructuredCronJobIds(result);
181
+ if (structured.length > 0)
182
+ return structured[0];
55
183
  for (const text of collectText(result)) {
184
+ // CLI adapters commonly wrap JSON in a text field.
185
+ try {
186
+ const parsed = JSON.parse(text);
187
+ const parsedId = collectStructuredCronJobIds(parsed)[0];
188
+ if (parsedId)
189
+ return parsedId;
190
+ }
191
+ catch {
192
+ // Fall through to the UUID-only text fallback below.
193
+ }
56
194
  const match = text.match(CRON_JOB_ID_PATTERN);
57
195
  if (match)
58
196
  return match[0];
@@ -69,9 +207,15 @@ export function parseCronSessionKey(sessionKey) {
69
207
  return undefined;
70
208
  const agentId = sessionKey.slice("agent:".length, markerIndex);
71
209
  const rest = sessionKey.slice(markerIndex + marker.length);
210
+ if (!agentId || !rest)
211
+ return undefined;
72
212
  const runMarker = ":run:";
73
213
  const runIndex = rest.indexOf(runMarker);
74
- if (!agentId || runIndex <= 0 || runIndex + runMarker.length >= rest.length)
214
+ if (runIndex < 0) {
215
+ // Isolated Cron sessions are stable per job and have no run segment.
216
+ return { agentId, jobId: rest, runId: "" };
217
+ }
218
+ if (runIndex <= 0 || runIndex + runMarker.length >= rest.length)
75
219
  return undefined;
76
220
  const jobId = rest.slice(0, runIndex);
77
221
  const runId = rest.slice(runIndex + runMarker.length);
@@ -92,37 +236,34 @@ export function registerExecEnvHook(api) {
92
236
  api.on("before_tool_call", (event, ctx) => {
93
237
  if (event.toolName !== "exec")
94
238
  return;
95
- const cron = parseCronSessionKey(ctx.sessionKey);
96
- const cronBinding = cron ? readCronBinding(cron.agentId, cron.jobId) : undefined;
97
- const env = cron
98
- ? {}
99
- : { ...resolveEnvForSession(ctx.sessionKey) };
100
- if (cronBinding)
101
- env.XG_OPENAPI_APP_KEY = cronBinding.appKey;
239
+ let resolution;
240
+ try {
241
+ resolution = resolveAppKeyForSession(api, ctx.sessionKey, ctx.agentId);
242
+ }
243
+ catch (err) {
244
+ resolution = { source: "none", sessionKey: ctx.sessionKey, agentId: ctx.agentId, reason: `RESOLVE_ERROR:${String(err)}` };
245
+ }
102
246
  const baseUrl = resolveBaseUrl();
103
- if (baseUrl) {
104
- env[XG_OPENAPI_BASE_URL] = baseUrl;
105
- }
106
- const existing = isRecord(event.params.env) ? event.params.env : {};
107
- if (cron && !cronBinding) {
108
- const hadAppKey = Object.prototype.hasOwnProperty.call(existing, "XG_OPENAPI_APP_KEY");
109
- const sanitizedExisting = { ...existing };
110
- delete sanitizedExisting.XG_OPENAPI_APP_KEY;
111
- if (!hadAppKey && Object.keys(sanitizedExisting).length === 0 && !baseUrl)
112
- return;
113
- return {
114
- params: {
115
- ...event.params,
116
- env: { ...sanitizedExisting, ...(baseUrl ? { [XG_OPENAPI_BASE_URL]: baseUrl } : {}) },
117
- },
118
- };
119
- }
120
- if (Object.keys(env).length === 0)
247
+ const existing = isRecord(event.params.env) ? { ...event.params.env } : {};
248
+ const hadAppKey = Object.prototype.hasOwnProperty.call(existing, "XG_OPENAPI_APP_KEY");
249
+ delete existing.XG_OPENAPI_APP_KEY;
250
+ if (resolution.appKey)
251
+ existing.XG_OPENAPI_APP_KEY = resolution.appKey;
252
+ if (baseUrl)
253
+ existing[XG_OPENAPI_BASE_URL] = baseUrl;
254
+ const changed = hadAppKey || Boolean(resolution.appKey) || Boolean(baseUrl);
255
+ const source = resolution.source;
256
+ const fp = appKeyFingerprint(resolution.appKey);
257
+ console.debug(`[xg_cwork_im] [appkey-resolve] event=appkey-resolve sessionKey=${ctx.sessionKey ?? "(none)"} ` +
258
+ `parentSessionKey=${resolution.parentSessionKey ?? "(none)"} source=${source} ` +
259
+ `agentId=${resolution.agentId ?? ctx.agentId ?? "(none)"} jobId=${resolution.jobId ?? "(none)"} ` +
260
+ `bindingFound=${Boolean(resolution.appKey)} appKeyFingerprint=${fp ?? "(none)"} reason=${resolution.reason ?? "(none)"}`);
261
+ if (!changed)
121
262
  return;
122
263
  return {
123
264
  params: {
124
265
  ...event.params,
125
- env: { ...existing, ...env },
266
+ env: existing,
126
267
  },
127
268
  };
128
269
  }, { priority: 0 });
@@ -134,8 +275,8 @@ export function registerCronAppKeyBindingHook(api) {
134
275
  console.warn(`[xg_cwork_im] [cron-binding] missing jobId/sessionKey; binding skipped`);
135
276
  return;
136
277
  }
137
- const sessionEnv = resolveEnvForSession(sessionKey);
138
- const appKey = sessionEnv.XG_OPENAPI_APP_KEY;
278
+ const resolved = resolveAppKeyForSession(api, sessionKey, agentIdHint);
279
+ const appKey = resolved.appKey;
139
280
  if (!appKey) {
140
281
  console.warn(`[xg_cwork_im] [cron-binding] no appKey in creator session; jobId=${jobId}`);
141
282
  return;
@@ -145,7 +286,7 @@ export function registerCronAppKeyBindingHook(api) {
145
286
  console.warn(`[xg_cwork_im] [cron-binding] agent mismatch; sessionAgent=${sessionAgent} agentId=${agentIdHint} jobId=${jobId}`);
146
287
  return;
147
288
  }
148
- const agentId = agentIdHint ?? sessionAgent;
289
+ const agentId = agentIdHint?.trim() || resolved.agentId || sessionAgent;
149
290
  if (!agentId) {
150
291
  console.warn(`[xg_cwork_im] [cron-binding] missing agentId; jobId=${jobId}`);
151
292
  return;