@hyperdreamer/pi-webui 1.28.3 → 1.29.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/dist/client/assets/{CodeViewer-DB-huRz7.js → CodeViewer-CFluauNE.js} +1 -1
- package/dist/client/assets/{index-Cv-pHUkZ.js → index-BEBGqZPh.js} +537 -485
- package/dist/client/assets/{mathjaxEngine-CzEPFGjJ.js → mathjaxEngine-D9QxelfG.js} +1 -1
- package/dist/client/index.html +1 -1
- package/dist/server/http/replyDisconnect.js +31 -0
- package/dist/server/http/replyDisconnect.js.map +1 -0
- package/dist/server/machines/machineClient.js +190 -27
- package/dist/server/machines/machineClient.js.map +1 -1
- package/dist/server/machines/machinePluginProxyRoutes.js +57 -14
- package/dist/server/machines/machinePluginProxyRoutes.js.map +1 -1
- package/dist/server/machines/machineProxyRoutes.js +110 -18
- package/dist/server/machines/machineProxyRoutes.js.map +1 -1
- package/dist/server/machines/machineService.js +28 -2
- package/dist/server/machines/machineService.js.map +1 -1
- package/dist/server/machines/machineStore.js +17 -2
- package/dist/server/machines/machineStore.js.map +1 -1
- package/dist/server/sessiond/sessionProxyRoutes.js +48 -17
- package/dist/server/sessiond/sessionProxyRoutes.js.map +1 -1
- package/dist/server/sessions/piSessionService.js +14 -4
- package/dist/server/sessions/piSessionService.js.map +1 -1
- package/dist/server/sessions/sessionNameGenerator.js +60 -14
- package/dist/server/sessions/sessionNameGenerator.js.map +1 -1
- package/dist/server/sessions/utilityModelResolver.js +3 -2
- package/dist/server/sessions/utilityModelResolver.js.map +1 -1
- package/dist/sessiond/sessionDaemonClient.js +18 -1
- package/dist/sessiond/sessionDaemonClient.js.map +1 -1
- package/dist/shared/apiTypes.d.ts +9 -0
- package/dist/shared/apiTypes.js.map +1 -1
- package/dist/shared/federatedRoutes.js +1 -2
- package/dist/shared/federatedRoutes.js.map +1 -1
- package/dist/shared/machineRequestTimeout.js +19 -0
- package/dist/shared/machineRequestTimeout.js.map +1 -0
- package/docs/config.md +14 -0
- package/package.json +3 -2
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { WebSocket } from "ws";
|
|
2
2
|
import { SessionDaemonClient } from "../../sessiond/sessionDaemonClient.js";
|
|
3
|
+
import { createReplyDisconnectScope } from "../http/replyDisconnect.js";
|
|
3
4
|
import { SlowConsumerGuard } from "../realtime/slowConsumerGuard.js";
|
|
4
5
|
const FORWARDED_RESPONSE_HEADERS = [
|
|
5
6
|
"content-type",
|
|
@@ -9,23 +10,7 @@ const FORWARDED_RESPONSE_HEADERS = [
|
|
|
9
10
|
"x-content-type-options",
|
|
10
11
|
];
|
|
11
12
|
export function registerSessionProxyRoutes(app, daemon = new SessionDaemonClient(), prefix = "/api") {
|
|
12
|
-
const proxy =
|
|
13
|
-
try {
|
|
14
|
-
const upstream = await daemon.request(request.method, stripPrefix(request.url, prefix), request.body);
|
|
15
|
-
reply.code(upstream.statusCode);
|
|
16
|
-
forwardResponseHeaders(reply, upstream.headers);
|
|
17
|
-
if (upstream.body === "")
|
|
18
|
-
return await reply.send();
|
|
19
|
-
const body = isJsonContentType(upstream.headers["content-type"])
|
|
20
|
-
? parseJson(upstream.body)
|
|
21
|
-
: upstream.body;
|
|
22
|
-
return await reply.send(body);
|
|
23
|
-
}
|
|
24
|
-
catch (error) {
|
|
25
|
-
requestFailed(reply, error);
|
|
26
|
-
return undefined;
|
|
27
|
-
}
|
|
28
|
-
};
|
|
13
|
+
const proxy = (request, reply) => proxySessionDaemonRequest(daemon, prefix, request, reply);
|
|
29
14
|
app.get(`${prefix}/sessiond/health`, (_request, reply) => proxy({ method: "GET", url: `${prefix}/health` }, reply));
|
|
30
15
|
app.get(`${prefix}/sessiond/runtime`, (_request, reply) => proxy({ method: "GET", url: `${prefix}/runtime` }, reply));
|
|
31
16
|
app.get(`${prefix}/sessions/:sessionId/events`, { websocket: true }, (socket, request) => {
|
|
@@ -52,6 +37,52 @@ export function registerSessionProxyRoutes(app, daemon = new SessionDaemonClient
|
|
|
52
37
|
app.all(`${prefix}/sessions`, (request, reply) => proxy(request, reply));
|
|
53
38
|
app.all(`${prefix}/sessions/*`, (request, reply) => proxy(request, reply));
|
|
54
39
|
}
|
|
40
|
+
/**
|
|
41
|
+
* Forwards one browser request to the session daemon. Only the receiving gateway's
|
|
42
|
+
* own session-list read (exact `/sessions` with a nonempty `cwd`) takes the
|
|
43
|
+
* browser's lifecycle signal, so a dropped browser stops the daemon transport and
|
|
44
|
+
* its buffering without touching accepted mutations or daemon enumeration.
|
|
45
|
+
*/
|
|
46
|
+
export async function proxySessionDaemonRequest(daemon, prefix, request, reply) {
|
|
47
|
+
const disconnect = isRemoteSessionListRead(prefix, request) ? createReplyDisconnectScope(reply) : undefined;
|
|
48
|
+
const signal = disconnect?.signal;
|
|
49
|
+
try {
|
|
50
|
+
const upstream = await daemon.request(request.method, stripPrefix(request.url, prefix), request.body, signal);
|
|
51
|
+
if (isDisconnected(signal, reply))
|
|
52
|
+
return await reply;
|
|
53
|
+
reply.code(upstream.statusCode);
|
|
54
|
+
forwardResponseHeaders(reply, upstream.headers);
|
|
55
|
+
if (upstream.body === "")
|
|
56
|
+
return await reply.send();
|
|
57
|
+
const body = isJsonContentType(upstream.headers["content-type"])
|
|
58
|
+
? parseJson(upstream.body)
|
|
59
|
+
: upstream.body;
|
|
60
|
+
return await reply.send(body);
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
// A disconnected browser is not a gateway failure, and nobody is left to answer it.
|
|
64
|
+
if (isDisconnected(signal, reply))
|
|
65
|
+
return await reply;
|
|
66
|
+
requestFailed(reply, error);
|
|
67
|
+
return undefined;
|
|
68
|
+
}
|
|
69
|
+
finally {
|
|
70
|
+
// The daemon body is fully buffered by now, so the signal has no work left.
|
|
71
|
+
disconnect?.dispose();
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
function isRemoteSessionListRead(prefix, request) {
|
|
75
|
+
if (prefix !== "/api" || request.method !== "GET")
|
|
76
|
+
return false;
|
|
77
|
+
const target = new URL(stripPrefix(request.url, prefix), "http://sessiond.invalid");
|
|
78
|
+
if (target.pathname !== "/sessions")
|
|
79
|
+
return false;
|
|
80
|
+
const cwd = target.searchParams.get("cwd");
|
|
81
|
+
return cwd !== null && cwd !== "";
|
|
82
|
+
}
|
|
83
|
+
function isDisconnected(signal, reply) {
|
|
84
|
+
return signal?.aborted === true || reply.raw.destroyed;
|
|
85
|
+
}
|
|
55
86
|
function stripPrefix(url, prefix) {
|
|
56
87
|
const path = url.split("?", 1)[0] ?? url;
|
|
57
88
|
const query = url.slice(path.length);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionProxyRoutes.js","sourceRoot":"","sources":["../../../src/server/sessiond/sessionProxyRoutes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAgB,MAAM,IAAI,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"sessionProxyRoutes.js","sourceRoot":"","sources":["../../../src/server/sessiond/sessionProxyRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -3234,16 +3234,26 @@ export class PiSessionService {
|
|
|
3234
3234
|
const model = session.model;
|
|
3235
3235
|
if (model === undefined)
|
|
3236
3236
|
return;
|
|
3237
|
-
void runWithUtilityModelFallback(this.utilityModelResolver, "lightweight", { model, thinkingLevel: "minimal" },
|
|
3237
|
+
void runWithUtilityModelFallback(this.utilityModelResolver, "lightweight", { model, thinkingLevel: "minimal" }, async (attempt) => {
|
|
3238
|
+
const result = await generateShortSessionName(session.agent.streamFunction, attempt.model, firstMessage);
|
|
3239
|
+
if (result.ok)
|
|
3240
|
+
return result;
|
|
3241
|
+
this.logger.info({
|
|
3242
|
+
provider: attempt.model.provider,
|
|
3243
|
+
modelId: attempt.model.id,
|
|
3244
|
+
reason: result.reason,
|
|
3245
|
+
}, "utility title model rejected");
|
|
3246
|
+
return undefined;
|
|
3247
|
+
}, (attempt, error) => {
|
|
3238
3248
|
this.logger.info({
|
|
3239
3249
|
provider: attempt.model.provider,
|
|
3240
3250
|
modelId: attempt.model.id,
|
|
3241
3251
|
thinkingLevel: attempt.thinkingLevel,
|
|
3242
3252
|
error: error instanceof Error ? error.message : String(error),
|
|
3243
3253
|
}, "utility title model failed");
|
|
3244
|
-
})
|
|
3245
|
-
.then((
|
|
3246
|
-
this.applyGeneratedSessionName(session,
|
|
3254
|
+
}, (attempt) => ({ ...attempt, thinkingLevel: "off" }))
|
|
3255
|
+
.then((result) => {
|
|
3256
|
+
this.applyGeneratedSessionName(session, result?.title ?? fallbackSessionName(firstMessage));
|
|
3247
3257
|
})
|
|
3248
3258
|
.catch((error) => {
|
|
3249
3259
|
this.logger.info({
|