@hjd-hitsz/claudex-web 4.1.5 → 4.2.0
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/.env.example +2 -0
- package/CHANGELOG.md +31 -0
- package/README.md +13 -1
- package/bin/auth.mjs +86 -0
- package/bin/claudex-web.mjs +20 -0
- package/bin/p2p.mjs +134 -0
- package/build-info.json +4 -4
- package/client/dist/app.js +104 -104
- package/client/dist/code-highlight-style.js +1 -1
- package/client/dist/document-editor.js +54 -54
- package/client/dist/file-panel.js +5 -5
- package/client/dist/notification-worker.js +2 -1
- package/client/dist/p2p-sw.js +162 -0
- package/client/dist/style.css +1 -1
- package/client/dist/terminal-panel.js +11 -11
- package/docs/architecture/backends.md +8 -1
- package/docs/architecture/behavior.md +159 -53
- package/docs/architecture.md +36 -339
- package/docs/background-tasks.md +30 -26
- package/docs/deployment.md +47 -6
- package/docs/development.md +107 -151
- package/docs/images/desktop-dark.png +0 -0
- package/docs/images/desktop-light.png +0 -0
- package/docs/images/mobile-sidebar.png +0 -0
- package/docs/images/mobile.png +0 -0
- package/docs/releases/v4.2.0.md +13 -0
- package/docs/versioning.md +13 -3
- package/package.json +9 -2
- package/packages/background-terminal/LICENSE +674 -0
- package/packages/background-terminal/README.md +17 -0
- package/packages/background-terminal/background-jobs.mjs +457 -0
- package/packages/background-terminal/background-mcp.mjs +79 -0
- package/packages/background-terminal/background-protocol.mjs +80 -0
- package/packages/background-terminal/cli.mjs +14 -0
- package/packages/background-terminal/client.mjs +61 -0
- package/packages/background-terminal/codex.mjs +88 -0
- package/packages/background-terminal/delivery.mjs +192 -0
- package/packages/background-terminal/log.mjs +25 -0
- package/packages/background-terminal/native-watches.mjs +160 -0
- package/packages/background-terminal/package.json +15 -0
- package/packages/background-terminal/service.mjs +126 -0
- package/packages/translation-engine/package.json +1 -1
- package/server/src/application.mjs +82 -10
- package/server/src/auth-http.mjs +187 -0
- package/server/src/auth-login.mjs +144 -0
- package/server/src/auth-totp.mjs +233 -0
- package/server/src/auth.mjs +169 -220
- package/server/src/backends/claude/background-tasks.mjs +88 -35
- package/server/src/backends/claude/messages.mjs +1 -1
- package/server/src/backends/claude/worker-client.mjs +47 -35
- package/server/src/backends/claude/worker-lines.mjs +17 -0
- package/server/src/backends/claude/worker-server.mjs +49 -69
- package/server/src/backends/codex/adapter.mjs +46 -5
- package/server/src/backends/codex/background-service.mjs +85 -0
- package/server/src/backends/codex/background-task-views.mjs +87 -0
- package/server/src/backends/codex/background-terminals.mjs +91 -0
- package/server/src/backends/codex/events.mjs +11 -0
- package/server/src/backends/codex/methods.mjs +1 -0
- package/server/src/backends/codex/native-background-handoff.mjs +72 -0
- package/server/src/backends/codex/requests.mjs +51 -38
- package/server/src/backends/codex/subscriptions.mjs +34 -4
- package/server/src/backends/configuration.mjs +8 -0
- package/server/src/backends/manager.mjs +34 -32
- package/server/src/backends/storage.mjs +3 -14
- package/server/src/config.mjs +13 -0
- package/server/src/http/business.mjs +21 -0
- package/server/src/http/router.mjs +12 -25
- package/server/src/p2p/http.mjs +136 -0
- package/server/src/p2p/peers.mjs +132 -0
- package/server/src/p2p/service.mjs +229 -0
- package/server/src/p2p/storage.mjs +45 -0
- package/server/src/p2p/tunnel.mjs +95 -0
- package/server/src/p2p-http.mjs +149 -0
- package/server/src/p2p-peer.mjs +135 -0
- package/server/src/private-file.mjs +14 -0
- package/server/src/summary-translation.mjs +1 -1
- package/server/src/thread-folders.mjs +3 -13
- package/server/src/translation-service.mjs +3 -8
- package/shared/codex-preferences.mjs +9 -0
- package/shared/p2p-wire.mjs +157 -0
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import {
|
|
2
|
+
mcpConfig,
|
|
3
|
+
taskRequest,
|
|
4
|
+
} from "../../../../packages/background-terminal/client.mjs";
|
|
5
|
+
import { threadMethods } from "./methods.mjs";
|
|
6
|
+
|
|
7
|
+
const prefix = "claudex-background:";
|
|
8
|
+
export const terminalMethods = new Set([
|
|
9
|
+
"thread/backgroundTerminals/list",
|
|
10
|
+
"thread/backgroundTerminals/clean",
|
|
11
|
+
]);
|
|
12
|
+
|
|
13
|
+
export function backgroundParams(method, params, directory, upstream) {
|
|
14
|
+
if (!directory || !threadMethods.has(method)) return params;
|
|
15
|
+
return {
|
|
16
|
+
...params,
|
|
17
|
+
config: { ...params.config, ...mcpConfig(directory, upstream) },
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export function backgroundTerminals(
|
|
22
|
+
directory,
|
|
23
|
+
upstream,
|
|
24
|
+
nativeCall,
|
|
25
|
+
request = taskRequest,
|
|
26
|
+
enabled = () => true,
|
|
27
|
+
) {
|
|
28
|
+
return async (method, params) => {
|
|
29
|
+
const tool = (name, args = {}) =>
|
|
30
|
+
request(directory, "tool", {
|
|
31
|
+
name,
|
|
32
|
+
args,
|
|
33
|
+
threadId: params.threadId,
|
|
34
|
+
expectedUpstream: new URL(upstream).href,
|
|
35
|
+
});
|
|
36
|
+
const running = async () => {
|
|
37
|
+
try {
|
|
38
|
+
return (await tool("background_list")).jobs.filter(
|
|
39
|
+
(job) => job.status === "running",
|
|
40
|
+
);
|
|
41
|
+
} catch (error) {
|
|
42
|
+
if (!enabled() && ["ENOENT", "ECONNREFUSED"].includes(error.code))
|
|
43
|
+
return [];
|
|
44
|
+
throw error;
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
if (method.endsWith("/clean")) {
|
|
48
|
+
const cancel = async () => {
|
|
49
|
+
const results = await Promise.allSettled(
|
|
50
|
+
(await running()).map((job) =>
|
|
51
|
+
tool("background_cancel", { job_id: job.id }),
|
|
52
|
+
),
|
|
53
|
+
);
|
|
54
|
+
for (const result of results)
|
|
55
|
+
if (result.status === "rejected") throw result.reason;
|
|
56
|
+
};
|
|
57
|
+
// Mark tracked tasks as cancelled before Codex emits their terminal events.
|
|
58
|
+
const [extension] = await Promise.allSettled([cancel()]);
|
|
59
|
+
const [native] = await Promise.allSettled([nativeCall(method, params)]);
|
|
60
|
+
if (native.status === "rejected") throw native.reason;
|
|
61
|
+
if (extension.status === "rejected") throw extension.reason;
|
|
62
|
+
return native.value;
|
|
63
|
+
}
|
|
64
|
+
// Native pages retain their own cursors. Extension pages use UUID order and
|
|
65
|
+
// a value cursor so stopping a job between pages cannot skip its neighbour.
|
|
66
|
+
const extensionPage = params.cursor?.startsWith(prefix);
|
|
67
|
+
const native = extensionPage
|
|
68
|
+
? { data: [], nextCursor: null }
|
|
69
|
+
: await nativeCall(method, params);
|
|
70
|
+
if (native.nextCursor) return native;
|
|
71
|
+
const cursor = extensionPage ? params.cursor.slice(prefix.length) : "";
|
|
72
|
+
const jobs = (await running())
|
|
73
|
+
.filter((job) => !job.native && job.id > cursor)
|
|
74
|
+
.sort((a, b) => a.id.localeCompare(b.id));
|
|
75
|
+
const room = Math.max(0, (params.limit || 100) - native.data.length);
|
|
76
|
+
const selected = jobs.slice(0, room);
|
|
77
|
+
return {
|
|
78
|
+
data: [
|
|
79
|
+
...native.data,
|
|
80
|
+
...selected.map((job) => ({
|
|
81
|
+
itemId: job.id,
|
|
82
|
+
processId: job.id,
|
|
83
|
+
command: job.command,
|
|
84
|
+
cwd: job.cwd,
|
|
85
|
+
})),
|
|
86
|
+
],
|
|
87
|
+
nextCursor:
|
|
88
|
+
jobs.length > room ? prefix + (selected.at(-1)?.id ?? cursor) : null,
|
|
89
|
+
};
|
|
90
|
+
};
|
|
91
|
+
}
|
|
@@ -7,6 +7,7 @@ export function createBridgeEvents({
|
|
|
7
7
|
terminals,
|
|
8
8
|
subscriptions,
|
|
9
9
|
unwrittenThreads,
|
|
10
|
+
updateGoal,
|
|
10
11
|
compactions,
|
|
11
12
|
threadNaming,
|
|
12
13
|
send,
|
|
@@ -40,6 +41,9 @@ export function createBridgeEvents({
|
|
|
40
41
|
if (p.status.type === "active") activeThreads.add(p.threadId);
|
|
41
42
|
else activeThreads.delete(p.threadId);
|
|
42
43
|
}
|
|
44
|
+
if (message.method === "thread/goal/updated")
|
|
45
|
+
updateGoal(p.threadId, p.goal);
|
|
46
|
+
if (message.method === "thread/goal/cleared") updateGoal(p.threadId, null);
|
|
43
47
|
if (
|
|
44
48
|
["thread/closed", "thread/deleted", "thread/archived"].includes(
|
|
45
49
|
message.method,
|
|
@@ -47,6 +51,7 @@ export function createBridgeEvents({
|
|
|
47
51
|
) {
|
|
48
52
|
subscriptions.delete(p.threadId);
|
|
49
53
|
unwrittenThreads.delete(p.threadId);
|
|
54
|
+
updateGoal(p.threadId, null);
|
|
50
55
|
activeThreads.delete(p.threadId);
|
|
51
56
|
activeTurns.delete(p.threadId);
|
|
52
57
|
if (message.method !== "thread/closed")
|
|
@@ -73,6 +78,12 @@ export function createBridgeEvents({
|
|
|
73
78
|
return;
|
|
74
79
|
}
|
|
75
80
|
function onResponse(request, message) {
|
|
81
|
+
if (!message.error && request.threadId) {
|
|
82
|
+
if (request.method === "thread/goal/set" && message.result?.goal)
|
|
83
|
+
updateGoal(request.threadId, message.result.goal);
|
|
84
|
+
if (request.method === "thread/goal/clear")
|
|
85
|
+
updateGoal(request.threadId, null);
|
|
86
|
+
}
|
|
76
87
|
if (message.error && request.method === "thread/compact/start")
|
|
77
88
|
compactions.reject(request.threadId, message.id, message.error.message);
|
|
78
89
|
if (
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { taskRequest } from "../../../../packages/background-terminal/client.mjs";
|
|
2
|
+
|
|
3
|
+
export function createNativeBackgroundHandoff({
|
|
4
|
+
background,
|
|
5
|
+
enabled,
|
|
6
|
+
upstream,
|
|
7
|
+
onSettled,
|
|
8
|
+
}) {
|
|
9
|
+
const turns = new Map();
|
|
10
|
+
const pending = new Map();
|
|
11
|
+
const expectedUpstream = new URL(upstream).href;
|
|
12
|
+
|
|
13
|
+
function event({ method, params }) {
|
|
14
|
+
const { threadId, turnId, item, turn } = params ?? {};
|
|
15
|
+
if (method === "item/started" && enabled()) {
|
|
16
|
+
if (
|
|
17
|
+
item?.type !== "commandExecution" ||
|
|
18
|
+
item.source !== "unifiedExecStartup" ||
|
|
19
|
+
!item.processId
|
|
20
|
+
)
|
|
21
|
+
return;
|
|
22
|
+
if (!turns.has(turnId)) turns.set(turnId, { threadId, items: new Map() });
|
|
23
|
+
turns.get(turnId).items.set(item.id, {
|
|
24
|
+
id: item.id,
|
|
25
|
+
processId: item.processId,
|
|
26
|
+
command: item.command,
|
|
27
|
+
cwd: item.cwd,
|
|
28
|
+
startedAtMs: item.startedAtMs ?? params.startedAtMs,
|
|
29
|
+
});
|
|
30
|
+
} else if (method === "item/completed") {
|
|
31
|
+
turns.get(turnId)?.items.delete(item?.id);
|
|
32
|
+
} else if (method === "turn/completed") {
|
|
33
|
+
const record = turns.get(turn.id);
|
|
34
|
+
turns.delete(turn.id);
|
|
35
|
+
if (!record?.items.size || turn.status !== "completed" || !enabled())
|
|
36
|
+
return;
|
|
37
|
+
if (!pending.has(threadId)) pending.set(threadId, new Set());
|
|
38
|
+
const requests = pending.get(threadId);
|
|
39
|
+
const work = background
|
|
40
|
+
.ensure()
|
|
41
|
+
.then((directory) =>
|
|
42
|
+
taskRequest(directory, "watchNative", {
|
|
43
|
+
threadId,
|
|
44
|
+
turnId: turn.id,
|
|
45
|
+
items: [...record.items.values()],
|
|
46
|
+
expectedUpstream,
|
|
47
|
+
}),
|
|
48
|
+
)
|
|
49
|
+
.catch((error) =>
|
|
50
|
+
console.error("订阅 Codex 原生后台终端", threadId, error.message),
|
|
51
|
+
)
|
|
52
|
+
.finally(() => {
|
|
53
|
+
requests.delete(work);
|
|
54
|
+
if (!requests.size) pending.delete(threadId);
|
|
55
|
+
onSettled();
|
|
56
|
+
});
|
|
57
|
+
requests.add(work);
|
|
58
|
+
} else if (
|
|
59
|
+
["thread/closed", "thread/archived", "thread/deleted"].includes(method)
|
|
60
|
+
) {
|
|
61
|
+
for (const [id, record] of turns)
|
|
62
|
+
if (record.threadId === threadId) turns.delete(id);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
return {
|
|
67
|
+
event,
|
|
68
|
+
pending: (threadId) => pending.has(threadId),
|
|
69
|
+
wait: (threadId) => Promise.all(pending.get(threadId) ?? []),
|
|
70
|
+
disconnected: () => turns.clear(),
|
|
71
|
+
};
|
|
72
|
+
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { terminalMethods } from "./background-terminals.mjs";
|
|
1
2
|
import { MAX_RPC_MESSAGE_BYTES } from "../../rpc-transport.mjs";
|
|
2
3
|
import { threadMethods, loadedThreadMethods } from "./methods.mjs";
|
|
3
4
|
import { assertConversationOperation } from "../../bridge/conversation-policy.mjs";
|
|
@@ -13,12 +14,19 @@ export function createRequestHandler({
|
|
|
13
14
|
subscriptions,
|
|
14
15
|
releasing,
|
|
15
16
|
resumeForWrite,
|
|
17
|
+
retainThread,
|
|
16
18
|
releaseUnusedThreads,
|
|
19
|
+
backgroundCall,
|
|
20
|
+
waitForBackgroundHandoff,
|
|
21
|
+
includeBackground,
|
|
17
22
|
offline,
|
|
18
23
|
online,
|
|
19
24
|
send,
|
|
20
25
|
broadcast,
|
|
21
26
|
}) {
|
|
27
|
+
function sendError(client, request, message, code = -32000) {
|
|
28
|
+
send(client, { id: request.id, error: { code, message } });
|
|
29
|
+
}
|
|
22
30
|
async function dispatchLocal(handlers, client, message) {
|
|
23
31
|
const handle = handlers.get(message.method);
|
|
24
32
|
if (!handle) return false;
|
|
@@ -28,10 +36,7 @@ export function createRequestHandler({
|
|
|
28
36
|
result: await handle(message.params || {}),
|
|
29
37
|
});
|
|
30
38
|
} catch (error) {
|
|
31
|
-
|
|
32
|
-
id: message.id,
|
|
33
|
-
error: { code: -32000, message: error.message },
|
|
34
|
-
});
|
|
39
|
+
sendError(client, message, error.message);
|
|
35
40
|
}
|
|
36
41
|
return true;
|
|
37
42
|
}
|
|
@@ -39,13 +44,8 @@ export function createRequestHandler({
|
|
|
39
44
|
if (await dispatchLocal(offline, client, message)) return;
|
|
40
45
|
const threadId = message.params?.threadId;
|
|
41
46
|
if (threadId && releasing.has(threadId)) await releasing.get(threadId);
|
|
42
|
-
if (!transport.ready)
|
|
43
|
-
|
|
44
|
-
id: message.id,
|
|
45
|
-
error: { code: -32000, message: "正在连接 Codex,请稍后重试。" },
|
|
46
|
-
});
|
|
47
|
-
return;
|
|
48
|
-
}
|
|
47
|
+
if (!transport.ready)
|
|
48
|
+
return sendError(client, message, "正在连接 Codex,请稍后重试。");
|
|
49
49
|
if (await dispatchLocal(online, client, message)) return;
|
|
50
50
|
if (message.method) {
|
|
51
51
|
try {
|
|
@@ -60,11 +60,7 @@ export function createRequestHandler({
|
|
|
60
60
|
),
|
|
61
61
|
});
|
|
62
62
|
} catch (error) {
|
|
63
|
-
|
|
64
|
-
id: message.id,
|
|
65
|
-
error: { code: -32000, message: error.message },
|
|
66
|
-
});
|
|
67
|
-
return;
|
|
63
|
+
return sendError(client, message, error.message);
|
|
68
64
|
}
|
|
69
65
|
|
|
70
66
|
if (
|
|
@@ -88,18 +84,35 @@ export function createRequestHandler({
|
|
|
88
84
|
...message.params,
|
|
89
85
|
config: { ...message.params?.config, thread_unload_delay_secs: 0 },
|
|
90
86
|
};
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
87
|
+
if (
|
|
88
|
+
backgroundCall &&
|
|
89
|
+
terminalMethods.has(message.method) &&
|
|
90
|
+
includeBackground()
|
|
91
|
+
) {
|
|
92
|
+
const release = retainThread(threadId);
|
|
93
|
+
try {
|
|
94
|
+
await resumeForWrite(threadId);
|
|
95
|
+
await waitForBackgroundHandoff(threadId);
|
|
96
|
+
send(client, {
|
|
97
|
+
id: message.id,
|
|
98
|
+
result: await backgroundCall(message.method, message.params),
|
|
99
|
+
});
|
|
100
|
+
} catch (error) {
|
|
101
|
+
sendError(client, message, error.message);
|
|
102
|
+
} finally {
|
|
103
|
+
release();
|
|
104
|
+
}
|
|
101
105
|
return;
|
|
102
106
|
}
|
|
107
|
+
const id = transport.nextId();
|
|
108
|
+
const forwarded = JSON.stringify({ ...message, id });
|
|
109
|
+
if (Buffer.byteLength(forwarded) > MAX_RPC_MESSAGE_BYTES)
|
|
110
|
+
return sendError(
|
|
111
|
+
client,
|
|
112
|
+
message,
|
|
113
|
+
"单次消息过大(最多 64 MiB),请减少附件后重试。",
|
|
114
|
+
-32600,
|
|
115
|
+
);
|
|
103
116
|
const processId =
|
|
104
117
|
message.method === "command/exec" && message.params?.processId;
|
|
105
118
|
if (processId) {
|
|
@@ -116,13 +129,11 @@ export function createRequestHandler({
|
|
|
116
129
|
transport.pending.delete(id);
|
|
117
130
|
releaseUnusedThreads();
|
|
118
131
|
}
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
},
|
|
125
|
-
});
|
|
132
|
+
sendError(
|
|
133
|
+
client,
|
|
134
|
+
message,
|
|
135
|
+
"请求等待超时;任务可能仍在继续,请刷新会话查看。",
|
|
136
|
+
);
|
|
126
137
|
}, 120000);
|
|
127
138
|
transport.pending.set(id, {
|
|
128
139
|
client,
|
|
@@ -146,16 +157,18 @@ export function createRequestHandler({
|
|
|
146
157
|
compactions.start(threadId, id);
|
|
147
158
|
if (threadId && loadedThreadMethods.has(message.method)) {
|
|
148
159
|
try {
|
|
149
|
-
await resumeForWrite(
|
|
160
|
+
await resumeForWrite(
|
|
161
|
+
threadId,
|
|
162
|
+
message.method === "mcpServerStatus/list"
|
|
163
|
+
? { inheritPermissions: true }
|
|
164
|
+
: { cwd: message.params?.cwd },
|
|
165
|
+
);
|
|
150
166
|
} catch (error) {
|
|
151
167
|
if (message.method === "thread/compact/start")
|
|
152
168
|
compactions.reject(threadId, id, error.message);
|
|
153
169
|
clearTimeout(timer);
|
|
154
170
|
if (transport.pending.delete(id))
|
|
155
|
-
|
|
156
|
-
id: message.id,
|
|
157
|
-
error: { code: -32000, message: error.message },
|
|
158
|
-
});
|
|
171
|
+
sendError(client, message, error.message);
|
|
159
172
|
releaseUnusedThreads();
|
|
160
173
|
return;
|
|
161
174
|
}
|
|
@@ -3,12 +3,22 @@ export function createSubscriptions({
|
|
|
3
3
|
compactions,
|
|
4
4
|
activeTurns,
|
|
5
5
|
activeThreads,
|
|
6
|
+
backgroundHandoffPending = () => false,
|
|
6
7
|
}) {
|
|
7
8
|
const subscriptions = new Map(),
|
|
8
9
|
releasing = new Map(),
|
|
9
|
-
resuming = new Map()
|
|
10
|
+
resuming = new Map(),
|
|
11
|
+
retained = new Map();
|
|
10
12
|
const unwrittenThreads = new Set();
|
|
11
|
-
|
|
13
|
+
const activeGoals = new Set();
|
|
14
|
+
function updateGoal(threadId, goal) {
|
|
15
|
+
if (goal?.status === "active") activeGoals.add(threadId);
|
|
16
|
+
else activeGoals.delete(threadId);
|
|
17
|
+
}
|
|
18
|
+
async function resumeForWrite(
|
|
19
|
+
threadId,
|
|
20
|
+
{ cwd, inheritPermissions = false } = {},
|
|
21
|
+
) {
|
|
12
22
|
if (subscriptions.has(threadId)) return;
|
|
13
23
|
if (!resuming.has(threadId)) {
|
|
14
24
|
const resume = transport
|
|
@@ -16,8 +26,10 @@ export function createSubscriptions({
|
|
|
16
26
|
threadId,
|
|
17
27
|
...(cwd && { cwd }),
|
|
18
28
|
excludeTurns: true,
|
|
19
|
-
|
|
20
|
-
|
|
29
|
+
...(!inheritPermissions && {
|
|
30
|
+
approvalPolicy: "never",
|
|
31
|
+
sandbox: "danger-full-access",
|
|
32
|
+
}),
|
|
21
33
|
config: { thread_unload_delay_secs: 0 },
|
|
22
34
|
})
|
|
23
35
|
.then(({ thread }) => {
|
|
@@ -35,9 +47,12 @@ export function createSubscriptions({
|
|
|
35
47
|
if (
|
|
36
48
|
!transport.ready ||
|
|
37
49
|
compactions.busy(threadId) ||
|
|
50
|
+
activeGoals.has(threadId) ||
|
|
38
51
|
(unwrittenThreads.has(threadId) && owners.size) ||
|
|
39
52
|
activeTurns.has(threadId) ||
|
|
40
53
|
activeThreads.has(threadId) ||
|
|
54
|
+
backgroundHandoffPending(threadId) ||
|
|
55
|
+
retained.has(threadId) ||
|
|
41
56
|
resuming.has(threadId) ||
|
|
42
57
|
releasing.has(threadId) ||
|
|
43
58
|
[...transport.pending.values()].some(
|
|
@@ -75,8 +90,21 @@ export function createSubscriptions({
|
|
|
75
90
|
releasing,
|
|
76
91
|
resuming,
|
|
77
92
|
unwrittenThreads,
|
|
93
|
+
updateGoal,
|
|
78
94
|
resumeForWrite,
|
|
79
95
|
releaseUnusedThreads,
|
|
96
|
+
retainThread(threadId) {
|
|
97
|
+
if (!retained.has(threadId)) retained.set(threadId, new Set());
|
|
98
|
+
const leases = retained.get(threadId);
|
|
99
|
+
const lease = Symbol();
|
|
100
|
+
leases.add(lease);
|
|
101
|
+
return () => {
|
|
102
|
+
leases.delete(lease);
|
|
103
|
+
if (!leases.size && retained.get(threadId) === leases)
|
|
104
|
+
retained.delete(threadId);
|
|
105
|
+
releaseUnusedThreads();
|
|
106
|
+
};
|
|
107
|
+
},
|
|
80
108
|
releaseClient(client) {
|
|
81
109
|
for (const owners of subscriptions.values()) owners.delete(client);
|
|
82
110
|
releaseUnusedThreads();
|
|
@@ -85,7 +113,9 @@ export function createSubscriptions({
|
|
|
85
113
|
subscriptions.clear();
|
|
86
114
|
releasing.clear();
|
|
87
115
|
resuming.clear();
|
|
116
|
+
retained.clear();
|
|
88
117
|
unwrittenThreads.clear();
|
|
118
|
+
activeGoals.clear();
|
|
89
119
|
},
|
|
90
120
|
};
|
|
91
121
|
}
|
|
@@ -38,6 +38,12 @@ export function validateBackend(input, config) {
|
|
|
38
38
|
].includes(input.subagentEffort)
|
|
39
39
|
)
|
|
40
40
|
throw new Error("子代理思考强度无效");
|
|
41
|
+
if (
|
|
42
|
+
input.backgroundTerminalEnabled !== undefined &&
|
|
43
|
+
(input.type !== "codex" ||
|
|
44
|
+
typeof input.backgroundTerminalEnabled !== "boolean")
|
|
45
|
+
)
|
|
46
|
+
throw new Error("后台终端 MCP 开关仅接受 Codex 的布尔设置");
|
|
41
47
|
const backend = {
|
|
42
48
|
id: input.id,
|
|
43
49
|
name: input.type === "codex" ? "Codex" : "Claude Code",
|
|
@@ -70,6 +76,8 @@ export function validateBackend(input, config) {
|
|
|
70
76
|
)
|
|
71
77
|
throw new Error("跨主机后端必须使用 WSS");
|
|
72
78
|
backend.url = url.href;
|
|
79
|
+
backend.backgroundTerminalEnabled =
|
|
80
|
+
input.backgroundTerminalEnabled ?? Boolean(config.backgroundTaskDir);
|
|
73
81
|
if (
|
|
74
82
|
input.hiddenModels !== undefined &&
|
|
75
83
|
(!Array.isArray(input.hiddenModels) ||
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { createBackgroundService } from "./codex/background-service.mjs";
|
|
1
2
|
import { createThreadFolders } from "../thread-folders.mjs";
|
|
2
3
|
import { createTokenUsageStore } from "../token-usage.mjs";
|
|
3
4
|
import { createTokenUsageReconciliation } from "../token-usage-reconciliation.mjs";
|
|
@@ -5,6 +6,7 @@ import { createCliInstallation } from "./cli-installation.mjs";
|
|
|
5
6
|
import { join } from "node:path";
|
|
6
7
|
import { readProjectlessDirectories } from "../thread-projects.mjs";
|
|
7
8
|
import { createWorkspace } from "../workspace/service.mjs";
|
|
9
|
+
import { isCodexPreference } from "../../../shared/codex-preferences.mjs";
|
|
8
10
|
import { hasBackendWork } from "../../../shared/backend-activity.mjs";
|
|
9
11
|
import {
|
|
10
12
|
resourceTarget,
|
|
@@ -37,6 +39,7 @@ export function createBackendManager({
|
|
|
37
39
|
const tokenUsage = createTokenUsageStore(config.configDir);
|
|
38
40
|
const workspace = createWorkspace({ broadcast, configDir: config.configDir });
|
|
39
41
|
const configuration = createBackendConfiguration(config);
|
|
42
|
+
const background = createBackgroundService(config);
|
|
40
43
|
const providers = createProviders(configuration);
|
|
41
44
|
const instances = new Map();
|
|
42
45
|
const installationJobs = new Map();
|
|
@@ -60,6 +63,9 @@ export function createBackendManager({
|
|
|
60
63
|
const publicBackends = () =>
|
|
61
64
|
[...instances.values()].map(({ backend, adapter, error }) => ({
|
|
62
65
|
...backend,
|
|
66
|
+
...(backend.type === "codex" && {
|
|
67
|
+
backgroundTerminalAvailable: background.available,
|
|
68
|
+
}),
|
|
63
69
|
installation: {
|
|
64
70
|
...cli.state(backend.id),
|
|
65
71
|
installing: installationJobs.has(backend.id),
|
|
@@ -122,6 +128,9 @@ export function createBackendManager({
|
|
|
122
128
|
entry.adapter = factory({
|
|
123
129
|
backend,
|
|
124
130
|
config,
|
|
131
|
+
background,
|
|
132
|
+
backgroundEnabled: () =>
|
|
133
|
+
entry.backend.backgroundTerminalEnabled && background.available,
|
|
125
134
|
version,
|
|
126
135
|
providers,
|
|
127
136
|
readSubagentSettings: () =>
|
|
@@ -169,6 +178,15 @@ export function createBackendManager({
|
|
|
169
178
|
throw new Error(entry?.error || "后端未启用,请在设置中检查配置。");
|
|
170
179
|
return entry;
|
|
171
180
|
}
|
|
181
|
+
function projectResult(entry, result, method, usageRevision, forkUsage) {
|
|
182
|
+
return tokenUsage.result(
|
|
183
|
+
folders.result(mapResult(result, entry.backend.id, method), method),
|
|
184
|
+
method,
|
|
185
|
+
usageRevision,
|
|
186
|
+
forkUsage,
|
|
187
|
+
entry.adapter.readTokenUsage,
|
|
188
|
+
);
|
|
189
|
+
}
|
|
172
190
|
function proxy(entry, client) {
|
|
173
191
|
if (!entry.proxies.has(client)) {
|
|
174
192
|
const methods = new Map();
|
|
@@ -190,15 +208,12 @@ export function createBackendManager({
|
|
|
190
208
|
send(client, {
|
|
191
209
|
...message,
|
|
192
210
|
...(message.result && {
|
|
193
|
-
result: await
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
method,
|
|
197
|
-
),
|
|
211
|
+
result: await projectResult(
|
|
212
|
+
entry,
|
|
213
|
+
message.result,
|
|
198
214
|
method,
|
|
199
215
|
usageRevision,
|
|
200
216
|
forkUsage,
|
|
201
|
-
entry.adapter.readTokenUsage,
|
|
202
217
|
),
|
|
203
218
|
}),
|
|
204
219
|
});
|
|
@@ -233,15 +248,11 @@ export function createBackendManager({
|
|
|
233
248
|
if (message.error) reject(new Error(message.error.message));
|
|
234
249
|
else
|
|
235
250
|
resolve(
|
|
236
|
-
await
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
method,
|
|
240
|
-
),
|
|
251
|
+
await projectResult(
|
|
252
|
+
entry,
|
|
253
|
+
message.result,
|
|
241
254
|
method,
|
|
242
255
|
usageRevision,
|
|
243
|
-
undefined,
|
|
244
|
-
entry.adapter.readTokenUsage,
|
|
245
256
|
),
|
|
246
257
|
);
|
|
247
258
|
} catch (error) {
|
|
@@ -297,20 +308,13 @@ export function createBackendManager({
|
|
|
297
308
|
const next = validateBackend({ ...old?.backend, ...params }, config);
|
|
298
309
|
await validateSubagentSettings(next, providers);
|
|
299
310
|
if (
|
|
300
|
-
params.
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
)
|
|
304
|
-
)
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
...old.backend,
|
|
308
|
-
hiddenModels: params.hiddenModels,
|
|
309
|
-
});
|
|
310
|
-
emitState();
|
|
311
|
-
return { backends: publicBackends() };
|
|
312
|
-
}
|
|
313
|
-
if (!prepare && isSubagentSettings(params)) {
|
|
311
|
+
params.backgroundTerminalEnabled === true &&
|
|
312
|
+
!old?.backend.backgroundTerminalEnabled
|
|
313
|
+
)
|
|
314
|
+
await background.ensure();
|
|
315
|
+
if (params.hiddenModels !== undefined && params.id !== "codex")
|
|
316
|
+
throw new Error("模型显示配置仅用于 Codex");
|
|
317
|
+
if (!prepare && (isCodexPreference(params) || isSubagentSettings(params))) {
|
|
314
318
|
old.backend = await configuration.save(params);
|
|
315
319
|
emitState();
|
|
316
320
|
return { backends: publicBackends() };
|
|
@@ -370,10 +374,10 @@ export function createBackendManager({
|
|
|
370
374
|
instances.get("codex")?.backend.dataDir || config.codexHome,
|
|
371
375
|
),
|
|
372
376
|
});
|
|
373
|
-
if (method === "lan/backends/versions")
|
|
374
|
-
|
|
377
|
+
if (method === "lan/backends/versions" && !instances.has(params.id))
|
|
378
|
+
throw new Error("未知后端");
|
|
379
|
+
if (["lan/backends/list", "lan/backends/versions"].includes(method))
|
|
375
380
|
return reply({ backends: publicBackends() });
|
|
376
|
-
}
|
|
377
381
|
if (method === "lan/backends/install") {
|
|
378
382
|
const entry = instances.get(params.id);
|
|
379
383
|
if (!entry) throw new Error("未知后端");
|
|
@@ -396,8 +400,6 @@ export function createBackendManager({
|
|
|
396
400
|
}
|
|
397
401
|
return reply({ backends: publicBackends() });
|
|
398
402
|
}
|
|
399
|
-
if (method === "lan/backends/list")
|
|
400
|
-
return reply({ backends: publicBackends() });
|
|
401
403
|
if (
|
|
402
404
|
[
|
|
403
405
|
"lan/backends/save",
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { randomUUID } from "node:crypto";
|
|
1
|
+
import { readFile } from "node:fs/promises";
|
|
2
|
+
import { writePrivateFile } from "../private-file.mjs";
|
|
4
3
|
|
|
5
4
|
export function createStorage(path, initial) {
|
|
6
5
|
let writing = Promise.resolve();
|
|
@@ -15,17 +14,7 @@ export function createStorage(path, initial) {
|
|
|
15
14
|
function update(change, readCurrent = true) {
|
|
16
15
|
const operation = writing.then(async () => {
|
|
17
16
|
const next = await change(readCurrent ? await read() : undefined);
|
|
18
|
-
await
|
|
19
|
-
const temporary = `${path}.${randomUUID()}.tmp`;
|
|
20
|
-
try {
|
|
21
|
-
await writeFile(temporary, JSON.stringify(next, null, 2) + "\n", {
|
|
22
|
-
mode: 0o600,
|
|
23
|
-
flag: "wx",
|
|
24
|
-
});
|
|
25
|
-
await rename(temporary, path);
|
|
26
|
-
} finally {
|
|
27
|
-
await rm(temporary, { force: true });
|
|
28
|
-
}
|
|
17
|
+
await writePrivateFile(path, JSON.stringify(next, null, 2) + "\n");
|
|
29
18
|
return next;
|
|
30
19
|
});
|
|
31
20
|
writing = operation.catch(() => {});
|
package/server/src/config.mjs
CHANGED
|
@@ -4,6 +4,14 @@ import { fileURLToPath } from "node:url";
|
|
|
4
4
|
|
|
5
5
|
import { productDirectories } from "./product-config.mjs";
|
|
6
6
|
|
|
7
|
+
export function supportsBackgroundTerminal(upstream) {
|
|
8
|
+
const url = new URL(upstream);
|
|
9
|
+
return (
|
|
10
|
+
url.protocol === "ws:" &&
|
|
11
|
+
["127.0.0.1", "localhost", "[::1]"].includes(url.hostname)
|
|
12
|
+
);
|
|
13
|
+
}
|
|
14
|
+
|
|
7
15
|
export function readConfig(env = process.env) {
|
|
8
16
|
const port = Number(env.PORT || 8766);
|
|
9
17
|
if (!Number.isInteger(port) || port < 0 || port > 65535)
|
|
@@ -22,6 +30,8 @@ export function readConfig(env = process.env) {
|
|
|
22
30
|
!["127.0.0.1", "localhost", "[::1]"].includes(backend.hostname)
|
|
23
31
|
)
|
|
24
32
|
throw new Error("跨主机 CODEX_APP_SERVER_URL 必须使用 wss://");
|
|
33
|
+
if (env.CLAUDEX_BACKGROUND_TASKS_DIR && !supportsBackgroundTerminal(backend))
|
|
34
|
+
throw new Error("后台终端 MCP 需要同机回环 WebSocket 地址");
|
|
25
35
|
if (!!env.TLS_CERT !== !!env.TLS_KEY)
|
|
26
36
|
throw new Error("TLS_CERT 与 TLS_KEY 必须同时配置");
|
|
27
37
|
const sessionDays = Number(env.AUTH_SESSION_DAYS || 30);
|
|
@@ -31,6 +41,9 @@ export function readConfig(env = process.env) {
|
|
|
31
41
|
if (!/^[a-zA-Z0-9_-]+$/.test(pamService))
|
|
32
42
|
throw new Error("AUTH_PAM_SERVICE 必须是 PAM 服务名称");
|
|
33
43
|
return {
|
|
44
|
+
backgroundTaskDir: env.CLAUDEX_BACKGROUND_TASKS_DIR
|
|
45
|
+
? resolve(env.CLAUDEX_BACKGROUND_TASKS_DIR)
|
|
46
|
+
: null,
|
|
34
47
|
backendsFile: env.CLAUDEX_WEB_BACKENDS_FILE
|
|
35
48
|
? resolve(env.CLAUDEX_WEB_BACKENDS_FILE)
|
|
36
49
|
: join(configDir, "backends.json"),
|