@kaitranntt/ccs 7.52.0 → 7.52.1-dev.2
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/ccs.js +11 -20
- package/dist/ccs.js.map +1 -1
- package/dist/cliproxy/config/generator.d.ts +2 -1
- package/dist/cliproxy/config/generator.d.ts.map +1 -1
- package/dist/cliproxy/config/generator.js +3 -59
- package/dist/cliproxy/config/generator.js.map +1 -1
- package/dist/commands/copilot-command.d.ts.map +1 -1
- package/dist/commands/copilot-command.js +9 -3
- package/dist/commands/copilot-command.js.map +1 -1
- package/dist/copilot/constants.d.ts +11 -0
- package/dist/copilot/constants.d.ts.map +1 -0
- package/dist/copilot/constants.js +46 -0
- package/dist/copilot/constants.js.map +1 -0
- package/dist/copilot/copilot-daemon.d.ts.map +1 -1
- package/dist/copilot/copilot-daemon.js +136 -18
- package/dist/copilot/copilot-daemon.js.map +1 -1
- package/dist/copilot/copilot-executor.d.ts +1 -1
- package/dist/copilot/copilot-executor.d.ts.map +1 -1
- package/dist/copilot/copilot-executor.js +6 -4
- package/dist/copilot/copilot-executor.js.map +1 -1
- package/dist/cursor/daemon-process-ownership.d.ts +1 -0
- package/dist/cursor/daemon-process-ownership.d.ts.map +1 -1
- package/dist/cursor/daemon-process-ownership.js +7 -4
- package/dist/cursor/daemon-process-ownership.js.map +1 -1
- package/dist/web-server/routes/copilot-routes.d.ts.map +1 -1
- package/dist/web-server/routes/copilot-routes.js +124 -11
- package/dist/web-server/routes/copilot-routes.js.map +1 -1
- package/package.json +1 -1
|
@@ -34,22 +34,57 @@ const child_process_1 = require("child_process");
|
|
|
34
34
|
const fs = __importStar(require("fs"));
|
|
35
35
|
const path = __importStar(require("path"));
|
|
36
36
|
const http = __importStar(require("http"));
|
|
37
|
+
const unified_config_types_1 = require("../config/unified-config-types");
|
|
38
|
+
const unified_config_loader_1 = require("../config/unified-config-loader");
|
|
37
39
|
const copilot_package_manager_1 = require("./copilot-package-manager");
|
|
38
|
-
const
|
|
40
|
+
const daemon_process_ownership_1 = require("../cursor/daemon-process-ownership");
|
|
41
|
+
const DAEMON_HEALTH_MARKER = 'server running';
|
|
42
|
+
const MIN_PORT = 1;
|
|
43
|
+
const MAX_PORT = 65535;
|
|
44
|
+
function isValidPort(port) {
|
|
45
|
+
return Number.isInteger(port) && port >= MIN_PORT && port <= MAX_PORT;
|
|
46
|
+
}
|
|
47
|
+
function getConfiguredCopilotPort() {
|
|
48
|
+
try {
|
|
49
|
+
const config = (0, unified_config_loader_1.loadOrCreateUnifiedConfig)();
|
|
50
|
+
const port = config.copilot?.port ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.port;
|
|
51
|
+
return isValidPort(port) ? port : unified_config_types_1.DEFAULT_COPILOT_CONFIG.port;
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
return unified_config_types_1.DEFAULT_COPILOT_CONFIG.port;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
function getPidFilePath() {
|
|
58
|
+
return path.join((0, copilot_package_manager_1.getCopilotDir)(), 'daemon.pid');
|
|
59
|
+
}
|
|
39
60
|
/**
|
|
40
61
|
* Check if copilot-api daemon is running on the specified port.
|
|
41
62
|
* Uses 127.0.0.1 instead of localhost for more reliable local connections.
|
|
42
63
|
*/
|
|
43
64
|
async function isDaemonRunning(port) {
|
|
65
|
+
if (!isValidPort(port)) {
|
|
66
|
+
return false;
|
|
67
|
+
}
|
|
44
68
|
return new Promise((resolve) => {
|
|
45
69
|
const req = http.request({
|
|
46
70
|
hostname: '127.0.0.1',
|
|
47
71
|
port,
|
|
48
|
-
path: '/
|
|
72
|
+
path: '/',
|
|
49
73
|
method: 'GET',
|
|
50
74
|
timeout: 3000,
|
|
51
75
|
}, (res) => {
|
|
52
|
-
|
|
76
|
+
let body = '';
|
|
77
|
+
res.setEncoding('utf8');
|
|
78
|
+
res.on('data', (chunk) => {
|
|
79
|
+
body += chunk;
|
|
80
|
+
});
|
|
81
|
+
res.on('end', () => {
|
|
82
|
+
if (res.statusCode !== 200) {
|
|
83
|
+
resolve(false);
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
86
|
+
resolve(body.trim().toLowerCase().includes(DAEMON_HEALTH_MARKER));
|
|
87
|
+
});
|
|
53
88
|
});
|
|
54
89
|
req.on('error', () => {
|
|
55
90
|
resolve(false);
|
|
@@ -79,9 +114,10 @@ exports.getDaemonStatus = getDaemonStatus;
|
|
|
79
114
|
* Read PID from file.
|
|
80
115
|
*/
|
|
81
116
|
function getPidFromFile() {
|
|
117
|
+
const pidFile = getPidFilePath();
|
|
82
118
|
try {
|
|
83
|
-
if (fs.existsSync(
|
|
84
|
-
const content = fs.readFileSync(
|
|
119
|
+
if (fs.existsSync(pidFile)) {
|
|
120
|
+
const content = fs.readFileSync(pidFile, 'utf8').trim();
|
|
85
121
|
const pid = parseInt(content, 10);
|
|
86
122
|
return isNaN(pid) ? null : pid;
|
|
87
123
|
}
|
|
@@ -95,12 +131,13 @@ function getPidFromFile() {
|
|
|
95
131
|
* Write PID to file.
|
|
96
132
|
*/
|
|
97
133
|
function writePidToFile(pid) {
|
|
134
|
+
const pidFile = getPidFilePath();
|
|
98
135
|
try {
|
|
99
|
-
const dir = path.dirname(
|
|
136
|
+
const dir = path.dirname(pidFile);
|
|
100
137
|
if (!fs.existsSync(dir)) {
|
|
101
138
|
fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
102
139
|
}
|
|
103
|
-
fs.writeFileSync(
|
|
140
|
+
fs.writeFileSync(pidFile, pid.toString(), { mode: 0o600 });
|
|
104
141
|
}
|
|
105
142
|
catch {
|
|
106
143
|
// Ignore errors
|
|
@@ -110,9 +147,10 @@ function writePidToFile(pid) {
|
|
|
110
147
|
* Remove PID file.
|
|
111
148
|
*/
|
|
112
149
|
function removePidFile() {
|
|
150
|
+
const pidFile = getPidFilePath();
|
|
113
151
|
try {
|
|
114
|
-
if (fs.existsSync(
|
|
115
|
-
fs.unlinkSync(
|
|
152
|
+
if (fs.existsSync(pidFile)) {
|
|
153
|
+
fs.unlinkSync(pidFile);
|
|
116
154
|
}
|
|
117
155
|
}
|
|
118
156
|
catch {
|
|
@@ -126,6 +164,12 @@ function removePidFile() {
|
|
|
126
164
|
* @returns Promise that resolves when daemon is ready
|
|
127
165
|
*/
|
|
128
166
|
async function startDaemon(config) {
|
|
167
|
+
if (!isValidPort(config.port)) {
|
|
168
|
+
return {
|
|
169
|
+
success: false,
|
|
170
|
+
error: `Invalid Copilot daemon port ${config.port}. Expected integer between ${MIN_PORT} and ${MAX_PORT}.`,
|
|
171
|
+
};
|
|
172
|
+
}
|
|
129
173
|
// Check if already running
|
|
130
174
|
if (await isDaemonRunning(config.port)) {
|
|
131
175
|
return { success: true, pid: getPidFromFile() ?? undefined };
|
|
@@ -145,6 +189,20 @@ async function startDaemon(config) {
|
|
|
145
189
|
}
|
|
146
190
|
return new Promise((resolve) => {
|
|
147
191
|
let proc;
|
|
192
|
+
let resolved = false;
|
|
193
|
+
let checkTimeout = null;
|
|
194
|
+
const safeResolve = (result) => {
|
|
195
|
+
if (resolved)
|
|
196
|
+
return;
|
|
197
|
+
resolved = true;
|
|
198
|
+
if (checkTimeout) {
|
|
199
|
+
clearTimeout(checkTimeout);
|
|
200
|
+
}
|
|
201
|
+
if (!result.success) {
|
|
202
|
+
removePidFile();
|
|
203
|
+
}
|
|
204
|
+
resolve(result);
|
|
205
|
+
};
|
|
148
206
|
try {
|
|
149
207
|
proc = (0, child_process_1.spawn)(binPath, args, {
|
|
150
208
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
@@ -159,30 +217,54 @@ async function startDaemon(config) {
|
|
|
159
217
|
// Wait for daemon to be ready (poll for up to 30 seconds)
|
|
160
218
|
let attempts = 0;
|
|
161
219
|
const maxAttempts = 30;
|
|
162
|
-
const
|
|
220
|
+
const pollHealth = async () => {
|
|
221
|
+
if (resolved)
|
|
222
|
+
return;
|
|
163
223
|
attempts++;
|
|
164
224
|
if (await isDaemonRunning(config.port)) {
|
|
165
|
-
|
|
166
|
-
resolve({ success: true, pid: proc.pid });
|
|
225
|
+
safeResolve({ success: true, pid: proc.pid });
|
|
167
226
|
}
|
|
168
227
|
else if (attempts >= maxAttempts) {
|
|
169
|
-
|
|
170
|
-
|
|
228
|
+
if (proc.pid) {
|
|
229
|
+
try {
|
|
230
|
+
process.kill(proc.pid, 'SIGTERM');
|
|
231
|
+
}
|
|
232
|
+
catch {
|
|
233
|
+
// Already exited
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
safeResolve({
|
|
171
237
|
success: false,
|
|
172
238
|
error: 'Daemon did not start within 30 seconds',
|
|
173
239
|
});
|
|
174
240
|
}
|
|
175
|
-
|
|
241
|
+
else {
|
|
242
|
+
checkTimeout = setTimeout(pollHealth, 1000);
|
|
243
|
+
}
|
|
244
|
+
};
|
|
245
|
+
checkTimeout = setTimeout(pollHealth, 1000);
|
|
176
246
|
proc.on('error', (err) => {
|
|
177
|
-
|
|
178
|
-
resolve({
|
|
247
|
+
safeResolve({
|
|
179
248
|
success: false,
|
|
180
249
|
error: `Failed to start daemon: ${err.message}`,
|
|
181
250
|
});
|
|
182
251
|
});
|
|
252
|
+
proc.on('exit', (code, signal) => {
|
|
253
|
+
if (code === null) {
|
|
254
|
+
safeResolve({
|
|
255
|
+
success: false,
|
|
256
|
+
error: `Daemon process was killed by signal ${signal}`,
|
|
257
|
+
});
|
|
258
|
+
return;
|
|
259
|
+
}
|
|
260
|
+
safeResolve({
|
|
261
|
+
success: false,
|
|
262
|
+
error: `Daemon process exited with code ${code}`,
|
|
263
|
+
});
|
|
264
|
+
});
|
|
183
265
|
}
|
|
184
266
|
catch (err) {
|
|
185
|
-
|
|
267
|
+
safeResolve({
|
|
186
268
|
success: false,
|
|
187
269
|
error: `Failed to spawn daemon: ${err.message}`,
|
|
188
270
|
});
|
|
@@ -195,12 +277,48 @@ exports.startDaemon = startDaemon;
|
|
|
195
277
|
*/
|
|
196
278
|
async function stopDaemon() {
|
|
197
279
|
const pid = getPidFromFile();
|
|
280
|
+
const configuredPort = getConfiguredCopilotPort();
|
|
198
281
|
if (!pid) {
|
|
199
282
|
// No PID file, try to find by port
|
|
200
283
|
removePidFile();
|
|
201
284
|
return { success: true };
|
|
202
285
|
}
|
|
203
286
|
try {
|
|
287
|
+
const ownership = (0, daemon_process_ownership_1.verifyProcessOwnership)(pid, (commandLine) => {
|
|
288
|
+
const lower = commandLine.toLowerCase();
|
|
289
|
+
const hasCopilotApiBinary = /copilot-api(\.cmd|\.exe)?/.test(lower);
|
|
290
|
+
const hasStartCommand = /\bstart\b/.test(lower);
|
|
291
|
+
const hasPortArgument = /--port(?:\s+|=)\d+\b/.test(lower);
|
|
292
|
+
// copilot-api is launched as `... copilot-api start --port <n>`
|
|
293
|
+
return hasCopilotApiBinary && hasStartCommand && hasPortArgument;
|
|
294
|
+
});
|
|
295
|
+
if (ownership === 'not-running') {
|
|
296
|
+
removePidFile();
|
|
297
|
+
return { success: true };
|
|
298
|
+
}
|
|
299
|
+
if (ownership === 'not-owned') {
|
|
300
|
+
// PID was reused by an unrelated process.
|
|
301
|
+
// If daemon is still live on configured port, report failure (stop not completed).
|
|
302
|
+
if (await isDaemonRunning(configuredPort)) {
|
|
303
|
+
return {
|
|
304
|
+
success: false,
|
|
305
|
+
error: `Refusing to clear PID ${pid}: unrelated process owns PID and daemon is still responding on port ${configuredPort}`,
|
|
306
|
+
};
|
|
307
|
+
}
|
|
308
|
+
removePidFile();
|
|
309
|
+
return { success: true };
|
|
310
|
+
}
|
|
311
|
+
if (ownership === 'unknown') {
|
|
312
|
+
// If daemon is not reachable, allow stale PID cleanup.
|
|
313
|
+
if (!(await isDaemonRunning(configuredPort))) {
|
|
314
|
+
removePidFile();
|
|
315
|
+
return { success: true };
|
|
316
|
+
}
|
|
317
|
+
return {
|
|
318
|
+
success: false,
|
|
319
|
+
error: `Refusing to stop PID ${pid}: unable to verify daemon ownership`,
|
|
320
|
+
};
|
|
321
|
+
}
|
|
204
322
|
// Send SIGTERM to the process
|
|
205
323
|
process.kill(pid, 'SIGTERM');
|
|
206
324
|
// Wait for process to exit (up to 5 seconds)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-daemon.js","sourceRoot":"","sources":["../../src/copilot/copilot-daemon.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,iDAAoD;AACpD,uCAAyB;AACzB,2CAA6B;AAC7B,2CAA6B;
|
|
1
|
+
{"version":3,"file":"copilot-daemon.js","sourceRoot":"","sources":["../../src/copilot/copilot-daemon.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,5 +22,5 @@ export declare function generateCopilotEnv(config: CopilotConfig, claudeConfigDi
|
|
|
22
22
|
* @param claudeArgs Arguments to pass to Claude CLI
|
|
23
23
|
* @returns Exit code
|
|
24
24
|
*/
|
|
25
|
-
export declare function executeCopilotProfile(config: CopilotConfig, claudeArgs: string[], claudeConfigDir?: string): Promise<number>;
|
|
25
|
+
export declare function executeCopilotProfile(config: CopilotConfig, claudeArgs: string[], claudeConfigDir?: string, claudeCliPath?: string): Promise<number>;
|
|
26
26
|
//# sourceMappingURL=copilot-executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-executor.d.ts","sourceRoot":"","sources":["../../src/copilot/copilot-executor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAK/D,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAMxC;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAapF;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,aAAa,EACrB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAsBxB;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,UAAU,EAAE,MAAM,EAAE,EACpB,eAAe,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"copilot-executor.d.ts","sourceRoot":"","sources":["../../src/copilot/copilot-executor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAK/D,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAMxC;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAapF;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,aAAa,EACrB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAsBxB;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,UAAU,EAAE,MAAM,EAAE,EACpB,eAAe,CAAC,EAAE,MAAM,EACxB,aAAa,GAAE,MAAiB,GAC/B,OAAO,CAAC,MAAM,CAAC,CAkGjB"}
|
|
@@ -67,7 +67,7 @@ exports.generateCopilotEnv = generateCopilotEnv;
|
|
|
67
67
|
* @param claudeArgs Arguments to pass to Claude CLI
|
|
68
68
|
* @returns Exit code
|
|
69
69
|
*/
|
|
70
|
-
async function executeCopilotProfile(config, claudeArgs, claudeConfigDir) {
|
|
70
|
+
async function executeCopilotProfile(config, claudeArgs, claudeConfigDir, claudeCliPath = 'claude') {
|
|
71
71
|
// Ensure copilot-api is installed (auto-install if missing, auto-update if outdated)
|
|
72
72
|
try {
|
|
73
73
|
await (0, copilot_package_manager_1.ensureCopilotApi)();
|
|
@@ -85,7 +85,7 @@ async function executeCopilotProfile(config, claudeArgs, claudeConfigDir) {
|
|
|
85
85
|
if (!(0, copilot_auth_1.isCopilotApiInstalled)()) {
|
|
86
86
|
console.error((0, ui_1.fail)('copilot-api is not installed.'));
|
|
87
87
|
console.error('');
|
|
88
|
-
console.error('Install
|
|
88
|
+
console.error('Install/repair by running: ccs copilot start');
|
|
89
89
|
return 1;
|
|
90
90
|
}
|
|
91
91
|
// Check authentication
|
|
@@ -113,7 +113,9 @@ async function executeCopilotProfile(config, claudeArgs, claudeConfigDir) {
|
|
|
113
113
|
else {
|
|
114
114
|
console.error((0, ui_1.fail)('copilot-api daemon is not running.'));
|
|
115
115
|
console.error('');
|
|
116
|
-
console.error('Start the daemon
|
|
116
|
+
console.error('Start the daemon:');
|
|
117
|
+
console.error(' ccs copilot start');
|
|
118
|
+
console.error('Fallback manual command:');
|
|
117
119
|
console.error(` npx copilot-api start --port ${config.port}`);
|
|
118
120
|
console.error('');
|
|
119
121
|
console.error('Or enable auto_start in config:');
|
|
@@ -141,7 +143,7 @@ async function executeCopilotProfile(config, claudeArgs, claudeConfigDir) {
|
|
|
141
143
|
console.log('');
|
|
142
144
|
// Spawn Claude CLI
|
|
143
145
|
return new Promise((resolve) => {
|
|
144
|
-
const proc = (0, child_process_1.spawn)(
|
|
146
|
+
const proc = (0, child_process_1.spawn)(claudeCliPath, claudeArgs, {
|
|
145
147
|
stdio: 'inherit',
|
|
146
148
|
env,
|
|
147
149
|
shell: process.platform === 'win32',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-executor.js","sourceRoot":"","sources":["../../src/copilot/copilot-executor.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iDAAsC;AAEtC,2EAAqE;AACrE,iDAAwE;AACxE,qDAAgE;AAChE,uEAA6D;AAE7D,oCAA6C;AAC7C,kEAAiE;AACjE,0CAAyD;AACzD,4DAA6D;AAE7D;;GAEG;AACI,KAAK,UAAU,gBAAgB,CAAC,MAAqB;IAC1D,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,IAAA,8BAAe,GAAE;QACjB,IAAA,gCAAe,EAAC,MAAM,CAAC,IAAI,CAAC;KAC7B,CAAC,CAAC;IAEH,OAAO;QACL,IAAI;QACJ,MAAM,EAAE;YACN,OAAO,EAAE,aAAa;YACtB,IAAI,EAAE,MAAM,CAAC,IAAI;SAClB;KACF,CAAC;AACJ,CAAC;AAbD,4CAaC;AAED;;;GAGG;AACH,SAAgB,kBAAkB,CAChC,MAAqB,EACrB,eAAwB;IAExB,wEAAwE;IACxE,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,KAAK,CAAC;IACpD,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,KAAK,CAAC;IACxD,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,KAAK,CAAC;IAEtD,yEAAyE;IACzE,sDAAsD;IACtD,OAAO;QACL,kBAAkB,EAAE,oBAAoB,MAAM,CAAC,IAAI,EAAE;QACrD,oBAAoB,EAAE,OAAO,EAAE,sCAAsC;QACrE,eAAe,EAAE,MAAM,CAAC,KAAK;QAC7B,qEAAqE;QACrE,4BAA4B,EAAE,SAAS;QACvC,8BAA8B,EAAE,WAAW;QAC3C,0BAA0B,EAAE,UAAU;QACtC,6BAA6B,EAAE,UAAU;QACzC,uDAAuD;QACvD,iCAAiC,EAAE,GAAG;QACtC,wCAAwC,EAAE,GAAG;QAC7C,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnE,CAAC;AACJ,CAAC;AAzBD,gDAyBC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,qBAAqB,CACzC,MAAqB,EACrB,UAAoB,EACpB,eAAwB;
|
|
1
|
+
{"version":3,"file":"copilot-executor.js","sourceRoot":"","sources":["../../src/copilot/copilot-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export type DaemonOwnershipStatus = 'owned' | 'not-owned' | 'not-running' | 'unknown';
|
|
2
|
+
export declare function verifyProcessOwnership(pid: number, ownershipMatcher: (commandLine: string) => boolean): DaemonOwnershipStatus;
|
|
2
3
|
export declare function verifyDaemonOwnership(pid: number): DaemonOwnershipStatus;
|
|
3
4
|
//# sourceMappingURL=daemon-process-ownership.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-process-ownership.d.ts","sourceRoot":"","sources":["../../src/cursor/daemon-process-ownership.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,WAAW,GAAG,aAAa,GAAG,SAAS,CAAC;AAmDtF,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,
|
|
1
|
+
{"version":3,"file":"daemon-process-ownership.d.ts","sourceRoot":"","sources":["../../src/cursor/daemon-process-ownership.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,WAAW,GAAG,aAAa,GAAG,SAAS,CAAC;AAmDtF,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,MAAM,EACX,gBAAgB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,GACjD,qBAAqB,CAiBvB;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAMxE"}
|
|
@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.verifyDaemonOwnership = void 0;
|
|
26
|
+
exports.verifyDaemonOwnership = exports.verifyProcessOwnership = void 0;
|
|
27
27
|
const child_process_1 = require("child_process");
|
|
28
28
|
const fs = __importStar(require("fs"));
|
|
29
29
|
function getProcessCommandLine(pid) {
|
|
@@ -74,7 +74,7 @@ function getProcessCommandLine(pid) {
|
|
|
74
74
|
}
|
|
75
75
|
return null;
|
|
76
76
|
}
|
|
77
|
-
function
|
|
77
|
+
function verifyProcessOwnership(pid, ownershipMatcher) {
|
|
78
78
|
try {
|
|
79
79
|
process.kill(pid, 0);
|
|
80
80
|
}
|
|
@@ -89,8 +89,11 @@ function verifyDaemonOwnership(pid) {
|
|
|
89
89
|
if (!commandLine) {
|
|
90
90
|
return 'unknown';
|
|
91
91
|
}
|
|
92
|
-
|
|
93
|
-
|
|
92
|
+
return ownershipMatcher(commandLine) ? 'owned' : 'not-owned';
|
|
93
|
+
}
|
|
94
|
+
exports.verifyProcessOwnership = verifyProcessOwnership;
|
|
95
|
+
function verifyDaemonOwnership(pid) {
|
|
96
|
+
return verifyProcessOwnership(pid, (commandLine) => commandLine.includes('--ccs-daemon') && commandLine.includes('cursor-daemon-entry'));
|
|
94
97
|
}
|
|
95
98
|
exports.verifyDaemonOwnership = verifyDaemonOwnership;
|
|
96
99
|
//# sourceMappingURL=daemon-process-ownership.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-process-ownership.js","sourceRoot":"","sources":["../../src/cursor/daemon-process-ownership.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAA0C;AAC1C,uCAAyB;AAIzB,SAAS,qBAAqB,CAAC,GAAW;IACxC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,wDAAwD;YACxD,OAAO,EAAE,CAAC,YAAY,CAAC,SAAS,GAAG,UAAU,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACpF,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE;gBACpE,QAAQ,EAAE,MAAM;aACjB,CAAC,CAAC;YACH,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,MAAM,OAAO,GAAG,uDAAuD,GAAG,gDAAgD,CAAC;QAC3H,MAAM,MAAM,GAAG,CAAC,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QACpE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,KAAK,EAAE,CAAC,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;oBACnE,QAAQ,EAAE,MAAM;iBACjB,CAAC,CAAC;gBACH,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBACjB,SAAS;gBACX,CAAC;gBACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACxB,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAC9B,CAAC;YAAC,MAAM,CAAC;gBACP,2BAA2B;YAC7B,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,
|
|
1
|
+
{"version":3,"file":"daemon-process-ownership.js","sourceRoot":"","sources":["../../src/cursor/daemon-process-ownership.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAA0C;AAC1C,uCAAyB;AAIzB,SAAS,qBAAqB,CAAC,GAAW;IACxC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,wDAAwD;YACxD,OAAO,EAAE,CAAC,YAAY,CAAC,SAAS,GAAG,UAAU,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACpF,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE;gBACpE,QAAQ,EAAE,MAAM;aACjB,CAAC,CAAC;YACH,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxC,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,MAAM,OAAO,GAAG,uDAAuD,GAAG,gDAAgD,CAAC;QAC3H,MAAM,MAAM,GAAG,CAAC,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QACpE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,KAAK,EAAE,CAAC,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;oBACnE,QAAQ,EAAE,MAAM;iBACjB,CAAC,CAAC;gBACH,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBACjB,SAAS;gBACX,CAAC;gBACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACxB,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAC9B,CAAC;YAAC,MAAM,CAAC;gBACP,2BAA2B;YAC7B,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,sBAAsB,CACpC,GAAW,EACX,gBAAkD;IAElD,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACvB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,KAAK,GAAG,GAA4B,CAAC;QAC3C,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC3B,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,WAAW,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC/C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC;AAC/D,CAAC;AApBD,wDAoBC;AAED,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,OAAO,sBAAsB,CAC3B,GAAG,EACH,CAAC,WAAW,EAAE,EAAE,CACd,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CACtF,CAAC;AACJ,CAAC;AAND,sDAMC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-routes.d.ts","sourceRoot":"","sources":["../../../src/web-server/routes/copilot-routes.ts"],"names":[],"mappings":"AAAA;;GAEG;AAsBH,QAAA,MAAM,MAAM,4CAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"copilot-routes.d.ts","sourceRoot":"","sources":["../../../src/web-server/routes/copilot-routes.ts"],"names":[],"mappings":"AAAA;;GAEG;AAsBH,QAAA,MAAM,MAAM,4CAAW,CAAC;AAwWxB,eAAe,MAAM,CAAC"}
|
|
@@ -14,6 +14,18 @@ const copilot_settings_routes_1 = __importDefault(require("./copilot-settings-ro
|
|
|
14
14
|
const router = (0, express_1.Router)();
|
|
15
15
|
// Mount settings sub-routes
|
|
16
16
|
router.use('/settings', copilot_settings_routes_1.default);
|
|
17
|
+
function parseRequiredModel(value) {
|
|
18
|
+
if (typeof value !== 'string')
|
|
19
|
+
return null;
|
|
20
|
+
const trimmed = value.trim();
|
|
21
|
+
return trimmed.length > 0 ? trimmed : null;
|
|
22
|
+
}
|
|
23
|
+
function parseOptionalModel(value) {
|
|
24
|
+
if (typeof value !== 'string')
|
|
25
|
+
return undefined;
|
|
26
|
+
const trimmed = value.trim();
|
|
27
|
+
return trimmed.length > 0 ? trimmed : undefined;
|
|
28
|
+
}
|
|
17
29
|
/**
|
|
18
30
|
* GET /api/copilot/status - Get Copilot status (auth + daemon + install info)
|
|
19
31
|
*/
|
|
@@ -61,23 +73,124 @@ router.get('/config', (_req, res) => {
|
|
|
61
73
|
router.put('/config', (req, res) => {
|
|
62
74
|
try {
|
|
63
75
|
const updates = req.body;
|
|
76
|
+
if (!updates || typeof updates !== 'object' || Array.isArray(updates)) {
|
|
77
|
+
res.status(400).json({ error: 'Request body must be a JSON object' });
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
const payload = updates;
|
|
81
|
+
const allowedKeys = new Set([
|
|
82
|
+
'enabled',
|
|
83
|
+
'auto_start',
|
|
84
|
+
'port',
|
|
85
|
+
'account_type',
|
|
86
|
+
'rate_limit',
|
|
87
|
+
'wait_on_limit',
|
|
88
|
+
'model',
|
|
89
|
+
'opus_model',
|
|
90
|
+
'sonnet_model',
|
|
91
|
+
'haiku_model',
|
|
92
|
+
]);
|
|
93
|
+
const unknownKeys = Object.keys(payload).filter((key) => !allowedKeys.has(key));
|
|
94
|
+
if (unknownKeys.length > 0) {
|
|
95
|
+
res.status(400).json({
|
|
96
|
+
error: `Unknown copilot config field(s): ${unknownKeys.join(', ')}`,
|
|
97
|
+
});
|
|
98
|
+
return;
|
|
99
|
+
}
|
|
100
|
+
if ('port' in payload) {
|
|
101
|
+
if (typeof payload.port !== 'number' || !Number.isInteger(payload.port)) {
|
|
102
|
+
res.status(400).json({ error: 'port must be an integer' });
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
if (payload.port < 1 || payload.port > 65535) {
|
|
106
|
+
res.status(400).json({ error: 'port must be between 1 and 65535' });
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
if ('enabled' in payload && typeof payload.enabled !== 'boolean') {
|
|
111
|
+
res.status(400).json({ error: 'enabled must be a boolean' });
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
if ('auto_start' in payload && typeof payload.auto_start !== 'boolean') {
|
|
115
|
+
res.status(400).json({ error: 'auto_start must be a boolean' });
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
if ('wait_on_limit' in payload && typeof payload.wait_on_limit !== 'boolean') {
|
|
119
|
+
res.status(400).json({ error: 'wait_on_limit must be a boolean' });
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
if ('account_type' in payload &&
|
|
123
|
+
payload.account_type !== 'individual' &&
|
|
124
|
+
payload.account_type !== 'business' &&
|
|
125
|
+
payload.account_type !== 'enterprise') {
|
|
126
|
+
res.status(400).json({ error: 'account_type must be individual, business, or enterprise' });
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
if ('rate_limit' in payload) {
|
|
130
|
+
if (payload.rate_limit !== null) {
|
|
131
|
+
if (typeof payload.rate_limit !== 'number' || !Number.isInteger(payload.rate_limit)) {
|
|
132
|
+
res.status(400).json({ error: 'rate_limit must be an integer or null' });
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
if (payload.rate_limit < 0) {
|
|
136
|
+
res.status(400).json({ error: 'rate_limit must be >= 0 or null' });
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
const normalizedModel = parseRequiredModel(payload.model);
|
|
142
|
+
if ('model' in payload && !normalizedModel) {
|
|
143
|
+
res.status(400).json({ error: 'model must be a non-empty string' });
|
|
144
|
+
return;
|
|
145
|
+
}
|
|
146
|
+
if ('opus_model' in payload &&
|
|
147
|
+
payload.opus_model !== undefined &&
|
|
148
|
+
payload.opus_model !== null &&
|
|
149
|
+
typeof payload.opus_model !== 'string') {
|
|
150
|
+
res.status(400).json({ error: 'opus_model must be a string' });
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
if ('sonnet_model' in payload &&
|
|
154
|
+
payload.sonnet_model !== undefined &&
|
|
155
|
+
payload.sonnet_model !== null &&
|
|
156
|
+
typeof payload.sonnet_model !== 'string') {
|
|
157
|
+
res.status(400).json({ error: 'sonnet_model must be a string' });
|
|
158
|
+
return;
|
|
159
|
+
}
|
|
160
|
+
if ('haiku_model' in payload &&
|
|
161
|
+
payload.haiku_model !== undefined &&
|
|
162
|
+
payload.haiku_model !== null &&
|
|
163
|
+
typeof payload.haiku_model !== 'string') {
|
|
164
|
+
res.status(400).json({ error: 'haiku_model must be a string' });
|
|
165
|
+
return;
|
|
166
|
+
}
|
|
64
167
|
const config = (0, unified_config_loader_1.loadOrCreateUnifiedConfig)();
|
|
65
168
|
// Merge updates with existing config
|
|
66
169
|
config.copilot = {
|
|
67
|
-
enabled:
|
|
68
|
-
auto_start:
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
170
|
+
enabled: payload.enabled ?? config.copilot?.enabled ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.enabled,
|
|
171
|
+
auto_start: payload.auto_start ??
|
|
172
|
+
config.copilot?.auto_start ??
|
|
173
|
+
unified_config_types_1.DEFAULT_COPILOT_CONFIG.auto_start,
|
|
174
|
+
port: payload.port ?? config.copilot?.port ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.port,
|
|
175
|
+
account_type: payload.account_type ??
|
|
176
|
+
config.copilot?.account_type ??
|
|
177
|
+
unified_config_types_1.DEFAULT_COPILOT_CONFIG.account_type,
|
|
178
|
+
rate_limit: payload.rate_limit !== undefined
|
|
179
|
+
? payload.rate_limit
|
|
73
180
|
: (config.copilot?.rate_limit ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.rate_limit),
|
|
74
|
-
wait_on_limit:
|
|
181
|
+
wait_on_limit: payload.wait_on_limit ??
|
|
75
182
|
config.copilot?.wait_on_limit ??
|
|
76
183
|
unified_config_types_1.DEFAULT_COPILOT_CONFIG.wait_on_limit,
|
|
77
|
-
model:
|
|
78
|
-
opus_model:
|
|
79
|
-
|
|
80
|
-
|
|
184
|
+
model: normalizedModel ?? config.copilot?.model ?? unified_config_types_1.DEFAULT_COPILOT_CONFIG.model,
|
|
185
|
+
opus_model: 'opus_model' in payload
|
|
186
|
+
? parseOptionalModel(payload.opus_model)
|
|
187
|
+
: config.copilot?.opus_model,
|
|
188
|
+
sonnet_model: 'sonnet_model' in payload
|
|
189
|
+
? parseOptionalModel(payload.sonnet_model)
|
|
190
|
+
: config.copilot?.sonnet_model,
|
|
191
|
+
haiku_model: 'haiku_model' in payload
|
|
192
|
+
? parseOptionalModel(payload.haiku_model)
|
|
193
|
+
: config.copilot?.haiku_model,
|
|
81
194
|
};
|
|
82
195
|
(0, unified_config_loader_1.saveUnifiedConfig)(config);
|
|
83
196
|
res.json({ success: true, copilot: config.copilot });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-routes.js","sourceRoot":"","sources":["../../../src/web-server/routes/copilot-routes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"copilot-routes.js","sourceRoot":"","sources":["../../../src/web-server/routes/copilot-routes.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;AAEH,qCAAoD;AACpD,2CAcuB;AACvB,4EAA2E;AAC3E,8EAAkG;AAClG,wFAA8D;AAE9D,MAAM,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;AAExB,4BAA4B;AAC5B,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,iCAAqB,CAAC,CAAC;AAE/C,SAAS,kBAAkB,CAAC,KAAc;IACxC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7C,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAc;IACxC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AAClD,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,IAAa,EAAE,GAAa,EAAiB,EAAE;IAC1E,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,iDAAyB,GAAE,CAAC;QAC3C,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,IAAI,6CAAsB,CAAC;QAC/D,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAgB,EAAC,aAAa,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,IAAA,+BAAqB,GAAE,CAAC;QAC1C,MAAM,OAAO,GAAG,IAAA,6BAA0B,GAAE,CAAC;QAE7C,GAAG,CAAC,IAAI,CAAC;YACP,OAAO,EAAE,aAAa,CAAC,OAAO;YAC9B,SAAS;YACT,OAAO;YACP,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa;YACxC,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO;YACrC,IAAI,EAAE,aAAa,CAAC,IAAI;YACxB,KAAK,EAAE,aAAa,CAAC,KAAK;YAC1B,YAAY,EAAE,aAAa,CAAC,YAAY;YACxC,UAAU,EAAE,aAAa,CAAC,UAAU;YACpC,UAAU,EAAE,aAAa,CAAC,UAAU;YACpC,aAAa,EAAE,aAAa,CAAC,aAAa;SAC3C,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,IAAa,EAAE,GAAa,EAAQ,EAAE;IAC3D,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,iDAAyB,GAAE,CAAC;QAC3C,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,IAAI,6CAAsB,CAAC;QAC/D,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,GAAY,EAAE,GAAa,EAAQ,EAAE;IAC1D,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACtE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,oCAAoC,EAAE,CAAC,CAAC;YACtE,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,OAAkC,CAAC;QACnD,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC;YAC1B,SAAS;YACT,YAAY;YACZ,MAAM;YACN,cAAc;YACd,YAAY;YACZ,eAAe;YACf,OAAO;YACP,YAAY;YACZ,cAAc;YACd,aAAa;SACd,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAChF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE,oCAAoC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;aACpE,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;YACtB,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC,CAAC;gBAC3D,OAAO;YACT,CAAC;YACD,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,GAAG,KAAK,EAAE,CAAC;gBAC7C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,kCAAkC,EAAE,CAAC,CAAC;gBACpE,OAAO;YACT,CAAC;QACH,CAAC;QAED,IAAI,SAAS,IAAI,OAAO,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACjE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAC,CAAC;YAC7D,OAAO;QACT,CAAC;QAED,IAAI,YAAY,IAAI,OAAO,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACvE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,8BAA8B,EAAE,CAAC,CAAC;YAChE,OAAO;QACT,CAAC;QAED,IAAI,eAAe,IAAI,OAAO,IAAI,OAAO,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YAC7E,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,iCAAiC,EAAE,CAAC,CAAC;YACnE,OAAO;QACT,CAAC;QAED,IACE,cAAc,IAAI,OAAO;YACzB,OAAO,CAAC,YAAY,KAAK,YAAY;YACrC,OAAO,CAAC,YAAY,KAAK,UAAU;YACnC,OAAO,CAAC,YAAY,KAAK,YAAY,EACrC,CAAC;YACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,0DAA0D,EAAE,CAAC,CAAC;YAC5F,OAAO;QACT,CAAC;QAED,IAAI,YAAY,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;gBAChC,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;oBACpF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,uCAAuC,EAAE,CAAC,CAAC;oBACzE,OAAO;gBACT,CAAC;gBACD,IAAI,OAAO,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC;oBAC3B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,iCAAiC,EAAE,CAAC,CAAC;oBACnE,OAAO;gBACT,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,eAAe,GAAG,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC1D,IAAI,OAAO,IAAI,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC;YAC3C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,kCAAkC,EAAE,CAAC,CAAC;YACpE,OAAO;QACT,CAAC;QAED,IACE,YAAY,IAAI,OAAO;YACvB,OAAO,CAAC,UAAU,KAAK,SAAS;YAChC,OAAO,CAAC,UAAU,KAAK,IAAI;YAC3B,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,EACtC,CAAC;YACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,6BAA6B,EAAE,CAAC,CAAC;YAC/D,OAAO;QACT,CAAC;QAED,IACE,cAAc,IAAI,OAAO;YACzB,OAAO,CAAC,YAAY,KAAK,SAAS;YAClC,OAAO,CAAC,YAAY,KAAK,IAAI;YAC7B,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ,EACxC,CAAC;YACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,+BAA+B,EAAE,CAAC,CAAC;YACjE,OAAO;QACT,CAAC;QAED,IACE,aAAa,IAAI,OAAO;YACxB,OAAO,CAAC,WAAW,KAAK,SAAS;YACjC,OAAO,CAAC,WAAW,KAAK,IAAI;YAC5B,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ,EACvC,CAAC;YACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,8BAA8B,EAAE,CAAC,CAAC;YAChE,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,IAAA,iDAAyB,GAAE,CAAC;QAE3C,qCAAqC;QACrC,MAAM,CAAC,OAAO,GAAG;YACf,OAAO,EACJ,OAAO,CAAC,OAAmB,IAAI,MAAM,CAAC,OAAO,EAAE,OAAO,IAAI,6CAAsB,CAAC,OAAO;YAC3F,UAAU,EACP,OAAO,CAAC,UAAsB;gBAC/B,MAAM,CAAC,OAAO,EAAE,UAAU;gBAC1B,6CAAsB,CAAC,UAAU;YACnC,IAAI,EAAG,OAAO,CAAC,IAAe,IAAI,MAAM,CAAC,OAAO,EAAE,IAAI,IAAI,6CAAsB,CAAC,IAAI;YACrF,YAAY,EACT,OAAO,CAAC,YAAyD;gBAClE,MAAM,CAAC,OAAO,EAAE,YAAY;gBAC5B,6CAAsB,CAAC,YAAY;YACrC,UAAU,EACR,OAAO,CAAC,UAAU,KAAK,SAAS;gBAC9B,CAAC,CAAE,OAAO,CAAC,UAA4B;gBACvC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,IAAI,6CAAsB,CAAC,UAAU,CAAC;YACvE,aAAa,EACV,OAAO,CAAC,aAAyB;gBAClC,MAAM,CAAC,OAAO,EAAE,aAAa;gBAC7B,6CAAsB,CAAC,aAAa;YACtC,KAAK,EAAE,eAAe,IAAI,MAAM,CAAC,OAAO,EAAE,KAAK,IAAI,6CAAsB,CAAC,KAAK;YAC/E,UAAU,EACR,YAAY,IAAI,OAAO;gBACrB,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC;gBACxC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU;YAChC,YAAY,EACV,cAAc,IAAI,OAAO;gBACvB,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,YAAY,CAAC;gBAC1C,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY;YAClC,WAAW,EACT,aAAa,IAAI,OAAO;gBACtB,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,WAAW,CAAC;gBACzC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,WAAW;SAClC,CAAC;QAEF,IAAA,yCAAiB,EAAC,MAAM,CAAC,CAAC;QAC1B,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,IAAa,EAAE,GAAa,EAAiB,EAAE;IAC/E,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAgB,GAAE,CAAC;QACxC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,EAAE,IAAa,EAAE,GAAa,EAAiB,EAAE;IAC/E,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAgB,GAAE,CAAC;QACxC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,IAAa,EAAE,GAAa,EAAiB,EAAE;IAC1E,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,iDAAyB,GAAE,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,IAAI,6CAAsB,CAAC,IAAI,CAAC;QACjE,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,KAAK,IAAI,6CAAsB,CAAC,KAAK,CAAC;QAC3E,MAAM,MAAM,GAAG,MAAM,IAAA,4BAAgB,EAAC,IAAI,CAAC,CAAC;QAE5C,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3C,GAAG,CAAC;YACJ,SAAS,EAAE,CAAC,CAAC,EAAE,KAAK,YAAY;SACjC,CAAC,CAAC,CAAC;QAEJ,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;IACjE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAa,EAAE,GAAa,EAAiB,EAAE;IACzE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,iDAAyB,GAAE,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,IAAI,6CAAsB,CAAC,IAAI,CAAC;QACjE,MAAM,aAAa,GAAG,MAAM,IAAA,yBAAe,EAAC,IAAI,CAAC,CAAC;QAElD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE,mCAAmC;gBAC1C,OAAO,EAAE,uCAAuC;aACjD,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAA,yBAAe,EAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE,+BAA+B;gBACtC,OAAO,EAAE,4CAA4C;aACtD,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,IAAa,EAAE,GAAa,EAAiB,EAAE;IACjF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,iDAAyB,GAAE,CAAC;QAC3C,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,IAAI,6CAAsB,CAAC;QAC/D,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAkB,EAAC,aAAa,CAAC,CAAC;QACvD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,EAAE,IAAa,EAAE,GAAa,EAAiB,EAAE;IAChF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAiB,GAAE,CAAC;QACzC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAiB,EAAE;IAC3E,IAAI,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;QAEnC,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,IAAA,kCAAwB,EAAC,OAAO,CAAC,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,MAAM,IAAA,0BAAgB,GAAE,CAAC;QAC3B,CAAC;QAED,MAAM,IAAI,GAAG,IAAA,2BAAiB,GAAE,CAAC;QACjC,GAAG,CAAC,IAAI,CAAC;YACP,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,IAAa,EAAE,GAAa,EAAQ,EAAE;IACzD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAA,2BAAiB,GAAE,CAAC;QACjC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,kBAAe,MAAM,CAAC"}
|