@hjd-hitsz/claudex-web 4.1.4 → 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 +47 -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 +55 -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 +9 -2
- package/docs/architecture/behavior.md +167 -53
- package/docs/architecture.md +36 -337
- package/docs/background-tasks.md +30 -26
- package/docs/deployment.md +47 -6
- package/docs/development.md +111 -153
- 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.1.5.md +6 -0
- package/docs/releases/v4.2.0.md +13 -0
- package/docs/versioning.md +13 -3
- package/package.json +14 -5
- 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 +35 -33
- 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/server/src/workspace/file-search.mjs +244 -0
- package/server/src/workspace/service.mjs +17 -3
- package/shared/codex-preferences.mjs +9 -0
- package/shared/p2p-wire.mjs +157 -0
|
@@ -7,6 +7,7 @@ import { claudeCapabilities } from "../../../../shared/backend-capabilities.mjs"
|
|
|
7
7
|
import { hasBackendWork } from "../../../../shared/backend-activity.mjs";
|
|
8
8
|
import { launchWorker, workerLocation } from "./worker-launcher.mjs";
|
|
9
9
|
import { workerRevision } from "./worker-revision.mjs";
|
|
10
|
+
import { readWorkerLines } from "./worker-lines.mjs";
|
|
10
11
|
import { networkProxyEnvironment } from "../network-proxy.mjs";
|
|
11
12
|
import { executionBackend } from "../../../../shared/subagent-settings.mjs";
|
|
12
13
|
import {
|
|
@@ -74,6 +75,7 @@ export function createClaudeWorkerAdapter({
|
|
|
74
75
|
const pending = new Map();
|
|
75
76
|
let socket,
|
|
76
77
|
reconnect,
|
|
78
|
+
upgradeRetry,
|
|
77
79
|
connecting,
|
|
78
80
|
closed = false,
|
|
79
81
|
workerPid,
|
|
@@ -107,16 +109,34 @@ export function createClaudeWorkerAdapter({
|
|
|
107
109
|
return hasBackendWork(snapshot.params);
|
|
108
110
|
}
|
|
109
111
|
function upgradeWhenIdle() {
|
|
110
|
-
if (
|
|
112
|
+
if (
|
|
113
|
+
closed ||
|
|
114
|
+
!socket ||
|
|
115
|
+
socket.destroyed ||
|
|
116
|
+
connecting ||
|
|
117
|
+
stopping ||
|
|
118
|
+
!outdated ||
|
|
119
|
+
!mayUpgrade ||
|
|
120
|
+
upgrading ||
|
|
121
|
+
upgradeRetry ||
|
|
122
|
+
busy()
|
|
123
|
+
)
|
|
124
|
+
return;
|
|
111
125
|
upgrading = true;
|
|
112
126
|
shutdownWorker(options)
|
|
113
|
-
.then(
|
|
114
|
-
|
|
115
|
-
|
|
127
|
+
.then(() => connect().catch(() => {}))
|
|
128
|
+
.catch((error) => {
|
|
129
|
+
if (closed || !socket || socket.destroyed) return;
|
|
130
|
+
if (error.code !== "EWORKERBUSY")
|
|
131
|
+
console.error("Claude 执行服务替换暂缓:", error.message);
|
|
132
|
+
upgradeRetry = setTimeout(() => {
|
|
133
|
+
upgradeRetry = null;
|
|
134
|
+
upgradeWhenIdle();
|
|
135
|
+
}, 1000);
|
|
116
136
|
})
|
|
117
|
-
.catch(() => {})
|
|
118
137
|
.finally(() => {
|
|
119
138
|
upgrading = false;
|
|
139
|
+
upgradeWhenIdle();
|
|
120
140
|
});
|
|
121
141
|
}
|
|
122
142
|
function accept(packet) {
|
|
@@ -131,7 +151,10 @@ export function createClaudeWorkerAdapter({
|
|
|
131
151
|
if (!request) return;
|
|
132
152
|
pending.delete(packet.id);
|
|
133
153
|
clearTimeout(request.timer);
|
|
134
|
-
if (packet.error)
|
|
154
|
+
if (packet.error)
|
|
155
|
+
request.reject(
|
|
156
|
+
Object.assign(new Error(packet.error), { code: packet.errorCode }),
|
|
157
|
+
);
|
|
135
158
|
else request.resolve(packet.result);
|
|
136
159
|
}
|
|
137
160
|
}
|
|
@@ -163,27 +186,24 @@ export function createClaudeWorkerAdapter({
|
|
|
163
186
|
throw workerConnectionError(error);
|
|
164
187
|
}
|
|
165
188
|
socket = connection;
|
|
166
|
-
let
|
|
167
|
-
|
|
168
|
-
connection
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
try {
|
|
177
|
-
accept(JSON.parse(line));
|
|
178
|
-
} catch (error) {
|
|
179
|
-
connection.destroy(error);
|
|
180
|
-
}
|
|
189
|
+
let initializing = true;
|
|
190
|
+
let latestState;
|
|
191
|
+
readWorkerLines(connection, "Claude IPC 响应超过限制", (line) => {
|
|
192
|
+
try {
|
|
193
|
+
const packet = JSON.parse(line);
|
|
194
|
+
if (initializing && packet.kind === "state")
|
|
195
|
+
latestState = packet.message;
|
|
196
|
+
else accept(packet);
|
|
197
|
+
} catch (error) {
|
|
198
|
+
connection.destroy(error);
|
|
181
199
|
}
|
|
182
200
|
});
|
|
183
201
|
connection.on("error", () => {});
|
|
184
202
|
connection.on("close", () => {
|
|
185
203
|
if (socket !== connection) return;
|
|
186
204
|
socket = null;
|
|
205
|
+
clearTimeout(upgradeRetry);
|
|
206
|
+
upgradeRetry = null;
|
|
187
207
|
for (const item of pending.values()) {
|
|
188
208
|
clearTimeout(item.timer);
|
|
189
209
|
item.reject(new Error("Claude 后端连接中断,请核对实际任务状态。"));
|
|
@@ -212,7 +232,7 @@ export function createClaudeWorkerAdapter({
|
|
|
212
232
|
}
|
|
213
233
|
workerPid = initialized.pid;
|
|
214
234
|
workerIdentity = (await captureNativeProcesses(workerPid)).owner;
|
|
215
|
-
snapshot = initialized.state;
|
|
235
|
+
snapshot = latestState || initialized.state;
|
|
216
236
|
outdated =
|
|
217
237
|
initialized.revision?.entry !== options.revision.entry ||
|
|
218
238
|
initialized.revision?.hash !== options.revision.hash ||
|
|
@@ -230,13 +250,8 @@ export function createClaudeWorkerAdapter({
|
|
|
230
250
|
));
|
|
231
251
|
mayUpgrade =
|
|
232
252
|
!initialized.generation || options.generation > initialized.generation;
|
|
253
|
+
initializing = false;
|
|
233
254
|
publish();
|
|
234
|
-
if (outdated && mayUpgrade && !initialized.busy) {
|
|
235
|
-
await shutdownWorker(options);
|
|
236
|
-
const error = new Error("Claude 后端代码更新,正在重新启动。");
|
|
237
|
-
error.code = "EWORKERUPDATE";
|
|
238
|
-
throw error;
|
|
239
|
-
}
|
|
240
255
|
}
|
|
241
256
|
async function connect() {
|
|
242
257
|
options.backend = {
|
|
@@ -254,11 +269,7 @@ export function createClaudeWorkerAdapter({
|
|
|
254
269
|
await open();
|
|
255
270
|
return;
|
|
256
271
|
} catch (error) {
|
|
257
|
-
if (
|
|
258
|
-
!["ENOENT", "ECONNREFUSED", "ECONNRESET", "EWORKERUPDATE"].includes(
|
|
259
|
-
error.code,
|
|
260
|
-
)
|
|
261
|
-
)
|
|
272
|
+
if (!["ENOENT", "ECONNREFUSED", "ECONNRESET"].includes(error.code))
|
|
262
273
|
throw error;
|
|
263
274
|
}
|
|
264
275
|
await launchWorker(backend, options);
|
|
@@ -270,8 +281,6 @@ export function createClaudeWorkerAdapter({
|
|
|
270
281
|
return;
|
|
271
282
|
} catch (error) {
|
|
272
283
|
lastError = error;
|
|
273
|
-
if (error.code === "EWORKERUPDATE")
|
|
274
|
-
await launchWorker(backend, options);
|
|
275
284
|
}
|
|
276
285
|
await delay(100);
|
|
277
286
|
}
|
|
@@ -291,10 +300,12 @@ export function createClaudeWorkerAdapter({
|
|
|
291
300
|
throw error;
|
|
292
301
|
} finally {
|
|
293
302
|
connecting = null;
|
|
303
|
+
upgradeWhenIdle();
|
|
294
304
|
}
|
|
295
305
|
}
|
|
296
306
|
async function shutdownWorker(replacement) {
|
|
297
307
|
if (!socket || socket.destroyed) return;
|
|
308
|
+
if (stopping) throw new Error("Claude 后端正在停止。");
|
|
298
309
|
const connection = socket;
|
|
299
310
|
let onClose;
|
|
300
311
|
const ended = new Promise((resolve) => {
|
|
@@ -354,6 +365,7 @@ export function createClaudeWorkerAdapter({
|
|
|
354
365
|
close() {
|
|
355
366
|
closed = true;
|
|
356
367
|
clearTimeout(reconnect);
|
|
368
|
+
clearTimeout(upgradeRetry);
|
|
357
369
|
socket?.destroy();
|
|
358
370
|
},
|
|
359
371
|
};
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
const MAX_IPC_BYTES = 128 * 1024 * 1024;
|
|
2
|
+
|
|
3
|
+
export function readWorkerLines(socket, limitError, receive) {
|
|
4
|
+
let input = "";
|
|
5
|
+
socket.setEncoding("utf8");
|
|
6
|
+
socket.on("data", (chunk) => {
|
|
7
|
+
input += chunk;
|
|
8
|
+
if (Buffer.byteLength(input) > MAX_IPC_BYTES)
|
|
9
|
+
return socket.destroy(new Error(limitError));
|
|
10
|
+
let index;
|
|
11
|
+
while ((index = input.indexOf("\n")) >= 0) {
|
|
12
|
+
const line = input.slice(0, index);
|
|
13
|
+
input = input.slice(index + 1);
|
|
14
|
+
receive(line);
|
|
15
|
+
}
|
|
16
|
+
});
|
|
17
|
+
}
|
|
@@ -1,18 +1,12 @@
|
|
|
1
1
|
import net from "node:net";
|
|
2
|
-
import {
|
|
3
|
-
mkdir,
|
|
4
|
-
readFile,
|
|
5
|
-
writeFile,
|
|
6
|
-
rename,
|
|
7
|
-
chmod,
|
|
8
|
-
lstat,
|
|
9
|
-
unlink,
|
|
10
|
-
} from "node:fs/promises";
|
|
2
|
+
import { mkdir, readFile, chmod, lstat, unlink } from "node:fs/promises";
|
|
11
3
|
import { join, resolve, dirname } from "node:path";
|
|
4
|
+
import { writePrivateFile } from "../../private-file.mjs";
|
|
12
5
|
import { createClaudeAdapter } from "./adapter.mjs";
|
|
13
6
|
import { createBackendConfiguration } from "../configuration.mjs";
|
|
14
7
|
import { createProviders } from "../providers.mjs";
|
|
15
8
|
import { workerRevision } from "./worker-revision.mjs";
|
|
9
|
+
import { readWorkerLines } from "./worker-lines.mjs";
|
|
16
10
|
import { hasBackendWork } from "../../../../shared/backend-activity.mjs";
|
|
17
11
|
import {
|
|
18
12
|
prepareWorkerDirectory,
|
|
@@ -67,8 +61,7 @@ async function currentState() {
|
|
|
67
61
|
};
|
|
68
62
|
}
|
|
69
63
|
async function isBusy() {
|
|
70
|
-
|
|
71
|
-
return Boolean(inflight || hasBackendWork(params));
|
|
64
|
+
return Boolean(inflight || hasBackendWork((await currentState()).params));
|
|
72
65
|
}
|
|
73
66
|
function send(socket, value) {
|
|
74
67
|
if (!socket.destroyed) socket.write(JSON.stringify(value) + "\n");
|
|
@@ -90,28 +83,17 @@ function broadcast(message) {
|
|
|
90
83
|
});
|
|
91
84
|
}
|
|
92
85
|
async function initialize(value) {
|
|
93
|
-
if (initializing)
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
)
|
|
101
|
-
throw new Error("Claude 后端目录或标识不匹配");
|
|
102
|
-
return;
|
|
103
|
-
}
|
|
86
|
+
if (initializing) await initializing;
|
|
87
|
+
if (
|
|
88
|
+
resolve(value.backend.stateDir) !== resolve(dataDir) ||
|
|
89
|
+
value.backend.id !== "claude"
|
|
90
|
+
)
|
|
91
|
+
throw new Error("Claude 后端目录或标识不匹配");
|
|
92
|
+
if (adapter) return;
|
|
104
93
|
initializing = (async () => {
|
|
105
|
-
if (
|
|
106
|
-
resolve(value.backend.stateDir) !== resolve(dataDir) ||
|
|
107
|
-
value.backend.id !== "claude"
|
|
108
|
-
)
|
|
109
|
-
throw new Error("Claude 后端目录或标识不匹配");
|
|
110
94
|
options = { ...value, revision, preferredEntry: revision.entry };
|
|
111
95
|
Object.assign(process.env, value.runtimeEnv || {});
|
|
112
|
-
|
|
113
|
-
await writeFile(temporary, JSON.stringify(options), { mode: 0o600 });
|
|
114
|
-
await rename(temporary, optionsPath);
|
|
96
|
+
await writePrivateFile(optionsPath, JSON.stringify(options));
|
|
115
97
|
const configuration = createBackendConfiguration(value.config);
|
|
116
98
|
const providers = createProviders(configuration);
|
|
117
99
|
adapter = createClaudeAdapter({
|
|
@@ -132,20 +114,10 @@ async function initialize(value) {
|
|
|
132
114
|
}
|
|
133
115
|
const server = net.createServer((socket) => {
|
|
134
116
|
clients.add(socket);
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
if (Buffer.byteLength(input) > 128 * 1024 * 1024)
|
|
140
|
-
return socket.destroy(new Error("Claude IPC 请求超过限制"));
|
|
141
|
-
let index;
|
|
142
|
-
while ((index = input.indexOf("\n")) >= 0) {
|
|
143
|
-
const line = input.slice(0, index);
|
|
144
|
-
input = input.slice(index + 1);
|
|
145
|
-
handle(socket, line).catch((error) =>
|
|
146
|
-
send(socket, { kind: "error", error: error.message }),
|
|
147
|
-
);
|
|
148
|
-
}
|
|
117
|
+
readWorkerLines(socket, "Claude IPC 请求超过限制", (line) => {
|
|
118
|
+
handle(socket, line).catch((error) =>
|
|
119
|
+
send(socket, { kind: "error", error: error.message }),
|
|
120
|
+
);
|
|
149
121
|
});
|
|
150
122
|
socket.on("error", () => {});
|
|
151
123
|
socket.on("close", () => clients.delete(socket));
|
|
@@ -156,15 +128,16 @@ async function handle(socket, line) {
|
|
|
156
128
|
request = JSON.parse(line);
|
|
157
129
|
if (request.kind === "initialize") {
|
|
158
130
|
await initialize(request.options);
|
|
131
|
+
const state = await currentState();
|
|
159
132
|
socket.initialized = true;
|
|
160
133
|
send(socket, {
|
|
161
134
|
kind: "response",
|
|
162
135
|
id: request.id,
|
|
163
136
|
result: {
|
|
164
137
|
pid: process.pid,
|
|
165
|
-
state
|
|
138
|
+
state,
|
|
166
139
|
revision,
|
|
167
|
-
busy:
|
|
140
|
+
busy: Boolean(inflight || hasBackendWork(state.params)),
|
|
168
141
|
configuration: {
|
|
169
142
|
backend: options.backend,
|
|
170
143
|
config: options.config,
|
|
@@ -189,29 +162,31 @@ async function handle(socket, line) {
|
|
|
189
162
|
if (request.kind === "shutdown") {
|
|
190
163
|
if (stopping) throw new Error("Claude 后端正在停止。");
|
|
191
164
|
stopping = true;
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
resolve(request.replacement.backend.stateDir) !== resolve(dataDir)
|
|
201
|
-
) {
|
|
202
|
-
stopping = false;
|
|
203
|
-
throw new Error("Claude 更新目录不匹配");
|
|
165
|
+
try {
|
|
166
|
+
if (await isBusy()) {
|
|
167
|
+
throw Object.assign(
|
|
168
|
+
new Error(
|
|
169
|
+
"Claude 后端仍有运行任务、排队输入或待答提问,请结束后再停止。",
|
|
170
|
+
),
|
|
171
|
+
{ code: "EWORKERBUSY" },
|
|
172
|
+
);
|
|
204
173
|
}
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
174
|
+
if (request.replacement) {
|
|
175
|
+
if (
|
|
176
|
+
resolve(request.replacement.backend.stateDir) !== resolve(dataDir)
|
|
177
|
+
)
|
|
178
|
+
throw new Error("Claude 更新目录不匹配");
|
|
179
|
+
await writePrivateFile(
|
|
180
|
+
optionsPath,
|
|
181
|
+
JSON.stringify({
|
|
182
|
+
...request.replacement,
|
|
183
|
+
preferredEntry: request.replacement.revision.entry,
|
|
184
|
+
}),
|
|
185
|
+
);
|
|
186
|
+
}
|
|
187
|
+
} catch (error) {
|
|
188
|
+
stopping = false;
|
|
189
|
+
throw error;
|
|
215
190
|
}
|
|
216
191
|
send(socket, { kind: "response", id: request.id, result: {} });
|
|
217
192
|
return shutdown();
|
|
@@ -236,7 +211,12 @@ async function handle(socket, line) {
|
|
|
236
211
|
if (!replied)
|
|
237
212
|
send(socket, { kind: "response", id: request.id, result: null });
|
|
238
213
|
} catch (error) {
|
|
239
|
-
send(socket, {
|
|
214
|
+
send(socket, {
|
|
215
|
+
kind: "response",
|
|
216
|
+
id: request?.id,
|
|
217
|
+
error: error.message,
|
|
218
|
+
errorCode: error.code,
|
|
219
|
+
});
|
|
240
220
|
}
|
|
241
221
|
}
|
|
242
222
|
async function listen() {
|
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
import { backgroundTaskViews } from "./background-task-views.mjs";
|
|
2
|
+
import {
|
|
3
|
+
backgroundParams,
|
|
4
|
+
backgroundTerminals,
|
|
5
|
+
} from "./background-terminals.mjs";
|
|
6
|
+
import { threadMethods } from "./methods.mjs";
|
|
1
7
|
import { referenceToolParams } from "./reference-tools.mjs";
|
|
2
8
|
import { subagentModelParams } from "./subagent-model.mjs";
|
|
3
9
|
import { join } from "node:path";
|
|
@@ -7,6 +13,7 @@ import { createCompactions } from "../../compaction.mjs";
|
|
|
7
13
|
import { createThreadNaming, generateThreadName } from "../../thread-names.mjs";
|
|
8
14
|
import { createUpstream } from "./upstream.mjs";
|
|
9
15
|
import { createSubscriptions } from "./subscriptions.mjs";
|
|
16
|
+
import { createNativeBackgroundHandoff } from "./native-background-handoff.mjs";
|
|
10
17
|
import { createCompactionRecovery } from "./compaction-recovery.mjs";
|
|
11
18
|
import { createBridgeEvents } from "./events.mjs";
|
|
12
19
|
import { createRequestHandler } from "./requests.mjs";
|
|
@@ -19,6 +26,8 @@ export function createCodexAdapter({
|
|
|
19
26
|
version,
|
|
20
27
|
send,
|
|
21
28
|
broadcast,
|
|
29
|
+
background,
|
|
30
|
+
backgroundEnabled = () => false,
|
|
22
31
|
readSubagentSettings = async () => backend,
|
|
23
32
|
}) {
|
|
24
33
|
config = { ...config, upstreamUrl: backend.url, codexHome: backend.dataDir };
|
|
@@ -27,6 +36,12 @@ export function createCodexAdapter({
|
|
|
27
36
|
const activeThreads = new Set();
|
|
28
37
|
const terminals = new Map();
|
|
29
38
|
const compactions = createCompactions(broadcast);
|
|
39
|
+
const handoff = createNativeBackgroundHandoff({
|
|
40
|
+
background,
|
|
41
|
+
enabled: () => Boolean(background?.available && backgroundEnabled()),
|
|
42
|
+
upstream: config.upstreamUrl,
|
|
43
|
+
onSettled: () => subscriptions.releaseUnusedThreads(),
|
|
44
|
+
});
|
|
30
45
|
const transport = createUpstream({
|
|
31
46
|
config,
|
|
32
47
|
version,
|
|
@@ -37,7 +52,10 @@ export function createCodexAdapter({
|
|
|
37
52
|
if (entry.status === "reconnecting")
|
|
38
53
|
checkCompaction(threadId).catch(() => {});
|
|
39
54
|
},
|
|
40
|
-
onEvent
|
|
55
|
+
onEvent(message) {
|
|
56
|
+
handoff.event(message);
|
|
57
|
+
events.onEvent(message);
|
|
58
|
+
},
|
|
41
59
|
onResponse: (request, message) => events.onResponse(request, message),
|
|
42
60
|
onSettled: () => subscriptions.releaseUnusedThreads(),
|
|
43
61
|
onDisconnect() {
|
|
@@ -46,6 +64,7 @@ export function createCodexAdapter({
|
|
|
46
64
|
questions.clear();
|
|
47
65
|
activeTurns.clear();
|
|
48
66
|
activeThreads.clear();
|
|
67
|
+
handoff.disconnected();
|
|
49
68
|
subscriptions.reset();
|
|
50
69
|
for (const terminal of terminals.values()) terminal.running = false;
|
|
51
70
|
broadcast(state());
|
|
@@ -55,10 +74,15 @@ export function createCodexAdapter({
|
|
|
55
74
|
const sessionParams = async (method, params) =>
|
|
56
75
|
subagentModelParams(
|
|
57
76
|
method,
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
77
|
+
backgroundParams(
|
|
78
|
+
method,
|
|
79
|
+
referenceToolParams(method, params, config),
|
|
80
|
+
threadMethods.has(method) && backgroundEnabled()
|
|
81
|
+
? await background.ensure()
|
|
82
|
+
: null,
|
|
83
|
+
config.upstreamUrl,
|
|
84
|
+
),
|
|
85
|
+
threadMethods.has(method) ? await readSubagentSettings() : backend,
|
|
62
86
|
);
|
|
63
87
|
transport.call = async (method, params, options) =>
|
|
64
88
|
nativeCall(method, await sessionParams(method, params), options);
|
|
@@ -77,6 +101,7 @@ export function createCodexAdapter({
|
|
|
77
101
|
compactions,
|
|
78
102
|
activeTurns,
|
|
79
103
|
activeThreads,
|
|
104
|
+
backgroundHandoffPending: handoff.pending,
|
|
80
105
|
});
|
|
81
106
|
const checkCompaction = createCompactionRecovery({
|
|
82
107
|
transport,
|
|
@@ -119,6 +144,21 @@ export function createCodexAdapter({
|
|
|
119
144
|
undoing: files.undoing,
|
|
120
145
|
...subscriptions,
|
|
121
146
|
...methods,
|
|
147
|
+
online: new Map([
|
|
148
|
+
...methods.online,
|
|
149
|
+
...backgroundTaskViews(background, config.upstreamUrl),
|
|
150
|
+
]),
|
|
151
|
+
includeBackground: () => backgroundEnabled() || background.listening(),
|
|
152
|
+
waitForBackgroundHandoff: handoff.wait,
|
|
153
|
+
backgroundCall:
|
|
154
|
+
background?.available &&
|
|
155
|
+
backgroundTerminals(
|
|
156
|
+
background.directory,
|
|
157
|
+
config.upstreamUrl,
|
|
158
|
+
transport.call,
|
|
159
|
+
undefined,
|
|
160
|
+
backgroundEnabled,
|
|
161
|
+
),
|
|
122
162
|
send,
|
|
123
163
|
broadcast,
|
|
124
164
|
});
|
|
@@ -155,6 +195,7 @@ export function createCodexAdapter({
|
|
|
155
195
|
releaseClient: subscriptions.releaseClient,
|
|
156
196
|
close() {
|
|
157
197
|
threadNaming.clear();
|
|
198
|
+
handoff.disconnected();
|
|
158
199
|
transport.close();
|
|
159
200
|
subscriptions.reset();
|
|
160
201
|
},
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
import { existsSync } from "node:fs";
|
|
2
|
+
import { execFile } from "node:child_process";
|
|
3
|
+
import { createHash } from "node:crypto";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
import { setTimeout as delay } from "node:timers/promises";
|
|
6
|
+
import { fileURLToPath } from "node:url";
|
|
7
|
+
import { promisify } from "node:util";
|
|
8
|
+
import { taskRequest } from "../../../../packages/background-terminal/client.mjs";
|
|
9
|
+
import { supportsBackgroundTerminal } from "../../config.mjs";
|
|
10
|
+
|
|
11
|
+
export function createBackgroundService(config) {
|
|
12
|
+
const directory =
|
|
13
|
+
config.backgroundTaskDir || join(config.configDir, "background-terminal");
|
|
14
|
+
const upstream = new URL(config.upstreamUrl).href;
|
|
15
|
+
const available = supportsBackgroundTerminal(upstream);
|
|
16
|
+
let checking;
|
|
17
|
+
async function responding() {
|
|
18
|
+
try {
|
|
19
|
+
await taskRequest(directory, "health", { expectedUpstream: upstream });
|
|
20
|
+
return true;
|
|
21
|
+
} catch (error) {
|
|
22
|
+
if (["ENOENT", "ECONNREFUSED"].includes(error.code)) return false;
|
|
23
|
+
throw error;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
async function start() {
|
|
27
|
+
if (!available)
|
|
28
|
+
throw new Error("后台终端 MCP 需要同机 Codex 回环 WebSocket 连接");
|
|
29
|
+
if (await responding()) return directory;
|
|
30
|
+
const unit =
|
|
31
|
+
"claudex-background-" +
|
|
32
|
+
createHash("sha256").update(directory).digest("hex").slice(0, 16);
|
|
33
|
+
const entry = fileURLToPath(
|
|
34
|
+
new URL(
|
|
35
|
+
"../../../../packages/background-terminal/cli.mjs",
|
|
36
|
+
import.meta.url,
|
|
37
|
+
),
|
|
38
|
+
);
|
|
39
|
+
let launchError;
|
|
40
|
+
try {
|
|
41
|
+
await promisify(execFile)(
|
|
42
|
+
"systemd-run",
|
|
43
|
+
[
|
|
44
|
+
"--user",
|
|
45
|
+
"--collect",
|
|
46
|
+
"--property=Restart=on-failure",
|
|
47
|
+
"--service-type=exec",
|
|
48
|
+
"--unit",
|
|
49
|
+
unit,
|
|
50
|
+
"--",
|
|
51
|
+
process.execPath,
|
|
52
|
+
entry,
|
|
53
|
+
"serve",
|
|
54
|
+
directory,
|
|
55
|
+
upstream,
|
|
56
|
+
],
|
|
57
|
+
{ timeout: 5000 },
|
|
58
|
+
);
|
|
59
|
+
} catch (error) {
|
|
60
|
+
launchError = error;
|
|
61
|
+
}
|
|
62
|
+
// Another bridge using this directory may already be starting the same unit.
|
|
63
|
+
for (let attempt = 0; attempt < 30; attempt++) {
|
|
64
|
+
if (await responding()) return directory;
|
|
65
|
+
await delay(100);
|
|
66
|
+
}
|
|
67
|
+
throw new Error(
|
|
68
|
+
"后台终端服务启动失败:" +
|
|
69
|
+
(launchError?.stderr?.trim() ||
|
|
70
|
+
launchError?.message ||
|
|
71
|
+
unit + ".service"),
|
|
72
|
+
);
|
|
73
|
+
}
|
|
74
|
+
return {
|
|
75
|
+
available,
|
|
76
|
+
directory,
|
|
77
|
+
listening: () => existsSync(join(directory, "service.sock")),
|
|
78
|
+
ensure() {
|
|
79
|
+
checking ??= start().finally(() => {
|
|
80
|
+
checking = null;
|
|
81
|
+
});
|
|
82
|
+
return checking;
|
|
83
|
+
},
|
|
84
|
+
};
|
|
85
|
+
}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import { join } from "node:path";
|
|
2
|
+
import {
|
|
3
|
+
privateDirectory,
|
|
4
|
+
taskRequest,
|
|
5
|
+
} from "../../../../packages/background-terminal/client.mjs";
|
|
6
|
+
import { readTaskLog } from "../../../../packages/background-terminal/log.mjs";
|
|
7
|
+
|
|
8
|
+
export function backgroundTaskViews(background, upstream) {
|
|
9
|
+
const expectedUpstream = new URL(upstream).href;
|
|
10
|
+
const tool = (threadId, name, args = {}) =>
|
|
11
|
+
taskRequest(background.directory, "tool", {
|
|
12
|
+
name,
|
|
13
|
+
args,
|
|
14
|
+
threadId,
|
|
15
|
+
expectedUpstream,
|
|
16
|
+
});
|
|
17
|
+
const list = async (threadId) => {
|
|
18
|
+
if (!background?.available || !background.listening()) return [];
|
|
19
|
+
if (typeof threadId !== "string" || !threadId)
|
|
20
|
+
throw new Error("缺少所属对话");
|
|
21
|
+
return (await tool(threadId, "background_list")).jobs;
|
|
22
|
+
};
|
|
23
|
+
const summary = ({
|
|
24
|
+
id,
|
|
25
|
+
title,
|
|
26
|
+
command,
|
|
27
|
+
status,
|
|
28
|
+
startedAt,
|
|
29
|
+
completedAt,
|
|
30
|
+
delivery,
|
|
31
|
+
exitCode,
|
|
32
|
+
}) => ({
|
|
33
|
+
id,
|
|
34
|
+
title,
|
|
35
|
+
command,
|
|
36
|
+
status,
|
|
37
|
+
startedAt,
|
|
38
|
+
completedAt,
|
|
39
|
+
delivery,
|
|
40
|
+
exitCode,
|
|
41
|
+
});
|
|
42
|
+
async function owned({ threadId, taskId }) {
|
|
43
|
+
const job = (await list(threadId)).find((job) => job.id === taskId);
|
|
44
|
+
if (!job || !/^[a-f0-9-]{36}$/.test(job.id))
|
|
45
|
+
throw new Error("该对话中没有此后台任务");
|
|
46
|
+
return job;
|
|
47
|
+
}
|
|
48
|
+
return new Map([
|
|
49
|
+
[
|
|
50
|
+
"thread/backgroundTasks/list",
|
|
51
|
+
async ({ threadId }) => {
|
|
52
|
+
const jobs = await list(threadId);
|
|
53
|
+
return {
|
|
54
|
+
tasks: jobs.filter((job) => job.status === "running").map(summary),
|
|
55
|
+
completed: jobs
|
|
56
|
+
.filter(
|
|
57
|
+
(job) => job.status !== "running" && job.delivery === "accepted",
|
|
58
|
+
)
|
|
59
|
+
.slice(0, 20)
|
|
60
|
+
.map(summary),
|
|
61
|
+
};
|
|
62
|
+
},
|
|
63
|
+
],
|
|
64
|
+
[
|
|
65
|
+
"thread/backgroundTasks/read",
|
|
66
|
+
async (params) => {
|
|
67
|
+
const job = await owned(params);
|
|
68
|
+
const directory = await privateDirectory(background.directory);
|
|
69
|
+
// 查看输出保留原任务服务的完成投递状态。
|
|
70
|
+
const logPath = join(directory, `output-${job.id}.log`);
|
|
71
|
+
const { output, offset } = await readTaskLog(logPath, undefined, 8192);
|
|
72
|
+
return { ...summary(job), output, logPath, truncated: offset > 0 };
|
|
73
|
+
},
|
|
74
|
+
],
|
|
75
|
+
[
|
|
76
|
+
"thread/backgroundTasks/cancel",
|
|
77
|
+
async (params) => {
|
|
78
|
+
const job = await owned(params);
|
|
79
|
+
if (job.status === "running")
|
|
80
|
+
return await tool(params.threadId, "background_cancel", {
|
|
81
|
+
job_id: job.id,
|
|
82
|
+
});
|
|
83
|
+
return {};
|
|
84
|
+
},
|
|
85
|
+
],
|
|
86
|
+
]);
|
|
87
|
+
}
|