@relace-ai/jacq 0.1.2-beta.4 → 0.1.2-beta.6
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/actions/messages.d.ts +16 -16
- package/dist/actions/messages.js +47 -29
- package/dist/actions/messages.js.map +1 -1
- package/dist/actions/tasks.d.ts +1 -2
- package/dist/actions/tasks.js +8 -8
- package/dist/actions/tasks.js.map +1 -1
- package/dist/approvalGate.d.ts +42 -0
- package/dist/approvalGate.js +140 -0
- package/dist/approvalGate.js.map +1 -0
- package/dist/approvals.d.ts +21 -0
- package/dist/approvals.js +79 -0
- package/dist/approvals.js.map +1 -0
- package/dist/auth.d.ts +1 -0
- package/dist/auth.js +3 -0
- package/dist/auth.js.map +1 -1
- package/dist/charWidth.d.ts +7 -0
- package/dist/charWidth.js +24 -19
- package/dist/charWidth.js.map +1 -1
- package/dist/clipboard.d.ts +0 -5
- package/dist/clipboard.js +0 -5
- package/dist/clipboard.js.map +1 -1
- package/dist/commands.js +3 -2
- package/dist/commands.js.map +1 -1
- package/dist/config.d.ts +2 -1
- package/dist/config.js +17 -10
- package/dist/config.js.map +1 -1
- package/dist/connection.d.ts +2 -0
- package/dist/connection.js +199 -6
- package/dist/connection.js.map +1 -1
- package/dist/index.js +196 -34
- package/dist/index.js.map +1 -1
- package/dist/markdown/parser.js +248 -60
- package/dist/markdown/parser.js.map +1 -1
- package/dist/markdown/renderer.d.ts +3 -3
- package/dist/markdown/renderer.js +254 -108
- package/dist/markdown/renderer.js.map +1 -1
- package/dist/markdown/types.d.ts +4 -1
- package/dist/markdown/types.js.map +1 -1
- package/dist/protocol.d.ts +0 -2
- package/dist/protocol.js +137 -98
- package/dist/protocol.js.map +1 -1
- package/dist/renderer.js +4 -0
- package/dist/renderer.js.map +1 -1
- package/dist/startupAnimation.d.ts +4 -0
- package/dist/startupAnimation.js +326 -0
- package/dist/startupAnimation.js.map +1 -0
- package/dist/state.js +23 -5
- package/dist/state.js.map +1 -1
- package/dist/styles.js +4 -1
- package/dist/styles.js.map +1 -1
- package/dist/terminal.d.ts +9 -0
- package/dist/terminal.js +15 -0
- package/dist/terminal.js.map +1 -1
- package/dist/tools/registry.js +138 -13
- package/dist/tools/registry.js.map +1 -1
- package/dist/types.d.ts +57 -21
- package/dist/types.js +3 -1
- package/dist/types.js.map +1 -1
- package/dist/ui/config.d.ts +6 -0
- package/dist/ui/config.js +53 -0
- package/dist/ui/config.js.map +1 -0
- package/dist/ui/diffViewer.d.ts +9 -0
- package/dist/ui/diffViewer.js +320 -0
- package/dist/ui/diffViewer.js.map +1 -0
- package/dist/ui/index.js +40 -21
- package/dist/ui/index.js.map +1 -1
- package/dist/ui/input.d.ts +1 -1
- package/dist/ui/input.js +40 -15
- package/dist/ui/input.js.map +1 -1
- package/dist/ui/localCommands.d.ts +8 -0
- package/dist/ui/localCommands.js +267 -0
- package/dist/ui/localCommands.js.map +1 -0
- package/dist/ui/messages.js +195 -93
- package/dist/ui/messages.js.map +1 -1
- package/dist/ui/primitives.js +2 -1
- package/dist/ui/primitives.js.map +1 -1
- package/dist/ui/promptInput.js +42 -8
- package/dist/ui/promptInput.js.map +1 -1
- package/dist/ui/promptPicker.js +3 -4
- package/dist/ui/promptPicker.js.map +1 -1
- package/dist/ui/resumeTask.d.ts +6 -0
- package/dist/ui/resumeTask.js +136 -0
- package/dist/ui/resumeTask.js.map +1 -0
- package/dist/ui/sessions.js +2 -2
- package/dist/ui/sessions.js.map +1 -1
- package/dist/ui/welcome.js +22 -35
- package/dist/ui/welcome.js.map +1 -1
- package/dist/utils/resolvePath.d.ts +10 -0
- package/dist/utils/resolvePath.js +24 -0
- package/dist/utils/resolvePath.js.map +1 -0
- package/package.json +7 -4
- package/dist/ui/backgroundTasks.d.ts +0 -7
- package/dist/ui/backgroundTasks.js +0 -192
- package/dist/ui/backgroundTasks.js.map +0 -1
package/dist/ui/messages.js
CHANGED
|
@@ -2,32 +2,76 @@
|
|
|
2
2
|
* Messages Component — full-screen draw() API
|
|
3
3
|
* Displays message history with scroll support
|
|
4
4
|
*/
|
|
5
|
+
import { assertNever } from '../types.js';
|
|
5
6
|
import { drawStyledLine, drawText } from './primitives.js';
|
|
6
7
|
import { getVisibleMessages, isCurrentTaskRunning } from '../actions/messages.js';
|
|
7
8
|
import { state } from '../state.js';
|
|
9
|
+
import { interceptsShiftScroll } from '../terminal.js';
|
|
8
10
|
import { parse } from '../markdown/parser.js';
|
|
9
11
|
import { renderTokens } from '../markdown/renderer.js';
|
|
10
12
|
import { supportsHyperlinks } from '../terminal-caps.js';
|
|
13
|
+
import { displayWidth, fitToDisplayWidth } from '../charWidth.js';
|
|
14
|
+
function formatTimestamp(ts) {
|
|
15
|
+
const d = new Date(ts);
|
|
16
|
+
const now = new Date();
|
|
17
|
+
const isToday = d.getFullYear() === now.getFullYear() && d.getMonth() === now.getMonth() && d.getDate() === now.getDate();
|
|
18
|
+
const time = d.toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit' });
|
|
19
|
+
if (isToday)
|
|
20
|
+
return time;
|
|
21
|
+
const date = d.toLocaleDateString('en-US', { month: 'short', day: 'numeric' });
|
|
22
|
+
return `${date} ${time}`;
|
|
23
|
+
}
|
|
11
24
|
/**
|
|
12
|
-
* Wrap text to fit within maxWidth, breaking on spaces when possible.
|
|
25
|
+
* Wrap text to fit within maxWidth (display columns), breaking on spaces when possible.
|
|
13
26
|
*/
|
|
14
27
|
function wrapText(text, maxWidth) {
|
|
15
28
|
if (maxWidth <= 0)
|
|
16
29
|
return [text];
|
|
17
|
-
if (text
|
|
30
|
+
if (displayWidth(text) <= maxWidth)
|
|
18
31
|
return [text];
|
|
19
32
|
const result = [];
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
33
|
+
const words = text.split(' ');
|
|
34
|
+
let currentLine = '';
|
|
35
|
+
let currentWidth = 0;
|
|
36
|
+
for (const word of words) {
|
|
37
|
+
const wordWidth = displayWidth(word);
|
|
38
|
+
const sep = currentLine ? 1 : 0;
|
|
39
|
+
if (currentWidth + sep + wordWidth <= maxWidth) {
|
|
40
|
+
currentLine += (currentLine ? ' ' : '') + word;
|
|
41
|
+
currentWidth += sep + wordWidth;
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
if (currentLine)
|
|
45
|
+
result.push(currentLine);
|
|
46
|
+
if (wordWidth > maxWidth) {
|
|
47
|
+
let remaining = word;
|
|
48
|
+
while (displayWidth(remaining) > maxWidth) {
|
|
49
|
+
let chunk = '';
|
|
50
|
+
let chunkWidth = 0;
|
|
51
|
+
for (const ch of remaining) {
|
|
52
|
+
const cw = displayWidth(ch);
|
|
53
|
+
if (chunkWidth + cw > maxWidth)
|
|
54
|
+
break;
|
|
55
|
+
chunk += ch;
|
|
56
|
+
chunkWidth += cw;
|
|
57
|
+
}
|
|
58
|
+
if (chunk.length === 0)
|
|
59
|
+
chunk = [...remaining][0];
|
|
60
|
+
result.push(chunk);
|
|
61
|
+
remaining = remaining.slice(chunk.length);
|
|
62
|
+
}
|
|
63
|
+
currentLine = remaining;
|
|
64
|
+
currentWidth = displayWidth(remaining);
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
currentLine = word;
|
|
68
|
+
currentWidth = wordWidth;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
27
71
|
}
|
|
28
|
-
if (
|
|
29
|
-
result.push(
|
|
30
|
-
return result;
|
|
72
|
+
if (currentLine)
|
|
73
|
+
result.push(currentLine);
|
|
74
|
+
return result.length > 0 ? result : [text];
|
|
31
75
|
}
|
|
32
76
|
/**
|
|
33
77
|
* Format tool context (file paths, commands, etc.)
|
|
@@ -39,7 +83,7 @@ function formatToolContext(toolCall) {
|
|
|
39
83
|
case 'bash': {
|
|
40
84
|
const cmd = String(args.command || '');
|
|
41
85
|
const firstLine = cmd.split('\n')[0];
|
|
42
|
-
return firstLine
|
|
86
|
+
return displayWidth(firstLine) > 80 ? fitToDisplayWidth(firstLine, 79) + '…' : firstLine;
|
|
43
87
|
}
|
|
44
88
|
case 'write_file':
|
|
45
89
|
case 'read_file':
|
|
@@ -52,22 +96,23 @@ function formatToolContext(toolCall) {
|
|
|
52
96
|
case 'grep': {
|
|
53
97
|
const grepPattern = String(args.pattern || '');
|
|
54
98
|
const grepPath = String(args.path || '.');
|
|
55
|
-
|
|
99
|
+
const truncatedPattern = displayWidth(grepPattern) > 40 ? fitToDisplayWidth(grepPattern, 39) + '…' : grepPattern;
|
|
100
|
+
return `"${truncatedPattern}" in ${grepPath}`;
|
|
56
101
|
}
|
|
57
102
|
case 'tap':
|
|
58
103
|
case 'type_text': {
|
|
59
104
|
const text = String(args.text || args.element_id || '');
|
|
60
|
-
return text
|
|
105
|
+
return displayWidth(text) > 60 ? fitToDisplayWidth(text, 59) + '…' : text;
|
|
61
106
|
}
|
|
62
107
|
case 'goto': {
|
|
63
108
|
const url = String(args.path || args.url || '');
|
|
64
|
-
return url
|
|
109
|
+
return displayWidth(url) > 60 ? fitToDisplayWidth(url, 59) + '…' : url;
|
|
65
110
|
}
|
|
66
111
|
case 'scroll':
|
|
67
112
|
return String(args.direction || '');
|
|
68
113
|
case 'search': {
|
|
69
114
|
const query = String(args.query || '');
|
|
70
|
-
return query
|
|
115
|
+
return displayWidth(query) > 60 ? fitToDisplayWidth(query, 59) + '…' : query;
|
|
71
116
|
}
|
|
72
117
|
case 'ask_user':
|
|
73
118
|
return args.response || args.responseText || args.responseReceived
|
|
@@ -76,7 +121,7 @@ function formatToolContext(toolCall) {
|
|
|
76
121
|
default: {
|
|
77
122
|
const firstArg = Object.values(args).find(v => typeof v === 'string');
|
|
78
123
|
if (firstArg && typeof firstArg === 'string') {
|
|
79
|
-
return firstArg
|
|
124
|
+
return displayWidth(firstArg) > 60 ? fitToDisplayWidth(firstArg, 59) + '…' : firstArg;
|
|
80
125
|
}
|
|
81
126
|
return '';
|
|
82
127
|
}
|
|
@@ -123,7 +168,7 @@ function getLines(width) {
|
|
|
123
168
|
const maxWidth = width - 4;
|
|
124
169
|
const isRunning = isCurrentTaskRunning();
|
|
125
170
|
const showThinking = !state.pendingPrompt && (state.activityPhase === 'submitting' ||
|
|
126
|
-
state.activityPhase === '
|
|
171
|
+
state.activityPhase === 'waiting_for_step');
|
|
127
172
|
const showSubmitting = !state.pendingPrompt && state.activityPhase === 'resuming_from_prompt';
|
|
128
173
|
let lastToolIdx = -1;
|
|
129
174
|
for (let i = messages.length - 1; i >= 0; i--) {
|
|
@@ -146,26 +191,18 @@ function getLines(width) {
|
|
|
146
191
|
fileCount = fileList.split(', ').length;
|
|
147
192
|
}
|
|
148
193
|
const userLines = userContent.split('\n');
|
|
149
|
-
// Bubble: " ▶ text " / " text "
|
|
194
|
+
// Bubble: " ▶ text " / " text " — all lines get inverted style
|
|
150
195
|
// Leave 7 extra chars clear on right for scroll indicators
|
|
151
196
|
const wrapWidth = maxWidth - 9;
|
|
197
|
+
// Pre-compute bubble width across ALL lines for consistent padding
|
|
198
|
+
const allWrapped = userLines.map(line => wrapText(line, wrapWidth));
|
|
199
|
+
const bubbleWidth = Math.max(...allWrapped.flat().map(w => displayWidth(w)));
|
|
152
200
|
for (let i = 0; i < userLines.length; i++) {
|
|
153
|
-
const
|
|
154
|
-
|
|
155
|
-
const
|
|
156
|
-
const
|
|
157
|
-
|
|
158
|
-
const prefix = w === 0 ? ' ▶ ' : ' ';
|
|
159
|
-
const padded = wrapped[w].padEnd(bubbleWidth);
|
|
160
|
-
lines.push({ text: `${prefix}${padded} `, styleKey: 'userText' });
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
else {
|
|
164
|
-
const wrapped = wrapText(line, maxWidth - 4);
|
|
165
|
-
for (let w = 0; w < wrapped.length; w++) {
|
|
166
|
-
const prefix = w === 0 ? ' ⎿ ' : ' ';
|
|
167
|
-
lines.push({ text: `${prefix}${wrapped[w]}`, styleKey: 'text' });
|
|
168
|
-
}
|
|
201
|
+
const wrapped = allWrapped[i];
|
|
202
|
+
for (let w = 0; w < wrapped.length; w++) {
|
|
203
|
+
const prefix = (i === 0 && w === 0) ? ' ▶ ' : ' ';
|
|
204
|
+
const padded = fitToDisplayWidth(wrapped[w], bubbleWidth);
|
|
205
|
+
lines.push({ text: `${prefix}${padded} `, styleKey: 'userText' });
|
|
169
206
|
}
|
|
170
207
|
}
|
|
171
208
|
if (fileCount > 0) {
|
|
@@ -176,22 +213,23 @@ function getLines(width) {
|
|
|
176
213
|
}
|
|
177
214
|
case 'tool': {
|
|
178
215
|
lines.push({ text: '', styleKey: 'text' });
|
|
179
|
-
const hasDoneTool = msg.toolCalls
|
|
216
|
+
const hasDoneTool = msg.toolCalls.some(tc => tc.name === 'done');
|
|
180
217
|
const nextMsg = messages[msgIdx + 1];
|
|
181
218
|
const isFollowedByUser = nextMsg && (nextMsg.type === 'user' || nextMsg.type === 'status' || nextMsg.type === 'error');
|
|
182
219
|
const stepIsDone = !!hasDoneTool || (msgIdx !== lastToolIdx && !!isFollowedByUser);
|
|
183
|
-
const isInProgress = state.activityPhase === 'streaming' &&
|
|
220
|
+
const isInProgress = (state.activityPhase === 'streaming' || state.activityPhase === 'awaiting_prompt') &&
|
|
184
221
|
isRunning &&
|
|
185
222
|
msgIdx === lastToolIdx &&
|
|
186
223
|
!showThinking &&
|
|
187
|
-
!stepIsDone
|
|
224
|
+
!stepIsDone &&
|
|
225
|
+
!state.streamBuffer;
|
|
188
226
|
const stepDot = isInProgress ? (state.blinkVisible ? '●' : ' ') : '●';
|
|
189
227
|
let tokenSuffix = '';
|
|
190
228
|
if (msg.tokens) {
|
|
191
229
|
const input = msg.tokens.input || 0;
|
|
192
230
|
const output = msg.tokens.output || 0;
|
|
193
231
|
if (input + output > 0) {
|
|
194
|
-
tokenSuffix = `
|
|
232
|
+
tokenSuffix = ` \u2193${formatTokens(input)} \u2191${formatTokens(output)}`;
|
|
195
233
|
}
|
|
196
234
|
}
|
|
197
235
|
const stepText = `${stepDot} ${msg.content}`;
|
|
@@ -214,36 +252,6 @@ function getLines(width) {
|
|
|
214
252
|
: undefined;
|
|
215
253
|
lines.push({ text: fullText, styleKey: 'dotDone', segments });
|
|
216
254
|
}
|
|
217
|
-
if (msg.toolCalls) {
|
|
218
|
-
for (const tc of msg.toolCalls) {
|
|
219
|
-
if (tc.name === 'done')
|
|
220
|
-
continue;
|
|
221
|
-
const tcArgs = tc.args || {};
|
|
222
|
-
const context = formatToolContext(tc);
|
|
223
|
-
let tcText = ` → ${tc.name}`;
|
|
224
|
-
if (context) {
|
|
225
|
-
tcText += ` ${context}`;
|
|
226
|
-
}
|
|
227
|
-
if (tcText.length > maxWidth) {
|
|
228
|
-
tcText = tcText.slice(0, maxWidth - 1) + '…';
|
|
229
|
-
}
|
|
230
|
-
lines.push({ text: tcText, styleKey: 'toolCall' });
|
|
231
|
-
if (tc.name === 'ask_user') {
|
|
232
|
-
const question = formatAskUserQuestion(tcArgs);
|
|
233
|
-
const answer = formatAskUserAnswer(tcArgs);
|
|
234
|
-
if (question) {
|
|
235
|
-
for (const qLine of wrapText(`Q: ${question}`, maxWidth - 6)) {
|
|
236
|
-
lines.push({ text: ` ${qLine}`, styleKey: 'dim' });
|
|
237
|
-
}
|
|
238
|
-
}
|
|
239
|
-
if (answer) {
|
|
240
|
-
for (const aLine of wrapText(`A: ${answer}`, maxWidth - 6)) {
|
|
241
|
-
lines.push({ text: ` ${aLine}`, styleKey: 'dim' });
|
|
242
|
-
}
|
|
243
|
-
}
|
|
244
|
-
}
|
|
245
|
-
}
|
|
246
|
-
}
|
|
247
255
|
if (msg.agentMessage) {
|
|
248
256
|
lines.push({ text: '', styleKey: 'text' });
|
|
249
257
|
const mdTokens = parse(msg.agentMessage);
|
|
@@ -268,16 +276,62 @@ function getLines(width) {
|
|
|
268
276
|
});
|
|
269
277
|
}
|
|
270
278
|
}
|
|
279
|
+
const lineLinks = mdLine.links ? mdLine.links.map(l => ({
|
|
280
|
+
start: l.start + prefixLen,
|
|
281
|
+
end: l.end + prefixLen,
|
|
282
|
+
url: l.url,
|
|
283
|
+
})) : undefined;
|
|
271
284
|
lines.push({
|
|
272
285
|
text: prefix + mdLine.text,
|
|
273
286
|
styleKey: 'text',
|
|
274
287
|
segments: segments.length > 0 ? segments : undefined,
|
|
288
|
+
links: lineLinks,
|
|
275
289
|
});
|
|
276
290
|
}
|
|
277
291
|
}
|
|
278
|
-
|
|
292
|
+
const hasVisibleTools = msg.toolCalls.some(tc => tc.name !== 'done');
|
|
293
|
+
if (msg.agentMessage && hasVisibleTools) {
|
|
279
294
|
lines.push({ text: '', styleKey: 'text' });
|
|
280
|
-
|
|
295
|
+
}
|
|
296
|
+
for (const tc of msg.toolCalls) {
|
|
297
|
+
if (tc.name === 'done')
|
|
298
|
+
continue;
|
|
299
|
+
const tcArgs = tc.args || {};
|
|
300
|
+
const context = formatToolContext(tc);
|
|
301
|
+
let targetLabel = '';
|
|
302
|
+
if (tc.source && tc.target) {
|
|
303
|
+
targetLabel = ` ${tc.source} → ${tc.target}`;
|
|
304
|
+
}
|
|
305
|
+
else if (tc.target) {
|
|
306
|
+
targetLabel = ` @${tc.target}`;
|
|
307
|
+
}
|
|
308
|
+
let tcText = ` \u2192 ${tc.name}`;
|
|
309
|
+
if (context) {
|
|
310
|
+
tcText += ` ${context}`;
|
|
311
|
+
}
|
|
312
|
+
const suffixWidth = displayWidth(targetLabel);
|
|
313
|
+
if (displayWidth(tcText) + suffixWidth > maxWidth) {
|
|
314
|
+
tcText = fitToDisplayWidth(tcText, maxWidth - suffixWidth - 1) + '…';
|
|
315
|
+
}
|
|
316
|
+
const fullTcText = tcText + targetLabel;
|
|
317
|
+
const segments = targetLabel
|
|
318
|
+
? [{ start: tcText.length, end: fullTcText.length, styleKey: 'dim' }]
|
|
319
|
+
: undefined;
|
|
320
|
+
lines.push({ text: fullTcText, styleKey: 'toolCall', segments });
|
|
321
|
+
if (tc.name === 'ask_user') {
|
|
322
|
+
const question = formatAskUserQuestion(tcArgs);
|
|
323
|
+
const answer = formatAskUserAnswer(tcArgs);
|
|
324
|
+
if (question) {
|
|
325
|
+
for (const qLine of wrapText(`Q: ${question}`, maxWidth - 6)) {
|
|
326
|
+
lines.push({ text: ` ${qLine}`, styleKey: 'dim' });
|
|
327
|
+
}
|
|
328
|
+
}
|
|
329
|
+
if (answer) {
|
|
330
|
+
for (const aLine of wrapText(`A: ${answer}`, maxWidth - 6)) {
|
|
331
|
+
lines.push({ text: ` ${aLine}`, styleKey: 'dim' });
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
}
|
|
281
335
|
}
|
|
282
336
|
break;
|
|
283
337
|
}
|
|
@@ -294,19 +348,25 @@ function getLines(width) {
|
|
|
294
348
|
start: s.start + 6,
|
|
295
349
|
end: s.end + 6
|
|
296
350
|
})) : undefined,
|
|
351
|
+
links: mdLine.links ? mdLine.links.map(l => ({
|
|
352
|
+
...l,
|
|
353
|
+
start: l.start + 6,
|
|
354
|
+
end: l.end + 6
|
|
355
|
+
})) : undefined,
|
|
297
356
|
});
|
|
298
357
|
}
|
|
299
358
|
break;
|
|
300
359
|
}
|
|
301
360
|
case 'status': {
|
|
361
|
+
const ts = msg.timestamp > 0 ? ` ${formatTimestamp(msg.timestamp)}` : '';
|
|
302
362
|
lines.push({ text: '', styleKey: 'text' });
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
lines.push({ text: ' ■ Done', styleKey: 'statusDone' });
|
|
363
|
+
if (msg.statusKind === 'done') {
|
|
364
|
+
const text = ' ■ Done' + ts;
|
|
365
|
+
lines.push({ text, styleKey: 'statusDone', segments: ts ? [{ start: text.length - ts.length, end: text.length, styleKey: 'dim' }] : undefined });
|
|
307
366
|
}
|
|
308
|
-
else if (
|
|
309
|
-
|
|
367
|
+
else if (msg.statusKind === 'cancelled') {
|
|
368
|
+
const text = ' ⊘ Cancelled' + ts;
|
|
369
|
+
lines.push({ text, styleKey: 'statusDone', segments: ts ? [{ start: text.length - ts.length, end: text.length, styleKey: 'dim' }] : undefined });
|
|
310
370
|
}
|
|
311
371
|
else if (msg.linkUrl && !supportsHyperlinks()) {
|
|
312
372
|
// Terminal doesn't support OSC 8 — show URL as plain text.
|
|
@@ -322,16 +382,23 @@ function getLines(width) {
|
|
|
322
382
|
}
|
|
323
383
|
}
|
|
324
384
|
else {
|
|
325
|
-
const lineText = ' ' + msg.content;
|
|
385
|
+
const lineText = ' ' + msg.content + ts;
|
|
326
386
|
const line = { text: lineText, styleKey: 'statusDefault' };
|
|
387
|
+
const segments = [];
|
|
327
388
|
if (msg.linkUrl) {
|
|
328
389
|
const linkLabel = 'Open ↗';
|
|
329
390
|
const linkStart = lineText.indexOf(linkLabel);
|
|
330
391
|
if (linkStart >= 0) {
|
|
331
392
|
line.links = [{ start: linkStart, end: linkStart + linkLabel.length, url: msg.linkUrl }];
|
|
332
|
-
|
|
393
|
+
segments.push({ start: linkStart, end: linkStart + linkLabel.length, styleKey: 'value' });
|
|
333
394
|
}
|
|
334
395
|
}
|
|
396
|
+
if (ts) {
|
|
397
|
+
segments.push({ start: lineText.length - ts.length, end: lineText.length, styleKey: 'dim' });
|
|
398
|
+
}
|
|
399
|
+
if (segments.length > 0) {
|
|
400
|
+
line.segments = segments;
|
|
401
|
+
}
|
|
335
402
|
lines.push(line);
|
|
336
403
|
}
|
|
337
404
|
break;
|
|
@@ -341,7 +408,7 @@ function getLines(width) {
|
|
|
341
408
|
lines.push({ text: ' ✗ ' + msg.content, styleKey: 'statusDefault' });
|
|
342
409
|
break;
|
|
343
410
|
default:
|
|
344
|
-
|
|
411
|
+
assertNever(msg);
|
|
345
412
|
}
|
|
346
413
|
}
|
|
347
414
|
// Show request-in-flight indicator before first step arrives
|
|
@@ -351,26 +418,61 @@ function getLines(width) {
|
|
|
351
418
|
const label = showSubmitting ? 'Submitting...' : 'Thinking...';
|
|
352
419
|
lines.push({ text: ` ${thinkingDot} ${label}`, styleKey: 'toolStep' });
|
|
353
420
|
}
|
|
354
|
-
// Show pending question indicator
|
|
355
|
-
if (state.pendingPrompt) {
|
|
356
|
-
lines.push({ text: '', styleKey: 'text' });
|
|
357
|
-
lines.push({ text: ' ? Awaiting answer', styleKey: 'statusDone' });
|
|
358
|
-
}
|
|
359
421
|
// Show cancellation progress (transient — replaced by status message when server confirms)
|
|
360
422
|
if (state.currentTaskId && state.activityPhase === 'cancelling') {
|
|
361
423
|
lines.push({ text: '', styleKey: 'text' });
|
|
362
424
|
lines.push({ text: ' ⊘ Cancelling...', styleKey: 'statusDefault' });
|
|
363
425
|
}
|
|
364
426
|
// Stream buffer (in-progress streaming text with markdown)
|
|
365
|
-
|
|
427
|
+
// Only render when pinned to bottom — avoids pushing the view when scrolled up
|
|
428
|
+
if (state.streamBuffer && state.isPinned) {
|
|
429
|
+
lines.push({ text: '', styleKey: 'text' });
|
|
430
|
+
// Step header with blinking dot
|
|
431
|
+
const currentTask = state.tasks.find(t => t.id === state.currentTaskId);
|
|
432
|
+
const nextStep = (currentTask?.currentStep || 0) + 1;
|
|
433
|
+
const stepDot = state.blinkVisible ? '●' : ' ';
|
|
434
|
+
const stepText = `${stepDot} Step ${nextStep}`;
|
|
435
|
+
const fullStepText = ' ' + stepText;
|
|
436
|
+
const stepContentEnd = 2 + stepText.length;
|
|
437
|
+
lines.push({
|
|
438
|
+
text: fullStepText,
|
|
439
|
+
styleKey: 'dim',
|
|
440
|
+
segments: [{ start: 4, end: stepContentEnd, styleKey: 'dotDone' }],
|
|
441
|
+
});
|
|
442
|
+
// Agent text with │ prefix
|
|
366
443
|
lines.push({ text: '', styleKey: 'text' });
|
|
367
444
|
const streamTokens = parse(state.streamBuffer);
|
|
368
|
-
const
|
|
445
|
+
const prefix = ' │ ';
|
|
446
|
+
const prefixLen = prefix.length;
|
|
447
|
+
const streamMdLines = renderTokens(streamTokens, maxWidth - prefixLen);
|
|
369
448
|
for (const mdLine of streamMdLines) {
|
|
449
|
+
const segments = [];
|
|
450
|
+
if (mdLine.text.length > 0 && mdLine.styleKey !== 'text') {
|
|
451
|
+
segments.push({
|
|
452
|
+
start: prefixLen,
|
|
453
|
+
end: prefixLen + mdLine.text.length,
|
|
454
|
+
styleKey: mdLine.styleKey,
|
|
455
|
+
});
|
|
456
|
+
}
|
|
457
|
+
if (mdLine.segments) {
|
|
458
|
+
for (const s of mdLine.segments) {
|
|
459
|
+
segments.push({
|
|
460
|
+
start: s.start + prefixLen,
|
|
461
|
+
end: s.end + prefixLen,
|
|
462
|
+
styleKey: s.styleKey,
|
|
463
|
+
});
|
|
464
|
+
}
|
|
465
|
+
}
|
|
466
|
+
const lineLinks = mdLine.links ? mdLine.links.map(l => ({
|
|
467
|
+
start: l.start + prefixLen,
|
|
468
|
+
end: l.end + prefixLen,
|
|
469
|
+
url: l.url,
|
|
470
|
+
})) : undefined;
|
|
370
471
|
lines.push({
|
|
371
|
-
text: mdLine.text,
|
|
372
|
-
styleKey: '
|
|
373
|
-
segments:
|
|
472
|
+
text: prefix + mdLine.text,
|
|
473
|
+
styleKey: 'text',
|
|
474
|
+
segments: segments.length > 0 ? segments : undefined,
|
|
475
|
+
links: lineLinks,
|
|
374
476
|
});
|
|
375
477
|
}
|
|
376
478
|
}
|
|
@@ -404,11 +506,11 @@ const messages = {
|
|
|
404
506
|
}
|
|
405
507
|
// Scroll indicators
|
|
406
508
|
if (scrollOffset > 0) {
|
|
407
|
-
const indicator = 'Shift+\
|
|
509
|
+
const indicator = (interceptsShiftScroll ? 'Fn' : 'Shift') + '+\u2193';
|
|
408
510
|
drawText(screen, layout.width - indicator.length - 1, y + height - 1, indicator, styles.dim || 0);
|
|
409
511
|
}
|
|
410
512
|
if (startLine > 0) {
|
|
411
|
-
const indicator = 'Shift+\
|
|
513
|
+
const indicator = (interceptsShiftScroll ? 'Fn' : 'Shift') + '+\u2191';
|
|
412
514
|
drawText(screen, layout.width - indicator.length - 1, y + bottomOffset, indicator, styles.dim || 0);
|
|
413
515
|
}
|
|
414
516
|
},
|
package/dist/ui/messages.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/ui/messages.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/ui/messages.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGlE,SAAS,eAAe,CAAC,EAAU;IAC/B,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;IACvB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,MAAM,OAAO,GAAG,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC;IAC1H,MAAM,IAAI,GAAG,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IACnF,IAAI,OAAO;QAAE,OAAO,IAAI,CAAC;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;IAC/E,OAAO,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;AAC7B,CAAC;AAED;;GAEG;AACH,SAAS,QAAQ,CAAC,IAAY,EAAE,QAAgB;IAC5C,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,QAAQ;QAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAElD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,IAAI,YAAY,GAAG,CAAC,CAAC;IAErB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,YAAY,GAAG,GAAG,GAAG,SAAS,IAAI,QAAQ,EAAE,CAAC;YAC7C,WAAW,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;YAC/C,YAAY,IAAI,GAAG,GAAG,SAAS,CAAC;QACpC,CAAC;aAAM,CAAC;YACJ,IAAI,WAAW;gBAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC1C,IAAI,SAAS,GAAG,QAAQ,EAAE,CAAC;gBACvB,IAAI,SAAS,GAAG,IAAI,CAAC;gBACrB,OAAO,YAAY,CAAC,SAAS,CAAC,GAAG,QAAQ,EAAE,CAAC;oBACxC,IAAI,KAAK,GAAG,EAAE,CAAC;oBACf,IAAI,UAAU,GAAG,CAAC,CAAC;oBACnB,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;wBACzB,MAAM,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC,CAAC;wBAC5B,IAAI,UAAU,GAAG,EAAE,GAAG,QAAQ;4BAAE,MAAM;wBACtC,KAAK,IAAI,EAAE,CAAC;wBACZ,UAAU,IAAI,EAAE,CAAC;oBACrB,CAAC;oBACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;wBAAE,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;oBAClD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACnB,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC9C,CAAC;gBACD,WAAW,GAAG,SAAS,CAAC;gBACxB,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACJ,WAAW,GAAG,IAAI,CAAC;gBACnB,YAAY,GAAG,SAAS,CAAC;YAC7B,CAAC;QACL,CAAC;IACL,CAAC;IACD,IAAI,WAAW;QAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC1C,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAC/C,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB,CAAC,QAA0D;IACjF,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC;IACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAE3B,QAAQ,IAAI,EAAE,CAAC;QACX,KAAK,MAAM,CAAC,CAAC,CAAC;YACV,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;YACvC,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACrC,OAAO,YAAY,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;QAC7F,CAAC;QACD,KAAK,YAAY,CAAC;QAClB,KAAK,WAAW;YACZ,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QACnC,KAAK,YAAY,CAAC,CAAC,CAAC;YAChB,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;YAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACzD,OAAO,GAAG,QAAQ,GAAG,OAAO,EAAE,CAAC;QACnC,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACV,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;YAC1C,MAAM,gBAAgB,GAAG,YAAY,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC;YACjH,OAAO,IAAI,gBAAgB,QAAQ,QAAQ,EAAE,CAAC;QAClD,CAAC;QACD,KAAK,KAAK,CAAC;QACX,KAAK,WAAW,CAAC,CAAC,CAAC;YACf,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;YACxD,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9E,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACV,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;YAChD,OAAO,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QAC3E,CAAC;QACD,KAAK,QAAQ;YACT,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QACxC,KAAK,QAAQ,CAAC,CAAC,CAAC;YACZ,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YACvC,OAAO,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;QACjF,CAAC;QACD,KAAK,UAAU;YACX,OAAO,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,gBAAgB;gBAC9D,CAAC,CAAC,mBAAmB;gBACrB,CAAC,CAAC,mBAAmB,CAAC;QAC9B,OAAO,CAAC,CAAC,CAAC;YACN,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC;YACtE,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBAC3C,OAAO,YAAY,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;YAC1F,CAAC;YACD,OAAO,EAAE,CAAC;QACd,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAS,qBAAqB,CAAC,IAA6B;IACxD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAqD,CAAC;IAC7E,MAAM,QAAQ,GAAG,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC;IAC1C,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;QAAE,OAAO,IAAI,CAAC;IAClE,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;AAC3B,CAAC;AAED,SAAS,mBAAmB,CAAC,IAA6B;IACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAA+C,CAAC;IACtE,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC3C,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAC;QAC7B,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,UAAU,CAAC;QAC7B,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;IACvC,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;QAC1D,OAAO,YAAY,CAAC,IAAI,EAAE,CAAC;IAC/B,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAS,YAAY,CAAC,KAAa;IAC/B,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;IAC3C,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC;AAED;;;GAGG;AACH,SAAS,QAAQ,CAAC,KAAa;IAC3B,MAAM,QAAQ,GAAG,kBAAkB,EAAE,CAAC;IACtC,MAAM,KAAK,GAAiB,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,KAAK,GAAG,CAAC,CAAC;IAC3B,MAAM,SAAS,GAAG,oBAAoB,EAAE,CAAC;IACzC,MAAM,YAAY,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,CACzC,KAAK,CAAC,aAAa,KAAK,YAAY;QACpC,KAAK,CAAC,aAAa,KAAK,kBAAkB,CAC7C,CAAC;IACF,MAAM,cAAc,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,aAAa,KAAK,sBAAsB,CAAC;IAE9F,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC;IACrB,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5C,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC9B,WAAW,GAAG,CAAC,CAAC;YAChB,MAAM;QACV,CAAC;IACL,CAAC;IAED,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;QACtD,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC7B,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;YACf,KAAK,MAAM,CAAC,CAAC,CAAC;gBACV,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC3C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;gBACtE,IAAI,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC;gBAC9B,IAAI,SAAS,GAAG,CAAC,CAAC;gBAElB,IAAI,WAAW,EAAE,CAAC;oBACd,MAAM,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,GAAG,WAAW,CAAC;oBAC9C,WAAW,GAAG,WAAW,CAAC;oBAC1B,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;gBAC5C,CAAC;gBAED,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC1C,iEAAiE;gBACjE,2DAA2D;gBAC3D,MAAM,SAAS,GAAG,QAAQ,GAAG,CAAC,CAAC;gBAC/B,mEAAmE;gBACnE,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;gBACpE,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBACxC,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;oBAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBACtC,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;wBACpD,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;wBAC1D,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,MAAM,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;oBACtE,CAAC;gBACL,CAAC;gBAED,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;oBAChB,MAAM,UAAU,GAAG,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,SAAS,iBAAiB,CAAC;oBACvF,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,UAAU,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;gBAChE,CAAC;gBACD,MAAM;YACV,CAAC;YAED,KAAK,MAAM,CAAC,CAAC,CAAC;gBACV,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBAE3C,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;gBACjE,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBACrC,MAAM,gBAAgB,GAAG,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;gBACvH,MAAM,UAAU,GAAG,CAAC,CAAC,WAAW,IAAI,CAAC,MAAM,KAAK,WAAW,IAAI,CAAC,CAAC,gBAAgB,CAAC,CAAC;gBAEnF,MAAM,YAAY,GACd,CAAC,KAAK,CAAC,aAAa,KAAK,WAAW,IAAI,KAAK,CAAC,aAAa,KAAK,iBAAiB,CAAC;oBAClF,SAAS;oBACT,MAAM,KAAK,WAAW;oBACtB,CAAC,YAAY;oBACb,CAAC,UAAU;oBACX,CAAC,KAAK,CAAC,YAAY,CAAC;gBACxB,MAAM,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;gBAEtE,IAAI,WAAW,GAAG,EAAE,CAAC;gBACrB,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;oBACb,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC;oBACpC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC;oBACtC,IAAI,KAAK,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC;wBACrB,WAAW,GAAG,WAAW,YAAY,CAAC,KAAK,CAAC,UAAU,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;oBACjF,CAAC;gBACL,CAAC;gBACD,MAAM,QAAQ,GAAG,GAAG,OAAO,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;gBAC7C,MAAM,QAAQ,GAAG,IAAI,GAAG,QAAQ,GAAG,WAAW,CAAC;gBAC/C,MAAM,cAAc,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;gBAC3C,IAAI,YAAY,EAAE,CAAC;oBACf,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;oBAC1E,IAAI,WAAW,EAAE,CAAC;wBACd,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;oBACpF,CAAC;oBACD,KAAK,CAAC,IAAI,CAAC;wBACP,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,KAAK;wBACf,QAAQ;qBACX,CAAC,CAAC;gBACP,CAAC;qBAAM,CAAC;oBACJ,MAAM,QAAQ,GAAG,WAAW;wBACxB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;wBACpE,CAAC,CAAC,SAAS,CAAC;oBAChB,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAClE,CAAC;gBACD,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;oBACnB,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;oBAC3C,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;oBACzC,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC;oBACrD,MAAM,MAAM,GAAG,QAAQ,CAAC;oBACxB,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;oBAEhC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;wBAC3B,MAAM,QAAQ,GAAG,EAAE,CAAC;wBAEpB,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;4BACvD,QAAQ,CAAC,IAAI,CAAC;gCACV,KAAK,EAAE,SAAS;gCAChB,GAAG,EAAE,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM;gCACnC,QAAQ,EAAE,MAAM,CAAC,QAAQ;6BAC5B,CAAC,CAAC;wBACP,CAAC;wBAED,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;4BAClB,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gCAC9B,QAAQ,CAAC,IAAI,CAAC;oCACV,KAAK,EAAE,CAAC,CAAC,KAAK,GAAG,SAAS;oCAC1B,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,SAAS;oCACtB,QAAQ,EAAE,CAAC,CAAC,QAAQ;iCACvB,CAAC,CAAC;4BACP,CAAC;wBACL,CAAC;wBAED,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;4BACpD,KAAK,EAAE,CAAC,CAAC,KAAK,GAAG,SAAS;4BAC1B,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,SAAS;4BACtB,GAAG,EAAE,CAAC,CAAC,GAAG;yBACb,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;wBAEhB,KAAK,CAAC,IAAI,CAAC;4BACP,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,IAAI;4BAC1B,QAAQ,EAAE,MAAM;4BAChB,QAAQ,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;4BACpD,KAAK,EAAE,SAAS;yBACnB,CAAC,CAAC;oBACP,CAAC;gBACL,CAAC;gBACD,MAAM,eAAe,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;gBACrE,IAAI,GAAG,CAAC,YAAY,IAAI,eAAe,EAAE,CAAC;oBACtC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC/C,CAAC;gBACD,KAAK,MAAM,EAAE,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;oBAC7B,IAAI,EAAE,CAAC,IAAI,KAAK,MAAM;wBAAE,SAAS;oBACjC,MAAM,MAAM,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;oBAC7B,MAAM,OAAO,GAAG,iBAAiB,CAAC,EAAE,CAAC,CAAC;oBACtC,IAAI,WAAW,GAAG,EAAE,CAAC;oBACrB,IAAI,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;wBACzB,WAAW,GAAG,KAAK,EAAE,CAAC,MAAM,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;oBAClD,CAAC;yBAAM,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;wBACnB,WAAW,GAAG,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;oBACpC,CAAC;oBACD,IAAI,MAAM,GAAG,cAAc,EAAE,CAAC,IAAI,EAAE,CAAC;oBACrC,IAAI,OAAO,EAAE,CAAC;wBACV,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;oBAC5B,CAAC;oBACD,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;oBAC9C,IAAI,YAAY,CAAC,MAAM,CAAC,GAAG,WAAW,GAAG,QAAQ,EAAE,CAAC;wBAChD,MAAM,GAAG,iBAAiB,CAAC,MAAM,EAAE,QAAQ,GAAG,WAAW,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;oBACzE,CAAC;oBACD,MAAM,UAAU,GAAG,MAAM,GAAG,WAAW,CAAC;oBACxC,MAAM,QAAQ,GAAG,WAAW;wBACxB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,UAAU,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;wBACrE,CAAC,CAAC,SAAS,CAAC;oBAChB,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;oBAEjE,IAAI,EAAE,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBACzB,MAAM,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;wBAC/C,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;wBAE3C,IAAI,QAAQ,EAAE,CAAC;4BACX,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,MAAM,QAAQ,EAAE,EAAE,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC;gCAC3D,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;4BAC5D,CAAC;wBACL,CAAC;wBACD,IAAI,MAAM,EAAE,CAAC;4BACT,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,MAAM,MAAM,EAAE,EAAE,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC;gCACzD,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;4BAC5D,CAAC;wBACL,CAAC;oBACL,CAAC;gBACL,CAAC;gBAED,MAAM;YACV,CAAC;YAED,KAAK,OAAO,CAAC,CAAC,CAAC;gBACX,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC3C,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACvC,MAAM,UAAU,GAAG,YAAY,CAAC,WAAW,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC;gBAC3D,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;oBAC9B,KAAK,CAAC,IAAI,CAAC;wBACP,IAAI,EAAE,QAAQ,GAAG,MAAM,CAAC,IAAI;wBAC5B,QAAQ,EAAE,MAAM,CAAC,QAAQ;wBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;4BAClD,GAAG,CAAC;4BACJ,KAAK,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC;4BAClB,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC;yBACjB,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;wBACf,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;4BACzC,GAAG,CAAC;4BACJ,KAAK,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC;4BAClB,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC;yBACjB,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;qBAClB,CAAC,CAAC;gBACP,CAAC;gBACD,MAAM;YACV,CAAC;YAED,KAAK,QAAQ,CAAC,CAAC,CAAC;gBACZ,MAAM,EAAE,GAAG,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1E,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC3C,IAAI,GAAG,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;oBAC5B,MAAM,IAAI,GAAG,UAAU,GAAG,EAAE,CAAC;oBAC7B,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;gBACrJ,CAAC;qBAAM,IAAI,GAAG,CAAC,UAAU,KAAK,WAAW,EAAE,CAAC;oBACxC,MAAM,IAAI,GAAG,eAAe,GAAG,EAAE,CAAC;oBAClC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;gBACrJ,CAAC;qBAAM,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;oBAC9C,2DAA2D;oBAC3D,4DAA4D;oBAC5D,8DAA8D;oBAC9D,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;oBACpD,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC;oBAC9D,MAAM,OAAO,GAAG,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC;oBACnC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC;oBAC/D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;wBAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;wBACxD,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;oBACjE,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,MAAM,QAAQ,GAAG,IAAI,GAAG,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC;oBACzC,MAAM,IAAI,GAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;oBACvE,MAAM,QAAQ,GAAuD,EAAE,CAAC;oBACxE,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;wBACd,MAAM,SAAS,GAAG,QAAQ,CAAC;wBAC3B,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;wBAC9C,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;4BACjB,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,GAAG,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;4BACzF,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,GAAG,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;wBAC9F,CAAC;oBACL,CAAC;oBACD,IAAI,EAAE,EAAE,CAAC;wBACL,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;oBACjG,CAAC;oBACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACtB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;oBAC7B,CAAC;oBACD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACrB,CAAC;gBACD,MAAM;YACV,CAAC;YAED,KAAK,OAAO;gBACR,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC3C,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC;gBACtE,MAAM;YAEV;gBACI,WAAW,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;IACL,CAAC;IAED,6DAA6D;IAC7D,IAAI,CAAC,YAAY,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;QAC3D,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACnD,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,aAAa,CAAC;QAC/D,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,WAAW,IAAI,KAAK,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,2FAA2F;IAC3F,IAAI,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,aAAa,KAAK,YAAY,EAAE,CAAC;QAC9D,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3C,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,2DAA2D;IAC3D,+EAA+E;IAC/E,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACvC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAE3C,gCAAgC;QAChC,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,aAAa,CAAC,CAAC;QACxE,MAAM,QAAQ,GAAG,CAAC,WAAW,EAAE,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QAC/C,MAAM,QAAQ,GAAG,GAAG,OAAO,SAAS,QAAQ,EAAE,CAAC;QAC/C,MAAM,YAAY,GAAG,IAAI,GAAG,QAAQ,CAAC;QACrC,MAAM,cAAc,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC3C,KAAK,CAAC,IAAI,CAAC;YACP,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;SACrE,CAAC,CAAC;QAEH,2BAA2B;QAC3B,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3C,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,QAAQ,CAAC;QACxB,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;QAChC,MAAM,aAAa,GAAG,YAAY,CAAC,YAAY,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAC;QACvE,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE,CAAC;YACjC,MAAM,QAAQ,GAAuD,EAAE,CAAC;YAExE,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;gBACvD,QAAQ,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,SAAS;oBAChB,GAAG,EAAE,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM;oBACnC,QAAQ,EAAE,MAAM,CAAC,QAAQ;iBAC5B,CAAC,CAAC;YACP,CAAC;YAED,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAClB,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;oBAC9B,QAAQ,CAAC,IAAI,CAAC;wBACV,KAAK,EAAE,CAAC,CAAC,KAAK,GAAG,SAAS;wBAC1B,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,SAAS;wBACtB,QAAQ,EAAE,CAAC,CAAC,QAAQ;qBACvB,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACpD,KAAK,EAAE,CAAC,CAAC,KAAK,GAAG,SAAS;gBAC1B,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,SAAS;gBACtB,GAAG,EAAE,CAAC,CAAC,GAAG;aACb,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAEhB,KAAK,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,IAAI;gBAC1B,QAAQ,EAAE,MAAM;gBAChB,QAAQ,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;gBACpD,KAAK,EAAE,SAAS;aACnB,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,MAAM,QAAQ,GAA4D;IACtE,QAAQ;IAER,MAAM,CAAC,KAAe;QAClB,OAAO,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,MAAc,EAAE,CAAS,EAAE,KAAe,EAAE,MAAc,EAAE,MAAgB;QAC7E,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC;QACrC,IAAI,MAAM,IAAI,CAAC;YAAE,OAAO;QAExB,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;QAEhC,mEAAmE;QACnE,wDAAwD;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC,CAAC;QACnD,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QAExC,+CAA+C;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,YAAY,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,GAAG,MAAM,CAAC,CAAC;QAEzD,2CAA2C;QAC3C,MAAM,YAAY,GAAG,OAAO,GAAG,SAAS,CAAC;QACzC,MAAM,YAAY,GAAG,MAAM,GAAG,YAAY,CAAC;QAE3C,KAAK,IAAI,CAAC,GAAG,SAAS,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,MAAM,KAAK,GAAG,CAAC,GAAG,YAAY,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;YACjD,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QACrE,CAAC;QAED,oBAAoB;QACpB,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACnB,MAAM,SAAS,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;YACvE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QACtG,CAAC;QACD,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;YAChB,MAAM,SAAS,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;YACvE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QACxG,CAAC;IACL,CAAC;IAED,SAAS,CAAC,IAAwB,EAAE,IAAa,EAAE,MAAgB;QAC/D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC9B,CAAC;CACJ,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
package/dist/ui/primitives.js
CHANGED
|
@@ -54,12 +54,13 @@ export function drawTextWithSegments(screen, x, y, text, defaultStyleId, segment
|
|
|
54
54
|
if (maxWidth !== undefined && displayX + w > maxWidth)
|
|
55
55
|
break;
|
|
56
56
|
// Determine style from segments
|
|
57
|
+
// Use the last matching segment (later segments override earlier ones)
|
|
57
58
|
let styleId = defaultStyleId;
|
|
58
59
|
if (segments) {
|
|
59
60
|
for (const seg of segments) {
|
|
60
61
|
if (charIndex >= seg.start && charIndex < seg.end) {
|
|
61
62
|
styleId = styles[seg.styleKey] ?? defaultStyleId;
|
|
62
|
-
break
|
|
63
|
+
// Don't break - keep looking for later overrides
|
|
63
64
|
}
|
|
64
65
|
}
|
|
65
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"primitives.js","sourceRoot":"","sources":["../../src/ui/primitives.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,0DAA0D;AAC1D,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAE5B;;;;GAIG;AACH,MAAM,UAAU,QAAQ,CACpB,MAAc,EACd,CAAS,EACT,CAAS,EACT,IAAY,EACZ,OAAe,EACf,QAAiB;IAEjB,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,KAAK,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;QACpB,MAAM,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,EAAE,KAAK,SAAS;YAAE,SAAS;QAE/B,MAAM,CAAC,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;QAE7B,gCAAgC;QAChC,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,GAAG,CAAC,GAAG,QAAQ;YAAE,MAAM;QAE7D,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAEzC,6DAA6D;QAC7D,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACV,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC,EAAE,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAC/D,CAAC;QAED,QAAQ,IAAI,CAAC,CAAC;IAClB,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAChC,MAAc,EACd,CAAS,EACT,CAAS,EACT,IAAY,EACZ,cAAsB,EACtB,QAAmC,EACnC,MAAgB,EAChB,QAAiB,EACjB,KAAkB;IAElB,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,KAAK,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;QACpB,MAAM,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;YACnB,SAAS,EAAE,CAAC;YACZ,SAAS;QACb,CAAC;QAED,MAAM,CAAC,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;QAE7B,gCAAgC;QAChC,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,GAAG,CAAC,GAAG,QAAQ;YAAE,MAAM;QAE7D,gCAAgC;QAChC,IAAI,OAAO,GAAG,cAAc,CAAC;QAC7B,IAAI,QAAQ,EAAE,CAAC;YACX,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;gBACzB,IAAI,SAAS,IAAI,GAAG,CAAC,KAAK,IAAI,SAAS,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC;oBAChD,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,cAAc,CAAC;oBACjD,
|
|
1
|
+
{"version":3,"file":"primitives.js","sourceRoot":"","sources":["../../src/ui/primitives.ts"],"names":[],"mappings":"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"}
|