wherever-dev 0.22.0 → 0.23.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/CHANGELOG.md +20 -0
- package/dist/assistant-tools.d.ts +15 -0
- package/dist/assistant-tools.d.ts.map +1 -1
- package/dist/assistant-tools.js +21 -0
- package/dist/assistant-tools.js.map +1 -1
- package/dist/delta-coalescer.d.ts +77 -0
- package/dist/delta-coalescer.d.ts.map +1 -0
- package/dist/delta-coalescer.js +117 -0
- package/dist/delta-coalescer.js.map +1 -0
- package/dist/frame-chunks.d.ts +41 -0
- package/dist/frame-chunks.d.ts.map +1 -0
- package/dist/frame-chunks.js +61 -0
- package/dist/frame-chunks.js.map +1 -0
- package/dist/history-images.d.ts +33 -0
- package/dist/history-images.d.ts.map +1 -0
- package/dist/history-images.js +47 -0
- package/dist/history-images.js.map +1 -0
- package/dist/index.js +148 -7
- package/dist/index.js.map +1 -1
- package/dist/session-pool.d.ts +3 -0
- package/dist/session-pool.d.ts.map +1 -1
- package/dist/session-pool.js.map +1 -1
- package/dist/session-transcript.d.ts +19 -0
- package/dist/session-transcript.d.ts.map +1 -1
- package/dist/session-transcript.js +67 -0
- package/dist/session-transcript.js.map +1 -1
- package/dist/session-types.d.ts +21 -2
- package/dist/session-types.d.ts.map +1 -1
- package/dist/static-compression.d.ts +15 -0
- package/dist/static-compression.d.ts.map +1 -0
- package/dist/static-compression.js +87 -0
- package/dist/static-compression.js.map +1 -0
- package/dist/telegram-channel.d.ts +3 -0
- package/dist/telegram-channel.d.ts.map +1 -1
- package/dist/telegram-channel.js +1 -0
- package/dist/telegram-channel.js.map +1 -1
- package/dist/telegram-replies.d.ts +53 -7
- package/dist/telegram-replies.d.ts.map +1 -1
- package/dist/telegram-replies.js +167 -22
- package/dist/telegram-replies.js.map +1 -1
- package/package.json +1 -1
- package/public/_app/immutable/assets/{0.BkzT3rFr.css → 0.hWfYEET-.css} +1 -1
- package/public/_app/immutable/chunks/{CkOw6fRa.js → BHw5ar2A.js} +2 -2
- package/public/_app/immutable/chunks/{CkOw6fRa.js.map → BHw5ar2A.js.map} +1 -1
- package/public/_app/immutable/chunks/{DyHllYtq.js → CLKlGLL7.js} +2 -2
- package/public/_app/immutable/chunks/{DyHllYtq.js.map → CLKlGLL7.js.map} +1 -1
- package/public/_app/immutable/chunks/{CExVgK9Z.js → FePVnZ_7.js} +2 -2
- package/public/_app/immutable/chunks/{CExVgK9Z.js.map → FePVnZ_7.js.map} +1 -1
- package/public/_app/immutable/entry/{app.D3PEFbtP.js → app.BJxkSaKZ.js} +3 -3
- package/public/_app/immutable/entry/{app.D3PEFbtP.js.map → app.BJxkSaKZ.js.map} +1 -1
- package/public/_app/immutable/entry/start.CRP1MCwE.js +2 -0
- package/public/_app/immutable/entry/start.CRP1MCwE.js.map +1 -0
- package/public/_app/immutable/nodes/{0.DG3L8hMN.js → 0.DGFJlad5.js} +2 -2
- package/public/_app/immutable/nodes/{0.DG3L8hMN.js.map → 0.DGFJlad5.js.map} +1 -1
- package/public/_app/immutable/nodes/{1.BCpuoZxW.js → 1.Cy3IVwDh.js} +2 -2
- package/public/_app/immutable/nodes/{1.BCpuoZxW.js.map → 1.Cy3IVwDh.js.map} +1 -1
- package/public/_app/immutable/nodes/2.eb9p7ShF.js +123 -0
- package/public/_app/immutable/nodes/2.eb9p7ShF.js.map +1 -0
- package/public/_app/version.json +1 -1
- package/public/index.html +11 -11
- package/public/service-worker.js +1 -1
- package/public/_app/immutable/entry/start.BR00Qps5.js +0 -2
- package/public/_app/immutable/entry/start.BR00Qps5.js.map +0 -1
- package/public/_app/immutable/nodes/2.D2auiZW1.js +0 -122
- package/public/_app/immutable/nodes/2.D2auiZW1.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# wherever-dev
|
|
2
2
|
|
|
3
|
+
## 0.23.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 016c887: Wherever is now usable on a slow connection. Before, opening or reconnecting to a session whose recent history held a large tool image (a `read` on a screenshot) could loop forever on a weak link: the history was one multi-MB WebSocket frame, the browser only delivers a frame once it has fully arrived, and the client's liveness watchdog took the long silence for a dead socket, reconnected and asked for the same history again. Measured at 30 KB/s with a 3 MB image: the history never painted; now it paints in about 2 s.
|
|
8
|
+
- Large server frames are split into small chunks for clients that ask (`frames=chunk.v1`), so a big transfer keeps proving the socket alive and no longer times out the session load.
|
|
9
|
+
- History tool images larger than 16 KB are sent by reference for clients that ask (`imageRefs=1`; `WhereverClient` gains an `imageRefs` option, off by default, which the web app turns on) and loaded lazily from the new `GET /session/tool-image`, which the browser caches for good. A reconnect now re-sends text only, and the on-device conversation cache keeps those images.
|
|
10
|
+
- WebSocket frames are compressed (`permessage-deflate`), and the web app's JS/CSS/HTML are served with brotli or gzip.
|
|
11
|
+
- Streamed reply, thinking and tool-output deltas are merged into about one frame per 50 ms instead of one frame per token (order unchanged, nothing dropped), and a client that falls behind catches up in a few large frames instead of thousands of tiny ones.
|
|
12
|
+
|
|
13
|
+
Chunking and images by reference are opt-in per connection, so an older cached web build or client keeps the previous behaviour; delta merging is transparent to every client.
|
|
14
|
+
|
|
15
|
+
## 0.22.1
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- a86638c: Assistant notifications settings: a failed "Push notifications on this device" toggle no longer stays checked; it rolls back to the device's real subscription state. Errors now show their name with the message, plus a hint for an `AbortError` (browser push disabled or unreachable: on Firefox and LibreWolf check `about:config` `dom.push.enabled` and `dom.push.connection.enabled`) and for a denied permission. New "Send test notification" button (while subscribed), backed by the token-gated `POST /push/test`, which delivers through the same path as `assistant_notify` and reports the result per channel.
|
|
20
|
+
- a86638c: The Telegram pairing code can be selected again (the sidebar's unlayered `user-select: none` rule beat Tailwind's `select-all`), and has Copy buttons for the code and for `/pair <code>`, with a "Copied" confirmation and a fallback when the clipboard API is unavailable. A new `.selectable` opt-in also makes the Telegram and push error messages, the paired user line, the version string and form fields in the sidebar selectable.
|
|
21
|
+
- a86638c: Telegram: stop sending an empty `sendMessageDraft` to "clear" a reply draft. The Bot API shows an empty draft as a "Thinking..." placeholder, so after every assistant message (right before each tool call) the chat showed a lingering animated indicator and clients could notify an unsupported message. A draft is now always ended by a real message: the final text at the message end, the text so far when a tool call starts or the turn ends first, and on abort the partial text that was shown (marked `⏹ (stopped)`, sent silently). New option `assistantTelegram.toolCalls`: `"off"` (default, a tool call shows nothing) or `"compact"` (one silent plain-text line per call, such as `🔧 bash: git status` or `🔧 read: <path>`, with secret-looking values redacted).
|
|
22
|
+
|
|
3
23
|
## 0.22.0
|
|
4
24
|
|
|
5
25
|
### Minor Changes
|
|
@@ -160,6 +160,21 @@ export declare function resolveNotifyTarget(input: {
|
|
|
160
160
|
export declare function notifySource(callerCwd: string, job: JobOrigin | null): string;
|
|
161
161
|
/** `assistant_notify`: deliver to every channel at once, with the tap target per `resolveNotifyTarget`. */
|
|
162
162
|
export declare function notifyOp(backend: AssistantNotifyBackend, caller: AssistantToolCaller, args: unknown): Promise<OpResult>;
|
|
163
|
+
/** The text of the settings' "Send test notification" (`POST /push/test`). */
|
|
164
|
+
export declare const TEST_NOTIFICATION_TITLE = "Test notification";
|
|
165
|
+
export declare const TEST_NOTIFICATION_BODY = "Sent from the wherever settings. If you can read this, notifications reach this device.";
|
|
166
|
+
/**
|
|
167
|
+
* The settings' test notification (`POST /push/test`): the SAME delivery as
|
|
168
|
+
* `assistant_notify` (`backend.notify`, every channel at once), from the
|
|
169
|
+
* assistant folder, opening `sessionId` (the session the calling device has
|
|
170
|
+
* open) or, without a usable one, the main screen (an empty target). The id
|
|
171
|
+
* only ends up in a URL fragment (`/#<id>`), so anything but a plain id is
|
|
172
|
+
* dropped.
|
|
173
|
+
*/
|
|
174
|
+
export declare function testNotification(backend: AssistantNotifyBackend, input: {
|
|
175
|
+
sessionId?: unknown;
|
|
176
|
+
assistantFolder: string;
|
|
177
|
+
}): Promise<NotifyOutcome>;
|
|
163
178
|
/** What a CLI twin answers while `assistantFolder` is unset on this server. */
|
|
164
179
|
export declare const ASSISTANT_NOT_CONFIGURED_ERROR = "the wherever assistant is not configured on this server (set assistantFolder in the wherever config and restart it)";
|
|
165
180
|
export type AssistantCliOp = (args: unknown, caller: AssistantToolCaller) => Promise<OpResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assistant-tools.d.ts","sourceRoot":"","sources":["../src/assistant-tools.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"assistant-tools.d.ts","sourceRoot":"","sources":["../src/assistant-tools.ts"],"names":[],"mappings":"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"}
|
package/dist/assistant-tools.js
CHANGED
|
@@ -207,6 +207,27 @@ export async function notifyOp(backend, caller, args) {
|
|
|
207
207
|
details: { target, source, deliveries: outcome.deliveries },
|
|
208
208
|
};
|
|
209
209
|
}
|
|
210
|
+
/** The text of the settings' "Send test notification" (`POST /push/test`). */
|
|
211
|
+
export const TEST_NOTIFICATION_TITLE = 'Test notification';
|
|
212
|
+
export const TEST_NOTIFICATION_BODY = 'Sent from the wherever settings. If you can read this, notifications reach this device.';
|
|
213
|
+
/**
|
|
214
|
+
* The settings' test notification (`POST /push/test`): the SAME delivery as
|
|
215
|
+
* `assistant_notify` (`backend.notify`, every channel at once), from the
|
|
216
|
+
* assistant folder, opening `sessionId` (the session the calling device has
|
|
217
|
+
* open) or, without a usable one, the main screen (an empty target). The id
|
|
218
|
+
* only ends up in a URL fragment (`/#<id>`), so anything but a plain id is
|
|
219
|
+
* dropped.
|
|
220
|
+
*/
|
|
221
|
+
export async function testNotification(backend, input) {
|
|
222
|
+
const raw = typeof input.sessionId === 'string' ? input.sessionId.trim() : '';
|
|
223
|
+
const navigate = /^[A-Za-z0-9_.:-]{1,200}$/.test(raw) && !raw.includes('..') ? raw : '';
|
|
224
|
+
return backend.notify({
|
|
225
|
+
title: TEST_NOTIFICATION_TITLE,
|
|
226
|
+
body: TEST_NOTIFICATION_BODY,
|
|
227
|
+
source: notifySource(input.assistantFolder, null),
|
|
228
|
+
navigate,
|
|
229
|
+
});
|
|
230
|
+
}
|
|
210
231
|
/** What a CLI twin answers while `assistantFolder` is unset on this server. */
|
|
211
232
|
export const ASSISTANT_NOT_CONFIGURED_ERROR = 'the wherever assistant is not configured on this server (set assistantFolder in the wherever config and restart it)';
|
|
212
233
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assistant-tools.js","sourceRoot":"","sources":["../src/assistant-tools.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"assistant-tools.js","sourceRoot":"","sources":["../src/assistant-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Coalesce streamed deltas into fewer WebSocket frames, per socket.
|
|
3
|
+
*
|
|
4
|
+
* Every streamed token used to be its own frame: a ~4-character `text_delta`
|
|
5
|
+
* wrapped in ~60 bytes of JSON (type + a 36-character session id), below the
|
|
6
|
+
* permessage-deflate threshold and so uncompressed, then TLS/TCP framing on top.
|
|
7
|
+
* On a slow phone link that was over an order of magnitude more bytes than the
|
|
8
|
+
* text itself, plus one client re-render per token.
|
|
9
|
+
*
|
|
10
|
+
* Rules (the reason this is safe for every client, old or new):
|
|
11
|
+
* - Only APPEND-ONLY deltas are held: `message_update`, `thinking_update` (keyed
|
|
12
|
+
* by session) and `tool_update` (keyed by session + tool name). For each, the
|
|
13
|
+
* client appends `delta` to the streaming message, so one frame carrying
|
|
14
|
+
* `d1 + d2` renders exactly like `d1` then `d2`.
|
|
15
|
+
* - ORDER IS NEVER CHANGED: any other frame (and a delta with another key)
|
|
16
|
+
* flushes the held delta first, then goes out. So `message_end`, `tool_end`,
|
|
17
|
+
* `agent_end` etc. always follow every delta that preceded them.
|
|
18
|
+
* - A held delta goes out after `windowMs` (default 50 ms, imperceptible), or at
|
|
19
|
+
* once when it reaches `maxChars` (keeps frames well under the chunking size).
|
|
20
|
+
* - Backpressure: while the socket still has unsent data (`isBackedUp`), the
|
|
21
|
+
* held delta keeps growing instead of queueing yet another frame behind it, up
|
|
22
|
+
* to `maxHoldMs`. A client that fell behind thus catches up in a few large
|
|
23
|
+
* frames instead of thousands of tiny ones. Nothing is ever dropped.
|
|
24
|
+
*/
|
|
25
|
+
export type DeltaMessage = {
|
|
26
|
+
type: 'message_update';
|
|
27
|
+
sessionId: string;
|
|
28
|
+
delta: string;
|
|
29
|
+
} | {
|
|
30
|
+
type: 'thinking_update';
|
|
31
|
+
sessionId: string;
|
|
32
|
+
delta: string;
|
|
33
|
+
} | {
|
|
34
|
+
type: 'tool_update';
|
|
35
|
+
sessionId: string;
|
|
36
|
+
toolName: string;
|
|
37
|
+
delta: string;
|
|
38
|
+
};
|
|
39
|
+
export interface DeltaCoalescerOptions {
|
|
40
|
+
windowMs?: number;
|
|
41
|
+
maxChars?: number;
|
|
42
|
+
maxHoldMs?: number;
|
|
43
|
+
/** True while the transport still has unsent data queued. */
|
|
44
|
+
isBackedUp?: () => boolean;
|
|
45
|
+
/** Injected for tests. */
|
|
46
|
+
setTimer?: (fn: () => void, ms: number) => unknown;
|
|
47
|
+
clearTimer?: (t: unknown) => void;
|
|
48
|
+
now?: () => number;
|
|
49
|
+
}
|
|
50
|
+
export declare const DELTA_WINDOW_MS = 50;
|
|
51
|
+
export declare const DELTA_MAX_CHARS: number;
|
|
52
|
+
export declare const DELTA_MAX_HOLD_MS = 1000;
|
|
53
|
+
export declare class DeltaCoalescer<M extends {
|
|
54
|
+
type: string;
|
|
55
|
+
}> {
|
|
56
|
+
private readonly write;
|
|
57
|
+
private held;
|
|
58
|
+
private heldKey;
|
|
59
|
+
private heldSince;
|
|
60
|
+
private timer;
|
|
61
|
+
private readonly windowMs;
|
|
62
|
+
private readonly maxChars;
|
|
63
|
+
private readonly maxHoldMs;
|
|
64
|
+
private readonly isBackedUp;
|
|
65
|
+
private readonly setTimer;
|
|
66
|
+
private readonly clearTimer;
|
|
67
|
+
private readonly now;
|
|
68
|
+
constructor(write: (msg: M) => void, opts?: DeltaCoalescerOptions);
|
|
69
|
+
/** Send `msg`, holding it briefly if it is a delta that can be merged. */
|
|
70
|
+
send(msg: M): void;
|
|
71
|
+
/** Send the held delta now, if any. */
|
|
72
|
+
flush(): void;
|
|
73
|
+
/** Forget the held delta without sending it (the socket is gone). */
|
|
74
|
+
dispose(): void;
|
|
75
|
+
private arm;
|
|
76
|
+
}
|
|
77
|
+
//# sourceMappingURL=delta-coalescer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"delta-coalescer.d.ts","sourceRoot":"","sources":["../src/delta-coalescer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,MAAM,MAAM,YAAY,GACpB;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC5D;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhF,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC;IAC3B,0BAA0B;IAC1B,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,EAAE,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC;IACnD,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAClC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,eAAe,KAAK,CAAC;AAClC,eAAO,MAAM,eAAe,QAAY,CAAC;AACzC,eAAO,MAAM,iBAAiB,OAAQ,CAAC;AAUvC,qBAAa,cAAc,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE;IAclD,OAAO,CAAC,QAAQ,CAAC,KAAK;IAbxB,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,OAAO,CAAM;IACrB,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,KAAK,CAAiB;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0C;IACnE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuB;IAClD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;gBAGhB,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,EACxC,IAAI,GAAE,qBAA0B;IAiBlC,0EAA0E;IAC1E,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI;IAmBlB,uCAAuC;IACvC,KAAK,IAAI,IAAI;IAWb,qEAAqE;IACrE,OAAO,IAAI,IAAI;IAOf,OAAO,CAAC,GAAG;CAWZ"}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Coalesce streamed deltas into fewer WebSocket frames, per socket.
|
|
3
|
+
*
|
|
4
|
+
* Every streamed token used to be its own frame: a ~4-character `text_delta`
|
|
5
|
+
* wrapped in ~60 bytes of JSON (type + a 36-character session id), below the
|
|
6
|
+
* permessage-deflate threshold and so uncompressed, then TLS/TCP framing on top.
|
|
7
|
+
* On a slow phone link that was over an order of magnitude more bytes than the
|
|
8
|
+
* text itself, plus one client re-render per token.
|
|
9
|
+
*
|
|
10
|
+
* Rules (the reason this is safe for every client, old or new):
|
|
11
|
+
* - Only APPEND-ONLY deltas are held: `message_update`, `thinking_update` (keyed
|
|
12
|
+
* by session) and `tool_update` (keyed by session + tool name). For each, the
|
|
13
|
+
* client appends `delta` to the streaming message, so one frame carrying
|
|
14
|
+
* `d1 + d2` renders exactly like `d1` then `d2`.
|
|
15
|
+
* - ORDER IS NEVER CHANGED: any other frame (and a delta with another key)
|
|
16
|
+
* flushes the held delta first, then goes out. So `message_end`, `tool_end`,
|
|
17
|
+
* `agent_end` etc. always follow every delta that preceded them.
|
|
18
|
+
* - A held delta goes out after `windowMs` (default 50 ms, imperceptible), or at
|
|
19
|
+
* once when it reaches `maxChars` (keeps frames well under the chunking size).
|
|
20
|
+
* - Backpressure: while the socket still has unsent data (`isBackedUp`), the
|
|
21
|
+
* held delta keeps growing instead of queueing yet another frame behind it, up
|
|
22
|
+
* to `maxHoldMs`. A client that fell behind thus catches up in a few large
|
|
23
|
+
* frames instead of thousands of tiny ones. Nothing is ever dropped.
|
|
24
|
+
*/
|
|
25
|
+
export const DELTA_WINDOW_MS = 50;
|
|
26
|
+
export const DELTA_MAX_CHARS = 16 * 1024;
|
|
27
|
+
export const DELTA_MAX_HOLD_MS = 1_000;
|
|
28
|
+
function isDelta(msg) {
|
|
29
|
+
return msg.type === 'message_update' || msg.type === 'thinking_update' || msg.type === 'tool_update';
|
|
30
|
+
}
|
|
31
|
+
function keyOf(msg) {
|
|
32
|
+
return msg.type === 'tool_update' ? `${msg.type}\0${msg.sessionId}\0${msg.toolName}` : `${msg.type}\0${msg.sessionId}`;
|
|
33
|
+
}
|
|
34
|
+
export class DeltaCoalescer {
|
|
35
|
+
write;
|
|
36
|
+
held = null;
|
|
37
|
+
heldKey = '';
|
|
38
|
+
heldSince = 0;
|
|
39
|
+
timer = null;
|
|
40
|
+
windowMs;
|
|
41
|
+
maxChars;
|
|
42
|
+
maxHoldMs;
|
|
43
|
+
isBackedUp;
|
|
44
|
+
setTimer;
|
|
45
|
+
clearTimer;
|
|
46
|
+
now;
|
|
47
|
+
constructor(write, opts = {}) {
|
|
48
|
+
this.write = write;
|
|
49
|
+
this.windowMs = opts.windowMs ?? DELTA_WINDOW_MS;
|
|
50
|
+
this.maxChars = opts.maxChars ?? DELTA_MAX_CHARS;
|
|
51
|
+
this.maxHoldMs = opts.maxHoldMs ?? DELTA_MAX_HOLD_MS;
|
|
52
|
+
this.isBackedUp = opts.isBackedUp ?? (() => false);
|
|
53
|
+
this.setTimer =
|
|
54
|
+
opts.setTimer ??
|
|
55
|
+
((fn, ms) => {
|
|
56
|
+
const t = setTimeout(fn, ms);
|
|
57
|
+
t.unref?.();
|
|
58
|
+
return t;
|
|
59
|
+
});
|
|
60
|
+
this.clearTimer = opts.clearTimer ?? ((t) => clearTimeout(t));
|
|
61
|
+
this.now = opts.now ?? Date.now;
|
|
62
|
+
}
|
|
63
|
+
/** Send `msg`, holding it briefly if it is a delta that can be merged. */
|
|
64
|
+
send(msg) {
|
|
65
|
+
if (!isDelta(msg)) {
|
|
66
|
+
this.flush();
|
|
67
|
+
this.write(msg);
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
const key = keyOf(msg);
|
|
71
|
+
if (this.held && this.heldKey === key) {
|
|
72
|
+
this.held = { ...this.held, delta: this.held.delta + msg.delta };
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
this.flush();
|
|
76
|
+
this.held = { ...msg };
|
|
77
|
+
this.heldKey = key;
|
|
78
|
+
this.heldSince = this.now();
|
|
79
|
+
this.arm();
|
|
80
|
+
}
|
|
81
|
+
if (this.held.delta.length >= this.maxChars)
|
|
82
|
+
this.flush();
|
|
83
|
+
}
|
|
84
|
+
/** Send the held delta now, if any. */
|
|
85
|
+
flush() {
|
|
86
|
+
if (this.timer !== null) {
|
|
87
|
+
this.clearTimer(this.timer);
|
|
88
|
+
this.timer = null;
|
|
89
|
+
}
|
|
90
|
+
const held = this.held;
|
|
91
|
+
this.held = null;
|
|
92
|
+
this.heldKey = '';
|
|
93
|
+
if (held)
|
|
94
|
+
this.write(held);
|
|
95
|
+
}
|
|
96
|
+
/** Forget the held delta without sending it (the socket is gone). */
|
|
97
|
+
dispose() {
|
|
98
|
+
if (this.timer !== null)
|
|
99
|
+
this.clearTimer(this.timer);
|
|
100
|
+
this.timer = null;
|
|
101
|
+
this.held = null;
|
|
102
|
+
this.heldKey = '';
|
|
103
|
+
}
|
|
104
|
+
arm() {
|
|
105
|
+
this.timer = this.setTimer(() => {
|
|
106
|
+
this.timer = null;
|
|
107
|
+
if (!this.held)
|
|
108
|
+
return;
|
|
109
|
+
if (this.isBackedUp() && this.now() - this.heldSince < this.maxHoldMs) {
|
|
110
|
+
this.arm();
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
this.flush();
|
|
114
|
+
}, this.windowMs);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
//# sourceMappingURL=delta-coalescer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"delta-coalescer.js","sourceRoot":"","sources":["../src/delta-coalescer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Frame chunking (`frames=chunk.v1`): split one large server -> client JSON frame
|
|
3
|
+
* into several small TEXT frames that the client reassembles.
|
|
4
|
+
*
|
|
5
|
+
* Why: a browser hands a WebSocket message to the page only once ALL of it has
|
|
6
|
+
* arrived. Over a slow link (a phone on a weak cell) a multi-MB frame, typically
|
|
7
|
+
* a `message_history` carrying base64 tool images, takes longer to arrive than
|
|
8
|
+
* the client's liveness watchdog tolerates silence (`STALE_SOCKET_MS`), so the
|
|
9
|
+
* client tore down a healthy socket mid-transfer, reconnected, asked for the
|
|
10
|
+
* same history and looped forever without ever painting it. Small frames make
|
|
11
|
+
* every piece an inbound frame, which is the watchdog's proof of life.
|
|
12
|
+
*
|
|
13
|
+
* Opt-in per connection: the client says it understands chunks with the
|
|
14
|
+
* `frames=chunk.v1` query parameter on the socket URL, so an older cached web
|
|
15
|
+
* build (or the CLI bridge socket, which never asks) never receives a frame it cannot parse.
|
|
16
|
+
*
|
|
17
|
+
* Wire format of one chunk (a text frame): `\u0001<id> <seq> <count>\n<data>`.
|
|
18
|
+
* The leading U+0001 can never start a JSON document, so a chunk is told apart
|
|
19
|
+
* from an ordinary frame by its first character. `id` names the message, `seq`
|
|
20
|
+
* is 0-based, `count` is the number of chunks; concatenating every chunk's data
|
|
21
|
+
* in order gives back the original JSON text. The chunks of one message are sent
|
|
22
|
+
* back to back, so frame ORDER on the socket is unchanged.
|
|
23
|
+
*
|
|
24
|
+
* The client half lives in `client/src/frame-chunks.ts` (kept in sync by hand:
|
|
25
|
+
* the server does not depend on the client package).
|
|
26
|
+
*/
|
|
27
|
+
export declare const FRAME_CHUNK_PARAM = "frames";
|
|
28
|
+
export declare const FRAME_CHUNK_VERSION = "chunk.v1";
|
|
29
|
+
export declare const FRAME_CHUNK_MARK = "\u0001";
|
|
30
|
+
/** Chunk payload size in UTF-16 code units. ~32 KB keeps each piece a few
|
|
31
|
+
* seconds long even on a ~10 KB/s link. */
|
|
32
|
+
export declare const FRAME_CHUNK_CHARS: number;
|
|
33
|
+
/**
|
|
34
|
+
* Split `json` into chunk frames, or return `[json]` unchanged when it fits in
|
|
35
|
+
* one. Never splits a surrogate pair: a lone surrogate would be replaced by
|
|
36
|
+
* U+FFFD when the frame is UTF-8 encoded, corrupting the text.
|
|
37
|
+
*/
|
|
38
|
+
export declare function splitFrame(json: string, id: number, maxChars?: number): string[];
|
|
39
|
+
/** True when the socket URL's query string asks for chunked frames. */
|
|
40
|
+
export declare function wantsFrameChunks(searchParams: URLSearchParams): boolean;
|
|
41
|
+
//# sourceMappingURL=frame-chunks.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"frame-chunks.d.ts","sourceRoot":"","sources":["../src/frame-chunks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAC1C,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAC9C,eAAO,MAAM,gBAAgB,WAAW,CAAC;AACzC;4CAC4C;AAC5C,eAAO,MAAM,iBAAiB,QAAY,CAAC;AAE3C;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,SAAoB,GAAG,MAAM,EAAE,CAgB3F;AAED,uEAAuE;AACvE,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,eAAe,GAAG,OAAO,CAEvE"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Frame chunking (`frames=chunk.v1`): split one large server -> client JSON frame
|
|
3
|
+
* into several small TEXT frames that the client reassembles.
|
|
4
|
+
*
|
|
5
|
+
* Why: a browser hands a WebSocket message to the page only once ALL of it has
|
|
6
|
+
* arrived. Over a slow link (a phone on a weak cell) a multi-MB frame, typically
|
|
7
|
+
* a `message_history` carrying base64 tool images, takes longer to arrive than
|
|
8
|
+
* the client's liveness watchdog tolerates silence (`STALE_SOCKET_MS`), so the
|
|
9
|
+
* client tore down a healthy socket mid-transfer, reconnected, asked for the
|
|
10
|
+
* same history and looped forever without ever painting it. Small frames make
|
|
11
|
+
* every piece an inbound frame, which is the watchdog's proof of life.
|
|
12
|
+
*
|
|
13
|
+
* Opt-in per connection: the client says it understands chunks with the
|
|
14
|
+
* `frames=chunk.v1` query parameter on the socket URL, so an older cached web
|
|
15
|
+
* build (or the CLI bridge socket, which never asks) never receives a frame it cannot parse.
|
|
16
|
+
*
|
|
17
|
+
* Wire format of one chunk (a text frame): `\u0001<id> <seq> <count>\n<data>`.
|
|
18
|
+
* The leading U+0001 can never start a JSON document, so a chunk is told apart
|
|
19
|
+
* from an ordinary frame by its first character. `id` names the message, `seq`
|
|
20
|
+
* is 0-based, `count` is the number of chunks; concatenating every chunk's data
|
|
21
|
+
* in order gives back the original JSON text. The chunks of one message are sent
|
|
22
|
+
* back to back, so frame ORDER on the socket is unchanged.
|
|
23
|
+
*
|
|
24
|
+
* The client half lives in `client/src/frame-chunks.ts` (kept in sync by hand:
|
|
25
|
+
* the server does not depend on the client package).
|
|
26
|
+
*/
|
|
27
|
+
export const FRAME_CHUNK_PARAM = 'frames';
|
|
28
|
+
export const FRAME_CHUNK_VERSION = 'chunk.v1';
|
|
29
|
+
export const FRAME_CHUNK_MARK = '\u0001';
|
|
30
|
+
/** Chunk payload size in UTF-16 code units. ~32 KB keeps each piece a few
|
|
31
|
+
* seconds long even on a ~10 KB/s link. */
|
|
32
|
+
export const FRAME_CHUNK_CHARS = 32 * 1024;
|
|
33
|
+
/**
|
|
34
|
+
* Split `json` into chunk frames, or return `[json]` unchanged when it fits in
|
|
35
|
+
* one. Never splits a surrogate pair: a lone surrogate would be replaced by
|
|
36
|
+
* U+FFFD when the frame is UTF-8 encoded, corrupting the text.
|
|
37
|
+
*/
|
|
38
|
+
export function splitFrame(json, id, maxChars = FRAME_CHUNK_CHARS) {
|
|
39
|
+
if (json.length <= maxChars)
|
|
40
|
+
return [json];
|
|
41
|
+
const pieces = [];
|
|
42
|
+
let at = 0;
|
|
43
|
+
while (at < json.length) {
|
|
44
|
+
let end = Math.min(at + maxChars, json.length);
|
|
45
|
+
if (end < json.length) {
|
|
46
|
+
const c = json.charCodeAt(end - 1);
|
|
47
|
+
// Back off one so the pair stays whole; with a 1-char budget that would
|
|
48
|
+
// make no progress, so take the whole pair instead.
|
|
49
|
+
if (c >= 0xd800 && c <= 0xdbff)
|
|
50
|
+
end = end - 1 > at ? end - 1 : end + 1;
|
|
51
|
+
}
|
|
52
|
+
pieces.push(json.slice(at, end));
|
|
53
|
+
at = end;
|
|
54
|
+
}
|
|
55
|
+
return pieces.map((data, seq) => `${FRAME_CHUNK_MARK}${id} ${seq} ${pieces.length}\n${data}`);
|
|
56
|
+
}
|
|
57
|
+
/** True when the socket URL's query string asks for chunked frames. */
|
|
58
|
+
export function wantsFrameChunks(searchParams) {
|
|
59
|
+
return searchParams.getAll(FRAME_CHUNK_PARAM).includes(FRAME_CHUNK_VERSION);
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=frame-chunks.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"frame-chunks.js","sourceRoot":"","sources":["../src/frame-chunks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,MAAM,CAAC,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAC1C,MAAM,CAAC,MAAM,mBAAmB,GAAG,UAAU,CAAC;AAC9C,MAAM,CAAC,MAAM,gBAAgB,GAAG,QAAQ,CAAC;AACzC;4CAC4C;AAC5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,GAAG,IAAI,CAAC;AAE3C;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,EAAU,EAAE,QAAQ,GAAG,iBAAiB;IAC/E,IAAI,IAAI,CAAC,MAAM,IAAI,QAAQ;QAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,EAAE,GAAG,CAAC,CAAC;IACX,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACxB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;YACnC,wEAAwE;YACxE,oDAAoD;YACpD,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM;gBAAE,GAAG,GAAG,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QACjC,EAAE,GAAG,GAAG,CAAC;IACX,CAAC;IACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,gBAAgB,GAAG,EAAE,IAAI,GAAG,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC,CAAC;AAChG,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,gBAAgB,CAAC,YAA6B;IAC5D,OAAO,YAAY,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;AAC9E,CAAC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tool images by reference in `message_history`.
|
|
3
|
+
*
|
|
4
|
+
* A history window inlines every tool image as base64 (a `read` on a screenshot
|
|
5
|
+
* is often 1-3 MB), and the window is re-sent on every load AND on every
|
|
6
|
+
* reconnect. Over a slow link that made a session with a few screenshots take
|
|
7
|
+
* minutes to resync, every time the phone dropped its socket. A socket that asks
|
|
8
|
+
* for refs (`imageRefs=1` on the socket URL) gets large images WITHOUT their
|
|
9
|
+
* bytes; the web loads each one lazily from `GET /session/tool-image`, which the
|
|
10
|
+
* browser caches (a tool result never changes), so a reconnect costs text only.
|
|
11
|
+
*
|
|
12
|
+
* Opt-in so an older cached web build, which only knows inline `data`, keeps
|
|
13
|
+
* getting it. Only images with a `toolCallId` to address them by are stripped,
|
|
14
|
+
* and small ones stay inline (a fetch costs more than it saves).
|
|
15
|
+
*/
|
|
16
|
+
import type { HistoryMessage } from './session-types.js';
|
|
17
|
+
export declare const IMAGE_REFS_PARAM = "imageRefs";
|
|
18
|
+
/** Base64 characters above which an image is sent by reference. */
|
|
19
|
+
export declare const INLINE_IMAGE_MAX_CHARS: number;
|
|
20
|
+
export declare function wantsImageRefs(searchParams: URLSearchParams): boolean;
|
|
21
|
+
/**
|
|
22
|
+
* A copy of `messages` with large tool images replaced by references. Messages
|
|
23
|
+
* without such images are returned as is (same objects), so the common case
|
|
24
|
+
* allocates nothing.
|
|
25
|
+
*/
|
|
26
|
+
export declare function stripHistoryImages(messages: HistoryMessage[]): HistoryMessage[];
|
|
27
|
+
/**
|
|
28
|
+
* Raster types the endpoint will serve inline (and so the only ones sent by
|
|
29
|
+
* reference). SVG is excluded on purpose (it can carry script; see
|
|
30
|
+
* dispositionTypeFor in index.ts), as is anything unexpected.
|
|
31
|
+
*/
|
|
32
|
+
export declare const SERVABLE_IMAGE_TYPES: Set<string>;
|
|
33
|
+
//# sourceMappingURL=history-images.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"history-images.d.ts","sourceRoot":"","sources":["../src/history-images.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,eAAO,MAAM,gBAAgB,cAAc,CAAC;AAC5C,mEAAmE;AACnE,eAAO,MAAM,sBAAsB,QAAY,CAAC;AAEhD,wBAAgB,cAAc,CAAC,YAAY,EAAE,eAAe,GAAG,OAAO,CAErE;AAQD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,cAAc,EAAE,CAqB/E;AAMD;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,aAA6F,CAAC"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
export const IMAGE_REFS_PARAM = 'imageRefs';
|
|
2
|
+
/** Base64 characters above which an image is sent by reference. */
|
|
3
|
+
export const INLINE_IMAGE_MAX_CHARS = 16 * 1024;
|
|
4
|
+
export function wantsImageRefs(searchParams) {
|
|
5
|
+
return searchParams.get(IMAGE_REFS_PARAM) === '1';
|
|
6
|
+
}
|
|
7
|
+
/** Approximate decoded size of a base64 string. */
|
|
8
|
+
function base64Bytes(data) {
|
|
9
|
+
const pad = data.endsWith('==') ? 2 : data.endsWith('=') ? 1 : 0;
|
|
10
|
+
return Math.max(0, Math.floor((data.length * 3) / 4) - pad);
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* A copy of `messages` with large tool images replaced by references. Messages
|
|
14
|
+
* without such images are returned as is (same objects), so the common case
|
|
15
|
+
* allocates nothing.
|
|
16
|
+
*/
|
|
17
|
+
export function stripHistoryImages(messages) {
|
|
18
|
+
let changed = false;
|
|
19
|
+
const out = messages.map((m) => {
|
|
20
|
+
if (!m.toolCallId || !m.images?.some(byRef))
|
|
21
|
+
return m;
|
|
22
|
+
changed = true;
|
|
23
|
+
return {
|
|
24
|
+
...m,
|
|
25
|
+
images: m.images.map((i, index) => byRef(i)
|
|
26
|
+
? {
|
|
27
|
+
mimeType: i.mimeType,
|
|
28
|
+
bytes: base64Bytes(i.data),
|
|
29
|
+
toolCallId: m.toolCallId,
|
|
30
|
+
...(m.entryId ? { entryId: m.entryId } : {}),
|
|
31
|
+
index,
|
|
32
|
+
}
|
|
33
|
+
: i),
|
|
34
|
+
};
|
|
35
|
+
});
|
|
36
|
+
return changed ? out : messages;
|
|
37
|
+
}
|
|
38
|
+
function byRef(i) {
|
|
39
|
+
return typeof i.data === 'string' && i.data.length > INLINE_IMAGE_MAX_CHARS && SERVABLE_IMAGE_TYPES.has(i.mimeType);
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* Raster types the endpoint will serve inline (and so the only ones sent by
|
|
43
|
+
* reference). SVG is excluded on purpose (it can carry script; see
|
|
44
|
+
* dispositionTypeFor in index.ts), as is anything unexpected.
|
|
45
|
+
*/
|
|
46
|
+
export const SERVABLE_IMAGE_TYPES = new Set(['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/bmp', 'image/avif']);
|
|
47
|
+
//# sourceMappingURL=history-images.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"history-images.js","sourceRoot":"","sources":["../src/history-images.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,MAAM,gBAAgB,GAAG,WAAW,CAAC;AAC5C,mEAAmE;AACnE,MAAM,CAAC,MAAM,sBAAsB,GAAG,EAAE,GAAG,IAAI,CAAC;AAEhD,MAAM,UAAU,cAAc,CAAC,YAA6B;IAC1D,OAAO,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,KAAK,GAAG,CAAC;AACpD,CAAC;AAED,mDAAmD;AACnD,SAAS,WAAW,CAAC,IAAY;IAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACjE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;AAC9D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,QAA0B;IAC3D,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7B,IAAI,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,CAAC,CAAC;QACtD,OAAO,GAAG,IAAI,CAAC;QACf,OAAO;YACL,GAAG,CAAC;YACJ,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAChC,KAAK,CAAC,CAAC,CAAC;gBACN,CAAC,CAAC;oBACE,QAAQ,EAAE,CAAC,CAAC,QAAQ;oBACpB,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,IAAK,CAAC;oBAC3B,UAAU,EAAE,CAAC,CAAC,UAAU;oBACxB,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC5C,KAAK;iBACN;gBACH,CAAC,CAAC,CAAC,CACN;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;AAClC,CAAC;AAED,SAAS,KAAK,CAAC,CAAsC;IACnD,OAAO,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,sBAAsB,IAAI,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AACtH,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC"}
|