kumo-cli 1.0.6 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +26 -13
- package/dist/auth/credentialsStore.js +20 -7
- package/dist/auth/credentialsStore.js.map +1 -1
- package/dist/claude/conversation.js +272 -0
- package/dist/claude/conversation.js.map +1 -0
- package/dist/claude/transcriptParser.js +140 -36
- package/dist/claude/transcriptParser.js.map +1 -1
- package/dist/commands/cliArgs.js +1 -0
- package/dist/commands/cliArgs.js.map +1 -1
- package/dist/core/config.js +1 -9
- package/dist/core/config.js.map +1 -1
- package/dist/core/logger.js +50 -21
- package/dist/core/logger.js.map +1 -1
- package/dist/core/projectFileWatcher.js +100 -36
- package/dist/core/projectFileWatcher.js.map +1 -1
- package/dist/engine/claudeArgs.js +106 -0
- package/dist/engine/claudeArgs.js.map +1 -0
- package/dist/engine/claudeBinary.js +94 -0
- package/dist/engine/claudeBinary.js.map +1 -0
- package/dist/engine/claudeConfig.js +127 -0
- package/dist/engine/claudeConfig.js.map +1 -0
- package/dist/engine/claudeLogin.js +76 -0
- package/dist/engine/claudeLogin.js.map +1 -0
- package/dist/engine/controlChannel.js +75 -0
- package/dist/engine/controlChannel.js.map +1 -0
- package/dist/engine/liveTranscript.js +150 -0
- package/dist/engine/liveTranscript.js.map +1 -0
- package/dist/engine/ndjson.js +48 -0
- package/dist/engine/ndjson.js.map +1 -0
- package/dist/engine/permissions.js +101 -0
- package/dist/engine/permissions.js.map +1 -0
- package/dist/engine/probePool.js +51 -0
- package/dist/engine/probePool.js.map +1 -0
- package/dist/engine/processTree.js +45 -0
- package/dist/engine/processTree.js.map +1 -0
- package/dist/engine/remoteConfig.js +17 -0
- package/dist/engine/remoteConfig.js.map +1 -0
- package/dist/engine/sessionManager.js +444 -0
- package/dist/engine/sessionManager.js.map +1 -0
- package/dist/engine/settingsCommands.js +260 -0
- package/dist/engine/settingsCommands.js.map +1 -0
- package/dist/engine/streamSession.js +502 -0
- package/dist/engine/streamSession.js.map +1 -0
- package/dist/engine/taskTracker.js +110 -0
- package/dist/engine/taskTracker.js.map +1 -0
- package/dist/engine/toolLabels.js +32 -0
- package/dist/engine/toolLabels.js.map +1 -0
- package/dist/handlers/controlRequest.js +17 -0
- package/dist/handlers/controlRequest.js.map +1 -0
- package/dist/handlers/fileHandlers.js +12 -0
- package/dist/handlers/fileHandlers.js.map +1 -1
- package/dist/handlers/messageRouter.js +8 -1
- package/dist/handlers/messageRouter.js.map +1 -1
- package/dist/handlers/promptImages.js +5 -91
- package/dist/handlers/promptImages.js.map +1 -1
- package/dist/handlers/runtimeHandlers.js +100 -32
- package/dist/handlers/runtimeHandlers.js.map +1 -1
- package/dist/handlers/sessionHandlers.js +85 -80
- package/dist/handlers/sessionHandlers.js.map +1 -1
- package/dist/handlers/terminalHandlers.js +9 -2
- package/dist/handlers/terminalHandlers.js.map +1 -1
- package/dist/http/httpClient.js +6 -0
- package/dist/http/httpClient.js.map +1 -1
- package/dist/index.js +87 -50
- package/dist/index.js.map +1 -1
- package/dist/pty/terminalManager.js +58 -11
- package/dist/pty/terminalManager.js.map +1 -1
- package/dist/services/bootstrapService.js +17 -1
- package/dist/services/bootstrapService.js.map +1 -1
- package/dist/services/claudeAdapterProxy.js +68 -21
- package/dist/services/claudeAdapterProxy.js.map +1 -1
- package/dist/services/cliRuntime.js +39 -32
- package/dist/services/cliRuntime.js.map +1 -1
- package/dist/services/effortService.js +13 -60
- package/dist/services/effortService.js.map +1 -1
- package/dist/services/fileService.js +50 -24
- package/dist/services/fileService.js.map +1 -1
- package/dist/services/forkService.js +120 -0
- package/dist/services/forkService.js.map +1 -0
- package/dist/services/modelService.js +86 -89
- package/dist/services/modelService.js.map +1 -1
- package/dist/services/pairingService.js +21 -15
- package/dist/services/pairingService.js.map +1 -1
- package/dist/services/sessionListService.js +7 -9
- package/dist/services/sessionListService.js.map +1 -1
- package/dist/services/sessionService.js +245 -106
- package/dist/services/sessionService.js.map +1 -1
- package/dist/services/tunnelHelpers.js +9 -5
- package/dist/services/tunnelHelpers.js.map +1 -1
- package/dist/services/tunnelService.js +21 -5
- package/dist/services/tunnelService.js.map +1 -1
- package/dist/transport/wsClient.js +60 -42
- package/dist/transport/wsClient.js.map +1 -1
- package/dist/utils/ignorePaths.js +3 -3
- package/dist/utils/ignorePaths.js.map +1 -1
- package/dist/utils/json.js +7 -0
- package/dist/utils/json.js.map +1 -0
- package/dist/utils/localHost.js +17 -0
- package/dist/utils/localHost.js.map +1 -0
- package/dist/utils/safePath.js +51 -20
- package/dist/utils/safePath.js.map +1 -1
- package/package.json +5 -12
- package/dist/ansiCodes.js +0 -107
- package/dist/ansiCodes.js.map +0 -1
- package/dist/auth/credentialsStore.test.js +0 -60
- package/dist/auth/credentialsStore.test.js.map +0 -1
- package/dist/claude/fileHistory.js +0 -79
- package/dist/claude/fileHistory.js.map +0 -1
- package/dist/claude/generateHookSettings.js +0 -23
- package/dist/claude/generateHookSettings.js.map +0 -1
- package/dist/claude/hookServer.js +0 -33
- package/dist/claude/hookServer.js.map +0 -1
- package/dist/claude/sessionScanner.js +0 -162
- package/dist/claude/sessionScanner.js.map +0 -1
- package/dist/claude/sessionScanner.test.js +0 -24
- package/dist/claude/sessionScanner.test.js.map +0 -1
- package/dist/claude/transcriptParser.test.js +0 -78
- package/dist/claude/transcriptParser.test.js.map +0 -1
- package/dist/commands/cliArgs.test.js +0 -25
- package/dist/commands/cliArgs.test.js.map +0 -1
- package/dist/config.js +0 -40
- package/dist/config.js.map +0 -1
- package/dist/credentialsStore.js +0 -57
- package/dist/credentialsStore.js.map +0 -1
- package/dist/generateHookSettings.js +0 -30
- package/dist/generateHookSettings.js.map +0 -1
- package/dist/handlers/fileHandlerPayloads.test.js +0 -55
- package/dist/handlers/fileHandlerPayloads.test.js.map +0 -1
- package/dist/handlers/promptImages.test.js +0 -52
- package/dist/handlers/promptImages.test.js.map +0 -1
- package/dist/hookServer.js +0 -32
- package/dist/hookServer.js.map +0 -1
- package/dist/ignorePaths.js +0 -68
- package/dist/ignorePaths.js.map +0 -1
- package/dist/loadDotEnv.js +0 -79
- package/dist/loadDotEnv.js.map +0 -1
- package/dist/logger.js +0 -29
- package/dist/logger.js.map +0 -1
- package/dist/portForwardManager.js +0 -97
- package/dist/portForwardManager.js.map +0 -1
- package/dist/projectHistoryReader.js +0 -85
- package/dist/projectHistoryReader.js.map +0 -1
- package/dist/pty/ansiCodes.js +0 -14
- package/dist/pty/ansiCodes.js.map +0 -1
- package/dist/pty/notificationDetector.js +0 -29
- package/dist/pty/notificationDetector.js.map +0 -1
- package/dist/pty/notificationDetector.test.js +0 -24
- package/dist/pty/notificationDetector.test.js.map +0 -1
- package/dist/pty/ptyMenuParser.js +0 -91
- package/dist/pty/ptyMenuParser.js.map +0 -1
- package/dist/pty/ptyMenuParser.test.js +0 -26
- package/dist/pty/ptyMenuParser.test.js.map +0 -1
- package/dist/pty/ptySnapshotRenderer.js +0 -71
- package/dist/pty/ptySnapshotRenderer.js.map +0 -1
- package/dist/pty/selectionMenuDetector.js +0 -49
- package/dist/pty/selectionMenuDetector.js.map +0 -1
- package/dist/pty/selectionMenuDetector.test.js +0 -62
- package/dist/pty/selectionMenuDetector.test.js.map +0 -1
- package/dist/pty/selectionMenuMeta.js +0 -54
- package/dist/pty/selectionMenuMeta.js.map +0 -1
- package/dist/pty/selectionMenuMeta.test.js +0 -26
- package/dist/pty/selectionMenuMeta.test.js.map +0 -1
- package/dist/pty/selectionMenuParser.js +0 -83
- package/dist/pty/selectionMenuParser.js.map +0 -1
- package/dist/pty/selectionMenuParser.test.js +0 -30
- package/dist/pty/selectionMenuParser.test.js.map +0 -1
- package/dist/pty/spawn.js +0 -104
- package/dist/pty/spawn.js.map +0 -1
- package/dist/pty/spawn.test.js +0 -17
- package/dist/pty/spawn.test.js.map +0 -1
- package/dist/pty/statusSessionDetector.js +0 -28
- package/dist/pty/statusSessionDetector.js.map +0 -1
- package/dist/pty/statusSessionDetector.test.js +0 -23
- package/dist/pty/statusSessionDetector.test.js.map +0 -1
- package/dist/pty/textInputDetector.js +0 -60
- package/dist/pty/textInputDetector.js.map +0 -1
- package/dist/pty/textInputDetector.test.js +0 -32
- package/dist/pty/textInputDetector.test.js.map +0 -1
- package/dist/ptyMenuParser.js +0 -470
- package/dist/ptyMenuParser.js.map +0 -1
- package/dist/ptySnapshotRenderer.js +0 -78
- package/dist/ptySnapshotRenderer.js.map +0 -1
- package/dist/services/checkpointService.js +0 -113
- package/dist/services/checkpointService.js.map +0 -1
- package/dist/services/checkpointService.test.js +0 -61
- package/dist/services/checkpointService.test.js.map +0 -1
- package/dist/services/claudeMenuBridge.js +0 -116
- package/dist/services/claudeMenuBridge.js.map +0 -1
- package/dist/services/claudeMenuBridge.test.js +0 -90
- package/dist/services/claudeMenuBridge.test.js.map +0 -1
- package/dist/services/claudeService.js +0 -146
- package/dist/services/claudeService.js.map +0 -1
- package/dist/services/claudeService.test.js +0 -39
- package/dist/services/claudeService.test.js.map +0 -1
- package/dist/services/cliRuntime.test.js +0 -55
- package/dist/services/cliRuntime.test.js.map +0 -1
- package/dist/services/modelAdapter.test.js +0 -47
- package/dist/services/modelAdapter.test.js.map +0 -1
- package/dist/services/modelArgs.test.js +0 -64
- package/dist/services/modelArgs.test.js.map +0 -1
- package/dist/services/modelBaseUrl.test.js +0 -32
- package/dist/services/modelBaseUrl.test.js.map +0 -1
- package/dist/services/modelService.test.js +0 -136
- package/dist/services/modelService.test.js.map +0 -1
- package/dist/services/notificationDedupe.js +0 -23
- package/dist/services/notificationDedupe.js.map +0 -1
- package/dist/services/notificationDedupe.test.js +0 -20
- package/dist/services/notificationDedupe.test.js.map +0 -1
- package/dist/services/sessionListService.test.js +0 -22
- package/dist/services/sessionListService.test.js.map +0 -1
- package/dist/services/sessionRollbackService.js +0 -195
- package/dist/services/sessionRollbackService.js.map +0 -1
- package/dist/services/sessionRollbackService.test.js +0 -142
- package/dist/services/sessionRollbackService.test.js.map +0 -1
- package/dist/services/tunnelHelpers.test.js +0 -42
- package/dist/services/tunnelHelpers.test.js.map +0 -1
- package/dist/services/tunnelService.test.js +0 -91
- package/dist/services/tunnelService.test.js.map +0 -1
- package/dist/sessionScanner.js +0 -271
- package/dist/sessionScanner.js.map +0 -1
- package/dist/snapshotScanner.js +0 -154
- package/dist/snapshotScanner.js.map +0 -1
- package/dist/spawn.js +0 -79
- package/dist/spawn.js.map +0 -1
- package/dist/terminalManager.js +0 -73
- package/dist/terminalManager.js.map +0 -1
- package/dist/transport/directWsServer.js +0 -135
- package/dist/transport/directWsServer.js.map +0 -1
- package/dist/transport/webrtcTransport.js +0 -145
- package/dist/transport/webrtcTransport.js.map +0 -1
- package/dist/transport/webrtcTransport.test.js +0 -104
- package/dist/transport/webrtcTransport.test.js.map +0 -1
- package/dist/transport/webrtcTypes.js +0 -29
- package/dist/transport/webrtcTypes.js.map +0 -1
- package/dist/transport/webrtcTypes.test.js +0 -20
- package/dist/transport/webrtcTypes.test.js.map +0 -1
- package/dist/utils/ptyBuffer.js +0 -46
- package/dist/utils/ptyBuffer.js.map +0 -1
- package/scripts/claude_launcher.cjs +0 -71
- package/scripts/run-tests.mjs +0 -46
- package/scripts/session_hook_forwarder.cjs +0 -44
package/dist/snapshotScanner.js
DELETED
|
@@ -1,154 +0,0 @@
|
|
|
1
|
-
import fs from 'fs';
|
|
2
|
-
import path from 'path';
|
|
3
|
-
import { EventEmitter } from 'events';
|
|
4
|
-
export class SnapshotScanner extends EventEmitter {
|
|
5
|
-
sessionId;
|
|
6
|
-
snapshotDir;
|
|
7
|
-
filePath = null;
|
|
8
|
-
offset = 0;
|
|
9
|
-
watcher = null;
|
|
10
|
-
seenUuids = new Set();
|
|
11
|
-
pollTimer = null;
|
|
12
|
-
constructor(sessionId, snapshotDir) {
|
|
13
|
-
super();
|
|
14
|
-
this.sessionId = sessionId;
|
|
15
|
-
this.snapshotDir = snapshotDir;
|
|
16
|
-
}
|
|
17
|
-
start() {
|
|
18
|
-
this.filePath = this.findJsonlFile();
|
|
19
|
-
if (!this.filePath) {
|
|
20
|
-
this.pollTimer = setInterval(() => {
|
|
21
|
-
const found = this.findJsonlFile();
|
|
22
|
-
if (found) {
|
|
23
|
-
this.filePath = found;
|
|
24
|
-
clearInterval(this.pollTimer);
|
|
25
|
-
this.pollTimer = null;
|
|
26
|
-
this.watchFile();
|
|
27
|
-
}
|
|
28
|
-
}, 500);
|
|
29
|
-
return;
|
|
30
|
-
}
|
|
31
|
-
this.watchFile();
|
|
32
|
-
}
|
|
33
|
-
stop() {
|
|
34
|
-
this.watcher?.close();
|
|
35
|
-
if (this.pollTimer)
|
|
36
|
-
clearInterval(this.pollTimer);
|
|
37
|
-
}
|
|
38
|
-
findJsonlFile() {
|
|
39
|
-
const projectsDir = path.join(this.snapshotDir, 'projects');
|
|
40
|
-
if (!fs.existsSync(projectsDir))
|
|
41
|
-
return null;
|
|
42
|
-
const entries = fs.readdirSync(projectsDir, { withFileTypes: true });
|
|
43
|
-
for (const entry of entries) {
|
|
44
|
-
if (!entry.isDirectory())
|
|
45
|
-
continue;
|
|
46
|
-
const candidate = path.join(projectsDir, entry.name, `${this.sessionId}.jsonl`);
|
|
47
|
-
if (fs.existsSync(candidate))
|
|
48
|
-
return candidate;
|
|
49
|
-
}
|
|
50
|
-
return null;
|
|
51
|
-
}
|
|
52
|
-
watchFile() {
|
|
53
|
-
if (!this.filePath)
|
|
54
|
-
return;
|
|
55
|
-
this.readIncremental();
|
|
56
|
-
try {
|
|
57
|
-
this.watcher = fs.watch(this.filePath, () => this.readIncremental());
|
|
58
|
-
}
|
|
59
|
-
catch { }
|
|
60
|
-
}
|
|
61
|
-
readIncremental() {
|
|
62
|
-
if (!this.filePath)
|
|
63
|
-
return;
|
|
64
|
-
try {
|
|
65
|
-
const stat = fs.statSync(this.filePath);
|
|
66
|
-
if (stat.size <= this.offset)
|
|
67
|
-
return;
|
|
68
|
-
const fd = fs.openSync(this.filePath, 'r');
|
|
69
|
-
const buf = Buffer.alloc(stat.size - this.offset);
|
|
70
|
-
fs.readSync(fd, buf, 0, buf.length, this.offset);
|
|
71
|
-
fs.closeSync(fd);
|
|
72
|
-
this.offset = stat.size;
|
|
73
|
-
const lines = buf.toString('utf-8').split('\n');
|
|
74
|
-
for (const line of lines) {
|
|
75
|
-
if (!line.trim())
|
|
76
|
-
continue;
|
|
77
|
-
try {
|
|
78
|
-
const entry = JSON.parse(line);
|
|
79
|
-
this.processEntry(entry);
|
|
80
|
-
}
|
|
81
|
-
catch { }
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
catch { }
|
|
85
|
-
}
|
|
86
|
-
processEntry(entry) {
|
|
87
|
-
if (entry.type !== 'user' && entry.type !== 'assistant')
|
|
88
|
-
return;
|
|
89
|
-
if (!entry.message)
|
|
90
|
-
return;
|
|
91
|
-
const role = entry.message.role;
|
|
92
|
-
if (!role || role === 'system')
|
|
93
|
-
return;
|
|
94
|
-
if (entry.uuid && this.seenUuids.has(entry.uuid))
|
|
95
|
-
return;
|
|
96
|
-
if (entry.uuid)
|
|
97
|
-
this.seenUuids.add(entry.uuid);
|
|
98
|
-
const content = entry.message.content;
|
|
99
|
-
if (typeof content === 'string') {
|
|
100
|
-
if (!content)
|
|
101
|
-
return;
|
|
102
|
-
if (this.isNoiseTranscript(content))
|
|
103
|
-
return;
|
|
104
|
-
this.emit('jsonl_message', { role, content, id: entry.uuid, timestamp: entry.timestamp });
|
|
105
|
-
return;
|
|
106
|
-
}
|
|
107
|
-
if (!Array.isArray(content))
|
|
108
|
-
return;
|
|
109
|
-
for (const block of content) {
|
|
110
|
-
if (block.type === 'text' && block.text) {
|
|
111
|
-
if (this.isNoiseTranscript(block.text))
|
|
112
|
-
continue;
|
|
113
|
-
this.emit('jsonl_message', {
|
|
114
|
-
role,
|
|
115
|
-
content: block.text,
|
|
116
|
-
id: entry.uuid,
|
|
117
|
-
timestamp: entry.timestamp,
|
|
118
|
-
});
|
|
119
|
-
}
|
|
120
|
-
else if (block.type === 'tool_use') {
|
|
121
|
-
const toolContent = JSON.stringify({ name: block.name, input: block.input });
|
|
122
|
-
this.emit('jsonl_message', {
|
|
123
|
-
role: 'tool_use',
|
|
124
|
-
content: toolContent,
|
|
125
|
-
id: block.id ?? entry.uuid,
|
|
126
|
-
timestamp: entry.timestamp,
|
|
127
|
-
});
|
|
128
|
-
}
|
|
129
|
-
else if (block.type === 'tool_result') {
|
|
130
|
-
const resultContent = typeof block.content === 'string'
|
|
131
|
-
? block.content
|
|
132
|
-
: JSON.stringify(block.content);
|
|
133
|
-
this.emit('jsonl_message', {
|
|
134
|
-
role: 'tool_result',
|
|
135
|
-
content: resultContent,
|
|
136
|
-
id: block.tool_use_id ?? entry.uuid,
|
|
137
|
-
timestamp: entry.timestamp,
|
|
138
|
-
});
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
|
-
}
|
|
142
|
-
isNoiseTranscript(content) {
|
|
143
|
-
if (/<local-command-stdout>/.test(content))
|
|
144
|
-
return false;
|
|
145
|
-
if (/<local-command-|<\/local-command-|<command-name>|<command-message>|<command-args>/i.test(content))
|
|
146
|
-
return true;
|
|
147
|
-
if (/request interrupted by user|interrupted by user|interrupted the running process/i.test(content))
|
|
148
|
-
return true;
|
|
149
|
-
if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\s*$/i.test(content.trim()))
|
|
150
|
-
return true;
|
|
151
|
-
return false;
|
|
152
|
-
}
|
|
153
|
-
}
|
|
154
|
-
//# sourceMappingURL=snapshotScanner.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"snapshotScanner.js","sourceRoot":"","sources":["../src/snapshotScanner.ts"],"names":[],"mappings":"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"}
|
package/dist/spawn.js
DELETED
|
@@ -1,79 +0,0 @@
|
|
|
1
|
-
import { execSync } from 'child_process';
|
|
2
|
-
import os from 'os';
|
|
3
|
-
import * as pty from 'node-pty';
|
|
4
|
-
function getClaudeCmd() {
|
|
5
|
-
if (os.platform() === 'win32') {
|
|
6
|
-
try {
|
|
7
|
-
const r = execSync('where claude.cmd', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
|
|
8
|
-
const first = r.split('\n')[0].trim();
|
|
9
|
-
if (first)
|
|
10
|
-
return first;
|
|
11
|
-
}
|
|
12
|
-
catch { }
|
|
13
|
-
const appData = process.env['APPDATA'] ?? '';
|
|
14
|
-
return `${appData}\\npm\\claude.cmd`;
|
|
15
|
-
}
|
|
16
|
-
try {
|
|
17
|
-
const r = execSync('which claude', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
|
|
18
|
-
if (r)
|
|
19
|
-
return r.split('\n')[0].trim();
|
|
20
|
-
}
|
|
21
|
-
catch { }
|
|
22
|
-
return 'claude';
|
|
23
|
-
}
|
|
24
|
-
const CLAUDE_CMD = getClaudeCmd();
|
|
25
|
-
export function spawnClaude(args, _onThinking, onPtyData, onResize, onSpawn, cwdOverride, extraEnv) {
|
|
26
|
-
const shell = os.platform() === 'win32' ? 'cmd.exe' : undefined;
|
|
27
|
-
const cmdArgs = os.platform() === 'win32'
|
|
28
|
-
? ['/c', CLAUDE_CMD, ...args]
|
|
29
|
-
: args;
|
|
30
|
-
const cmd = os.platform() === 'win32' ? shell : CLAUDE_CMD;
|
|
31
|
-
// merge caller-supplied env over process.env; undefined values clear the var
|
|
32
|
-
const baseEnv = { ...process.env };
|
|
33
|
-
if (extraEnv) {
|
|
34
|
-
for (const [k, v] of Object.entries(extraEnv)) {
|
|
35
|
-
if (v === undefined)
|
|
36
|
-
delete baseEnv[k];
|
|
37
|
-
else
|
|
38
|
-
baseEnv[k] = v;
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
const child = pty.spawn(cmd, cmdArgs, {
|
|
42
|
-
name: 'xterm-256color',
|
|
43
|
-
cols: process.stdout.columns ?? 120,
|
|
44
|
-
rows: process.stdout.rows ?? 30,
|
|
45
|
-
cwd: cwdOverride ?? process.cwd(),
|
|
46
|
-
env: baseEnv,
|
|
47
|
-
useConpty: process.stdout.isTTY === true,
|
|
48
|
-
});
|
|
49
|
-
onSpawn?.(child);
|
|
50
|
-
child.onData((data) => {
|
|
51
|
-
onPtyData?.(data);
|
|
52
|
-
process.stdout.write(data);
|
|
53
|
-
});
|
|
54
|
-
if (process.stdin.isTTY) {
|
|
55
|
-
process.stdin.setRawMode(true);
|
|
56
|
-
}
|
|
57
|
-
process.stdin.resume();
|
|
58
|
-
const stdinHandler = (data) => child.write(data.toString());
|
|
59
|
-
process.stdin.on('data', stdinHandler);
|
|
60
|
-
let ptyAlive = true;
|
|
61
|
-
child.onExit(() => { ptyAlive = false; });
|
|
62
|
-
process.stdout.on('resize', () => {
|
|
63
|
-
if (!ptyAlive)
|
|
64
|
-
return;
|
|
65
|
-
const cols = process.stdout.columns ?? 120;
|
|
66
|
-
const rows = process.stdout.rows ?? 30;
|
|
67
|
-
try {
|
|
68
|
-
child.resize(cols, rows);
|
|
69
|
-
onResize?.(cols, rows);
|
|
70
|
-
}
|
|
71
|
-
catch {
|
|
72
|
-
}
|
|
73
|
-
});
|
|
74
|
-
return { pty: child, cleanup: () => { process.stdin.removeListener('data', stdinHandler); } };
|
|
75
|
-
}
|
|
76
|
-
export function writeToProcess(child, text) {
|
|
77
|
-
child.write(text + '\r');
|
|
78
|
-
}
|
|
79
|
-
//# sourceMappingURL=spawn.js.map
|
package/dist/spawn.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"spawn.js","sourceRoot":"","sources":["../src/spawn.ts"],"names":[],"mappings":"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"}
|
package/dist/terminalManager.js
DELETED
|
@@ -1,73 +0,0 @@
|
|
|
1
|
-
import * as pty from 'node-pty';
|
|
2
|
-
import os from 'os';
|
|
3
|
-
import { randomUUID } from 'crypto';
|
|
4
|
-
export class TerminalManager {
|
|
5
|
-
terminals = new Map();
|
|
6
|
-
onData;
|
|
7
|
-
onExit;
|
|
8
|
-
constructor(onData, onExit) {
|
|
9
|
-
this.onData = onData;
|
|
10
|
-
this.onExit = onExit;
|
|
11
|
-
}
|
|
12
|
-
create(cols = 120, rows = 30, cwd) {
|
|
13
|
-
const id = randomUUID();
|
|
14
|
-
const shell = os.platform() === 'win32' ? 'cmd.exe' : process.env.SHELL || '/bin/bash';
|
|
15
|
-
const child = pty.spawn(shell, [], {
|
|
16
|
-
name: 'xterm-256color',
|
|
17
|
-
cols,
|
|
18
|
-
rows,
|
|
19
|
-
cwd: cwd || process.cwd(),
|
|
20
|
-
env: process.env,
|
|
21
|
-
});
|
|
22
|
-
child.onData((data) => {
|
|
23
|
-
this.onData(id, data);
|
|
24
|
-
});
|
|
25
|
-
child.onExit(({ exitCode }) => {
|
|
26
|
-
this.terminals.delete(id);
|
|
27
|
-
this.onExit(id, exitCode);
|
|
28
|
-
});
|
|
29
|
-
this.terminals.set(id, { id, pty: child, cols, rows });
|
|
30
|
-
return id;
|
|
31
|
-
}
|
|
32
|
-
write(id, data) {
|
|
33
|
-
const session = this.terminals.get(id);
|
|
34
|
-
if (!session)
|
|
35
|
-
return false;
|
|
36
|
-
session.pty.write(data);
|
|
37
|
-
return true;
|
|
38
|
-
}
|
|
39
|
-
resize(id, cols, rows) {
|
|
40
|
-
const session = this.terminals.get(id);
|
|
41
|
-
if (!session)
|
|
42
|
-
return false;
|
|
43
|
-
try {
|
|
44
|
-
session.pty.resize(cols, rows);
|
|
45
|
-
session.cols = cols;
|
|
46
|
-
session.rows = rows;
|
|
47
|
-
return true;
|
|
48
|
-
}
|
|
49
|
-
catch {
|
|
50
|
-
return false;
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
close(id) {
|
|
54
|
-
const session = this.terminals.get(id);
|
|
55
|
-
if (!session)
|
|
56
|
-
return false;
|
|
57
|
-
try {
|
|
58
|
-
session.pty.kill();
|
|
59
|
-
}
|
|
60
|
-
catch { }
|
|
61
|
-
this.terminals.delete(id);
|
|
62
|
-
return true;
|
|
63
|
-
}
|
|
64
|
-
list() {
|
|
65
|
-
return Array.from(this.terminals.keys());
|
|
66
|
-
}
|
|
67
|
-
closeAll() {
|
|
68
|
-
for (const [id] of this.terminals) {
|
|
69
|
-
this.close(id);
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
//# sourceMappingURL=terminalManager.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"terminalManager.js","sourceRoot":"","sources":["../src/terminalManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,135 +0,0 @@
|
|
|
1
|
-
import http from 'node:http';
|
|
2
|
-
import WebSocket, { WebSocketServer } from 'ws';
|
|
3
|
-
import { randomUUID } from 'node:crypto';
|
|
4
|
-
import { log } from '../core/logger.js';
|
|
5
|
-
import { httpRequest } from '../http/httpClient.js';
|
|
6
|
-
import { SERVER_HTTP } from '../core/config.js';
|
|
7
|
-
const IDLE_TIMEOUT_MS = 60_000;
|
|
8
|
-
export class DirectWsServer {
|
|
9
|
-
onMessage;
|
|
10
|
-
onDisconnect;
|
|
11
|
-
server = null;
|
|
12
|
-
wss = null;
|
|
13
|
-
active = null;
|
|
14
|
-
currentSignalId = null;
|
|
15
|
-
constructor(onMessage, onDisconnect) {
|
|
16
|
-
this.onMessage = onMessage;
|
|
17
|
-
this.onDisconnect = onDisconnect;
|
|
18
|
-
}
|
|
19
|
-
// start an ephemeral direct websocket endpoint bound to localhost and one signal id
|
|
20
|
-
async prepare(signalId) {
|
|
21
|
-
await this.close();
|
|
22
|
-
this.currentSignalId = signalId;
|
|
23
|
-
this.server = http.createServer();
|
|
24
|
-
this.wss = new WebSocketServer({ noServer: true });
|
|
25
|
-
this.wss.on('connection', (socket, request) => {
|
|
26
|
-
void this.handleConnection(socket, request.url ?? '/');
|
|
27
|
-
});
|
|
28
|
-
this.server.on('upgrade', (request, socket, head) => {
|
|
29
|
-
this.wss?.handleUpgrade(request, socket, head, (ws) => {
|
|
30
|
-
this.wss?.emit('connection', ws, request);
|
|
31
|
-
});
|
|
32
|
-
});
|
|
33
|
-
await new Promise((resolve, reject) => {
|
|
34
|
-
this.server?.once('error', reject);
|
|
35
|
-
this.server?.listen(0, '127.0.0.1', () => resolve());
|
|
36
|
-
});
|
|
37
|
-
const address = this.server.address();
|
|
38
|
-
if (!address || typeof address === 'string') {
|
|
39
|
-
throw new Error('failed to bind direct websocket server');
|
|
40
|
-
}
|
|
41
|
-
return `ws://127.0.0.1:${address.port}/direct?signalId=${signalId}`;
|
|
42
|
-
}
|
|
43
|
-
// send one runtime message to the active direct peer when connected
|
|
44
|
-
send(data) {
|
|
45
|
-
if (!this.active || this.active.socket.readyState !== WebSocket.OPEN)
|
|
46
|
-
return;
|
|
47
|
-
this.active.socket.send(JSON.stringify(data));
|
|
48
|
-
this.bumpIdleTimer();
|
|
49
|
-
}
|
|
50
|
-
// report whether a specific direct session is currently connected
|
|
51
|
-
isConnected(sessionId) {
|
|
52
|
-
return Boolean(this.active && this.active.sessionId === sessionId && this.active.socket.readyState === WebSocket.OPEN);
|
|
53
|
-
}
|
|
54
|
-
// close all direct websocket resources and forget current state
|
|
55
|
-
async close() {
|
|
56
|
-
if (this.active?.idleTimer)
|
|
57
|
-
clearTimeout(this.active.idleTimer);
|
|
58
|
-
try {
|
|
59
|
-
this.active?.socket.close();
|
|
60
|
-
}
|
|
61
|
-
catch { }
|
|
62
|
-
this.active = null;
|
|
63
|
-
this.currentSignalId = null;
|
|
64
|
-
if (this.wss) {
|
|
65
|
-
await new Promise((resolve) => this.wss?.close(() => resolve()));
|
|
66
|
-
this.wss = null;
|
|
67
|
-
}
|
|
68
|
-
if (this.server) {
|
|
69
|
-
await new Promise((resolve) => this.server?.close(() => resolve()));
|
|
70
|
-
this.server = null;
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
bumpIdleTimer() {
|
|
74
|
-
if (!this.active)
|
|
75
|
-
return;
|
|
76
|
-
if (this.active.idleTimer)
|
|
77
|
-
clearTimeout(this.active.idleTimer);
|
|
78
|
-
this.active.idleTimer = setTimeout(() => {
|
|
79
|
-
log(`[direct] idle timeout closing session=${this.active?.sessionId ?? 'n/a'}`);
|
|
80
|
-
void this.close();
|
|
81
|
-
}, IDLE_TIMEOUT_MS);
|
|
82
|
-
}
|
|
83
|
-
// validate ticket with backend before allowing the websocket to carry runtime payloads
|
|
84
|
-
async validateTicket(ticket, directSessionId) {
|
|
85
|
-
const res = await httpRequest('POST', `${SERVER_HTTP()}/api/cli/direct-sessions/consume`, {
|
|
86
|
-
body: { ticket, directSessionId },
|
|
87
|
-
});
|
|
88
|
-
if (res.status !== 200) {
|
|
89
|
-
throw new Error(`direct ticket rejected with status ${res.status}`);
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
async handleConnection(socket, requestUrl) {
|
|
93
|
-
try {
|
|
94
|
-
const url = new URL(requestUrl, 'ws://127.0.0.1');
|
|
95
|
-
const signalId = url.searchParams.get('signalId') ?? '';
|
|
96
|
-
const ticket = url.searchParams.get('ticket') ?? '';
|
|
97
|
-
const directSessionId = url.searchParams.get('directSessionId') ?? randomUUID();
|
|
98
|
-
if (!this.currentSignalId || signalId !== this.currentSignalId || !ticket) {
|
|
99
|
-
socket.close(1008, 'invalid direct session signal');
|
|
100
|
-
return;
|
|
101
|
-
}
|
|
102
|
-
await this.validateTicket(ticket, directSessionId);
|
|
103
|
-
if (this.active) {
|
|
104
|
-
try {
|
|
105
|
-
this.active.socket.close();
|
|
106
|
-
}
|
|
107
|
-
catch { }
|
|
108
|
-
}
|
|
109
|
-
this.active = { sessionId: directSessionId, socket, idleTimer: null };
|
|
110
|
-
this.bumpIdleTimer();
|
|
111
|
-
socket.on('message', (raw) => {
|
|
112
|
-
this.bumpIdleTimer();
|
|
113
|
-
try {
|
|
114
|
-
this.onMessage(JSON.parse(raw.toString()));
|
|
115
|
-
}
|
|
116
|
-
catch (error) {
|
|
117
|
-
log(`[direct] parse error: ${error}`);
|
|
118
|
-
}
|
|
119
|
-
});
|
|
120
|
-
socket.on('close', () => {
|
|
121
|
-
const sessionId = this.active?.sessionId ?? directSessionId;
|
|
122
|
-
this.active = null;
|
|
123
|
-
this.onDisconnect(sessionId);
|
|
124
|
-
});
|
|
125
|
-
}
|
|
126
|
-
catch (error) {
|
|
127
|
-
log(`[direct] connection error: ${error}`);
|
|
128
|
-
try {
|
|
129
|
-
socket.close(1011, 'direct session auth failed');
|
|
130
|
-
}
|
|
131
|
-
catch { }
|
|
132
|
-
}
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
//# sourceMappingURL=directWsServer.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"directWsServer.js","sourceRoot":"","sources":["../../src/transport/directWsServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,145 +0,0 @@
|
|
|
1
|
-
import { log } from '../core/logger.js';
|
|
2
|
-
import { domainForType, unwrapDomainEnvelope, wrapDomainEnvelope } from './webrtcTypes.js';
|
|
3
|
-
const routedDomains = new Set(['prompt', 'session', 'transcript', 'file']);
|
|
4
|
-
export class CliWebRtcTransport {
|
|
5
|
-
terminals;
|
|
6
|
-
send;
|
|
7
|
-
createPeerConnection;
|
|
8
|
-
hasPermission;
|
|
9
|
-
routeMessage;
|
|
10
|
-
peers = new Map();
|
|
11
|
-
channels = new Map();
|
|
12
|
-
terminalToSession = new Map();
|
|
13
|
-
constructor(terminals, send, createPeerConnection, hasPermission = () => true, routeMessage) {
|
|
14
|
-
this.terminals = terminals;
|
|
15
|
-
this.send = send;
|
|
16
|
-
this.createPeerConnection = createPeerConnection;
|
|
17
|
-
this.hasPermission = hasPermission;
|
|
18
|
-
this.routeMessage = routeMessage;
|
|
19
|
-
}
|
|
20
|
-
setMessageRouter(routeMessage) { this.routeMessage = routeMessage; }
|
|
21
|
-
async handleSignal(msg) {
|
|
22
|
-
if (!msg.sessionId)
|
|
23
|
-
return;
|
|
24
|
-
if (msg.signalType === 'offer') {
|
|
25
|
-
await this.acceptOffer(msg.sessionId, msg.payload);
|
|
26
|
-
return;
|
|
27
|
-
}
|
|
28
|
-
if (msg.signalType === 'ice') {
|
|
29
|
-
const peer = this.peers.get(msg.sessionId);
|
|
30
|
-
if (peer && msg.payload)
|
|
31
|
-
await peer.addIceCandidate(msg.payload);
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
attachTerminal(terminalId, sessionId) {
|
|
35
|
-
this.terminalToSession.set(terminalId, sessionId);
|
|
36
|
-
}
|
|
37
|
-
sendTerminalOutput(terminalId, data) {
|
|
38
|
-
const sessionId = this.terminalToSession.get(terminalId);
|
|
39
|
-
if (!sessionId)
|
|
40
|
-
return false;
|
|
41
|
-
return this.sendEnvelope(sessionId, { type: 'terminal_output', terminalId, data });
|
|
42
|
-
}
|
|
43
|
-
sendTerminalClosed(terminalId, exitCode) {
|
|
44
|
-
const sessionId = this.terminalToSession.get(terminalId);
|
|
45
|
-
this.terminalToSession.delete(terminalId);
|
|
46
|
-
if (!sessionId)
|
|
47
|
-
return false;
|
|
48
|
-
return this.sendEnvelope(sessionId, { type: 'terminal_closed', terminalId, exitCode });
|
|
49
|
-
}
|
|
50
|
-
sendMessage(sessionId, payload) {
|
|
51
|
-
return this.sendEnvelope(sessionId, payload);
|
|
52
|
-
}
|
|
53
|
-
close(sessionId) {
|
|
54
|
-
const ids = sessionId ? [sessionId] : Array.from(this.peers.keys());
|
|
55
|
-
for (const id of ids) {
|
|
56
|
-
try {
|
|
57
|
-
this.channels.get(id)?.close();
|
|
58
|
-
}
|
|
59
|
-
catch { }
|
|
60
|
-
try {
|
|
61
|
-
this.peers.get(id)?.close();
|
|
62
|
-
}
|
|
63
|
-
catch { }
|
|
64
|
-
this.channels.delete(id);
|
|
65
|
-
this.peers.delete(id);
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
async acceptOffer(sessionId, offer) {
|
|
69
|
-
if (!this.hasPermission(sessionId)) {
|
|
70
|
-
this.sendState(sessionId, 'permission_denied');
|
|
71
|
-
return;
|
|
72
|
-
}
|
|
73
|
-
this.close(sessionId);
|
|
74
|
-
const peer = this.createPeerConnection();
|
|
75
|
-
this.peers.set(sessionId, peer);
|
|
76
|
-
peer.onicecandidate = (event) => {
|
|
77
|
-
if (event.candidate)
|
|
78
|
-
this.send({ type: 'transport_signal', sessionId, signalType: 'ice', payload: event.candidate });
|
|
79
|
-
};
|
|
80
|
-
peer.ondatachannel = (event) => this.attachChannel(sessionId, event.channel);
|
|
81
|
-
peer.onconnectionstatechange = () => this.sendState(sessionId, peer.connectionState ?? 'unknown');
|
|
82
|
-
peer.oniceconnectionstatechange = () => this.sendState(sessionId, peer.iceConnectionState ?? 'unknown');
|
|
83
|
-
await peer.setRemoteDescription(offer);
|
|
84
|
-
const answer = await peer.createAnswer();
|
|
85
|
-
await peer.setLocalDescription(answer);
|
|
86
|
-
this.send({ type: 'transport_signal', sessionId, signalType: 'answer', payload: peer.localDescription ?? answer });
|
|
87
|
-
}
|
|
88
|
-
attachChannel(sessionId, channel) {
|
|
89
|
-
this.channels.set(sessionId, channel);
|
|
90
|
-
channel.onopen = () => this.sendState(sessionId, 'datachannel_open');
|
|
91
|
-
channel.onclose = () => this.sendState(sessionId, 'datachannel_closed');
|
|
92
|
-
channel.onerror = (event) => log(`[webrtc] datachannel error session=${sessionId}: ${String(event)}`);
|
|
93
|
-
channel.onmessage = (event) => this.handleChannelMessage(sessionId, event.data);
|
|
94
|
-
}
|
|
95
|
-
handleChannelMessage(sessionId, raw) {
|
|
96
|
-
let msg;
|
|
97
|
-
try {
|
|
98
|
-
msg = JSON.parse(String(raw));
|
|
99
|
-
}
|
|
100
|
-
catch {
|
|
101
|
-
return;
|
|
102
|
-
}
|
|
103
|
-
const payload = unwrapDomainEnvelope(msg);
|
|
104
|
-
if (!payload)
|
|
105
|
-
return;
|
|
106
|
-
if (!this.hasPermission(sessionId)) {
|
|
107
|
-
this.sendState(sessionId, 'permission_denied');
|
|
108
|
-
return;
|
|
109
|
-
}
|
|
110
|
-
if (routedDomains.has(domainForType(payload.type))) {
|
|
111
|
-
this.routeMessage?.(sessionId, { ...payload, transportSessionId: sessionId });
|
|
112
|
-
return;
|
|
113
|
-
}
|
|
114
|
-
if (payload.type === 'terminal_create') {
|
|
115
|
-
const terminalId = this.terminals.create(payload.cols ?? 120, payload.rows ?? 30, payload.cwd);
|
|
116
|
-
this.attachTerminal(terminalId, sessionId);
|
|
117
|
-
this.sendEnvelope(sessionId, { type: 'terminal_created', terminalId });
|
|
118
|
-
return;
|
|
119
|
-
}
|
|
120
|
-
if (payload.type === 'heartbeat' || payload.type === 'terminal_created' || payload.type === 'terminal_output' || payload.type === 'terminal_closed')
|
|
121
|
-
return;
|
|
122
|
-
if (!this.isSessionTerminal(sessionId, payload.terminalId))
|
|
123
|
-
return;
|
|
124
|
-
if (payload.type === 'terminal_input')
|
|
125
|
-
this.terminals.write(payload.terminalId, payload.data);
|
|
126
|
-
if (payload.type === 'terminal_resize')
|
|
127
|
-
this.terminals.resize(payload.terminalId, payload.cols, payload.rows);
|
|
128
|
-
if (payload.type === 'terminal_close')
|
|
129
|
-
this.terminals.close(payload.terminalId);
|
|
130
|
-
}
|
|
131
|
-
isSessionTerminal(sessionId, terminalId) {
|
|
132
|
-
return typeof terminalId === 'string' && this.terminalToSession.get(terminalId) === sessionId;
|
|
133
|
-
}
|
|
134
|
-
sendEnvelope(sessionId, payload) {
|
|
135
|
-
const channel = this.channels.get(sessionId);
|
|
136
|
-
if (!channel || channel.readyState !== 'open')
|
|
137
|
-
return false;
|
|
138
|
-
channel.send(JSON.stringify(wrapDomainEnvelope(payload)));
|
|
139
|
-
return true;
|
|
140
|
-
}
|
|
141
|
-
sendState(sessionId, state) {
|
|
142
|
-
this.send({ type: 'transport_signal', sessionId, signalType: 'state', payload: { state, at: Date.now() } });
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
//# sourceMappingURL=webrtcTransport.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"webrtcTransport.js","sourceRoot":"","sources":["../../src/transport/webrtcTransport.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,kBAAkB,EAA2H,MAAM,kBAAkB,CAAC;AAMpN,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;AAE3E,MAAM,OAAO,kBAAkB;IAMV;IACA;IACA;IACA;IACT;IATF,KAAK,GAAG,IAAI,GAAG,EAA8B,CAAC;IAC9C,QAAQ,GAAG,IAAI,GAAG,EAA2B,CAAC;IAC9C,iBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEtD,YACmB,SAA0B,EAC1B,IAAY,EACZ,oBAA2C,EAC3C,gBAA8B,GAAG,EAAE,CAAC,IAAI,EACjD,YAAwB;QAJf,cAAS,GAAT,SAAS,CAAiB;QAC1B,SAAI,GAAJ,IAAI,CAAQ;QACZ,yBAAoB,GAApB,oBAAoB,CAAuB;QAC3C,kBAAa,GAAb,aAAa,CAA2B;QACjD,iBAAY,GAAZ,YAAY,CAAY;IAC/B,CAAC;IAEJ,gBAAgB,CAAC,YAAuB,IAAU,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC;IAErF,KAAK,CAAC,YAAY,CAAC,GAAqB;QACtC,IAAI,CAAC,GAAG,CAAC,SAAS;YAAE,OAAO;QAC3B,IAAI,GAAG,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YACnD,OAAO;QACT,CAAC;QACD,IAAI,GAAG,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC3C,IAAI,IAAI,IAAI,GAAG,CAAC,OAAO;gBAAE,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,cAAc,CAAC,UAAkB,EAAE,SAAiB;QAClD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IACpD,CAAC;IAED,kBAAkB,CAAC,UAAkB,EAAE,IAAY;QACjD,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACzD,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAC7B,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IACrF,CAAC;IAED,kBAAkB,CAAC,UAAkB,EAAE,QAAgB;QACrD,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACzD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAC7B,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzF,CAAC;IAED,WAAW,CAAC,SAAiB,EAAE,OAAmD;QAChF,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,SAAkB;QACtB,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACrB,IAAI,CAAC;gBAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;YAChD,IAAI,CAAC;gBAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;YAC7C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACzB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,SAAiB,EAAE,KAAc;QACzD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;YAC/C,OAAO;QACT,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACtB,MAAM,IAAI,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACzC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,cAAc,GAAG,CAAC,KAAK,EAAE,EAAE;YAC9B,IAAI,KAAK,CAAC,SAAS;gBAAE,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;QACvH,CAAC,CAAC;QACF,IAAI,CAAC,aAAa,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7E,IAAI,CAAC,uBAAuB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,eAAe,IAAI,SAAS,CAAC,CAAC;QAClG,IAAI,CAAC,0BAA0B,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,kBAAkB,IAAI,SAAS,CAAC,CAAC;QACxG,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,gBAAgB,IAAI,MAAM,EAAE,CAAC,CAAC;IACrH,CAAC;IAEO,aAAa,CAAC,SAAiB,EAAE,OAAwB;QAC/D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACtC,OAAO,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;QACrE,OAAO,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;QACxE,OAAO,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,sCAAsC,SAAS,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACtG,OAAO,CAAC,SAAS,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAClF,CAAC;IAEO,oBAAoB,CAAC,SAAiB,EAAE,GAAY;QAC1D,IAAI,GAAqB,CAAC;QAC1B,IAAI,CAAC;YAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAqB,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO;QAAC,CAAC;QAC5E,MAAM,OAAO,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;YAC/C,OAAO;QACT,CAAC;QACD,IAAI,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,CAAC,CAAC;YAC9E,OAAO;QACT,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;YACvC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAE,OAAO,CAAC,IAAe,IAAI,GAAG,EAAG,OAAO,CAAC,IAAe,IAAI,EAAE,EAAE,OAAO,CAAC,GAAyB,CAAC,CAAC;YAC7I,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YAC3C,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,UAAU,EAAE,CAAC,CAAC;YACvE,OAAO;QACT,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,IAAI,OAAO,CAAC,IAAI,KAAK,kBAAkB,IAAI,OAAO,CAAC,IAAI,KAAK,iBAAiB,IAAI,OAAO,CAAC,IAAI,KAAK,iBAAiB;YAAE,OAAO;QAC5J,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,UAAgC,CAAC;YAAE,OAAO;QACzF,IAAI,OAAO,CAAC,IAAI,KAAK,gBAAgB;YAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,UAAoB,EAAE,OAAO,CAAC,IAAc,CAAC,CAAC;QAClH,IAAI,OAAO,CAAC,IAAI,KAAK,iBAAiB;YAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,UAAoB,EAAE,OAAO,CAAC,IAAc,EAAE,OAAO,CAAC,IAAc,CAAC,CAAC;QAC5I,IAAI,OAAO,CAAC,IAAI,KAAK,gBAAgB;YAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,UAAoB,CAAC,CAAC;IAC5F,CAAC;IAEO,iBAAiB,CAAC,SAAiB,EAAE,UAAmB;QAC9D,OAAO,OAAO,UAAU,KAAK,QAAQ,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,SAAS,CAAC;IAChG,CAAC;IAEO,YAAY,CAAC,SAAiB,EAAE,OAAmD;QACzF,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,UAAU,KAAK,MAAM;YAAE,OAAO,KAAK,CAAC;QAC5D,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,SAAS,CAAC,SAAiB,EAAE,KAAa;QAChD,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;IAC9G,CAAC;CACF"}
|