@ai-support-agent/cli 0.0.38 → 0.0.39-beta.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.
Files changed (56) hide show
  1. package/dist/agent-runner.d.ts.map +1 -1
  2. package/dist/agent-runner.js +14 -10
  3. package/dist/agent-runner.js.map +1 -1
  4. package/dist/api-client.d.ts.map +1 -1
  5. package/dist/api-client.js +7 -10
  6. package/dist/api-client.js.map +1 -1
  7. package/dist/auth-server.d.ts.map +1 -1
  8. package/dist/auth-server.js +6 -0
  9. package/dist/auth-server.js.map +1 -1
  10. package/dist/child-process-manager.d.ts +4 -5
  11. package/dist/child-process-manager.d.ts.map +1 -1
  12. package/dist/child-process-manager.js +58 -53
  13. package/dist/child-process-manager.js.map +1 -1
  14. package/dist/cli/service/darwin-service.d.ts +0 -1
  15. package/dist/cli/service/darwin-service.d.ts.map +1 -1
  16. package/dist/cli/service/darwin-service.js +9 -124
  17. package/dist/cli/service/darwin-service.js.map +1 -1
  18. package/dist/config-watcher.d.ts +3 -3
  19. package/dist/config-watcher.d.ts.map +1 -1
  20. package/dist/config-watcher.js +21 -16
  21. package/dist/config-watcher.js.map +1 -1
  22. package/dist/docker/docker-runner.d.ts.map +1 -1
  23. package/dist/docker/docker-runner.js +17 -1
  24. package/dist/docker/docker-runner.js.map +1 -1
  25. package/dist/ipc-types.d.ts +5 -0
  26. package/dist/ipc-types.d.ts.map +1 -1
  27. package/dist/ipc-types.js +3 -3
  28. package/dist/ipc-types.js.map +1 -1
  29. package/dist/locales/en.json +1 -0
  30. package/dist/locales/ja.json +1 -0
  31. package/dist/logger.d.ts.map +1 -1
  32. package/dist/logger.js +9 -2
  33. package/dist/logger.js.map +1 -1
  34. package/dist/mcp/tools/browser/browser-security.d.ts +2 -1
  35. package/dist/mcp/tools/browser/browser-security.d.ts.map +1 -1
  36. package/dist/mcp/tools/browser/browser-security.js +31 -1
  37. package/dist/mcp/tools/browser/browser-security.js.map +1 -1
  38. package/dist/mcp/tools/db-query.d.ts.map +1 -1
  39. package/dist/mcp/tools/db-query.js +12 -1
  40. package/dist/mcp/tools/db-query.js.map +1 -1
  41. package/dist/project-agent.js +1 -1
  42. package/dist/project-agent.js.map +1 -1
  43. package/dist/project-key.d.ts +6 -0
  44. package/dist/project-key.d.ts.map +1 -0
  45. package/dist/project-key.js +8 -0
  46. package/dist/project-key.js.map +1 -0
  47. package/dist/project-worker.d.ts.map +1 -1
  48. package/dist/project-worker.js +11 -8
  49. package/dist/project-worker.js.map +1 -1
  50. package/dist/security.d.ts.map +1 -1
  51. package/dist/security.js +7 -1
  52. package/dist/security.js.map +1 -1
  53. package/dist/terminal/terminal-websocket.d.ts.map +1 -1
  54. package/dist/terminal/terminal-websocket.js +13 -3
  55. package/dist/terminal/terminal-websocket.js.map +1 -1
  56. package/package.json +1 -1
@@ -53,9 +53,6 @@ const node_paths_1 = require("./node-paths");
53
53
  Object.defineProperty(exports, "getCliEntryPoint", { enumerable: true, get: function () { return node_paths_1.getCliEntryPoint; } });
54
54
  Object.defineProperty(exports, "getNodePath", { enumerable: true, get: function () { return node_paths_1.getNodePath; } });
55
55
  const SERVICE_LABEL = 'com.ai-support-agent.cli';
56
- function getPlistPath() {
57
- return path.join(os.homedir(), 'Library', 'LaunchAgents', `${SERVICE_LABEL}.plist`);
58
- }
59
56
  function getLogDir() {
60
57
  return path.join(os.homedir(), 'Library', 'Logs', 'ai-support-agent');
61
58
  }
@@ -322,8 +319,7 @@ class DarwinServiceStrategy {
322
319
  const config = (0, config_manager_1.loadConfig)();
323
320
  const projects = config ? (0, config_manager_1.getProjectList)(config) : [];
324
321
  if (projects.length === 0) {
325
- // Fallback: legacy single-plist mode (no registered projects with tenantCode)
326
- this.installLegacy(options);
322
+ logger_1.logger.error((0, i18n_1.t)('service.noProjectsConfigured'));
327
323
  return;
328
324
  }
329
325
  // Per-project mode: generate one plist + wrapper script per project
@@ -337,11 +333,6 @@ class DarwinServiceStrategy {
337
333
  if (!fs.existsSync(launchAgentsDir)) {
338
334
  fs.mkdirSync(launchAgentsDir, { recursive: true });
339
335
  }
340
- // Warn about legacy plist if it still exists
341
- const legacyPlistPath = getPlistPath();
342
- if (fs.existsSync(legacyPlistPath)) {
343
- logger_1.logger.warn((0, i18n_1.t)('service.legacyPlistFound', { path: legacyPlistPath }));
344
- }
345
336
  const servicesDir = getServicesDir();
346
337
  const updateScriptPath = path.join(process.env.AI_SUPPORT_AGENT_CONFIG_DIR
347
338
  ? path.resolve(process.env.AI_SUPPORT_AGENT_CONFIG_DIR)
@@ -389,78 +380,23 @@ class DarwinServiceStrategy {
389
380
  logger_1.logger.info((0, i18n_1.t)('service.logDir', { path: logDir }));
390
381
  logger_1.logger.info((0, i18n_1.t)('service.noLogRotation'));
391
382
  }
392
- installLegacy(options) {
393
- const plistPath = getPlistPath();
394
- const logDir = getLogDir();
395
- const nodePath = (0, node_paths_1.getNodePath)();
396
- const entryPoint = (0, node_paths_1.getCliEntryPoint)();
397
- if (!fs.existsSync(entryPoint)) {
398
- logger_1.logger.error((0, i18n_1.t)('service.entryPointNotFound', { path: entryPoint }));
399
- return;
400
- }
401
- if (!fs.existsSync(logDir)) {
402
- fs.mkdirSync(logDir, { recursive: true });
403
- }
404
- const launchAgentsDir = path.dirname(plistPath);
405
- if (!fs.existsSync(launchAgentsDir)) {
406
- fs.mkdirSync(launchAgentsDir, { recursive: true });
407
- }
408
- if (fs.existsSync(plistPath)) {
409
- logger_1.logger.info((0, i18n_1.t)('service.overwriting', { path: plistPath }));
410
- }
411
- const plist = generatePlist({
412
- nodePath,
413
- entryPoint,
414
- logDir,
415
- verbose: options.verbose,
416
- docker: options.docker,
417
- });
418
- fs.writeFileSync(plistPath, plist, 'utf-8');
419
- logger_1.logger.success((0, i18n_1.t)('service.installed', { path: plistPath }));
420
- logger_1.logger.info((0, i18n_1.t)('service.loadHint', { path: plistPath }));
421
- logger_1.logger.info((0, i18n_1.t)('service.logDir', { path: logDir }));
422
- logger_1.logger.info((0, i18n_1.t)('service.noLogRotation'));
423
- }
424
383
  uninstall() {
425
- let removed = false;
426
- // Remove all per-project plists
427
384
  const projectPlists = getAllProjectPlists();
385
+ if (projectPlists.length === 0) {
386
+ logger_1.logger.warn((0, i18n_1.t)('service.notInstalled'));
387
+ return;
388
+ }
428
389
  for (const { plistPath } of projectPlists) {
429
390
  if (fs.existsSync(plistPath)) {
430
391
  fs.unlinkSync(plistPath);
431
- removed = true;
432
392
  }
433
393
  }
434
- // Remove legacy plist if present
435
- const legacyPlistPath = getPlistPath();
436
- if (fs.existsSync(legacyPlistPath)) {
437
- logger_1.logger.info((0, i18n_1.t)('service.unloadHint', { label: SERVICE_LABEL }));
438
- fs.unlinkSync(legacyPlistPath);
439
- removed = true;
440
- }
441
- if (!removed) {
442
- logger_1.logger.warn((0, i18n_1.t)('service.notInstalled'));
443
- return;
444
- }
445
394
  logger_1.logger.success((0, i18n_1.t)('service.uninstalled'));
446
395
  }
447
396
  start() {
448
397
  const projectPlists = getAllProjectPlists();
449
398
  if (projectPlists.length === 0) {
450
- // Fallback to legacy
451
- const plistPath = getPlistPath();
452
- if (!fs.existsSync(plistPath)) {
453
- logger_1.logger.error((0, i18n_1.t)('service.notInstalled'));
454
- return;
455
- }
456
- try {
457
- (0, child_process_1.execSync)(`launchctl load ${plistPath}`, { stdio: 'pipe' });
458
- logger_1.logger.success((0, i18n_1.t)('service.started'));
459
- }
460
- catch (error) {
461
- const message = error instanceof Error ? error.message : String(error);
462
- logger_1.logger.error((0, i18n_1.t)('service.startFailed', { message }));
463
- }
399
+ logger_1.logger.error((0, i18n_1.t)('service.notInstalled'));
464
400
  return;
465
401
  }
466
402
  let failed = false;
@@ -481,20 +417,7 @@ class DarwinServiceStrategy {
481
417
  stop() {
482
418
  const projectPlists = getAllProjectPlists();
483
419
  if (projectPlists.length === 0) {
484
- // Fallback to legacy
485
- const plistPath = getPlistPath();
486
- if (!fs.existsSync(plistPath)) {
487
- logger_1.logger.error((0, i18n_1.t)('service.notInstalled'));
488
- return;
489
- }
490
- try {
491
- (0, child_process_1.execSync)(`launchctl remove ${SERVICE_LABEL}`, { stdio: 'pipe' });
492
- logger_1.logger.success((0, i18n_1.t)('service.stopped'));
493
- }
494
- catch (error) {
495
- const message = error instanceof Error ? error.message : String(error);
496
- logger_1.logger.error((0, i18n_1.t)('service.stopFailed', { message }));
497
- }
420
+ logger_1.logger.error((0, i18n_1.t)('service.notInstalled'));
498
421
  return;
499
422
  }
500
423
  let failed = false;
@@ -515,26 +438,7 @@ class DarwinServiceStrategy {
515
438
  restart() {
516
439
  const projectPlists = getAllProjectPlists();
517
440
  if (projectPlists.length === 0) {
518
- // Fallback to legacy
519
- const plistPath = getPlistPath();
520
- if (!fs.existsSync(plistPath)) {
521
- logger_1.logger.error((0, i18n_1.t)('service.notInstalled'));
522
- return;
523
- }
524
- try {
525
- try {
526
- (0, child_process_1.execSync)(`launchctl remove ${SERVICE_LABEL}`, { stdio: 'pipe' });
527
- }
528
- catch {
529
- // Service may not be loaded — ignore
530
- }
531
- (0, child_process_1.execSync)(`launchctl load ${plistPath}`, { stdio: 'pipe' });
532
- logger_1.logger.success((0, i18n_1.t)('service.restarted'));
533
- }
534
- catch (error) {
535
- const message = error instanceof Error ? error.message : String(error);
536
- logger_1.logger.error((0, i18n_1.t)('service.restartFailed', { message }));
537
- }
441
+ logger_1.logger.error((0, i18n_1.t)('service.notInstalled'));
538
442
  return;
539
443
  }
540
444
  let failed = false;
@@ -562,27 +466,11 @@ class DarwinServiceStrategy {
562
466
  const projectPlists = getAllProjectPlists();
563
467
  const logDir = getLogDir();
564
468
  if (projectPlists.length === 0) {
565
- // Fallback to legacy
566
- const plistPath = getPlistPath();
567
- if (!fs.existsSync(plistPath)) {
568
- return { installed: false, running: false };
569
- }
570
- try {
571
- const output = (0, child_process_1.execSync)(`launchctl list ${SERVICE_LABEL}`, { stdio: 'pipe' }).toString();
572
- const pidMatch = output.match(/"PID"\s*=\s*(\d+)/);
573
- const pid = pidMatch ? parseInt(pidMatch[1], 10) : undefined;
574
- return { installed: true, running: pid !== undefined, pid, logDir };
575
- }
576
- catch {
577
- return { installed: true, running: false, logDir };
578
- }
469
+ return { installed: false, running: false };
579
470
  }
580
- // Multi-project mode: report overall status
581
471
  let anyRunning = false;
582
- let anyInstalled = false;
583
472
  let firstPid;
584
473
  for (const { label } of projectPlists) {
585
- anyInstalled = true;
586
474
  try {
587
475
  const output = (0, child_process_1.execSync)(`launchctl list ${label}`, { stdio: 'pipe' }).toString();
588
476
  const pidMatch = output.match(/"PID"\s*=\s*(\d+)/);
@@ -596,9 +484,6 @@ class DarwinServiceStrategy {
596
484
  // Not loaded
597
485
  }
598
486
  }
599
- if (!anyInstalled) {
600
- return { installed: false, running: false };
601
- }
602
487
  return { installed: true, running: anyRunning, pid: firstPid, logDir };
603
488
  }
604
489
  }
@@ -1 +1 @@
1
- {"version":3,"file":"darwin-service.js","sourceRoot":"","sources":["../../../src/cli/service/darwin-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6BA,0CAIC;AAGD,kDAGC;AAGD,kDAoBC;AA0CD,sCAgDC;AAGD,oDA2CC;AAWD,sDAyEC;AAGD,oDAkCC;AA/TD,iDAAwC;AACxC,uCAAwB;AACxB,uCAAwB;AACxB,2CAA4B;AAE5B,yDAAiE;AACjE,qCAA8B;AAC9B,yCAAqC;AACrC,6CAAwC;AACxC,6CAA4D;AAGnD,iGAHA,6BAAgB,OAGA;AAAE,4FAHA,wBAAW,OAGA;AAEtC,MAAM,aAAa,GAAG,0BAA0B,CAAA;AAEhD,SAAS,YAAY;IACnB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,aAAa,QAAQ,CAAC,CAAA;AACrF,CAAC;AAED,SAAS,SAAS;IAChB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAA;AACvE,CAAC;AAED,8EAA8E;AAC9E,4BAA4B;AAC5B,8EAA8E;AAE9E,wDAAwD;AACxD,SAAgB,eAAe,CAAC,UAAkB,EAAE,WAAmB;IACrE,MAAM,UAAU,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAA;IACvE,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAA;IACzE,OAAO,GAAG,aAAa,IAAI,UAAU,IAAI,WAAW,EAAE,CAAA;AACxD,CAAC;AAED,sDAAsD;AACtD,SAAgB,mBAAmB,CAAC,UAAkB,EAAE,WAAmB;IACzE,MAAM,KAAK,GAAG,eAAe,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;IACtD,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,KAAK,QAAQ,CAAC,CAAA;AAC7E,CAAC;AAED,qEAAqE;AACrE,SAAgB,mBAAmB;IACjC,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,cAAc,CAAC,CAAA;IAC1E,MAAM,MAAM,GAAG,GAAG,aAAa,GAAG,CAAA;IAClC,MAAM,OAAO,GAAgD,EAAE,CAAA;IAC/D,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;QAC7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IACE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;gBACvB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBACvB,IAAI,KAAK,GAAG,aAAa,QAAQ,EACjC,CAAC;gBACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;gBAC7C,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;YACtE,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,yDAAyD;IAC3D,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,qFAAqF;AACrF,SAAS,uBAAuB,CAAC,UAAkB,EAAE,WAAmB;IACtE,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,2BAA2B;QACvD,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC;QACvD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,mBAAmB,CAAC,CAAA;IAChD,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,mBAAmB,CAAC,CAAA;AACvF,CAAC;AAED,gEAAgE;AAChE,SAAS,cAAc;IACrB,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,2BAA2B;QACvD,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC;QACvD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,mBAAmB,CAAC,CAAA;IAChD,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;AACzC,CAAC;AAED,8EAA8E;AAC9E,mBAAmB;AACnB,8EAA8E;AAE9E,MAAM,oBAAoB,GAAG;IAC3B,yBAAyB;IACzB,mBAAmB;IACnB,wBAAwB;IACxB,0BAA0B;CAC3B,CAAA;AAED,SAAS,qBAAqB;IAC5B,MAAM,OAAO,GAAa,EAAE,CAAA;IAC5B,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC9B,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,IAAI,CACV,kBAAkB,IAAA,sBAAS,EAAC,GAAG,CAAC,2BAA2B,IAAA,sBAAS,EAAC,KAAK,CAAC,WAAW,CACvF,CAAA;QACH,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AACzB,CAAC;AAED,SAAgB,aAAa,CAAC,OAAsB;IAClD,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IACjE,MAAM,IAAI,GAAG,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;IAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC1B,CAAC;IACD,IAAI,OAAO,EAAE,CAAC;QACZ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACxB,CAAC;IAED,MAAM,WAAW,GAAG,IAAI;SACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,IAAA,sBAAS,EAAC,CAAC,CAAC,WAAW,CAAC;SACtD,IAAI,CAAC,IAAI,CAAC,CAAA;IAEb,OAAO;;;;;;cAMK,aAAa;;;;EAIzB,WAAW;;;;;;;;;;cAUC,IAAA,sBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;;;cAG7C,IAAA,sBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;;;;;;;kBAOzC,IAAA,sBAAS,EAAC,EAAE,CAAC,OAAO,EAAE,CAAC,YAAY,qBAAqB,EAAE;;;SAGnE,CAAA;AACT,CAAC;AAED,oEAAoE;AACpE,SAAgB,oBAAoB,CAAC,IAIpC;IACC,OAAO;;;;;;cAMK,IAAA,sBAAS,EAAC,IAAI,CAAC,KAAK,CAAC;;;;;kBAKjB,IAAA,sBAAS,EAAC,IAAI,CAAC,iBAAiB,CAAC;;;;;;;;;;;;;cAarC,IAAA,sBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;;;cAGlD,IAAA,sBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;;;;;;;kBAO9C,IAAA,sBAAS,EAAC,EAAE,CAAC,OAAO,EAAE,CAAC;;;SAGhC,CAAA;AACT,CAAC;AAED,4EAA4E;AAC5E,SAAS,iBAAiB,CAAC,MAAc;IACvC,OAAO,MAAM,CAAC,OAAO,CACnB,+CAA+C,EAC/C,CAAC,CAAC,EAAE,MAAc,EAAE,KAAa,EAAE,IAAa,EAAE,EAAE,CAAC,GAAG,MAAM,uBAAuB,IAAI,IAAI,EAAE,EAAE,CAClG,CAAA;AACH,CAAC;AAED,sEAAsE;AACtE,SAAgB,qBAAqB,CAAC,IAYrC;IACC,MAAM,aAAa,GAAG,YAAY,CAAA;IAClC,MAAM,kBAAkB,GAAG,GAAG,aAAa,oBAAoB,CAAA;IAC/D,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,EAAE,CAAA;IAC5B,MAAM,eAAe,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEtD,MAAM,UAAU,GAAa;QAC3B,SAAS,OAAO,YAAY,aAAa,iBAAiB;QAC1D,SAAS,IAAI,CAAC,oBAAoB,IAAI,kBAAkB,SAAS;KAClE,CAAA;IACD,mEAAmE;IACnE,UAAU,CAAC,IAAI,CAAC,SAAS,OAAO,iBAAiB,aAAa,sBAAsB,CAAC,CAAA;IAErF,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,MAAM,mBAAmB,GAAG,uBAAuB,IAAI,CAAC,WAAW,EAAE,CAAA;QACrE,UAAU,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU,IAAI,mBAAmB,SAAS,CAAC,CAAA;IAC3E,CAAC;IAED,MAAM,QAAQ,GAAa;QACzB,sCAAsC;QACtC,aAAa,aAAa,KAAK;QAC/B,oCAAoC,kBAAkB,KAAK;QAC3D,+BAA+B,IAAI,CAAC,KAAK,KAAK;QAC9C,iCAAiC,eAAe,KAAK;KACtD,CAAA;IACD,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,QAAQ,CAAC,IAAI,CAAC,0BAA0B,IAAI,CAAC,eAAe,KAAK,CAAC,CAAA;IACpE,CAAC;IACD,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC9B,QAAQ,CAAC,IAAI,CAAC,gCAAgC,IAAI,CAAC,oBAAoB,KAAK,CAAC,CAAA;IAC/E,CAAC;IAED,MAAM,aAAa,GAAG;QACpB,kBAAkB,EAAE,OAAO,EAAE,aAAa;QAC1C,aAAa,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW,EAAE;KACnD,CAAA;IACD,IAAI,IAAI,CAAC,OAAO;QAAE,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAEjD,OAAO;;;kBAGS,IAAI,CAAC,oBAAoB;;;;;;;EAOzC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;EACrB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;IACjB,IAAI,CAAC,QAAQ;IACb,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC;;;;;UAKjB,IAAI,CAAC,gBAAgB;;;;CAI9B,CAAA;AACD,CAAC;AAED,gDAAgD;AAChD,SAAgB,oBAAoB;IAClC,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,cAAc,CAAC,CAAA;IAC1E,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,2BAA2B;QACvD,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC;QACvD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,mBAAmB,CAAC,CAAA;IAEhD,OAAO;;;;gBAIO,eAAe;;;;;;gBAMf,SAAS;;;;;;;;;;;gBAWT,eAAe;;;;;;CAM9B,CAAA;AACD,CAAC;AAED,8EAA8E;AAC9E,wBAAwB;AACxB,8EAA8E;AAE9E,MAAa,qBAAqB;IAChC,KAAK,CAAC,OAAO,CAAC,OAAuB;QACnC,gCAAgC;QAChC,MAAM,MAAM,GAAG,IAAA,2BAAU,GAAE,CAAA;QAC3B,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAErD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,8EAA8E;YAC9E,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;YAC3B,OAAM;QACR,CAAC;QAED,oEAAoE;QACpE,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,4BAA4B,GAAC,CAAA;QAClE,MAAM,QAAQ,GAAG,oBAAoB,WAAW,EAAE,EAAE,CAAA;QAEpD,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;QAC1B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC3C,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,cAAc,CAAC,CAAA;QAC1E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YACpC,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACpD,CAAC;QAED,6CAA6C;QAC7C,MAAM,eAAe,GAAG,YAAY,EAAE,CAAA;QACtC,IAAI,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YACnC,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,0BAA0B,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC,CAAA;QACvE,CAAC;QAED,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;QACpC,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAChC,OAAO,CAAC,GAAG,CAAC,2BAA2B;YACrC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC;YACvD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,mBAAmB,CAAC,EAChD,uBAAuB,CACxB,CAAA;QAED,iCAAiC;QACjC,MAAM,YAAY,GAAG,oBAAoB,EAAE,CAAA;QAC3C,EAAE,CAAC,aAAa,CAAC,gBAAgB,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;QAEjE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;YAC3C,MAAM,UAAU,GAAG,GAAG,UAAU,IAAI,WAAW,CAAC,WAAW,EAAE,EAAE,CAAA;YAC/D,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;YAC5D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBACtC,EAAE,CAAC,SAAS,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;YACnE,CAAC;YAED,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;YAC7E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,CAAC;gBACzC,EAAE,CAAC,SAAS,CAAC,oBAAoB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;YACtE,CAAC;YAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAA;YAChE,MAAM,aAAa,GAAG,qBAAqB,CAAC;gBAC1C,QAAQ;gBACR,UAAU;gBACV,WAAW;gBACX,oBAAoB;gBACpB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;gBAC9C,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;gBACzD,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,gBAAgB;aACjB,CAAC,CAAA;YACF,EAAE,CAAC,aAAa,CAAC,iBAAiB,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;YAEnE,MAAM,KAAK,GAAG,eAAe,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;YACtD,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;YAC9D,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;YACnD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;gBAClC,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YAClD,CAAC;YAED,MAAM,KAAK,GAAG,oBAAoB,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAA;YACvF,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;YAE3C,eAAM,CAAC,OAAO,CAAC,IAAA,QAAC,EAAC,0BAA0B,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;QACjF,CAAC;QAED,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,uBAAuB,CAAC,CAAC,CAAA;QACvC,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;QAClD,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,uBAAuB,CAAC,CAAC,CAAA;IACzC,CAAC;IAEO,aAAa,CAAC,OAAuB;QAC3C,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;QAChC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;QAC1B,MAAM,QAAQ,GAAG,IAAA,wBAAW,GAAE,CAAA;QAC9B,MAAM,UAAU,GAAG,IAAA,6BAAgB,GAAE,CAAA;QAErC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/B,eAAM,CAAC,KAAK,CAAC,IAAA,QAAC,EAAC,4BAA4B,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAA;YACnE,OAAM;QACR,CAAC;QAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC3C,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAC/C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YACpC,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACpD,CAAC;QAED,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,qBAAqB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;QAC5D,CAAC;QAED,MAAM,KAAK,GAAG,aAAa,CAAC;YAC1B,QAAQ;YACR,UAAU;YACV,MAAM;YACN,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC,CAAA;QACF,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;QAE3C,eAAM,CAAC,OAAO,CAAC,IAAA,QAAC,EAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;QAC3D,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;QACvD,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;QAClD,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,uBAAuB,CAAC,CAAC,CAAA;IACzC,CAAC;IAED,SAAS;QACP,IAAI,OAAO,GAAG,KAAK,CAAA;QAEnB,gCAAgC;QAChC,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAA;QAC3C,KAAK,MAAM,EAAE,SAAS,EAAE,IAAI,aAAa,EAAE,CAAC;YAC1C,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC7B,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;gBACxB,OAAO,GAAG,IAAI,CAAA;YAChB,CAAC;QACH,CAAC;QAED,iCAAiC;QACjC,MAAM,eAAe,GAAG,YAAY,EAAE,CAAA;QACtC,IAAI,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YACnC,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,oBAAoB,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC,CAAA;YAC9D,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,CAAA;YAC9B,OAAO,GAAG,IAAI,CAAA;QAChB,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,sBAAsB,CAAC,CAAC,CAAA;YACtC,OAAM;QACR,CAAC;QAED,eAAM,CAAC,OAAO,CAAC,IAAA,QAAC,EAAC,qBAAqB,CAAC,CAAC,CAAA;IAC1C,CAAC;IAED,KAAK;QACH,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAA;QAE3C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,qBAAqB;YACrB,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;YAChC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9B,eAAM,CAAC,KAAK,CAAC,IAAA,QAAC,EAAC,sBAAsB,CAAC,CAAC,CAAA;gBACvC,OAAM;YACR,CAAC;YACD,IAAI,CAAC;gBACH,IAAA,wBAAQ,EAAC,kBAAkB,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;gBAC1D,eAAM,CAAC,OAAO,CAAC,IAAA,QAAC,EAAC,iBAAiB,CAAC,CAAC,CAAA;YACtC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBACtE,eAAM,CAAC,KAAK,CAAC,IAAA,QAAC,EAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;YACrD,CAAC;YACD,OAAM;QACR,CAAC;QAED,IAAI,MAAM,GAAG,KAAK,CAAA;QAClB,KAAK,MAAM,EAAE,SAAS,EAAE,IAAI,aAAa,EAAE,CAAC;YAC1C,IAAI,CAAC;gBACH,IAAA,wBAAQ,EAAC,kBAAkB,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;YAC5D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBACtE,eAAM,CAAC,KAAK,CAAC,IAAA,QAAC,EAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;gBACnD,MAAM,GAAG,IAAI,CAAA;YACf,CAAC;QACH,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,eAAM,CAAC,OAAO,CAAC,IAAA,QAAC,EAAC,iBAAiB,CAAC,CAAC,CAAA;QACtC,CAAC;IACH,CAAC;IAED,IAAI;QACF,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAA;QAE3C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,qBAAqB;YACrB,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;YAChC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9B,eAAM,CAAC,KAAK,CAAC,IAAA,QAAC,EAAC,sBAAsB,CAAC,CAAC,CAAA;gBACvC,OAAM;YACR,CAAC;YACD,IAAI,CAAC;gBACH,IAAA,wBAAQ,EAAC,oBAAoB,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;gBAChE,eAAM,CAAC,OAAO,CAAC,IAAA,QAAC,EAAC,iBAAiB,CAAC,CAAC,CAAA;YACtC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBACtE,eAAM,CAAC,KAAK,CAAC,IAAA,QAAC,EAAC,oBAAoB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;YACpD,CAAC;YACD,OAAM;QACR,CAAC;QAED,IAAI,MAAM,GAAG,KAAK,CAAA;QAClB,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,aAAa,EAAE,CAAC;YACtC,IAAI,CAAC;gBACH,IAAA,wBAAQ,EAAC,oBAAoB,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;YAC1D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBACtE,eAAM,CAAC,KAAK,CAAC,IAAA,QAAC,EAAC,oBAAoB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;gBAClD,MAAM,GAAG,IAAI,CAAA;YACf,CAAC;QACH,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,eAAM,CAAC,OAAO,CAAC,IAAA,QAAC,EAAC,iBAAiB,CAAC,CAAC,CAAA;QACtC,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAA;QAE3C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,qBAAqB;YACrB,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;YAChC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9B,eAAM,CAAC,KAAK,CAAC,IAAA,QAAC,EAAC,sBAAsB,CAAC,CAAC,CAAA;gBACvC,OAAM;YACR,CAAC;YACD,IAAI,CAAC;gBACH,IAAI,CAAC;oBACH,IAAA,wBAAQ,EAAC,oBAAoB,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;gBAClE,CAAC;gBAAC,MAAM,CAAC;oBACP,qCAAqC;gBACvC,CAAC;gBACD,IAAA,wBAAQ,EAAC,kBAAkB,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;gBAC1D,eAAM,CAAC,OAAO,CAAC,IAAA,QAAC,EAAC,mBAAmB,CAAC,CAAC,CAAA;YACxC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBACtE,eAAM,CAAC,KAAK,CAAC,IAAA,QAAC,EAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;YACvD,CAAC;YACD,OAAM;QACR,CAAC;QAED,IAAI,MAAM,GAAG,KAAK,CAAA;QAClB,KAAK,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,aAAa,EAAE,CAAC;YACjD,IAAI,CAAC;gBACH,IAAI,CAAC;oBACH,IAAA,wBAAQ,EAAC,oBAAoB,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;gBAC1D,CAAC;gBAAC,MAAM,CAAC;oBACP,qCAAqC;gBACvC,CAAC;gBACD,IAAA,wBAAQ,EAAC,kBAAkB,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;YAC5D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBACtE,eAAM,CAAC,KAAK,CAAC,IAAA,QAAC,EAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;gBACrD,MAAM,GAAG,IAAI,CAAA;YACf,CAAC;QACH,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,eAAM,CAAC,OAAO,CAAC,IAAA,QAAC,EAAC,mBAAmB,CAAC,CAAC,CAAA;QACxC,CAAC;IACH,CAAC;IAED,MAAM;QACJ,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAA;QAC3C,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;QAE1B,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,qBAAqB;YACrB,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;YAChC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9B,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;YAC7C,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,kBAAkB,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;gBACxF,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;gBAClD,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;gBAC5D,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,CAAA;YACrE,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;YACpD,CAAC;QACH,CAAC;QAED,4CAA4C;QAC5C,IAAI,UAAU,GAAG,KAAK,CAAA;QACtB,IAAI,YAAY,GAAG,KAAK,CAAA;QACxB,IAAI,QAA4B,CAAA;QAEhC,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,aAAa,EAAE,CAAC;YACtC,YAAY,GAAG,IAAI,CAAA;YACnB,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,kBAAkB,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;gBAChF,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;gBAClD,IAAI,QAAQ,EAAE,CAAC;oBACb,UAAU,GAAG,IAAI,CAAA;oBACjB,IAAI,CAAC,QAAQ;wBAAE,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;gBACrD,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,aAAa;YACf,CAAC;QACH,CAAC;QAED,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;QAC7C,CAAC;QACD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;IACxE,CAAC;CACF;AA7TD,sDA6TC"}
1
+ {"version":3,"file":"darwin-service.js","sourceRoot":"","sources":["../../../src/cli/service/darwin-service.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,8 @@
1
1
  import type { ProjectRegistration } from './types';
2
2
  export interface ConfigWatcherCallbacks {
3
- onTokenUpdate: (projectCode: string, newToken: string) => void;
3
+ onTokenUpdate: (project: ProjectRegistration, newToken: string) => void;
4
4
  onProjectAdded: (project: ProjectRegistration) => void;
5
- onProjectRemoved: (projectCode: string) => void;
5
+ onProjectRemoved: (project: ProjectRegistration) => void;
6
6
  }
7
7
  /**
8
8
  * config.json を定期的にポーリングし、プロジェクトの追加・削除・トークン変更を検知する。
@@ -17,7 +17,7 @@ export declare function startConfigWatcher(initialProjects: ProjectRegistration[
17
17
  /**
18
18
  * Legacy wrapper: token-only watcher (backwards compatibility for startTokenWatcher imports)
19
19
  */
20
- export declare function startTokenWatcher(projects: ProjectRegistration[], onTokenUpdate: (projectCode: string, newToken: string) => void): {
20
+ export declare function startTokenWatcher(projects: ProjectRegistration[], onTokenUpdate: (project: ProjectRegistration, newToken: string) => void): {
21
21
  stop: () => void;
22
22
  };
23
23
  //# sourceMappingURL=config-watcher.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"config-watcher.d.ts","sourceRoot":"","sources":["../src/config-watcher.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAElD,MAAM,WAAW,sBAAsB;IACrC,aAAa,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;IAC9D,cAAc,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAA;IACtD,gBAAgB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAA;CAChD;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,mBAAmB,EAAE,EACtC,SAAS,EAAE,sBAAsB,GAChC;IAAE,IAAI,EAAE,MAAM,IAAI,CAAA;CAAE,CA+CtB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,mBAAmB,EAAE,EAC/B,aAAa,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,GAC7D;IAAE,IAAI,EAAE,MAAM,IAAI,CAAA;CAAE,CAMtB"}
1
+ {"version":3,"file":"config-watcher.d.ts","sourceRoot":"","sources":["../src/config-watcher.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAElD,MAAM,WAAW,sBAAsB;IACrC,aAAa,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;IACvE,cAAc,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAA;IACtD,gBAAgB,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAA;CACzD;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,mBAAmB,EAAE,EACtC,SAAS,EAAE,sBAAsB,GAChC;IAAE,IAAI,EAAE,MAAM,IAAI,CAAA;CAAE,CAkDtB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,mBAAmB,EAAE,EAC/B,aAAa,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,GACtE;IAAE,IAAI,EAAE,MAAM,IAAI,CAAA;CAAE,CAMtB"}
@@ -5,6 +5,7 @@ exports.startTokenWatcher = startTokenWatcher;
5
5
  const constants_1 = require("./constants");
6
6
  const config_manager_1 = require("./config-manager");
7
7
  const logger_1 = require("./logger");
8
+ const project_key_1 = require("./project-key");
8
9
  /**
9
10
  * config.json を定期的にポーリングし、プロジェクトの追加・削除・トークン変更を検知する。
10
11
  *
@@ -15,7 +16,7 @@ const logger_1 = require("./logger");
15
16
  function startConfigWatcher(initialProjects, callbacks) {
16
17
  const currentProjects = new Map();
17
18
  for (const p of initialProjects) {
18
- currentProjects.set(p.projectCode, { ...p });
19
+ currentProjects.set((0, project_key_1.projectKey)(p), { ...p });
19
20
  }
20
21
  const timer = setInterval(() => {
21
22
  try {
@@ -23,34 +24,38 @@ function startConfigWatcher(initialProjects, callbacks) {
23
24
  if (!config)
24
25
  return;
25
26
  const configProjects = (0, config_manager_1.getProjectList)(config);
26
- const configProjectCodes = new Set();
27
+ const configKeys = new Set();
27
28
  for (const cp of configProjects) {
28
- configProjectCodes.add(cp.projectCode);
29
- const existing = currentProjects.get(cp.projectCode);
29
+ const key = (0, project_key_1.projectKey)(cp);
30
+ configKeys.add(key);
31
+ const existing = currentProjects.get(key);
30
32
  if (!existing) {
31
33
  // New project added
32
- logger_1.logger.info(`Config watcher: new project detected: ${cp.projectCode}`);
33
- currentProjects.set(cp.projectCode, { ...cp });
34
+ logger_1.logger.info(`Config watcher: new project detected: ${key}`);
35
+ currentProjects.set(key, { ...cp });
34
36
  callbacks.onProjectAdded(cp);
35
37
  }
36
38
  else if (cp.token !== existing.token) {
37
39
  // Token changed
38
- logger_1.logger.debug(`Config watcher: token changed for ${cp.projectCode}`);
39
- currentProjects.set(cp.projectCode, { ...cp });
40
- callbacks.onTokenUpdate(cp.projectCode, cp.token);
40
+ logger_1.logger.debug(`Config watcher: token changed for ${key}`);
41
+ currentProjects.set(key, { ...cp });
42
+ callbacks.onTokenUpdate(cp, cp.token);
41
43
  }
42
44
  }
43
45
  // Detect removed projects
44
- for (const projectCode of currentProjects.keys()) {
45
- if (!configProjectCodes.has(projectCode)) {
46
- logger_1.logger.info(`Config watcher: project removed: ${projectCode}`);
47
- currentProjects.delete(projectCode);
48
- callbacks.onProjectRemoved(projectCode);
46
+ for (const [key, project] of currentProjects) {
47
+ if (!configKeys.has(key)) {
48
+ logger_1.logger.info(`Config watcher: project removed: ${key}`);
49
+ currentProjects.delete(key);
50
+ callbacks.onProjectRemoved(project);
49
51
  }
50
52
  }
51
53
  }
52
- catch {
53
- // Config may be in the middle of being written; ignore read errors
54
+ catch (err) {
55
+ // Config may be in the middle of being written; only warn on unexpected errors
56
+ if (err instanceof Error && 'code' in err && err.code === 'ENOENT')
57
+ return;
58
+ logger_1.logger.warn(`[config-watcher] Error reading config: ${err instanceof Error ? err.message : String(err)}`);
54
59
  }
55
60
  }, constants_1.TOKEN_WATCH_INTERVAL_MS);
56
61
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"config-watcher.js","sourceRoot":"","sources":["../src/config-watcher.ts"],"names":[],"mappings":";;AAkBA,gDAkDC;AAKD,8CASC;AAlFD,2CAAqD;AACrD,qDAA6D;AAC7D,qCAAiC;AASjC;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAChC,eAAsC,EACtC,SAAiC;IAEjC,MAAM,eAAe,GAAG,IAAI,GAAG,EAA+B,CAAA;IAC9D,KAAK,MAAM,CAAC,IAAI,eAAe,EAAE,CAAC;QAChC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,CAAA;IAC9C,CAAC;IAED,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;QAC7B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAA,2BAAU,GAAE,CAAA;YAC3B,IAAI,CAAC,MAAM;gBAAE,OAAM;YAEnB,MAAM,cAAc,GAAG,IAAA,+BAAc,EAAC,MAAM,CAAC,CAAA;YAC7C,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAA;YAE5C,KAAK,MAAM,EAAE,IAAI,cAAc,EAAE,CAAC;gBAChC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;gBAEtC,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;gBACpD,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,oBAAoB;oBACpB,eAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAA;oBACtE,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAA;oBAC9C,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;gBAC9B,CAAC;qBAAM,IAAI,EAAE,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;oBACvC,gBAAgB;oBAChB,eAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAA;oBACnE,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAA;oBAC9C,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;gBACnD,CAAC;YACH,CAAC;YAED,0BAA0B;YAC1B,KAAK,MAAM,WAAW,IAAI,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC;gBACjD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;oBACzC,eAAM,CAAC,IAAI,CAAC,oCAAoC,WAAW,EAAE,CAAC,CAAA;oBAC9D,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;oBACnC,SAAS,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAA;gBACzC,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,mEAAmE;QACrE,CAAC;IACH,CAAC,EAAE,mCAAuB,CAAC,CAAA;IAE3B,OAAO;QACL,IAAI,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC;KACjC,CAAA;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,iBAAiB,CAC/B,QAA+B,EAC/B,aAA8D;IAE9D,OAAO,kBAAkB,CAAC,QAAQ,EAAE;QAClC,aAAa;QACb,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;QACxB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;KAC3B,CAAC,CAAA;AACJ,CAAC"}
1
+ {"version":3,"file":"config-watcher.js","sourceRoot":"","sources":["../src/config-watcher.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"docker-runner.d.ts","sourceRoot":"","sources":["../../src/docker/docker-runner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"docker-runner.d.ts","sourceRoot":"","sources":["../../src/docker/docker-runner.ts"],"names":[],"mappings":"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"}
@@ -190,6 +190,22 @@ function generateProjectDockerfile(baseVersion, aptPackages, npmPackages, comman
190
190
  */
191
191
  /** Maximum total log size kept in memory per session (2 MB). Older content is discarded. */
192
192
  const MAX_SESSION_LOG_BYTES = 2 * 1024 * 1024;
193
+ /**
194
+ * docker build プロセスに渡す環境変数を必要最小限に絞る。
195
+ * process.env をそのまま渡すと API キー等の機密情報が漏洩するため、
196
+ * ビルドに必要な変数のみを明示的に選択する。
197
+ */
198
+ function buildDockerEnv() {
199
+ const ALLOWED_KEYS = ['PATH', 'HOME', 'USER', 'TMPDIR', 'TMP', 'TEMP', 'LANG', 'LC_ALL'];
200
+ const env = {};
201
+ for (const key of ALLOWED_KEYS) {
202
+ if (process.env[key] !== undefined) {
203
+ env[key] = process.env[key];
204
+ }
205
+ }
206
+ env['BUILDKIT_PROGRESS'] = 'plain';
207
+ return env;
208
+ }
193
209
  async function buildProjectImage(tenantCode, projectCode, baseVersion, dockerfilePath, apiClient, agentId) {
194
210
  const imageTag = (0, dockerfile_path_1.getProjectImageTag)(tenantCode, projectCode, baseVersion);
195
211
  const contextDir = (0, dockerfile_path_1.getDockerContextDir)();
@@ -230,7 +246,7 @@ async function buildProjectImage(tenantCode, projectCode, baseVersion, dockerfil
230
246
  'build', '-t', imageTag, '--pull=false', '--progress=plain',
231
247
  '--build-arg', `AGENT_VERSION=${baseVersion}`,
232
248
  '-f', dockerfilePath, contextDir,
233
- ], { stdio: ['ignore', 'pipe', 'pipe'], env: { ...process.env, BUILDKIT_PROGRESS: 'plain' } });
249
+ ], { stdio: ['ignore', 'pipe', 'pipe'], env: buildDockerEnv() });
234
250
  const writePrefixed = (0, logger_1.makeLinePrefixer)(prefix, (s) => process.stdout.write(s));
235
251
  const onData = (d) => {
236
252
  const text = d.toString();