@coralai/sps-cli 0.23.20 → 0.23.21
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/README.md +3 -3
- package/dist/commands/acpCommand.d.ts.map +1 -1
- package/dist/commands/acpCommand.js +4 -5
- package/dist/commands/acpCommand.js.map +1 -1
- package/dist/commands/cardDashboard.js +4 -4
- package/dist/commands/cardDashboard.js.map +1 -1
- package/dist/commands/workerDashboard.d.ts.map +1 -1
- package/dist/commands/workerDashboard.js +20 -36
- package/dist/commands/workerDashboard.js.map +1 -1
- package/dist/core/ptyControl.d.ts +27 -0
- package/dist/core/ptyControl.d.ts.map +1 -0
- package/dist/core/ptyControl.js +53 -0
- package/dist/core/ptyControl.js.map +1 -0
- package/dist/core/sessionLiveness.d.ts.map +1 -1
- package/dist/core/sessionLiveness.js +3 -2
- package/dist/core/sessionLiveness.js.map +1 -1
- package/dist/core/state.d.ts +2 -2
- package/dist/core/state.d.ts.map +1 -1
- package/dist/engines/CloseoutEngine.d.ts.map +1 -1
- package/dist/engines/CloseoutEngine.js +16 -5
- package/dist/engines/CloseoutEngine.js.map +1 -1
- package/dist/engines/ExecutionEngine.d.ts.map +1 -1
- package/dist/engines/ExecutionEngine.js +12 -1
- package/dist/engines/ExecutionEngine.js.map +1 -1
- package/dist/engines/MonitorEngine.js +2 -2
- package/dist/engines/MonitorEngine.js.map +1 -1
- package/dist/manager/post-actions.js +1 -1
- package/dist/manager/post-actions.js.map +1 -1
- package/dist/manager/pty-session-manager.d.ts +15 -4
- package/dist/manager/pty-session-manager.d.ts.map +1 -1
- package/dist/manager/pty-session-manager.js +101 -9
- package/dist/manager/pty-session-manager.js.map +1 -1
- package/dist/manager/pty-session.d.ts +18 -3
- package/dist/manager/pty-session.d.ts.map +1 -1
- package/dist/manager/pty-session.js +45 -2
- package/dist/manager/pty-session.js.map +1 -1
- package/dist/manager/recovery.js +1 -1
- package/dist/manager/recovery.js.map +1 -1
- package/dist/manager/runtime-coordinator.js +1 -1
- package/dist/manager/runtime-coordinator.js.map +1 -1
- package/dist/manager/supervisor.d.ts +2 -2
- package/dist/manager/supervisor.d.ts.map +1 -1
- package/dist/models/acp.d.ts +6 -3
- package/dist/models/acp.d.ts.map +1 -1
- package/dist/providers/PTYAgentRuntime.d.ts +4 -0
- package/dist/providers/PTYAgentRuntime.d.ts.map +1 -1
- package/dist/providers/PTYAgentRuntime.js +165 -37
- package/dist/providers/PTYAgentRuntime.js.map +1 -1
- package/dist/providers/parsers/claude-parser.js +5 -5
- package/dist/providers/parsers/claude-parser.js.map +1 -1
- package/dist/providers/parsers/codex-parser.js +6 -6
- package/dist/providers/parsers/codex-parser.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { RuntimeStore } from '../core/runtimeStore.js';
|
|
2
|
+
import { drainPTYControl } from '../core/ptyControl.js';
|
|
2
3
|
import { PTYSessionManager } from '../manager/pty-session-manager.js';
|
|
3
4
|
function now() {
|
|
4
5
|
return new Date().toISOString();
|
|
@@ -7,6 +8,23 @@ function previewPrompt(prompt) {
|
|
|
7
8
|
const oneLine = prompt.replace(/\s+/g, ' ').trim();
|
|
8
9
|
return oneLine.length > 120 ? `${oneLine.slice(0, 117)}...` : oneLine;
|
|
9
10
|
}
|
|
11
|
+
function outputAgeMs(lastOutputAt) {
|
|
12
|
+
if (!lastOutputAt)
|
|
13
|
+
return Number.POSITIVE_INFINITY;
|
|
14
|
+
const parsed = Date.parse(lastOutputAt);
|
|
15
|
+
if (Number.isNaN(parsed))
|
|
16
|
+
return Number.POSITIVE_INFINITY;
|
|
17
|
+
return Date.now() - parsed;
|
|
18
|
+
}
|
|
19
|
+
function hasPromptReturned(buffer) {
|
|
20
|
+
const tail = buffer
|
|
21
|
+
.split('\n')
|
|
22
|
+
.map(line => line.trim())
|
|
23
|
+
.filter(Boolean)
|
|
24
|
+
.slice(-8);
|
|
25
|
+
return tail.some(line => /^[›❯>]\s/.test(line) ||
|
|
26
|
+
(/OpenAI Codex/i.test(line) && /(\/review|\/model|% left)/i.test(line)));
|
|
27
|
+
}
|
|
10
28
|
// Shared singleton per tick process
|
|
11
29
|
let sharedManager = null;
|
|
12
30
|
export function getSharedPTYManager() {
|
|
@@ -20,11 +38,14 @@ export class PTYAgentRuntime {
|
|
|
20
38
|
manager;
|
|
21
39
|
runtimeStore;
|
|
22
40
|
notifier = null;
|
|
41
|
+
controlLoopStarted = false;
|
|
42
|
+
controlDrainInFlight = false;
|
|
23
43
|
constructor(ctx, manager, notifier) {
|
|
24
44
|
this.ctx = ctx;
|
|
25
45
|
this.manager = manager || getSharedPTYManager();
|
|
26
46
|
this.runtimeStore = new RuntimeStore(ctx);
|
|
27
47
|
this.notifier = notifier || null;
|
|
48
|
+
this.startControlLoop();
|
|
28
49
|
}
|
|
29
50
|
/** Set notifier for waiting_input push notifications */
|
|
30
51
|
setNotifier(notifier) {
|
|
@@ -50,7 +71,7 @@ export class PTYAgentRuntime {
|
|
|
50
71
|
});
|
|
51
72
|
// Clear pending when state leaves waiting_input
|
|
52
73
|
ptySession.on('state-change', (newState) => {
|
|
53
|
-
if (newState !== 'waiting_input') {
|
|
74
|
+
if (newState !== 'waiting_input' && newState !== 'needs_confirmation') {
|
|
54
75
|
this.clearPendingInput(normalizedSlot);
|
|
55
76
|
}
|
|
56
77
|
});
|
|
@@ -74,11 +95,12 @@ export class PTYAgentRuntime {
|
|
|
74
95
|
}
|
|
75
96
|
if (!session)
|
|
76
97
|
throw new Error(`Failed to create session for ${normalizedSlot}`);
|
|
77
|
-
|
|
98
|
+
await this.applyQueuedControlCommands();
|
|
99
|
+
const { runId } = await this.manager.startRun(this.ctx.projectName, normalizedSlot, prompt);
|
|
78
100
|
const info = this.manager.inspect(this.ctx.projectName, normalizedSlot);
|
|
79
101
|
const record = this.buildSessionRecord(normalizedSlot, info, selectedTool, cwd, {
|
|
80
102
|
runId,
|
|
81
|
-
status: 'submitted',
|
|
103
|
+
status: info.stalledReason ? 'stalled_submit' : 'submitted',
|
|
82
104
|
promptPreview: previewPrompt(prompt),
|
|
83
105
|
startedAt: now(),
|
|
84
106
|
});
|
|
@@ -94,12 +116,13 @@ export class PTYAgentRuntime {
|
|
|
94
116
|
if (!session || !session.isAlive()) {
|
|
95
117
|
throw new Error(`No live PTY session for ${normalizedSlot}`);
|
|
96
118
|
}
|
|
97
|
-
|
|
119
|
+
await this.applyQueuedControlCommands();
|
|
120
|
+
const { runId } = await this.manager.resumeRun(this.ctx.projectName, normalizedSlot, prompt);
|
|
98
121
|
const info = this.manager.inspect(this.ctx.projectName, normalizedSlot);
|
|
99
122
|
const tool = session.tool;
|
|
100
123
|
const record = this.buildSessionRecord(normalizedSlot, info, tool, session.cwd, {
|
|
101
124
|
runId,
|
|
102
|
-
status: 'submitted',
|
|
125
|
+
status: info.stalledReason ? 'stalled_submit' : 'submitted',
|
|
103
126
|
promptPreview: previewPrompt(prompt),
|
|
104
127
|
startedAt: now(),
|
|
105
128
|
});
|
|
@@ -109,10 +132,11 @@ export class PTYAgentRuntime {
|
|
|
109
132
|
return record;
|
|
110
133
|
}
|
|
111
134
|
async inspect(slot) {
|
|
135
|
+
await this.applyQueuedControlCommands();
|
|
112
136
|
const state = this.runtimeStore.readACPState();
|
|
113
137
|
if (slot) {
|
|
114
138
|
const normalizedSlot = this.normalizeSlot(slot);
|
|
115
|
-
const info = this.manager.
|
|
139
|
+
const info = await this.manager.maintainSession(this.ctx.projectName, normalizedSlot);
|
|
116
140
|
if (info) {
|
|
117
141
|
this.syncSessionRecord(state, normalizedSlot, info);
|
|
118
142
|
}
|
|
@@ -120,7 +144,7 @@ export class PTYAgentRuntime {
|
|
|
120
144
|
else {
|
|
121
145
|
// Inspect all slots
|
|
122
146
|
for (const [slotName, record] of Object.entries(state.sessions)) {
|
|
123
|
-
const info = this.manager.
|
|
147
|
+
const info = await this.manager.maintainSession(this.ctx.projectName, slotName);
|
|
124
148
|
if (info) {
|
|
125
149
|
this.syncSessionRecord(state, slotName, info);
|
|
126
150
|
}
|
|
@@ -184,7 +208,7 @@ export class PTYAgentRuntime {
|
|
|
184
208
|
state.sessions[slot].pendingInput = pending;
|
|
185
209
|
state.sessions[slot].updatedAt = now();
|
|
186
210
|
if (state.sessions[slot].currentRun) {
|
|
187
|
-
state.sessions[slot].currentRun.status = 'waiting_input';
|
|
211
|
+
state.sessions[slot].currentRun.status = event.type === 'input' ? 'waiting_input' : 'needs_confirmation';
|
|
188
212
|
state.sessions[slot].currentRun.updatedAt = now();
|
|
189
213
|
}
|
|
190
214
|
}
|
|
@@ -229,15 +253,21 @@ export class PTYAgentRuntime {
|
|
|
229
253
|
const sessionId = isSessionInfo ? info.sessionId : info.sessionId;
|
|
230
254
|
const alive = isSessionInfo ? info.alive : info.isAlive();
|
|
231
255
|
const buffer = isSessionInfo ? info.buffer : info.getBuffer(30);
|
|
256
|
+
const lastOutputAt = isSessionInfo ? info.lastOutputAt : null;
|
|
257
|
+
const submitAttempts = isSessionInfo ? info.submitAttempts : 0;
|
|
258
|
+
const stalledReason = isSessionInfo ? info.stalledReason : null;
|
|
259
|
+
const promptPreview = run?.promptPreview ?? (isSessionInfo ? info.promptPreview : null);
|
|
260
|
+
const executionEvidence = isSessionInfo ? info.executionEvidence : false;
|
|
232
261
|
const hasRun = !!run;
|
|
233
262
|
const sessionState = !alive ? 'offline' :
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
state === '
|
|
237
|
-
'
|
|
238
|
-
|
|
263
|
+
state === 'needs_confirmation' ? 'needs_confirmation' :
|
|
264
|
+
hasRun ? 'busy' :
|
|
265
|
+
state === 'busy' || state === 'waiting_input' ? 'busy' :
|
|
266
|
+
state === 'ready' ? 'ready' :
|
|
267
|
+
'booting';
|
|
268
|
+
const slotStatus = hasRun || stalledReason ? 'active' :
|
|
239
269
|
state === 'busy' ? 'active' :
|
|
240
|
-
state === 'waiting_input' ? 'active' :
|
|
270
|
+
state === 'waiting_input' || state === 'needs_confirmation' ? 'active' :
|
|
241
271
|
'idle';
|
|
242
272
|
return {
|
|
243
273
|
slot,
|
|
@@ -251,7 +281,7 @@ export class PTYAgentRuntime {
|
|
|
251
281
|
currentRun: run ? {
|
|
252
282
|
runId: run.runId,
|
|
253
283
|
status: run.status,
|
|
254
|
-
promptPreview: run.promptPreview,
|
|
284
|
+
promptPreview: promptPreview || run.promptPreview,
|
|
255
285
|
startedAt: run.startedAt,
|
|
256
286
|
updatedAt: now(),
|
|
257
287
|
completedAt: null,
|
|
@@ -260,6 +290,9 @@ export class PTYAgentRuntime {
|
|
|
260
290
|
createdAt: now(),
|
|
261
291
|
updatedAt: now(),
|
|
262
292
|
lastSeenAt: now(),
|
|
293
|
+
lastOutputAt,
|
|
294
|
+
submitAttempts,
|
|
295
|
+
stalledReason,
|
|
263
296
|
lastPaneText: buffer,
|
|
264
297
|
};
|
|
265
298
|
}
|
|
@@ -269,38 +302,133 @@ export class PTYAgentRuntime {
|
|
|
269
302
|
return;
|
|
270
303
|
const prevSessionState = existing.sessionState;
|
|
271
304
|
const prevRunStatus = existing.currentRun?.status ?? null;
|
|
272
|
-
const
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
305
|
+
const hadActiveRun = !!existing.currentRun && (prevRunStatus === 'submitted' ||
|
|
306
|
+
prevRunStatus === 'running' ||
|
|
307
|
+
prevRunStatus === 'waiting_input' ||
|
|
308
|
+
prevRunStatus === 'needs_confirmation' ||
|
|
309
|
+
prevRunStatus === 'stalled_submit');
|
|
310
|
+
const outputSettled = outputAgeMs(info.lastOutputAt) > 1_500;
|
|
311
|
+
const promptReturned = hasPromptReturned(info.buffer);
|
|
278
312
|
existing.pid = info.pid;
|
|
279
313
|
existing.lastSeenAt = now();
|
|
314
|
+
existing.lastOutputAt = info.lastOutputAt;
|
|
315
|
+
existing.submitAttempts = info.submitAttempts;
|
|
316
|
+
existing.stalledReason = info.stalledReason;
|
|
280
317
|
existing.lastPaneText = info.buffer;
|
|
281
318
|
existing.updatedAt = now();
|
|
319
|
+
let nextRunStatus = prevRunStatus;
|
|
282
320
|
if (existing.currentRun) {
|
|
283
|
-
if (info.state === '
|
|
284
|
-
|
|
285
|
-
existing.currentRun.updatedAt = now();
|
|
286
|
-
return;
|
|
321
|
+
if (info.state === 'needs_confirmation') {
|
|
322
|
+
nextRunStatus = 'needs_confirmation';
|
|
287
323
|
}
|
|
288
|
-
if (info.state === '
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
324
|
+
else if (info.state === 'waiting_input') {
|
|
325
|
+
nextRunStatus = 'waiting_input';
|
|
326
|
+
}
|
|
327
|
+
else if (info.stalledReason && !info.executionEvidence) {
|
|
328
|
+
nextRunStatus = 'stalled_submit';
|
|
329
|
+
}
|
|
330
|
+
else if (hadActiveRun &&
|
|
331
|
+
outputSettled &&
|
|
332
|
+
promptReturned &&
|
|
333
|
+
(!info.stalledReason || info.executionEvidence) &&
|
|
334
|
+
(info.state === 'ready' ||
|
|
335
|
+
prevSessionState === 'busy' ||
|
|
336
|
+
prevSessionState === 'needs_confirmation' ||
|
|
337
|
+
prevRunStatus === 'submitted' ||
|
|
338
|
+
prevRunStatus === 'running' ||
|
|
339
|
+
prevRunStatus === 'waiting_input' ||
|
|
340
|
+
prevRunStatus === 'needs_confirmation' ||
|
|
341
|
+
prevRunStatus === 'stalled_submit')) {
|
|
342
|
+
nextRunStatus = 'completed';
|
|
294
343
|
}
|
|
295
|
-
if (
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
344
|
+
else if (hadActiveRun &&
|
|
345
|
+
(info.state === 'busy' ||
|
|
346
|
+
info.executionEvidence ||
|
|
347
|
+
!outputSettled)) {
|
|
348
|
+
nextRunStatus = 'running';
|
|
349
|
+
}
|
|
350
|
+
if (nextRunStatus && nextRunStatus !== prevRunStatus) {
|
|
351
|
+
existing.currentRun.status = nextRunStatus;
|
|
301
352
|
existing.currentRun.updatedAt = now();
|
|
353
|
+
if (nextRunStatus === 'completed') {
|
|
354
|
+
existing.currentRun.completedAt = now();
|
|
355
|
+
}
|
|
302
356
|
}
|
|
303
357
|
}
|
|
358
|
+
const runIsActive = nextRunStatus === 'submitted' ||
|
|
359
|
+
nextRunStatus === 'running' ||
|
|
360
|
+
nextRunStatus === 'waiting_input' ||
|
|
361
|
+
nextRunStatus === 'needs_confirmation' ||
|
|
362
|
+
nextRunStatus === 'stalled_submit';
|
|
363
|
+
const nextSessionState = info.alive
|
|
364
|
+
? (nextRunStatus === 'completed' ? 'ready' :
|
|
365
|
+
info.state === 'needs_confirmation' ? 'needs_confirmation' :
|
|
366
|
+
info.state === 'busy' || info.state === 'waiting_input' || runIsActive ? 'busy' :
|
|
367
|
+
info.state === 'ready' ? 'ready' :
|
|
368
|
+
'booting')
|
|
369
|
+
: 'offline';
|
|
370
|
+
const nextSlotStatus = nextRunStatus === 'completed'
|
|
371
|
+
? 'idle'
|
|
372
|
+
: runIsActive || info.state === 'busy' || info.state === 'waiting_input' || info.state === 'needs_confirmation'
|
|
373
|
+
? 'active'
|
|
374
|
+
: 'idle';
|
|
375
|
+
existing.sessionState = nextSessionState;
|
|
376
|
+
existing.status = nextSlotStatus;
|
|
377
|
+
}
|
|
378
|
+
async applyQueuedControlCommands() {
|
|
379
|
+
if (this.controlDrainInFlight)
|
|
380
|
+
return;
|
|
381
|
+
this.controlDrainInFlight = true;
|
|
382
|
+
try {
|
|
383
|
+
const commands = drainPTYControl(this.ctx);
|
|
384
|
+
if (commands.length === 0)
|
|
385
|
+
return;
|
|
386
|
+
const appliedAt = now();
|
|
387
|
+
const appliedSlots = new Set();
|
|
388
|
+
for (const command of commands) {
|
|
389
|
+
const session = this.manager.getSession(this.ctx.projectName, command.slot);
|
|
390
|
+
if (!session || !session.isAlive())
|
|
391
|
+
continue;
|
|
392
|
+
if (command.type === 'reject') {
|
|
393
|
+
session.reject();
|
|
394
|
+
}
|
|
395
|
+
else if (command.type === 'confirm') {
|
|
396
|
+
session.confirm();
|
|
397
|
+
}
|
|
398
|
+
else {
|
|
399
|
+
this.manager.respond(this.ctx.projectName, command.slot, command.response);
|
|
400
|
+
}
|
|
401
|
+
appliedSlots.add(command.slot);
|
|
402
|
+
}
|
|
403
|
+
if (appliedSlots.size === 0)
|
|
404
|
+
return;
|
|
405
|
+
this.runtimeStore.updateACPState('pty-control-apply', (state) => {
|
|
406
|
+
for (const slot of appliedSlots) {
|
|
407
|
+
const session = state.sessions[slot];
|
|
408
|
+
if (!session)
|
|
409
|
+
continue;
|
|
410
|
+
session.pendingInput = null;
|
|
411
|
+
session.updatedAt = appliedAt;
|
|
412
|
+
if (session.currentRun && (session.currentRun.status === 'waiting_input' ||
|
|
413
|
+
session.currentRun.status === 'needs_confirmation')) {
|
|
414
|
+
session.currentRun.status = 'running';
|
|
415
|
+
session.currentRun.updatedAt = appliedAt;
|
|
416
|
+
}
|
|
417
|
+
}
|
|
418
|
+
});
|
|
419
|
+
}
|
|
420
|
+
finally {
|
|
421
|
+
this.controlDrainInFlight = false;
|
|
422
|
+
}
|
|
423
|
+
}
|
|
424
|
+
startControlLoop() {
|
|
425
|
+
if (this.controlLoopStarted)
|
|
426
|
+
return;
|
|
427
|
+
this.controlLoopStarted = true;
|
|
428
|
+
const timer = setInterval(() => {
|
|
429
|
+
void this.applyQueuedControlCommands();
|
|
430
|
+
}, 1_000);
|
|
431
|
+
timer.unref();
|
|
304
432
|
}
|
|
305
433
|
}
|
|
306
434
|
//# sourceMappingURL=PTYAgentRuntime.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PTYAgentRuntime.js","sourceRoot":"","sources":["../../src/providers/PTYAgentRuntime.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"PTYAgentRuntime.js","sourceRoot":"","sources":["../../src/providers/PTYAgentRuntime.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAQxD,OAAO,EAAE,iBAAiB,EAAoB,MAAM,mCAAmC,CAAC;AAIxF,SAAS,GAAG;IACV,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,aAAa,CAAC,MAAc;IACnC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACnD,OAAO,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;AACxE,CAAC;AAED,SAAS,WAAW,CAAC,YAAuC;IAC1D,IAAI,CAAC,YAAY;QAAE,OAAO,MAAM,CAAC,iBAAiB,CAAC;IACnD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACxC,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC,iBAAiB,CAAC;IAC1D,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC;AAC7B,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAc;IACvC,MAAM,IAAI,GAAG,MAAM;SAChB,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SACxB,MAAM,CAAC,OAAO,CAAC;SACf,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACb,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;QACrB,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACxE,CAAC;AACJ,CAAC;AAED,oCAAoC;AACpC,IAAI,aAAa,GAA6B,IAAI,CAAC;AAEnD,MAAM,UAAU,mBAAmB;IACjC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,aAAa,GAAG,IAAI,iBAAiB,EAAE,CAAC;IAC1C,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,MAAM,OAAO,eAAe;IAQP;IAPF,OAAO,CAAoB;IAC3B,YAAY,CAAe;IACpC,QAAQ,GAAoB,IAAI,CAAC;IACjC,kBAAkB,GAAG,KAAK,CAAC;IAC3B,oBAAoB,GAAG,KAAK,CAAC;IAErC,YACmB,GAAmB,EACpC,OAA2B,EAC3B,QAA0B;QAFT,QAAG,GAAH,GAAG,CAAgB;QAIpC,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,mBAAmB,EAAE,CAAC;QAChD,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,GAAG,QAAQ,IAAI,IAAI,CAAC;QACjC,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAED,wDAAwD;IACxD,WAAW,CAAC,QAAyB;QACnC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAY,EAAE,IAAc,EAAE,WAAoB;QACpE,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,GAAG,GAAG,WAAW,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;QAElD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;YAC/C,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW;YAC7B,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,YAAY;YAClB,GAAG;YACH,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO;SAChC,CAAC,CAAC;QAEH,2DAA2D;QAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QACjF,IAAI,UAAU,EAAE,CAAC;YACf,UAAU,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;YAC/C,UAAU,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,KAAwB,EAAE,EAAE;gBAC1D,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;YACH,gDAAgD;YAChD,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,QAAgB,EAAE,EAAE;gBACjD,IAAI,QAAQ,KAAK,eAAe,IAAI,QAAQ,KAAK,oBAAoB,EAAE,CAAC;oBACtE,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;QAEnF,4BAA4B;QAC5B,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;YACvD,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAY,EAAE,MAAc,EAAE,IAAc,EAAE,WAAoB;QAC/E,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,GAAG,GAAG,WAAW,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;QAElD,8BAA8B;QAC9B,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAC5E,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACnC,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;YAClD,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,cAAc,EAAE,CAAC,CAAC;QAEhF,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QACxC,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;QAE5F,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAE,CAAC;QACzE,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE;YAC9E,KAAK;YACL,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,WAAW;YAC3D,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC;YACpC,SAAS,EAAE,GAAG,EAAE;SACjB,CAAC,CAAC;QAEH,UAAU;QACV,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE;YAC1D,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,MAAc;QAC1C,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAC9E,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,2BAA2B,cAAc,EAAE,CAAC,CAAC;QAC/D,CAAC;QAED,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QACxC,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;QAE7F,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAE,CAAC;QACzE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAe,CAAC;QACrC,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE;YAC9E,KAAK;YACL,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,WAAW;YAC3D,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC;YACpC,SAAS,EAAE,GAAG,EAAE;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;YAC3D,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAa;QACzB,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;QAE/C,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAChD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;YACtF,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;aAAM,CAAC;YACN,oBAAoB;YACpB,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAChE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;gBAChF,IAAI,IAAI,EAAE,CAAC;oBACT,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;gBAChD,CAAC;qBAAM,CAAC;oBACN,8BAA8B;oBAC9B,MAAM,CAAC,YAAY,GAAG,SAAS,CAAC;oBAChC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;oBACvB,MAAM,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC;gBAC3B,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;YACxD,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAY;QAC5B,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAE/D,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;YACrD,IAAI,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBACnC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,YAAY,GAAG,SAAS,CAAC;gBACxD,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC;gBAC/C,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC;YACnD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,kBAAkB,CAAC,IAAY,EAAE,SAAkB;QACvD,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;IAC1F,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,IAAY,EAAE,QAAgB;QACpC,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;IACvE,CAAC;IAED;;OAEG;IACH,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,+DAA+D;IAEvD,kBAAkB,CAAC,IAAY,EAAE,KAAwB;QAC/D,MAAM,OAAO,GAAiB;YAC5B,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B,CAAC;QAEF,4BAA4B;QAC5B,IAAI,CAAC;YACH,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC9D,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBACzB,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,GAAG,OAAO,CAAC;oBAC5C,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC;oBACvC,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;wBACpC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,UAAW,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,oBAAoB,CAAC;wBAC1G,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,UAAW,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC;oBACrD,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;QAE7B,eAAe;QACf,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,KAAK,IAAI,qBAAqB,SAAS,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;QAC/F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;QAE/C,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;gBACpB,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACjD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;IACH,CAAC;IAEO,iBAAiB,CAAC,IAAY;QACpC,IAAI,CAAC;YACH,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC5D,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,CAAC;oBACvC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,GAAG,IAAI,CAAC;oBACzC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC;gBACzC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;IAC/B,CAAC;IAED,6DAA6D;IAErD,aAAa,CAAC,IAAY;QAChC,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC;IAC9D,CAAC;IAEO,WAAW;QACjB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,QAAQ,CAAY,CAAC;IAC/F,CAAC;IAEO,kBAAkB,CACxB,IAAY,EACZ,IAAkL,EAClL,IAAa,EACb,GAAW,EACX,GAAiF;QAEjF,MAAM,aAAa,GAAG,OAAO,IAAI,IAAI,CAAC;QACtC,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAE,IAAoB,CAAC,KAAK,CAAC,CAAC,CAAE,IAAY,CAAC,QAAQ,EAAE,CAAC;QACrF,MAAM,GAAG,GAAG,aAAa,CAAC,CAAC,CAAE,IAAoB,CAAC,GAAG,CAAC,CAAC,CAAE,IAAY,CAAC,GAAG,CAAC;QAC1E,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,CAAE,IAAoB,CAAC,SAAS,CAAC,CAAC,CAAE,IAAY,CAAC,SAAS,CAAC;QAC5F,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAE,IAAoB,CAAC,KAAK,CAAC,CAAC,CAAE,IAAY,CAAC,OAAO,EAAE,CAAC;QACpF,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAE,IAAoB,CAAC,MAAM,CAAC,CAAC,CAAE,IAAY,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC1F,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAE,IAAoB,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC;QAC/E,MAAM,cAAc,GAAG,aAAa,CAAC,CAAC,CAAE,IAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,MAAM,aAAa,GAAG,aAAa,CAAC,CAAC,CAAE,IAAoB,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC;QACjF,MAAM,aAAa,GAAG,GAAG,EAAE,aAAa,IAAI,CAAC,aAAa,CAAC,CAAC,CAAE,IAAoB,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACzG,MAAM,iBAAiB,GAAG,aAAa,CAAC,CAAC,CAAE,IAAoB,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC;QAE1F,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC;QACrB,MAAM,YAAY,GAChB,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YACpB,KAAK,KAAK,oBAAoB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;gBACvD,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;oBACjB,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;wBACxD,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;4BAC7B,SAAS,CAAC;QAEZ,MAAM,UAAU,GACd,MAAM,IAAI,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YACpC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBAC7B,KAAK,KAAK,eAAe,IAAI,KAAK,KAAK,oBAAoB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;oBACxE,MAAM,CAAC;QAET,OAAO;YACL,IAAI;YACJ,IAAI;YACJ,SAAS;YACT,WAAW,EAAE,SAAS;YACtB,GAAG;YACH,GAAG;YACH,MAAM,EAAE,UAAU;YAClB,YAAY;YACZ,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC;gBAChB,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,MAAM,EAAE,GAAG,CAAC,MAAa;gBACzB,aAAa,EAAE,aAAa,IAAI,GAAG,CAAC,aAAa;gBACjD,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,SAAS,EAAE,GAAG,EAAE;gBAChB,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC,CAAC,IAAI;YACR,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,GAAG,EAAE;YAChB,SAAS,EAAE,GAAG,EAAE;YAChB,UAAU,EAAE,GAAG,EAAE;YACjB,YAAY;YACZ,cAAc;YACd,aAAa;YACb,YAAY,EAAE,MAAM;SACrB,CAAC;IACJ,CAAC;IAEO,iBAAiB,CAAC,KAAe,EAAE,QAAgB,EAAE,IAAiB;QAC5E,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,YAAY,CAAC;QAC/C,MAAM,aAAa,GAAG,QAAQ,CAAC,UAAU,EAAE,MAAM,IAAI,IAAI,CAAC;QAC1D,MAAM,YAAY,GAAG,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,CAC5C,aAAa,KAAK,WAAW;YAC7B,aAAa,KAAK,SAAS;YAC3B,aAAa,KAAK,eAAe;YACjC,aAAa,KAAK,oBAAoB;YACtC,aAAa,KAAK,gBAAgB,CACnC,CAAC;QACF,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC;QAC7D,MAAM,cAAc,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEtD,QAAQ,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACxB,QAAQ,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;QAC5B,QAAQ,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAC1C,QAAQ,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAC9C,QAAQ,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QAC5C,QAAQ,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC;QACpC,QAAQ,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC;QAE3B,IAAI,aAAa,GAAG,aAAa,CAAC;QAClC,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;YACxB,IAAI,IAAI,CAAC,KAAK,KAAK,oBAAoB,EAAE,CAAC;gBACxC,aAAa,GAAG,oBAAoB,CAAC;YACvC,CAAC;iBAAM,IAAI,IAAI,CAAC,KAAK,KAAK,eAAe,EAAE,CAAC;gBAC1C,aAAa,GAAG,eAAe,CAAC;YAClC,CAAC;iBAAM,IAAI,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACzD,aAAa,GAAG,gBAAgB,CAAC;YACnC,CAAC;iBAAM,IACL,YAAY;gBACZ,aAAa;gBACb,cAAc;gBACd,CAAC,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,iBAAiB,CAAC;gBAC/C,CACE,IAAI,CAAC,KAAK,KAAK,OAAO;oBACtB,gBAAgB,KAAK,MAAM;oBAC3B,gBAAgB,KAAK,oBAAoB;oBACzC,aAAa,KAAK,WAAW;oBAC7B,aAAa,KAAK,SAAS;oBAC3B,aAAa,KAAK,eAAe;oBACjC,aAAa,KAAK,oBAAoB;oBACtC,aAAa,KAAK,gBAAgB,CACnC,EACD,CAAC;gBACD,aAAa,GAAG,WAAW,CAAC;YAC9B,CAAC;iBAAM,IACL,YAAY;gBACZ,CACE,IAAI,CAAC,KAAK,KAAK,MAAM;oBACrB,IAAI,CAAC,iBAAiB;oBACtB,CAAC,aAAa,CACf,EACD,CAAC;gBACD,aAAa,GAAG,SAAS,CAAC;YAC5B,CAAC;YAED,IAAI,aAAa,IAAI,aAAa,KAAK,aAAa,EAAE,CAAC;gBACrD,QAAQ,CAAC,UAAU,CAAC,MAAM,GAAG,aAAkD,CAAC;gBAChF,QAAQ,CAAC,UAAU,CAAC,SAAS,GAAG,GAAG,EAAE,CAAC;gBACtC,IAAI,aAAa,KAAK,WAAW,EAAE,CAAC;oBAClC,QAAQ,CAAC,UAAU,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC;gBAC1C,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,WAAW,GACf,aAAa,KAAK,WAAW;YAC7B,aAAa,KAAK,SAAS;YAC3B,aAAa,KAAK,eAAe;YACjC,aAAa,KAAK,oBAAoB;YACtC,aAAa,KAAK,gBAAgB,CAAC;QAErC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK;YACjC,CAAC,CAAC,CACA,aAAa,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBACzC,IAAI,CAAC,KAAK,KAAK,oBAAoB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;oBAC5D,IAAI,CAAC,KAAK,KAAK,MAAM,IAAI,IAAI,CAAC,KAAK,KAAK,eAAe,IAAI,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;wBACjF,IAAI,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;4BAClC,SAAS,CACV;YACD,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,cAAc,GAAG,aAAa,KAAK,WAAW;YAClD,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,IAAI,IAAI,CAAC,KAAK,KAAK,eAAe,IAAI,IAAI,CAAC,KAAK,KAAK,oBAAoB;gBAC/G,CAAC,CAAC,QAAQ;gBACV,CAAC,CAAC,MAAM,CAAC;QAEX,QAAQ,CAAC,YAAY,GAAG,gBAAgB,CAAC;QACzC,QAAQ,CAAC,MAAM,GAAG,cAAc,CAAC;IACnC,CAAC;IAEO,KAAK,CAAC,0BAA0B;QACtC,IAAI,IAAI,CAAC,oBAAoB;YAAE,OAAO;QACtC,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACjC,IAAI,CAAC;YACL,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO;YAElC,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC;YACxB,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;YAEvC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC5E,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;oBAAE,SAAS;gBAE7C,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC9B,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,CAAC;qBAAM,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACtC,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC7E,CAAC;gBACD,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjC,CAAC;YAED,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC;gBAAE,OAAO;YAEpC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC9D,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;oBAChC,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oBACrC,IAAI,CAAC,OAAO;wBAAE,SAAS;oBACvB,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;oBAC5B,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;oBAC9B,IAAI,OAAO,CAAC,UAAU,IAAI,CACxB,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,eAAe;wBAC7C,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,oBAAoB,CACnD,EAAE,CAAC;wBACF,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC;wBACtC,OAAO,CAAC,UAAU,CAAC,SAAS,GAAG,SAAS,CAAC;oBAC3C,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;QACpC,CAAC;IACH,CAAC;IAEO,gBAAgB;QACtB,IAAI,IAAI,CAAC,kBAAkB;YAAE,OAAO;QACpC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAC/B,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;YAC7B,KAAK,IAAI,CAAC,0BAA0B,EAAE,CAAC;QACzC,CAAC,EAAE,KAAK,CAAC,CAAC;QACV,KAAK,CAAC,KAAK,EAAE,CAAC;IAChB,CAAC;CACF"}
|
|
@@ -28,7 +28,7 @@ export class ClaudeOutputParser {
|
|
|
28
28
|
// Trust prompt during boot
|
|
29
29
|
if (this.accumulated.includes('Yes, I trust this folder') ||
|
|
30
30
|
this.accumulated.includes('trust this folder')) {
|
|
31
|
-
session.setState('
|
|
31
|
+
session.setState('needs_confirmation');
|
|
32
32
|
session.emit('waiting-input', {
|
|
33
33
|
type: 'trust',
|
|
34
34
|
prompt: 'Trust this folder?',
|
|
@@ -45,7 +45,7 @@ export class ClaudeOutputParser {
|
|
|
45
45
|
const permMatch = this.accumulated.match(/\? Allow[:\s]+(.+?)(?:\n|$)/);
|
|
46
46
|
if (permMatch) {
|
|
47
47
|
const promptText = permMatch[1].trim();
|
|
48
|
-
session.setState('
|
|
48
|
+
session.setState('needs_confirmation');
|
|
49
49
|
session.emit('waiting-input', {
|
|
50
50
|
type: 'permission',
|
|
51
51
|
prompt: promptText,
|
|
@@ -58,7 +58,7 @@ export class ClaudeOutputParser {
|
|
|
58
58
|
if (/Enter to confirm|Esc to cancel|y\/n\]?\s*$/i.test(this.accumulated)) {
|
|
59
59
|
const lines = this.accumulated.split('\n').filter(Boolean);
|
|
60
60
|
const promptText = lines[lines.length - 1]?.trim() || 'Confirmation required';
|
|
61
|
-
session.setState('
|
|
61
|
+
session.setState('needs_confirmation');
|
|
62
62
|
session.emit('waiting-input', {
|
|
63
63
|
type: 'confirmation',
|
|
64
64
|
prompt: promptText,
|
|
@@ -68,8 +68,8 @@ export class ClaudeOutputParser {
|
|
|
68
68
|
this.accumulated = '';
|
|
69
69
|
return;
|
|
70
70
|
}
|
|
71
|
-
// ── waiting_input → ready (user responded, prompt came back) ──
|
|
72
|
-
if (state === 'waiting_input' && this.hasPrompt()) {
|
|
71
|
+
// ── waiting_input / needs_confirmation → ready (user responded, prompt came back) ──
|
|
72
|
+
if ((state === 'waiting_input' || state === 'needs_confirmation') && this.hasPrompt()) {
|
|
73
73
|
session.setState('ready');
|
|
74
74
|
this.lastPromptAt = Date.now();
|
|
75
75
|
this.accumulated = '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-parser.js","sourceRoot":"","sources":["../../../src/providers/parsers/claude-parser.ts"],"names":[],"mappings":"AAQA,MAAM,YAAY,GAAG,yFAAyF,CAAC;AAE/G,MAAM,OAAO,kBAAkB;IACrB,WAAW,GAAG,EAAE,CAAC;IACjB,YAAY,GAAG,CAAC,CAAC;IAEzB,KAAK;QACH,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,CAAC,KAAa,EAAE,OAAmB;QACrC,IAAI,CAAC,WAAW,IAAI,KAAK,CAAC;QAE1B,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QAEjC,4DAA4D;QAC5D,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,sDAAsD;YACtD,IAAI,IAAI,CAAC,SAAS,EAAE,IAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;gBACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAC1B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC/B,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;gBACtB,OAAO;YACT,CAAC;YACD,sDAAsD;YACtD,IAAI,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAC1B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC/B,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;gBACtB,OAAO;YACT,CAAC;YAED,2BAA2B;YAC3B,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,0BAA0B,CAAC;gBACrD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;gBACnD,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"claude-parser.js","sourceRoot":"","sources":["../../../src/providers/parsers/claude-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export class CodexOutputParser {
|
|
|
15
15
|
return;
|
|
16
16
|
}
|
|
17
17
|
if (/update available/i.test(this.accumulated) && /press enter to continue/i.test(this.accumulated)) {
|
|
18
|
-
session.setState('
|
|
18
|
+
session.setState('needs_confirmation');
|
|
19
19
|
session.emit('waiting-input', {
|
|
20
20
|
type: 'confirmation',
|
|
21
21
|
prompt: 'Codex update notice — press Enter to continue',
|
|
@@ -28,7 +28,7 @@ export class CodexOutputParser {
|
|
|
28
28
|
}
|
|
29
29
|
// Trust/sandbox prompt during boot
|
|
30
30
|
if (/trust|sandbox|approve/i.test(this.accumulated) && /\[y\/n\]|Enter/i.test(this.accumulated)) {
|
|
31
|
-
session.setState('
|
|
31
|
+
session.setState('needs_confirmation');
|
|
32
32
|
session.emit('waiting-input', {
|
|
33
33
|
type: 'trust',
|
|
34
34
|
prompt: 'Codex trust/sandbox prompt',
|
|
@@ -44,7 +44,7 @@ export class CodexOutputParser {
|
|
|
44
44
|
const permMatch = this.accumulated.match(/\? (Allow|Approve|Execute)[:\s]+(.+?)(?:\n|$)/);
|
|
45
45
|
if (permMatch) {
|
|
46
46
|
const promptText = permMatch[2].trim();
|
|
47
|
-
session.setState('
|
|
47
|
+
session.setState('needs_confirmation');
|
|
48
48
|
session.emit('waiting-input', {
|
|
49
49
|
type: 'permission',
|
|
50
50
|
prompt: promptText,
|
|
@@ -54,8 +54,8 @@ export class CodexOutputParser {
|
|
|
54
54
|
this.accumulated = '';
|
|
55
55
|
return;
|
|
56
56
|
}
|
|
57
|
-
// ── waiting_input → ready ──
|
|
58
|
-
if (state === 'waiting_input' && this.hasPrompt()) {
|
|
57
|
+
// ── waiting_input / needs_confirmation → ready ──
|
|
58
|
+
if ((state === 'waiting_input' || state === 'needs_confirmation') && this.hasPrompt()) {
|
|
59
59
|
session.setState('ready');
|
|
60
60
|
this.accumulated = '';
|
|
61
61
|
return;
|
|
@@ -85,7 +85,7 @@ export class CodexOutputParser {
|
|
|
85
85
|
(/OpenAI Codex/.test(text) && /(\/review|\/model|100% left)/.test(text)));
|
|
86
86
|
}
|
|
87
87
|
hasBusyIndicator(chunk) {
|
|
88
|
-
return /Running|Thinking|Executing|apply_patch|Searching|Reading
|
|
88
|
+
return /Working|Running|Thinking|Executing|apply_patch|Searching|Reading|Ran|Updated|Inspecting|Planning/i.test(chunk);
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
//# sourceMappingURL=codex-parser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-parser.js","sourceRoot":"","sources":["../../../src/providers/parsers/codex-parser.ts"],"names":[],"mappings":"AAKA,MAAM,YAAY,GAAG,oEAAoE,CAAC;AAE1F,MAAM,OAAO,iBAAiB;IACpB,WAAW,GAAG,EAAE,CAAC;IAEzB,KAAK;QACH,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,IAAI,CAAC,KAAa,EAAE,OAAmB;QACrC,IAAI,CAAC,WAAW,IAAI,KAAK,CAAC;QAE1B,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QAEjC,wBAAwB;QACxB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;gBACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAC1B,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;gBACtB,OAAO;YACT,CAAC;YACD,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBACpG,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"codex-parser.js","sourceRoot":"","sources":["../../../src/providers/parsers/codex-parser.ts"],"names":[],"mappings":"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"}
|