@hjd-hitsz/claudex-web 4.1.2 → 4.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (56) hide show
  1. package/CHANGELOG.md +22 -0
  2. package/build-info.json +4 -4
  3. package/client/dist/_baseMerge.js +1 -1
  4. package/client/dist/app.js +91 -90
  5. package/client/dist/code-highlight-style.js +48 -13
  6. package/client/dist/dagre-NK4GIZVX.js +2 -2
  7. package/client/dist/document-editor.js +101 -136
  8. package/client/dist/file-panel.js +5 -1
  9. package/client/dist/graph.js +1 -1
  10. package/client/dist/index.js +2 -2
  11. package/client/dist/index10.js +1 -1
  12. package/client/dist/index11.js +1 -1
  13. package/client/dist/index12.js +1 -1
  14. package/client/dist/index13.js +2 -2
  15. package/client/dist/index14.js +1 -1
  16. package/client/dist/index15.js +1 -1
  17. package/client/dist/index16.js +2 -2
  18. package/client/dist/index17.js +1 -1
  19. package/client/dist/index18.js +2 -2
  20. package/client/dist/index19.js +1 -1
  21. package/client/dist/index20.js +1 -1
  22. package/client/dist/index21.js +1 -1
  23. package/client/dist/index22.js +1 -1
  24. package/client/dist/index3.js +1 -1
  25. package/client/dist/index4.js +1 -1
  26. package/client/dist/index5.js +1 -1
  27. package/client/dist/index6.js +2 -2
  28. package/client/dist/index7.js +1 -1
  29. package/client/dist/index8.js +1 -1
  30. package/client/dist/index9.js +1 -1
  31. package/client/dist/isArrayLikeObject.js +1 -1
  32. package/client/dist/style.css +1 -1
  33. package/docs/architecture/backend-regressions.md +2 -1
  34. package/docs/architecture/behavior.md +14 -2
  35. package/docs/architecture.md +7 -2
  36. package/docs/cli-command-coverage.md +1 -1
  37. package/docs/deployment.md +4 -2
  38. package/docs/development.md +14 -0
  39. package/docs/images/desktop-dark.png +0 -0
  40. package/docs/images/desktop-light.png +0 -0
  41. package/docs/releases/v4.1.3.md +8 -0
  42. package/package.json +1 -1
  43. package/packages/translation-engine/package.json +1 -1
  44. package/server/src/backends/claude/execution-session.mjs +27 -4
  45. package/server/src/backends/claude/native-provider.mjs +35 -0
  46. package/server/src/backends/claude/provider-environment.mjs +63 -11
  47. package/server/src/backends/claude/provider-transport.mjs +45 -9
  48. package/server/src/backends/claude/runtime.mjs +19 -4
  49. package/server/src/backends/claude/worker-client.mjs +2 -0
  50. package/server/src/backends/codex/adapter.mjs +9 -2
  51. package/server/src/backends/codex/requests.mjs +6 -2
  52. package/server/src/backends/codex/resume-lifecycle.mjs +38 -0
  53. package/server/src/backends/codex/subagent-model.mjs +19 -0
  54. package/server/src/backends/codex/upstream.mjs +9 -0
  55. package/server/src/backends/configuration.mjs +37 -0
  56. package/server/src/backends/manager.mjs +19 -1
@@ -1,4 +1,5 @@
1
1
  import { referenceToolParams } from "./reference-tools.mjs";
2
+ import { subagentModelParams } from "./subagent-model.mjs";
2
3
  import { join } from "node:path";
3
4
  import { codexCapabilities } from "../../../../shared/backend-capabilities.mjs";
4
5
  import { readAgentMessages } from "../../agent-messages.mjs";
@@ -50,8 +51,14 @@ export function createCodexAdapter({
50
51
  },
51
52
  });
52
53
  const nativeCall = transport.call;
54
+ const sessionParams = (method, params) =>
55
+ subagentModelParams(
56
+ method,
57
+ referenceToolParams(method, params, config),
58
+ backend,
59
+ );
53
60
  transport.call = (method, params, options) =>
54
- nativeCall(method, referenceToolParams(method, params, config), options);
61
+ nativeCall(method, sessionParams(method, params), options);
55
62
  const threadNaming = createThreadNaming({
56
63
  call: transport.call,
57
64
  generate: (params) =>
@@ -137,7 +144,7 @@ export function createCodexAdapter({
137
144
  if (providerId) throw new Error("Codex 使用现有账户与模型配置");
138
145
  return receive(client, {
139
146
  ...message,
140
- params: referenceToolParams(message.method, params, config),
147
+ params: sessionParams(message.method, params),
141
148
  });
142
149
  },
143
150
  connect: transport.connect,
@@ -109,8 +109,9 @@ export function createRequestHandler({
109
109
  const timer = processId
110
110
  ? null
111
111
  : setTimeout(() => {
112
- if (threadMethods.has(message.method))
113
- transport.pending.get(id).timedOut = true;
112
+ const request = transport.pending.get(id);
113
+ if (threadMethods.has(message.method) && !request?.waitingForClose)
114
+ request.timedOut = true;
114
115
  else {
115
116
  transport.pending.delete(id);
116
117
  releaseUnusedThreads();
@@ -130,6 +131,9 @@ export function createRequestHandler({
130
131
  processId,
131
132
  method: message.method,
132
133
  threadId,
134
+ ...(message.method === "thread/resume" && {
135
+ resumeParams: message.params,
136
+ }),
133
137
  ...(message.method === "turn/start" && {
134
138
  nameText: (message.params?.input || [])
135
139
  .filter((item) => item.type === "text")
@@ -0,0 +1,38 @@
1
+ // Codex 0.169 的取消订阅响应先于实际关闭,恢复请求可在这段间隔被拒绝。
2
+ // 只在原生明确报告目标线程正在关闭时等待其关闭事件,沿用原请求期限。
3
+ export function createResumeLifecycle({ pending, send }) {
4
+ function resume(id, request) {
5
+ request.waitingForClose = false;
6
+ request.closedSinceResume = false;
7
+ send({ id, method: "thread/resume", params: request.resumeParams });
8
+ }
9
+
10
+ return {
11
+ defer(id, request, error) {
12
+ const threadId = request.resumeParams?.threadId;
13
+ if (
14
+ request.method !== "thread/resume" ||
15
+ !threadId ||
16
+ request.timedOut ||
17
+ request.resumeRetried ||
18
+ error?.code !== -32600 ||
19
+ ![
20
+ `thread ${threadId} is closing; retry thread/resume after the thread is closed`,
21
+ `thread ${threadId} is closing; retry after the thread is closed`,
22
+ ].includes(error.message)
23
+ )
24
+ return false;
25
+ request.resumeRetried = true;
26
+ request.waitingForClose = true;
27
+ if (request.closedSinceResume) resume(id, request);
28
+ return true;
29
+ },
30
+ closed(threadId) {
31
+ for (const [id, request] of pending) {
32
+ if (request.resumeParams?.threadId !== threadId) continue;
33
+ request.closedSinceResume = true;
34
+ if (request.waitingForClose) resume(id, request);
35
+ }
36
+ },
37
+ };
38
+ }
@@ -0,0 +1,19 @@
1
+ export function subagentModelParams(method, params, backend) {
2
+ if (
3
+ (!backend.subagentModel && !backend.subagentEffort) ||
4
+ !["thread/start", "thread/resume", "thread/fork"].includes(method)
5
+ )
6
+ return params;
7
+ return {
8
+ ...params,
9
+ config: {
10
+ ...params.config,
11
+ ...(backend.subagentModel && {
12
+ "agents.default_subagent_model": backend.subagentModel,
13
+ }),
14
+ ...(backend.subagentEffort && {
15
+ "agents.default_subagent_reasoning_effort": backend.subagentEffort,
16
+ }),
17
+ },
18
+ };
19
+ }
@@ -1,5 +1,6 @@
1
1
  import WebSocket from "ws";
2
2
  import { sendRpcText } from "../../rpc-transport.mjs";
3
+ import { createResumeLifecycle } from "./resume-lifecycle.mjs";
3
4
 
4
5
  export function createUpstream({
5
6
  config,
@@ -18,6 +19,10 @@ export function createUpstream({
18
19
  let reconnectTimer;
19
20
  let closed = false;
20
21
  const nextId = () => sequence++;
22
+ const resumption = createResumeLifecycle({
23
+ pending,
24
+ send: (message) => sendRpcText(socket, JSON.stringify(message)),
25
+ });
21
26
 
22
27
  function rejectPending(message) {
23
28
  for (const request of pending.values()) {
@@ -48,6 +53,7 @@ export function createUpstream({
48
53
  reject,
49
54
  timer,
50
55
  method,
56
+ ...(method === "thread/resume" && { resumeParams: params }),
51
57
  ...(trackThread && { threadId: params.threadId }),
52
58
  });
53
59
  sendRpcText(socket, JSON.stringify({ id, method, params }));
@@ -91,10 +97,13 @@ export function createUpstream({
91
97
  }
92
98
  if (message.method) {
93
99
  onEvent(message);
100
+ if (message.method === "thread/closed")
101
+ resumption.closed(message.params.threadId);
94
102
  return;
95
103
  }
96
104
  const request = pending.get(message.id);
97
105
  if (!request) return;
106
+ if (resumption.defer(message.id, request, message.error)) return;
98
107
  clearTimeout(request.timer);
99
108
  pending.delete(message.id);
100
109
  if (request.resolve) {
@@ -5,11 +5,48 @@ import { validateNetworkProxy } from "./network-proxy.mjs";
5
5
  export function validateBackend(input, config) {
6
6
  if (!["codex", "claude"].includes(input.id) || input.id !== input.type)
7
7
  throw new Error("仅支持 Codex 与 Claude Code 两个固定后端");
8
+ if (
9
+ input.subagentModel !== undefined &&
10
+ (typeof input.subagentModel !== "string" ||
11
+ /[\s\x00-\x1f\x7f]/u.test(input.subagentModel.trim()) ||
12
+ input.subagentModel.length > 256)
13
+ )
14
+ throw new Error("子代理模型须为不含空白的模型 ID,留空使用原生默认");
15
+ if (
16
+ input.subagentProviderId !== undefined &&
17
+ (typeof input.subagentProviderId !== "string" ||
18
+ (input.subagentProviderId !== "" &&
19
+ input.subagentProviderId !== "@native" &&
20
+ !/^[a-zA-Z0-9_-]{1,80}$/.test(input.subagentProviderId)))
21
+ )
22
+ throw new Error("子代理供应商标识无效");
23
+ if (input.subagentProviderId && input.type !== "claude")
24
+ throw new Error("子代理跨供应商配置仅用于 Claude Code");
25
+ if (input.subagentProviderId && !input.subagentModel?.trim())
26
+ throw new Error("选择子代理供应商后须指定模型");
27
+ if (
28
+ input.subagentEffort !== undefined &&
29
+ ![
30
+ "",
31
+ "low",
32
+ "medium",
33
+ "high",
34
+ "xhigh",
35
+ "max",
36
+ ...(input.type === "codex" ? ["none", "minimal", "ultra"] : []),
37
+ ].includes(input.subagentEffort)
38
+ )
39
+ throw new Error("子代理思考强度无效");
8
40
  const backend = {
9
41
  id: input.id,
10
42
  name: input.type === "codex" ? "Codex" : "Claude Code",
11
43
  type: input.type,
12
44
  enabled: input.enabled !== false,
45
+ subagentModel: input.subagentModel?.trim() || "",
46
+ subagentEffort: input.subagentEffort || "",
47
+ ...(input.type === "claude" && {
48
+ subagentProviderId: input.subagentProviderId || "",
49
+ }),
13
50
  dataDir: resolve(
14
51
  input.type === "codex" ? config.codexHome : config.claudeHome,
15
52
  ),
@@ -290,7 +290,25 @@ export function createBackendManager({
290
290
  async function saveBackend(params, prepare) {
291
291
  validateBackend(params, config);
292
292
  const old = instances.get(params.id);
293
- if (params.hiddenModels !== undefined && params.enabled === undefined) {
293
+ const next = validateBackend({ ...old?.backend, ...params }, config);
294
+ if (next.subagentProviderId && next.subagentProviderId !== "@native") {
295
+ const provider = await providers.get("claude", next.subagentProviderId);
296
+ if (!provider.models.includes(next.subagentModel))
297
+ throw new Error("子代理模型不在所选供应商的模型列表中");
298
+ if (
299
+ next.subagentEffort &&
300
+ !provider.modelCapabilities?.[
301
+ next.subagentModel
302
+ ]?.supportedEffortLevels?.includes(next.subagentEffort)
303
+ )
304
+ throw new Error("子代理模型不支持所选思考强度");
305
+ }
306
+ if (
307
+ params.hiddenModels !== undefined &&
308
+ Object.keys(params).every((key) =>
309
+ ["id", "type", "hiddenModels"].includes(key),
310
+ )
311
+ ) {
294
312
  if (params.id !== "codex") throw new Error("模型显示配置仅用于 Codex");
295
313
  old.backend = await configuration.save({
296
314
  ...old.backend,