@aiderdesk/aiderdesk 0.87.0 → 0.88.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 (163) hide show
  1. package/out/renderer/assets/{AgentSettings-Cp7VI6CM.js → AgentSettings-DffQ3g7i.js} +2 -2
  2. package/out/renderer/assets/{InfoIcon-DesJ60KC.js → InfoIcon-CMLVIQF3.js} +1 -1
  3. package/out/renderer/assets/KaTeX_AMS-Regular-BQhdFMY1.woff2 +0 -0
  4. package/out/renderer/assets/KaTeX_AMS-Regular-DMm9YOAa.woff +0 -0
  5. package/out/renderer/assets/KaTeX_AMS-Regular-DRggAlZN.ttf +0 -0
  6. package/out/renderer/assets/KaTeX_Caligraphic-Bold-ATXxdsX0.ttf +0 -0
  7. package/out/renderer/assets/KaTeX_Caligraphic-Bold-BEiXGLvX.woff +0 -0
  8. package/out/renderer/assets/KaTeX_Caligraphic-Bold-Dq_IR9rO.woff2 +0 -0
  9. package/out/renderer/assets/KaTeX_Caligraphic-Regular-CTRA-rTL.woff +0 -0
  10. package/out/renderer/assets/KaTeX_Caligraphic-Regular-Di6jR-x-.woff2 +0 -0
  11. package/out/renderer/assets/KaTeX_Caligraphic-Regular-wX97UBjC.ttf +0 -0
  12. package/out/renderer/assets/KaTeX_Fraktur-Bold-BdnERNNW.ttf +0 -0
  13. package/out/renderer/assets/KaTeX_Fraktur-Bold-BsDP51OF.woff +0 -0
  14. package/out/renderer/assets/KaTeX_Fraktur-Bold-CL6g_b3V.woff2 +0 -0
  15. package/out/renderer/assets/KaTeX_Fraktur-Regular-CB_wures.ttf +0 -0
  16. package/out/renderer/assets/KaTeX_Fraktur-Regular-CTYiF6lA.woff2 +0 -0
  17. package/out/renderer/assets/KaTeX_Fraktur-Regular-Dxdc4cR9.woff +0 -0
  18. package/out/renderer/assets/KaTeX_Main-Bold-Cx986IdX.woff2 +0 -0
  19. package/out/renderer/assets/KaTeX_Main-Bold-Jm3AIy58.woff +0 -0
  20. package/out/renderer/assets/KaTeX_Main-Bold-waoOVXN0.ttf +0 -0
  21. package/out/renderer/assets/KaTeX_Main-BoldItalic-DxDJ3AOS.woff2 +0 -0
  22. package/out/renderer/assets/KaTeX_Main-BoldItalic-DzxPMmG6.ttf +0 -0
  23. package/out/renderer/assets/KaTeX_Main-BoldItalic-SpSLRI95.woff +0 -0
  24. package/out/renderer/assets/KaTeX_Main-Italic-3WenGoN9.ttf +0 -0
  25. package/out/renderer/assets/KaTeX_Main-Italic-BMLOBm91.woff +0 -0
  26. package/out/renderer/assets/KaTeX_Main-Italic-NWA7e6Wa.woff2 +0 -0
  27. package/out/renderer/assets/KaTeX_Main-Regular-B22Nviop.woff2 +0 -0
  28. package/out/renderer/assets/KaTeX_Main-Regular-Dr94JaBh.woff +0 -0
  29. package/out/renderer/assets/KaTeX_Main-Regular-ypZvNtVU.ttf +0 -0
  30. package/out/renderer/assets/KaTeX_Math-BoldItalic-B3XSjfu4.ttf +0 -0
  31. package/out/renderer/assets/KaTeX_Math-BoldItalic-CZnvNsCZ.woff2 +0 -0
  32. package/out/renderer/assets/KaTeX_Math-BoldItalic-iY-2wyZ7.woff +0 -0
  33. package/out/renderer/assets/KaTeX_Math-Italic-DA0__PXp.woff +0 -0
  34. package/out/renderer/assets/KaTeX_Math-Italic-flOr_0UB.ttf +0 -0
  35. package/out/renderer/assets/KaTeX_Math-Italic-t53AETM-.woff2 +0 -0
  36. package/out/renderer/assets/KaTeX_SansSerif-Bold-CFMepnvq.ttf +0 -0
  37. package/out/renderer/assets/KaTeX_SansSerif-Bold-D1sUS0GD.woff2 +0 -0
  38. package/out/renderer/assets/KaTeX_SansSerif-Bold-DbIhKOiC.woff +0 -0
  39. package/out/renderer/assets/KaTeX_SansSerif-Italic-C3H0VqGB.woff2 +0 -0
  40. package/out/renderer/assets/KaTeX_SansSerif-Italic-DN2j7dab.woff +0 -0
  41. package/out/renderer/assets/KaTeX_SansSerif-Italic-YYjJ1zSn.ttf +0 -0
  42. package/out/renderer/assets/KaTeX_SansSerif-Regular-BNo7hRIc.ttf +0 -0
  43. package/out/renderer/assets/KaTeX_SansSerif-Regular-CS6fqUqJ.woff +0 -0
  44. package/out/renderer/assets/KaTeX_SansSerif-Regular-DDBCnlJ7.woff2 +0 -0
  45. package/out/renderer/assets/KaTeX_Script-Regular-C5JkGWo-.ttf +0 -0
  46. package/out/renderer/assets/KaTeX_Script-Regular-D3wIWfF6.woff2 +0 -0
  47. package/out/renderer/assets/KaTeX_Script-Regular-D5yQViql.woff +0 -0
  48. package/out/renderer/assets/KaTeX_Size1-Regular-C195tn64.woff +0 -0
  49. package/out/renderer/assets/KaTeX_Size1-Regular-Dbsnue_I.ttf +0 -0
  50. package/out/renderer/assets/KaTeX_Size1-Regular-mCD8mA8B.woff2 +0 -0
  51. package/out/renderer/assets/KaTeX_Size2-Regular-B7gKUWhC.ttf +0 -0
  52. package/out/renderer/assets/KaTeX_Size2-Regular-Dy4dx90m.woff2 +0 -0
  53. package/out/renderer/assets/KaTeX_Size2-Regular-oD1tc_U0.woff +0 -0
  54. package/out/renderer/assets/KaTeX_Size3-Regular-CTq5MqoE.woff +0 -0
  55. package/out/renderer/assets/KaTeX_Size3-Regular-DgpXs0kz.ttf +0 -0
  56. package/out/renderer/assets/KaTeX_Size4-Regular-BF-4gkZK.woff +0 -0
  57. package/out/renderer/assets/KaTeX_Size4-Regular-DWFBv043.ttf +0 -0
  58. package/out/renderer/assets/KaTeX_Size4-Regular-Dl5lxZxV.woff2 +0 -0
  59. package/out/renderer/assets/KaTeX_Typewriter-Regular-C0xS9mPB.woff +0 -0
  60. package/out/renderer/assets/KaTeX_Typewriter-Regular-CO6r4hn1.woff2 +0 -0
  61. package/out/renderer/assets/KaTeX_Typewriter-Regular-D3Ib7_Hf.ttf +0 -0
  62. package/out/renderer/assets/{Onboarding-B2h7iatR.js → Onboarding-699qRMTN.js} +4 -4
  63. package/out/renderer/assets/{ProviderHeader-BvigqAWX.js → ProviderHeader-BnuGEmze.js} +2 -2
  64. package/out/renderer/assets/{SettingsPage-CBonY1bv.js → SettingsPage-CLTNRnQI.js} +6 -6
  65. package/out/renderer/assets/{UsageDashboard-DFgckoeT.js → UsageDashboard-DRihVOqx.js} +3 -3
  66. package/out/renderer/assets/{abnfDiagram-N423BO3Z-DV7pjob8.js → abnfDiagram-N423BO3Z-D0STbTTF.js} +4 -4
  67. package/out/renderer/assets/{arc-C2NyJjKR.js → arc-DeFSKBzy.js} +1 -1
  68. package/out/renderer/assets/{architectureDiagram-T3A2C74G-BmG8PHmc.js → architectureDiagram-T3A2C74G-BDrfxwK6.js} +3 -3
  69. package/out/renderer/assets/{blockDiagram-VBNYF7ZC-CJndPtzf.js → blockDiagram-VBNYF7ZC-x_YF9Yme.js} +4 -4
  70. package/out/renderer/assets/{c4Diagram-5PPSVZJV-B9DY2Hnr.js → c4Diagram-5PPSVZJV-C7kuvNRf.js} +2 -2
  71. package/out/renderer/assets/{channel-CCPkBLnh.js → channel-T97-CMvj.js} +1 -1
  72. package/out/renderer/assets/{chunk-2GRJ4B5K-Bt46bDfT.js → chunk-2GRJ4B5K-C7nbnxgH.js} +1 -1
  73. package/out/renderer/assets/{chunk-2Q5K7J3B-DkQwfKC2.js → chunk-2Q5K7J3B-D5IUyzX4.js} +1 -1
  74. package/out/renderer/assets/{chunk-5RXB4S5H-CFNEWvlR.js → chunk-5RXB4S5H-DkL2I1-Q.js} +4 -4
  75. package/out/renderer/assets/{chunk-5VM5RSS4-BNeZg_6d.js → chunk-5VM5RSS4-qszW8EYL.js} +1 -1
  76. package/out/renderer/assets/{chunk-6Q2QTUOP-BU5gT8Us.js → chunk-6Q2QTUOP-CbtMo4y_.js} +1 -1
  77. package/out/renderer/assets/{chunk-GF5L2VYU-BNML5JwJ.js → chunk-GF5L2VYU-C6qdgHXJ.js} +5 -5
  78. package/out/renderer/assets/{chunk-JWPE2WC7-Dvih3ku3.js → chunk-JWPE2WC7-DxAg7bLn.js} +1 -1
  79. package/out/renderer/assets/{chunk-KBJHAD2P-CMgAbRkQ.js → chunk-KBJHAD2P-Cqd2HDdS.js} +1 -1
  80. package/out/renderer/assets/{chunk-RYQCIY6F-CAJ6Qldz.js → chunk-RYQCIY6F-DVzbqgRf.js} +3 -3
  81. package/out/renderer/assets/{chunk-XXDRQBXY-BDZJ-WFV.js → chunk-XXDRQBXY-DF_8pbWI.js} +1 -1
  82. package/out/renderer/assets/{classDiagram-JCYQIIEL-BJCilkUQ.js → classDiagram-JCYQIIEL-MfTsDS5w.js} +6 -6
  83. package/out/renderer/assets/{classDiagram-v2-OCEON4UE-BJCilkUQ.js → classDiagram-v2-OCEON4UE-MfTsDS5w.js} +6 -6
  84. package/out/renderer/assets/{cose-bilkent-JH36ORCC-D6MsqBP5.js → cose-bilkent-JH36ORCC-BvzyW9fn.js} +1 -1
  85. package/out/renderer/assets/{cynefin-VYW2F7L2-3kPlVPG0.js → cynefin-VYW2F7L2-BmRenSSB.js} +1 -1
  86. package/out/renderer/assets/{cynefinDiagram-MW4NZA55-6BlkJqWN.js → cynefinDiagram-MW4NZA55-DmybMaTR.js} +3 -3
  87. package/out/renderer/assets/{dagre-VZM6K2ZE-Chj1W0as.js → dagre-VZM6K2ZE-b6plu1_t.js} +5 -5
  88. package/out/renderer/assets/{diagram-7IWD3JNH-CHFj7vIm.js → diagram-7IWD3JNH-B0LyLNK-.js} +4 -4
  89. package/out/renderer/assets/{diagram-B4RE2ZJO-BqOMO30m.js → diagram-B4RE2ZJO-BtJGLH72.js} +3 -3
  90. package/out/renderer/assets/{diagram-LBJQPF4R-CkiuQM5K.js → diagram-LBJQPF4R-BpSykW90.js} +3 -3
  91. package/out/renderer/assets/{diagram-Q27KOJAE-WVbpb4Iq.js → diagram-Q27KOJAE-_vw0jdNl.js} +4 -4
  92. package/out/renderer/assets/{diagram-UB23O5K3-B9Q0wQI3.js → diagram-UB23O5K3-rE12zYQ8.js} +3 -3
  93. package/out/renderer/assets/{ebnfDiagram-BXEA7PRR-BUhf1ZxU.js → ebnfDiagram-BXEA7PRR-BXR1_d_o.js} +4 -4
  94. package/out/renderer/assets/{erDiagram-JOGREHBK-DGxWkssI.js → erDiagram-JOGREHBK-B1QCAGl4.js} +4 -4
  95. package/out/renderer/assets/{flowDiagram-UKHOOZJN-D3ul5aGG.js → flowDiagram-UKHOOZJN-wRfN63to.js} +6 -6
  96. package/out/renderer/assets/{ganttDiagram-PKOTCBZU-BD3VbhAZ.js → ganttDiagram-PKOTCBZU-DsXpzatp.js} +3 -3
  97. package/out/renderer/assets/{gitGraphDiagram-DS77QQ5N-x-7NMw7v.js → gitGraphDiagram-DS77QQ5N-CsYsZ42q.js} +4 -4
  98. package/out/renderer/assets/{graph-BDbmSegI.js → graph-CfUL5tFv.js} +1 -1
  99. package/out/renderer/assets/{index-Bbv79qeB.js → index--DpoC2Fa.js} +2 -2
  100. package/out/renderer/assets/{index-uAJ0Zw9K.js → index-3hl2j-_p.js} +2 -2
  101. package/out/renderer/assets/{index-DE2koGci.js → index-4IKrE3Ch.js} +2 -2
  102. package/out/renderer/assets/{index-J-dLn6uq.js → index-8-JzmzqC.js} +2 -2
  103. package/out/renderer/assets/{index-BZmjwrvJ.js → index-B41U46QG.js} +1 -1
  104. package/out/renderer/assets/{index-DWZF-uSf.js → index-BFLm6WFt.js} +5 -5
  105. package/out/renderer/assets/{index-CuQvDzzr.js → index-BJ-vdpjD.js} +1 -1
  106. package/out/renderer/assets/{index-CenYyetH.js → index-BSh2X31_.js} +5 -5
  107. package/out/renderer/assets/{index-BKmr7UTW.js → index-BeF6VrSe.js} +1 -1
  108. package/out/renderer/assets/{index-cO9XeYPQ.js → index-BhXi7Le_.js} +5 -5
  109. package/out/renderer/assets/{index-CasrGDb0.js → index-Bv8Yvnki.js} +2 -2
  110. package/out/renderer/assets/{index-D4dhIRp1.js → index-C-WEDvyw.js} +5 -5
  111. package/out/renderer/assets/{index-bNFXvWqr.js → index-CBVmxCYX.js} +2 -2
  112. package/out/renderer/assets/{index-BFhJk8dv.js → index-CC_7dh5L.js} +2 -2
  113. package/out/renderer/assets/{index-Z71oMk_m.js → index-CNGDTtBW.js} +1 -1
  114. package/out/renderer/assets/{index-DKNYbwcH.js → index-CY4zeK5l.js} +3 -3
  115. package/out/renderer/assets/{index-B9bf5T9j.js → index-CnxPOcjf.js} +1 -1
  116. package/out/renderer/assets/{index-BP0q4HOE.js → index-D1Him45L.js} +2 -2
  117. package/out/renderer/assets/{index-C8TOzJWw.js → index-D1jY29Az.js} +4 -4
  118. package/out/renderer/assets/{index-C1I2Idqy.js → index-D2Y9BB9n.js} +5 -5
  119. package/out/renderer/assets/{index-DvSWnCZD.js → index-DBHj35Nq.js} +2 -2
  120. package/out/renderer/assets/{index-BzOM6AUj.js → index-DHZvdQmh.js} +2 -2
  121. package/out/renderer/assets/{index-B2jZTTYL.js → index-DTwId9nn.js} +1 -1
  122. package/out/renderer/assets/{index-x_iC3w5N.js → index-DUOs3uZb.js} +1 -1
  123. package/out/renderer/assets/{index-47ZLfCU8.js → index-DZ8Tuuit.js} +19180 -2969
  124. package/out/renderer/assets/{index-Bh4xfAPL.js → index-Dq8m0XiD.js} +2 -2
  125. package/out/renderer/assets/{index-Dk4pOCFt.js → index-HjbPyDJm.js} +5 -5
  126. package/out/renderer/assets/{index-Dx6kKrXY.js → index-Otcl72On.js} +3 -3
  127. package/out/renderer/assets/{index-tNlkrDYM.js → index-TTgmBk0H.js} +1 -1
  128. package/out/renderer/assets/{index-B_PkNLqT.js → index-Z7VaFhjR.js} +1 -1
  129. package/out/renderer/assets/{index-D_o1aMFn.css → index-ly0cB32v.css} +14 -0
  130. package/out/renderer/assets/{index-D-rE7YVD.js → index-tkTKXqGX.js} +3 -3
  131. package/out/renderer/assets/{index-CiIr--kg.js → index-vBiBurKH.js} +2 -2
  132. package/out/renderer/assets/{infoDiagram-6WML65LV-BMwbA6CU.js → infoDiagram-6WML65LV-BXT6TYnf.js} +2 -2
  133. package/out/renderer/assets/{ishikawaDiagram-WSZJBQD7-Bx90Gz0s.js → ishikawaDiagram-WSZJBQD7-6BJ687Ec.js} +1 -1
  134. package/out/renderer/assets/{journeyDiagram-NVQOT4AX-Dh4pUAU5.js → journeyDiagram-NVQOT4AX-HgkRlCT0.js} +4 -4
  135. package/out/renderer/assets/{jsx-dev-runtime-CtvYhMha.js → jsx-dev-runtime-DshTpFeb.js} +1 -1
  136. package/out/renderer/assets/{kanban-definition-27J2QSJJ-BZ_lX-ko.js → kanban-definition-27J2QSJJ-COYri25f.js} +2 -2
  137. package/out/renderer/assets/{layout-oaOUFeBM.js → layout-BBVpFPy1.js} +3 -3
  138. package/out/renderer/assets/{linear-B2eGZpM_.js → linear-DuNIFrPi.js} +1 -1
  139. package/out/renderer/assets/{map-BijQCI9U.js → map-toxJVbdU.js} +2 -2
  140. package/out/renderer/assets/{mindmap-definition-FAOFIHXS-BeWZh5qg.js → mindmap-definition-FAOFIHXS-DhCEcxPL.js} +3 -3
  141. package/out/renderer/assets/{pegDiagram-VL7TDLO6-BA6NzzN6.js → pegDiagram-VL7TDLO6-DZ8w3ViJ.js} +4 -4
  142. package/out/renderer/assets/{pieDiagram-7S7Q4E2Y-KJmT5t-P.js → pieDiagram-7S7Q4E2Y-JcEYE_Dn.js} +4 -4
  143. package/out/renderer/assets/{quadrantDiagram-CIZ2JOQS-BdFz_bQU.js → quadrantDiagram-CIZ2JOQS-De59Sk4l.js} +2 -2
  144. package/out/renderer/assets/{railroadDiagram-AXF67PYL-CbH2ZZ1S.js → railroadDiagram-AXF67PYL-D7nWbE5S.js} +4 -4
  145. package/out/renderer/assets/{requirementDiagram-LRYGKXZP-BZXG5Vgf.js → requirementDiagram-LRYGKXZP-DKWcKu7I.js} +3 -3
  146. package/out/renderer/assets/{sankeyDiagram-W5VNT64P-CV1Upv22.js → sankeyDiagram-W5VNT64P-Bj8jLitx.js} +1 -1
  147. package/out/renderer/assets/{sequenceDiagram-SI44F4Z6-Csbi3ivi.js → sequenceDiagram-SI44F4Z6-D9Jp65xC.js} +3 -3
  148. package/out/renderer/assets/{sizeCapture-X5ZJPWSS-CaN4k1d3.js → sizeCapture-X5ZJPWSS-mY9H2lE6.js} +1 -1
  149. package/out/renderer/assets/{stateDiagram-OKZ733FA-DSo1KeOQ.js → stateDiagram-OKZ733FA-BEn9ud4k.js} +8 -8
  150. package/out/renderer/assets/{stateDiagram-v2-UEYNNEHI-BhXw89HT.js → stateDiagram-v2-UEYNNEHI-D_psrMs3.js} +5 -5
  151. package/out/renderer/assets/{swimlanes-SLNWSIFB-p3GZ-wkU.js → swimlanes-SLNWSIFB-BMcpfWEi.js} +6 -6
  152. package/out/renderer/assets/{swimlanesDiagram-ULZ7WXOC-DGBdyiqy.js → swimlanesDiagram-ULZ7WXOC-OwdbT2xV.js} +7 -7
  153. package/out/renderer/assets/{time-4LaKa9ym.js → time-DMe8nTku.js} +1 -1
  154. package/out/renderer/assets/{timeline-definition-Z64GVDOM-DfY8hG5p.js → timeline-definition-Z64GVDOM-BTi-OvtJ.js} +2 -2
  155. package/out/renderer/assets/{vennDiagram-T6HMQDX7-wp87GaTi.js → vennDiagram-T6HMQDX7-CoxSnB7W.js} +1 -1
  156. package/out/renderer/assets/{wardleyDiagram-T6FBY63Y-DNrC2vOI.js → wardleyDiagram-T6FBY63Y-Dj0FNpwr.js} +3 -3
  157. package/out/renderer/assets/{xychartDiagram-ELKLHX3M-Bn8J2SKt.js → xychartDiagram-ELKLHX3M-jVSDR4Ov.js} +2 -2
  158. package/out/renderer/index.html +2 -2
  159. package/out/resources/skills/extension-creator/references/event-types.md +2 -0
  160. package/out/resources/skills/extension-creator/references/extension-interface.md +10 -1
  161. package/out/runner.js +564 -437
  162. package/package.json +3 -3
  163. package/out/renderer/assets/katex-oVG3DVWa.js +0 -14499
package/out/runner.js CHANGED
@@ -1035,6 +1035,7 @@ class ApprovalManager {
1035
1035
  }
1036
1036
  }
1037
1037
  const execAsync$3 = util.promisify(child_process.exec);
1038
+ const execFileAsync = util.promisify(child_process.execFile);
1038
1039
  let cachedPath = null;
1039
1040
  let isFirstCall = true;
1040
1041
  class ShellDetector {
@@ -1514,14 +1515,18 @@ const getShellCommandArgs = (command) => {
1514
1515
  const execWithShellPath = async (command, options) => {
1515
1516
  logger.debug(`Executing command with shell path: ${command}`);
1516
1517
  const shellPath = getShellPath();
1517
- return execAsync$3(command, {
1518
+ const execOptions = {
1518
1519
  ...options,
1519
1520
  env: {
1520
1521
  ...process.env,
1521
1522
  PATH: shellPath,
1522
1523
  ...options?.env
1523
1524
  }
1524
- });
1525
+ };
1526
+ if (Array.isArray(command)) {
1527
+ return execFileAsync(command[0], command.slice(1), execOptions);
1528
+ }
1529
+ return execAsync$3(command, execOptions);
1525
1530
  };
1526
1531
  const FLAG_MAP = {
1527
1532
  filesOnly: "--files-only",
@@ -3843,13 +3848,27 @@ File size limit (${sizeLimit.toFixed(1)} KB) exceeded. Use shell commands (e.g.,
3843
3848
  }
3844
3849
  return result;
3845
3850
  };
3851
+ const TOKENIZER_WARNING_INTERVAL_MS = 6e4;
3852
+ let lastTokenizerWarningAt;
3853
+ const countTextTokens = (text) => {
3854
+ try {
3855
+ return gpt4o.encode(text, { disallowedSpecial: /* @__PURE__ */ new Set() }).length;
3856
+ } catch {
3857
+ const now = Date.now();
3858
+ if (lastTokenizerWarningAt === void 0 || now - lastTokenizerWarningAt >= TOKENIZER_WARNING_INTERVAL_MS) {
3859
+ lastTokenizerWarningAt = now;
3860
+ logger.warn("Tokenizer failed; using a length-based token estimate.");
3861
+ }
3862
+ return Math.ceil(text.length / 3);
3863
+ }
3864
+ };
3846
3865
  const truncateToolResult = async (content, maxLines = 1e3, maxSizeKB = 50, maxTokens = 5e4, saveToFile = true, truncationSuffix) => {
3847
3866
  const lines = content.split("\n");
3848
3867
  const sizeBytes = Buffer.byteLength(content, "utf8");
3849
3868
  const sizeKB = sizeBytes / 1024;
3850
3869
  let tokenCount = 0;
3851
3870
  if (lines.length <= maxLines && sizeKB <= maxSizeKB && maxTokens !== Infinity) {
3852
- tokenCount = gpt4o.encode(content).length;
3871
+ tokenCount = countTextTokens(content);
3853
3872
  }
3854
3873
  if (lines.length <= maxLines && sizeKB <= maxSizeKB && tokenCount <= maxTokens) {
3855
3874
  return content;
@@ -3884,7 +3903,7 @@ const truncateToolResult = async (content, maxLines = 1e3, maxSizeKB = 50, maxTo
3884
3903
  const headLines = [];
3885
3904
  let headTokens = 0;
3886
3905
  for (const line of lines) {
3887
- const lineTokens = gpt4o.encode(line).length;
3906
+ const lineTokens = countTextTokens(line);
3888
3907
  if (headTokens + lineTokens > headBudget) {
3889
3908
  break;
3890
3909
  }
@@ -3897,7 +3916,7 @@ const truncateToolResult = async (content, maxLines = 1e3, maxSizeKB = 50, maxTo
3897
3916
  if (headLines.length + tailLines.length >= lines.length) {
3898
3917
  break;
3899
3918
  }
3900
- const lineTokens = gpt4o.encode(lines[i]).length;
3919
+ const lineTokens = countTextTokens(lines[i]);
3901
3920
  if (tailTokens + lineTokens > tailBudget) {
3902
3921
  break;
3903
3922
  }
@@ -4031,7 +4050,7 @@ const estimateMessageTokens = (messages2) => {
4031
4050
  }
4032
4051
  return { role: msg.role, content: textParts.join("\n\n") };
4033
4052
  });
4034
- return textOnlyMessages.reduce((sum, msg) => sum + gpt4o.encode(typeof msg.content === "string" ? msg.content : "").length, 0) + estimatedImageTokens;
4053
+ return textOnlyMessages.reduce((sum, msg) => sum + countTextTokens(typeof msg.content === "string" ? msg.content : ""), 0) + estimatedImageTokens;
4035
4054
  };
4036
4055
  const fileLocks = /* @__PURE__ */ new Map();
4037
4056
  const BASH_STREAMING_PREVIEW_CHARS = 8 * 1024;
@@ -4666,9 +4685,17 @@ Timeout: ${timeout}ms`;
4666
4685
  }
4667
4686
  isResolved = true;
4668
4687
  cleanup();
4669
- const truncatedStdout = await finishOutput(stdoutAccumulator);
4670
- const truncatedStderr = stderrOverride ?? await finishOutput(stderrAccumulator);
4671
- resolve({ stdout: truncatedStdout, stderr: truncatedStderr, exitCode });
4688
+ try {
4689
+ const truncatedStdout = await finishOutput(stdoutAccumulator);
4690
+ const truncatedStderr = stderrOverride ?? await finishOutput(stderrAccumulator);
4691
+ resolve({ stdout: truncatedStdout, stderr: truncatedStderr, exitCode });
4692
+ } catch (error) {
4693
+ resolve({
4694
+ stdout: "",
4695
+ stderr: `Error processing command output: ${error instanceof Error ? error.message : String(error)}`,
4696
+ exitCode: 1
4697
+ });
4698
+ }
4672
4699
  };
4673
4700
  const sendStreamingUpdate = () => {
4674
4701
  const now = Date.now();
@@ -5513,8 +5540,8 @@ Task ID: ${taskId}`;
5513
5540
  return `Task with ID ${taskId} not found`;
5514
5541
  }
5515
5542
  const contextFilePath = path.join(targetTask.project.baseDir, AIDER_DESK_TASKS_DIR, taskId, "context.json");
5516
- const exists = await fileExists(contextFilePath);
5517
- if (!exists) {
5543
+ const exists2 = await fileExists(contextFilePath);
5544
+ if (!exists2) {
5518
5545
  return `Task context file not found at ${contextFilePath}`;
5519
5546
  }
5520
5547
  logger.debug(`Searching in task context file: ${contextFilePath}`, {
@@ -5593,8 +5620,8 @@ const createSearchParentTaskTool = (task, promptContext) => {
5593
5620
  return `Parent task with ID ${parentTaskId} not found`;
5594
5621
  }
5595
5622
  const contextFilePath = path.join(parentTask.project.baseDir, AIDER_DESK_TASKS_DIR, parentTaskId, "context.json");
5596
- const exists = await fileExists(contextFilePath);
5597
- if (!exists) {
5623
+ const exists2 = await fileExists(contextFilePath);
5624
+ if (!exists2) {
5598
5625
  return `Parent task context file not found at ${contextFilePath}`;
5599
5626
  }
5600
5627
  logger.debug(`Searching in parent task context file: ${contextFilePath}`, { query, maxTokens: effectiveMaxTokens, parentTaskId });
@@ -6117,6 +6144,98 @@ Skill '${requested.name}' activated.${dirInfo}`;
6117
6144
  }
6118
6145
  return filteredTools;
6119
6146
  };
6147
+ const convertImageToolResults = (messages2) => {
6148
+ const newMessages = [];
6149
+ for (const message of messages2) {
6150
+ if (message.role === "tool") {
6151
+ const toolContent = message.content.filter((p) => p.type === "tool-result");
6152
+ const updatedToolContent = [];
6153
+ const imageParts = [];
6154
+ for (const toolResultPart of toolContent) {
6155
+ try {
6156
+ if (toolResultPart.output.type === "content") {
6157
+ if (Array.isArray(toolResultPart.output.value) && toolResultPart.output.value.some((p) => p.type === "file")) {
6158
+ const fileParts = toolResultPart.output.value.filter((p) => p.type === "file");
6159
+ const textParts = toolResultPart.output.value.filter((p) => p.type === "text");
6160
+ logger.debug(
6161
+ `[convertImageToolResults] Extracting ${fileParts.length} image(s) from content-type tool result "${toolResultPart.toolName}" into user message`
6162
+ );
6163
+ for (const filePart of fileParts) {
6164
+ if (filePart.data.type === "data") {
6165
+ imageParts.push({
6166
+ type: "file",
6167
+ data: filePart.data,
6168
+ mediaType: filePart.mediaType
6169
+ });
6170
+ }
6171
+ }
6172
+ const textValue = textParts.length > 0 ? textParts.map((p) => p.text).join("\n\n") : "Image rendered.";
6173
+ updatedToolContent.push({
6174
+ ...toolResultPart,
6175
+ output: { type: "text", value: textValue }
6176
+ });
6177
+ } else {
6178
+ updatedToolContent.push(toolResultPart);
6179
+ }
6180
+ continue;
6181
+ }
6182
+ if (toolResultPart.output.type !== "text" && toolResultPart.output.type !== "json") {
6183
+ updatedToolContent.push(toolResultPart);
6184
+ continue;
6185
+ }
6186
+ let parsedResult = null;
6187
+ if (toolResultPart.output.type === "text") {
6188
+ parsedResult = JSON.parse(toolResultPart.output.value);
6189
+ } else if (toolResultPart.output.type === "json") {
6190
+ parsedResult = toolResultPart.output.value;
6191
+ }
6192
+ if (parsedResult && Array.isArray(parsedResult.content)) {
6193
+ const converted = convertMcpResultToModelOutput(parsedResult);
6194
+ if (converted.type === "content" && converted.value.some((p) => p.type === "file")) {
6195
+ const fileParts = converted.value.filter((p) => p.type === "file");
6196
+ const textParts = converted.value.filter((p) => p.type === "text");
6197
+ logger.debug(`[convertImageToolResults] Extracting ${fileParts.length} image(s) from tool result "${toolResultPart.toolName}" into user message`);
6198
+ for (const filePart of fileParts) {
6199
+ if (filePart.data.type === "data") {
6200
+ imageParts.push({
6201
+ type: "file",
6202
+ data: filePart.data,
6203
+ mediaType: filePart.mediaType
6204
+ });
6205
+ }
6206
+ }
6207
+ const textValue = textParts.length > 0 ? textParts.map((p) => p.text).join("\n\n") : "Image rendered.";
6208
+ updatedToolContent.push({
6209
+ ...toolResultPart,
6210
+ output: { type: "text", value: textValue }
6211
+ });
6212
+ } else {
6213
+ updatedToolContent.push(toolResultPart);
6214
+ }
6215
+ } else {
6216
+ updatedToolContent.push(toolResultPart);
6217
+ }
6218
+ } catch {
6219
+ updatedToolContent.push(toolResultPart);
6220
+ }
6221
+ }
6222
+ newMessages.push({
6223
+ ...message,
6224
+ content: updatedToolContent
6225
+ });
6226
+ if (imageParts.length > 0) {
6227
+ logger.debug(`[convertImageToolResults] Added user message with ${imageParts.length} image(s)`);
6228
+ newMessages.push({
6229
+ role: "user",
6230
+ content: imageParts
6231
+ });
6232
+ }
6233
+ } else {
6234
+ newMessages.push(message);
6235
+ }
6236
+ }
6237
+ return newMessages;
6238
+ };
6120
6239
  const extractReasoningMiddleware = function extractReasoningMiddleware2({
6121
6240
  tagName,
6122
6241
  separator = "\n"
@@ -7097,55 +7216,14 @@ const generateCompactedSummary = async (userMessage, allMessages, profile, task,
7097
7216
  );
7098
7217
  return buildCompactSummaryMessages(userMessage, summaryText, promptContext);
7099
7218
  };
7100
- const optimizeMessages = async (messages2, cacheControl, task = null, profile = null, projectProfiles = [], userRequestMessageIndex = -1, extensionManager) => {
7101
- if (messages2.length === 0) {
7102
- return [];
7103
- }
7104
- let optimizedMessages = lodash.cloneDeep(messages2);
7105
- if (task && profile) {
7106
- optimizedMessages = await addImportantReminders(task, profile, projectProfiles, userRequestMessageIndex, optimizedMessages, extensionManager);
7107
- }
7108
- optimizedMessages = convertImageToolResults(optimizedMessages);
7109
- optimizedMessages = removeDuplicateToolCalls(optimizedMessages);
7110
- optimizedMessages = optimizeAiderMessages(optimizedMessages);
7111
- optimizedMessages = optimizeSubagentMessages(optimizedMessages);
7112
- logger.debug("Optimized messages:", {
7113
- before: {
7114
- count: messages2.length,
7115
- roles: messages2.map((m) => m.role)
7116
- },
7117
- after: {
7118
- count: optimizedMessages.length,
7119
- roles: optimizedMessages.map((message) => message.role)
7120
- }
7121
- });
7122
- const lastMessage = optimizedMessages[messages2.length - 1];
7123
- if (cacheControl) {
7124
- const placement = cacheControl.placement ?? "message";
7125
- if (placement === "message-part") {
7126
- if (Array.isArray(lastMessage.content) && lastMessage.content.length > 0) {
7127
- const lastContent = lastMessage.content[lastMessage.content.length - 1];
7128
- if (lastContent && typeof lastContent === "object") {
7129
- lastContent.providerOptions = {
7130
- ...lastContent.providerOptions,
7131
- ...cacheControl.providerOptions
7132
- };
7133
- }
7134
- }
7135
- } else {
7136
- lastMessage.providerOptions = {
7137
- ...lastMessage.providerOptions,
7138
- ...cacheControl.providerOptions
7139
- };
7140
- }
7141
- }
7142
- return optimizedMessages;
7143
- };
7144
7219
  const addImportantReminders = async (task, profile, projectProfiles, userRequestMessageIndex, messages2, extensionManager) => {
7145
7220
  if (userRequestMessageIndex === -1) {
7146
7221
  return messages2;
7147
7222
  }
7148
7223
  const userRequestMessage = messages2[userRequestMessageIndex];
7224
+ if (!userRequestMessage || userRequestMessage.role !== "user") {
7225
+ return messages2;
7226
+ }
7149
7227
  const reminders = [];
7150
7228
  if (profile.useTodoTools) {
7151
7229
  reminders.push(
@@ -7219,140 +7297,68 @@ ${remindersContent}
7219
7297
  newMessages[userRequestMessageIndex] = updatedFirstUserMessage;
7220
7298
  return newMessages;
7221
7299
  };
7222
- const optimizeAiderMessages = (messages2) => {
7223
- const newMessages = lodash.cloneDeep(messages2);
7224
- for (const message of newMessages) {
7225
- if (message.role === "tool") {
7226
- const toolContent = message.content.filter((p) => p.type === "tool-result");
7227
- for (const toolResultPart of toolContent) {
7228
- if (toolResultPart.toolName === `${AIDER_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${AIDER_TOOL_RUN_PROMPT}` && toolResultPart.output.type === "json") {
7229
- try {
7230
- const result = toolResultPart.output.value;
7231
- delete result.responses;
7232
- delete result.promptContext;
7233
- } catch {
7234
- }
7235
- }
7236
- }
7237
- }
7300
+ const getSubagentMessages = (value) => {
7301
+ const messages2 = Array.isArray(value) ? value : value && typeof value === "object" && "messages" in value ? value.messages : void 0;
7302
+ if (!Array.isArray(messages2)) {
7303
+ return void 0;
7238
7304
  }
7239
- return newMessages;
7305
+ if (!messages2.every((message) => message && typeof message === "object" && "role" in message && "content" in message)) {
7306
+ return void 0;
7307
+ }
7308
+ return messages2;
7240
7309
  };
7241
- const optimizeSubagentMessages = (messages2) => {
7242
- const newMessages = lodash.cloneDeep(messages2);
7243
- for (const message of newMessages) {
7244
- if (message.role === "tool") {
7245
- const toolContent = message.content.filter((p) => p.type === "tool-result");
7246
- for (const toolResultPart of toolContent) {
7247
- if (toolResultPart.toolName === `${SUBAGENTS_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${SUBAGENTS_TOOL_RUN_TASK}` && toolResultPart.output.type === "json") {
7248
- try {
7249
- const result = toolResultPart.output.value;
7250
- const lastMessage = result.messages[result.messages.length - 1];
7251
- toolResultPart.output = {
7252
- type: "text",
7253
- value: extractTextContent(lastMessage.content)
7254
- };
7255
- } catch {
7256
- }
7257
- }
7258
- }
7259
- }
7310
+ const getSubagentFinalText = (value) => {
7311
+ const messages2 = getSubagentMessages(value);
7312
+ if (!messages2) {
7313
+ return void 0;
7260
7314
  }
7261
- return newMessages;
7315
+ const lastMessage = messages2.at(-1);
7316
+ return lastMessage ? extractTextContent(lastMessage.content) : "";
7262
7317
  };
7263
- const convertImageToolResults = (messages2) => {
7264
- const newMessages = [];
7265
- for (const message of messages2) {
7266
- if (message.role === "tool") {
7267
- const toolContent = message.content.filter((p) => p.type === "tool-result");
7268
- const updatedToolContent = [];
7269
- const imageParts = [];
7270
- for (const toolResultPart of toolContent) {
7271
- try {
7272
- if (toolResultPart.output.type === "content") {
7273
- if (Array.isArray(toolResultPart.output.value) && toolResultPart.output.value.some((p) => p.type === "file")) {
7274
- const fileParts = toolResultPart.output.value.filter((p) => p.type === "file");
7275
- const textParts = toolResultPart.output.value.filter((p) => p.type === "text");
7276
- logger.debug(
7277
- `[convertImageToolResults] Extracting ${fileParts.length} image(s) from content-type tool result "${toolResultPart.toolName}" into user message`
7278
- );
7279
- for (const filePart of fileParts) {
7280
- if (filePart.data.type === "data") {
7281
- imageParts.push({
7282
- type: "file",
7283
- data: filePart.data,
7284
- mediaType: filePart.mediaType
7285
- });
7286
- }
7287
- }
7288
- const textValue = textParts.length > 0 ? textParts.map((p) => p.text).join("\n\n") : "Image rendered.";
7289
- updatedToolContent.push({
7290
- ...toolResultPart,
7291
- output: { type: "text", value: textValue }
7292
- });
7293
- } else {
7294
- updatedToolContent.push(toolResultPart);
7295
- }
7296
- continue;
7297
- }
7298
- if (toolResultPart.output.type !== "text" && toolResultPart.output.type !== "json") {
7299
- updatedToolContent.push(toolResultPart);
7300
- continue;
7301
- }
7302
- let parsedResult = null;
7303
- if (toolResultPart.output.type === "text") {
7304
- parsedResult = JSON.parse(toolResultPart.output.value);
7305
- } else if (toolResultPart.output.type === "json") {
7306
- parsedResult = toolResultPart.output.value;
7307
- }
7308
- if (parsedResult && Array.isArray(parsedResult.content)) {
7309
- const converted = convertMcpResultToModelOutput(parsedResult);
7310
- if (converted.type === "content" && converted.value.some((p) => p.type === "file")) {
7311
- const fileParts = converted.value.filter((p) => p.type === "file");
7312
- const textParts = converted.value.filter((p) => p.type === "text");
7313
- logger.debug(`[convertImageToolResults] Extracting ${fileParts.length} image(s) from tool result "${toolResultPart.toolName}" into user message`);
7314
- for (const filePart of fileParts) {
7315
- if (filePart.data.type === "data") {
7316
- imageParts.push({
7317
- type: "file",
7318
- data: filePart.data,
7319
- mediaType: filePart.mediaType
7320
- });
7321
- }
7322
- }
7323
- const textValue = textParts.length > 0 ? textParts.map((p) => p.text).join("\n\n") : "Image rendered.";
7324
- updatedToolContent.push({
7325
- ...toolResultPart,
7326
- output: { type: "text", value: textValue }
7327
- });
7328
- } else {
7329
- updatedToolContent.push(toolResultPart);
7330
- }
7331
- } else {
7332
- updatedToolContent.push(toolResultPart);
7333
- }
7334
- } catch {
7335
- updatedToolContent.push(toolResultPart);
7336
- }
7318
+ const transformMessages = (messages2) => {
7319
+ const transformedMessages = lodash.cloneDeep(messages2);
7320
+ for (const message of transformedMessages) {
7321
+ if (message.role !== "tool") {
7322
+ continue;
7323
+ }
7324
+ for (const part of message.content) {
7325
+ if (part.type !== "tool-result" || part.output.type !== "json") {
7326
+ continue;
7337
7327
  }
7338
- newMessages.push({
7339
- ...message,
7340
- content: updatedToolContent
7341
- });
7342
- if (imageParts.length > 0) {
7343
- logger.debug(`[convertImageToolResults] Added user message with ${imageParts.length} image(s)`);
7344
- newMessages.push({
7345
- role: "user",
7346
- content: imageParts
7347
- });
7328
+ if (part.toolName === `${AIDER_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${AIDER_TOOL_RUN_PROMPT}`) {
7329
+ const result = part.output.value;
7330
+ if (result && typeof result === "object" && !Array.isArray(result)) {
7331
+ part.output = {
7332
+ ...part.output,
7333
+ value: Object.fromEntries(Object.entries(result).filter(([key]) => key !== "responses" && key !== "promptContext"))
7334
+ };
7335
+ }
7336
+ } else if (part.toolName === `${SUBAGENTS_TOOL_GROUP_NAME}${TOOL_GROUP_NAME_SEPARATOR}${SUBAGENTS_TOOL_RUN_TASK}`) {
7337
+ const text = getSubagentFinalText(part.output.value);
7338
+ if (text !== void 0) {
7339
+ part.output = { type: "text", value: text };
7340
+ }
7348
7341
  }
7349
- } else {
7350
- newMessages.push(message);
7351
7342
  }
7352
7343
  }
7353
- return newMessages;
7344
+ return transformedMessages;
7345
+ };
7346
+ const hasFileOutput = (output) => {
7347
+ if (output.type === "content") {
7348
+ return output.value.some((part) => part.type === "file");
7349
+ }
7350
+ if (output.type !== "json" && output.type !== "text") {
7351
+ return false;
7352
+ }
7353
+ try {
7354
+ const value = output.type === "text" ? JSON.parse(output.value) : output.value;
7355
+ const converted = convertMcpResultToModelOutput(value);
7356
+ return converted.type === "content" && converted.value.some((part) => part.type === "file");
7357
+ } catch {
7358
+ return false;
7359
+ }
7354
7360
  };
7355
- const removeDuplicateToolCalls = (messages2) => {
7361
+ const optimizeMessages = (messages2) => {
7356
7362
  if (messages2.length < 4) {
7357
7363
  return messages2;
7358
7364
  }
@@ -7367,6 +7373,10 @@ const removeDuplicateToolCalls = (messages2) => {
7367
7373
  const thirdToolCallPart = Array.isArray(thirdMsg.content) ? thirdMsg.content.find((p) => p.type === "tool-call") : null;
7368
7374
  if (firstToolCallPart && thirdToolCallPart) {
7369
7375
  if (firstToolCallPart.toolName === thirdToolCallPart.toolName && JSON.stringify(firstToolCallPart.input) === JSON.stringify(thirdToolCallPart.input)) {
7376
+ const duplicateResult = fourthMsg.content.find((part) => part.type === "tool-result" && part.toolCallId === thirdToolCallPart.toolCallId);
7377
+ if (duplicateResult?.type === "tool-result" && hasFileOutput(duplicateResult.output)) {
7378
+ continue;
7379
+ }
7370
7380
  logger.info("Found duplicate sequential tool call. Modifying subsequent tool result.", {
7371
7381
  toolName: thirdToolCallPart.toolName,
7372
7382
  input: thirdToolCallPart.input
@@ -7395,6 +7405,75 @@ const removeDuplicateToolCalls = (messages2) => {
7395
7405
  }
7396
7406
  return newMessages;
7397
7407
  };
7408
+ const applyCacheControl = (messages2, cacheControl) => {
7409
+ const optimizedMessages = lodash.cloneDeep(messages2);
7410
+ const lastMessage = optimizedMessages.at(-1);
7411
+ if (cacheControl && lastMessage) {
7412
+ const placement = cacheControl.placement ?? "message";
7413
+ if (placement === "message-part") {
7414
+ if (Array.isArray(lastMessage.content) && lastMessage.content.length > 0) {
7415
+ const lastContent = lastMessage.content[lastMessage.content.length - 1];
7416
+ if (lastContent && typeof lastContent === "object") {
7417
+ lastContent.providerOptions = {
7418
+ ...lastContent.providerOptions,
7419
+ ...cacheControl.providerOptions
7420
+ };
7421
+ }
7422
+ }
7423
+ } else {
7424
+ lastMessage.providerOptions = {
7425
+ ...lastMessage.providerOptions,
7426
+ ...cacheControl.providerOptions
7427
+ };
7428
+ }
7429
+ }
7430
+ return optimizedMessages;
7431
+ };
7432
+ const prepareMessagesForModel = async (messages2, cacheControl, task = null, profile = null, projectProfiles = [], userRequestMessageIndex = -1, extensionManager) => {
7433
+ let preparedMessages = lodash.cloneDeep(messages2);
7434
+ if (task && profile && preparedMessages.length > 0) {
7435
+ preparedMessages = await addImportantReminders(task, profile, projectProfiles, userRequestMessageIndex, preparedMessages, extensionManager);
7436
+ }
7437
+ const transformationInput = lodash.cloneDeep(preparedMessages);
7438
+ preparedMessages = transformMessages(preparedMessages);
7439
+ if (extensionManager && task) {
7440
+ const result = await extensionManager.dispatchEvent(
7441
+ "onTransformMessages",
7442
+ { originalMessages: transformationInput, transformedMessages: preparedMessages },
7443
+ task.project,
7444
+ task
7445
+ );
7446
+ preparedMessages = result.transformedMessages ?? preparedMessages;
7447
+ }
7448
+ const optimizationInput = lodash.cloneDeep(preparedMessages);
7449
+ preparedMessages = optimizeMessages(lodash.cloneDeep(preparedMessages));
7450
+ if (extensionManager && task) {
7451
+ const result = await extensionManager.dispatchEvent(
7452
+ "onOptimizeMessages",
7453
+ { originalMessages: optimizationInput, optimizedMessages: preparedMessages },
7454
+ task.project,
7455
+ task
7456
+ );
7457
+ preparedMessages = result.optimizedMessages ?? preparedMessages;
7458
+ }
7459
+ preparedMessages = convertImageToolResults(preparedMessages);
7460
+ const cacheInput = lodash.cloneDeep(preparedMessages);
7461
+ preparedMessages = applyCacheControl(preparedMessages, cacheControl);
7462
+ if (extensionManager && task) {
7463
+ const result = await extensionManager.dispatchEvent(
7464
+ "onApplyCacheControl",
7465
+ {
7466
+ originalMessages: cacheInput,
7467
+ messages: preparedMessages,
7468
+ cacheControl
7469
+ },
7470
+ task.project,
7471
+ task
7472
+ );
7473
+ preparedMessages = result.messages ?? preparedMessages;
7474
+ }
7475
+ return preparedMessages;
7476
+ };
7398
7477
  const getEnabledSubagents = (profiles, mainAgentProfile) => {
7399
7478
  return profiles.filter((agentProfile) => isSubagentEnabled(agentProfile, mainAgentProfile));
7400
7479
  };
@@ -8382,29 +8461,15 @@ ${fileList}${readOnlyNote}`
8382
8461
  ...providerParameters
8383
8462
  });
8384
8463
  const getBaseModelCallParams = async () => {
8385
- const getOptimizedMessages = async () => {
8386
- const originalMessages = messages2;
8387
- const optimized = await optimizeMessages(
8388
- messages2,
8389
- cacheControl,
8390
- task,
8391
- profile,
8392
- projectProfiles,
8393
- initialUserRequestMessageIndex,
8394
- this.extensionManager
8395
- );
8396
- const extensionResult2 = await this.extensionManager.dispatchEvent(
8397
- "onOptimizeMessages",
8398
- {
8399
- originalMessages,
8400
- optimizedMessages: optimized
8401
- },
8402
- task.project,
8403
- task
8404
- );
8405
- return extensionResult2.optimizedMessages ?? optimized;
8406
- };
8407
- const optimizedMessages = await getOptimizedMessages();
8464
+ const optimizedMessages = await prepareMessagesForModel(
8465
+ messages2,
8466
+ cacheControl,
8467
+ task,
8468
+ profile,
8469
+ projectProfiles,
8470
+ initialUserRequestMessageIndex,
8471
+ this.extensionManager
8472
+ );
8408
8473
  return {
8409
8474
  providerOptions,
8410
8475
  model: ai.wrapLanguageModel({
@@ -8771,6 +8836,9 @@ ${fileList}${readOnlyNote}`
8771
8836
  } else {
8772
8837
  task.addLogMessage("error", `${error instanceof Error ? error.message : String(error)}`, false, promptContext);
8773
8838
  }
8839
+ if (profile.isSubagent) {
8840
+ throw error;
8841
+ }
8774
8842
  await task.updateTask({
8775
8843
  state: DefaultTaskState.Interrupted
8776
8844
  });
@@ -9024,7 +9092,7 @@ ${fileList}${readOnlyNote}`
9024
9092
  const result = await ai.generateText({
9025
9093
  model: model2,
9026
9094
  instructions: systemPrompt,
9027
- messages: await optimizeMessages(messages2, cacheControl),
9095
+ messages: await prepareMessagesForModel(messages2, cacheControl),
9028
9096
  abortSignal: effectiveAbortSignal,
9029
9097
  providerOptions,
9030
9098
  ...providerParameters,
@@ -9080,7 +9148,7 @@ ${fileList}${readOnlyNote}`
9080
9148
  model: model2,
9081
9149
  output: ai.Output.object({ schema }),
9082
9150
  instructions: systemPrompt,
9083
- messages: await optimizeMessages(messages2, cacheControl),
9151
+ messages: await prepareMessagesForModel(messages2, cacheControl),
9084
9152
  abortSignal: effectiveAbortSignal,
9085
9153
  providerOptions,
9086
9154
  ...providerParameters,
@@ -9115,7 +9183,7 @@ ${fileList}${readOnlyNote}`
9115
9183
  const cacheControl = this.modelManager.getCacheControl(provider, profile.model);
9116
9184
  const lastUserIndex = messages2.map((m) => m.role).lastIndexOf("user");
9117
9185
  const userRequestMessageIndex = lastUserIndex >= 0 ? lastUserIndex : 0;
9118
- const optimizedMessages = await optimizeMessages(
9186
+ const optimizedMessages = await prepareMessagesForModel(
9119
9187
  messages2,
9120
9188
  cacheControl,
9121
9189
  task,
@@ -9174,15 +9242,18 @@ ${fileList}${readOnlyNote}`
9174
9242
  // Log truncated text
9175
9243
  toolCalls: toolCalls?.map((tc) => tc.toolName),
9176
9244
  toolResults: toolResults?.map((tr) => tr.toolName),
9177
- usage,
9178
- providerMetadata,
9245
+ usage: {
9246
+ inputTokens: usage?.inputTokens,
9247
+ outputTokens: usage?.outputTokens,
9248
+ totalTokens: usage?.totalTokens
9249
+ },
9179
9250
  promptContext,
9180
9251
  contentLength: content.length
9181
9252
  });
9182
9253
  const messages2 = [];
9183
9254
  const usageReport = this.modelManager.getUsageReport(task, provider, model2, usage, providerMetadata);
9184
9255
  if (providerMetadata) {
9185
- await task.updateTask({ lastAgentProviderMetadata: providerMetadata });
9256
+ await task.updateTask({ lastAgentProviderMetadata: providerMetadata }, false);
9186
9257
  }
9187
9258
  const hasAssistantMessage = content.some((part) => (part.type === "text" || part.type === "reasoning") && part.text?.trim());
9188
9259
  let responseMessageIndex = 0;
@@ -9287,6 +9358,9 @@ ${fileList}${readOnlyNote}`
9287
9358
  tokens: profile.autoCompactThresholdTokens ?? taskSettings.contextCompactingThreshold.tokens
9288
9359
  };
9289
9360
  const taskTokensOverride = task.task.contextCompactingThresholdTokens;
9361
+ if (taskTokensOverride === 0) {
9362
+ return true;
9363
+ }
9290
9364
  let contextCompactionType = profile.autoCompactionType ?? taskSettings.contextCompactionType ?? ContextCompactionType.Compact;
9291
9365
  if (profile.isSubagent && contextCompactionType === ContextCompactionType.Handoff) {
9292
9366
  contextCompactionType = ContextCompactionType.Smart;
@@ -9316,7 +9390,8 @@ ${fileList}${readOnlyNote}`
9316
9390
  let totalTokens = usageReport.sentTokens + usageReport.receivedTokens + (usageReport.cacheReadTokens ?? 0);
9317
9391
  const lastReportIndex = resultMessages.indexOf(lastUsageReportMessage);
9318
9392
  if (lastReportIndex >= 0 && lastReportIndex < resultMessages.length - 1) {
9319
- const trailingTokens = estimateMessageTokens(resultMessages.slice(lastReportIndex + 1));
9393
+ const trailingMessages = convertImageToolResults(resultMessages.slice(lastReportIndex + 1));
9394
+ const trailingTokens = estimateMessageTokens(trailingMessages);
9320
9395
  totalTokens += trailingTokens;
9321
9396
  logger.debug("Added trailing (post-usage-report) tokens to context total", { trailingTokens, totalTokens });
9322
9397
  }
@@ -9769,9 +9844,10 @@ class McpOAuthManager {
9769
9844
  }
9770
9845
  }
9771
9846
  }
9847
+ const projectTrust$3 = { "title": "Trust this project?", "warning": "This project contains agents, MCP servers, or extensions. They may run malicious code with your user permissions, access your files and credentials, or send data to external services.", "review": "Review the listed files before continuing. Only trust this project if you trust its source. Cancel to leave the project unopened.", "confirm": "Trust the project", "agents": "Agents", "mcpServers": "MCP servers", "extensions": "Extensions", "checking": "Checking project configuration…", "checkFailed": "Unable to inspect the project configuration. The project was not opened. Check file permissions and configuration files, then try again." };
9772
9848
  const languages$3 = { "en": "English", "zh": "中文", "ru": "Русский", "ko": "한국어" };
9773
9849
  const commandPalette$3 = { "title": "Command Palette", "placeholder": "Type to search...", "noResults": "No matching results", "scrollForMore": "Scroll for more results", "tabs": { "all": "All", "file": "Files", "action": "Actions", "task": "Tasks", "project": "Projects" } };
9774
- const uiActions$3 = { "openModelSelector": "Open Model Selector", "changeAgentProfile": "Change Agent Profile", "setAutonomyMode": "Switch autonomy mode", "openSettingsPage": "Open settings page", "showLogs": "Show Logs", "showArchivedTasks": "Show archived tasks", "hideArchivedTasks": "Hide archived tasks", "createNewTask": "Create new task", "createNewSubtask": "Create new subtask", "createNewSiblingTask": "Create new sibling task", "renameTask": "Rename task", "archiveTask": "Archive Task", "unarchiveTask": "Unarchive Task", "deleteTask": "Delete Task", "duplicateTask": "Duplicate Task", "exportTaskImage": "Export Task as Image", "exportTaskMarkdown": "Export Task as Markdown", "copyTaskMarkdown": "Copy Task as Markdown", "copyTaskId": "Copy Task ID", "copyTaskIdFailed": "Failed to copy task id", "interruptResponse": "Interrupt Response", "restartConnector": "Restart Aider Connector", "togglePin": "Toggle Pin", "moveToTop": "Move Task to Top", "switchToLocal": "Switch to Local Mode", "switchToWorktree": "Switch to Worktree Mode", "switchWorkingMode": "Switch the working mode", "gitAction": "Git action", "gitBranches": "Show Git Branches" };
9850
+ const uiActions$3 = { "openModelSelector": "Open Model Selector", "changeAgentProfile": "Change Agent Profile", "setAutonomyMode": "Switch autonomy mode", "openSettingsPage": "Open settings page", "showLogs": "Show Logs", "showArchivedTasks": "Show archived tasks", "hideArchivedTasks": "Hide archived tasks", "createNewTask": "Create new task", "createNewSubtask": "Create new subtask", "createNewSiblingTask": "Create new sibling task", "renameTask": "Rename task", "archiveTask": "Archive Task", "unarchiveTask": "Unarchive Task", "deleteTask": "Delete Task", "duplicateTask": "Duplicate Task", "exportTaskImage": "Export Task as Image", "exportTaskMarkdown": "Export Task as Markdown", "copyTaskMarkdown": "Copy Task as Markdown", "copyTaskId": "Copy Task ID", "copyTaskIdFailed": "Failed to copy task id", "interruptResponse": "Interrupt Response", "restartConnector": "Restart Aider Connector", "togglePin": "Toggle Pin", "moveToTop": "Move Task to Top", "switchToLocal": "Switch to Local Mode", "switchToWorktree": "Switch to Worktree Mode", "switchWorkingMode": "Switch the working mode", "switchToAgentMode": "Switch to Agent mode", "switchToCodeMode": "Switch to Code mode", "switchToAskMode": "Switch to Ask mode", "switchToArchitectMode": "Switch to Architect mode", "switchToContextMode": "Switch to Context mode", "switchToMode": "Switch to {{mode}} mode", "gitAction": "Git action", "gitBranches": "Show Git Branches" };
9775
9851
  const common$3 = { "settings": "Settings", "cancel": "Cancel", "save": "Save", "delete": "Delete", "edit": "Edit", "add": "Add", "remove": "Remove", "close": "Close", "confirm": "Confirm", "back": "Back", "undo": "Undo", "next": "Next", "previous": "Previous", "of": "of", "finish": "Finish", "loading": "Loading...", "startingUp": "Starting up...", "loadingProjectSettings": "Loading project settings...", "loadingProject": "Loading project...", "loadingTask": "Loading task...", "loadingMessages": "Loading messages...", "error": "Error", "success": "Success", "warning": "Warning", "info": "Info", "yes": "Yes", "no": "No", "refresh": "Refresh", "retry": "Retry", "open": "Open", "openProject": "Open Project", "clone": "Clone", "lock": "Lock", "default": "Default", "suffix.billion": "B", "suffix.million": "M", "suffix.thousand": "K", "suffix.tokens": "tokens", "ok": "OK", "collapse": "Collapse", "expand": "Expand", "enabled": "Enabled", "noFiles": "No files", "loadingFiles": "Loading files...", "closeTasks": "Close Tasks", "toggleTasks": "Toggle Tasks", "submit": "Submit", "inputPrompt": "Input Required", "rememberSession": "Remember for this session", "enterPassword": "Enter password...", "showPassword": "Show password", "hidePassword": "Hide password" };
9776
9852
  const search$3 = { "placeholder": "Search...", "previousResult": "Previous result (SHIFT + F3)", "nextResult": "Next result (F3)" };
9777
9853
  const onboarding$3 = { "title": "Welcome to AiderDesk", "description": "Transparent, steerable AI orchestration for professional software engineers. More than a GUI for Aider — a complete orchestration layer that helps you:", "skipForNow": "Skip for now", "finish": "Finish Setup", "features": { "1": "Manage projects, tasks, and Git worktrees in isolated environments", "2": "Review every change before it lands with rich diff viewers and approval gates", "3": "Steer AI behavior with tool approval gates, message editing, and task forking", "4": "Use smart context and memory with semantic search and vector embeddings", "5": "Extend everything via MCP, custom extensions, and multi-model subagents" }, "getStarted": "Let's get started by connecting your AI model.", "steps": { "welcome": "Welcome", "connectModel": "Connect AI Model", "language": "Language", "aider": "Aider", "agent": "AI Agent", "providers": "Providers", "finish": "Finish", "choosePath": "Choose Path", "configure": "Configure" }, "choice": { "title": "How will you use AiderDesk?", "description": "This tailors your setup and sets your default mode. You can change it anytime in Settings → General.", "recommended": "Recommended", "agent": { "title": "Agent-first", "subtitle": "Default", "description": "Autonomous agent with full tool access. Describe the outcome — it plans and executes.", "feature1": "Multi-step planning and file edits", "feature2": "Power tools, MCP servers and skills", "feature3": "Aider modes still one switch away", "modeLabel": "Sets default mode → Agent" }, "aider": { "title": "Coming from Aider", "subtitle": "Aider modes primary", "description": "You already know aider — keep Code, Ask and Architect front and center.", "feature1": "Aider settings set up in-line", "feature2": "Edit formats, auto-commits, env vars", "feature3": "Agent mode available when you want it", "modeLabel": "Sets default mode → Code" } }, "language": { "title": "Choose Your Language", "description": "Select your preferred language for the application interface." }, "aider": { "title": "Configure Aider", "description": "To get started, please configure your Aider settings. You'll need to:", "options": { "1": "Add your API keys for the LLM provider you want to use", "2": "Set any additional options for Aider", "3": ".env and .aider.conf.yaml are also read as they would with Aider" }, "configureLater": "You can also do that later in the Settings.", "fineTuneTitle": "Fine-Tune Aider (Optional)", "fineTuneDescription": "Advanced users can configure additional Aider settings and environment variables. This step is completely optional and can be safely skipped.", "fineTuneNote": "Note: These settings are for advanced users who want to customize Aider's behavior. Most users can skip this step and configure these later in Settings if needed.", "agentSwitchNote": "Tip: Agent mode is one switch away — use the mode picker above the prompt anytime you want full autonomy." }, "providers": { "title": "Model Providers", "description": "Configure your LLM providers for use with both Aider and Agent modes. You can set up API keys and additional settings for various providers.", "configureLater": "You can configure these later in the Settings if you prefer.", "connectTitle": "Connect Your AI Model", "connectDescription": "AiderDesk supports multiple AI providers including OpenAI, Anthropic, Google Gemini, and more. Your API keys are stored securely on your local machine and never shared.", "advancedUsersNote": "Advanced users: You can also configure providers using environment variables in the next step's Aider configuration section.", "advancedSettings": "Advanced settings", "order": "Order", "orderDescription": 'List of provider slugs to try in order (e.g. ["anthropic", "openai"]).', "allowFallbacks": "Allow Fallbacks", "allowFallbacksDescription": "Whether to allow backup providers when the primary is unavailable.", "dataCollection": "Data Collection", "dataCollectionDescription": "Control whether to use providers that may store data.", "only": "Only", "onlyDescription": "List of provider slugs to allow.", "ignore": "Ignore", "ignoreDescription": "List of provider slugs to skip.", "quantizations": "Quantizations", "quantizationsDescription": 'List of quantization levels to filter by (e.g. ["int4", "int8"]).', "sort": "Sort", "sortDescription": "Sort providers by price or throughput.", "requireParameters": "Require Parameters", "requireParametersDescription": "Only use providers that support all parameters in your request.", "setupLater": "You can also configure the providers and models in Model Library later." }, "agent": { "title": "Meet Your AI Agent", "description": "Discover the power of autonomous AI assistance with AiderDesk's Agent mode. Your AI agent can work independently to complete complex tasks.", "capabilities": "Agent Capabilities:", "autonomousPlanning": "Autonomous Task Planning:", "autonomousPlanningDesc": "Breaks down complex requests into manageable steps and executes them systematically.", "toolUse": "Tool Use:", "toolUseDesc": "Leverages various tools for file operations, web searches, and code analysis.", "extensible": "Extensible via MCP:", "extensibleDesc": "Connect to Model Context Protocol servers for enhanced capabilities.", "configureAgent": "Configure Agent", "finishLater": "Finish Setup (Configure Agent Later)", "configureTitle": "Configure Your Agent (Optional)", "configureDescription": "Customize your default agent profile to match your workflow. You can adjust settings like tool permissions, context preferences, and behavior rules." }, "complete": { "title": "Setup Complete!", "description": "Congratulations! You've successfully set up AiderDesk. You're now ready to steer AI-assisted development with full transparency and control.", "ready": "Click 'Finish Setup' to begin your coding journey.", "success": "Onboarding completed successfully! Welcome to AiderDesk.", "mode": "New tasks will start in {{mode}} mode — you can change this anytime in Settings → General.", "modeAgent": "Agent", "modeCode": "Code", "customizeTitle": "Make AiderDesk yours", "customizeDescription": "There's more to explore — a few places worth a look:", "general": { "title": "Settings → General", "description": "Appearance, language, default mode and startup behavior" }, "mcp": { "title": "Settings → MCP", "description": "Connect MCP servers to give the agent more tools" }, "tasks": { "title": "Settings → Tasks", "description": "Task behavior, automation and smart states" } }, "errors": { "navigationFailed": "Navigation failed. Please try again.", "finishFailed": "Failed to complete onboarding. Please try again." } };
@@ -9818,7 +9894,7 @@ const addFileDialog$3 = { "title": "Add context files", "browse": "Browse files"
9818
9894
  const fileFinder$3 = { "addPathTooltip": "Add path", "browseFile": "Browse for files", "browseDirectory": "Browse for directories", "placeholder": { "filesOnly": "Enter file to add", "directoriesOnly": "Enter directory to add", "filesAndDirectories": "Enter file or directory to add" }, "placeholderFinish": { "filesOnly": "Enter file or press Enter to finish", "directoriesOnly": "Enter directory or press Enter to finish", "filesAndDirectories": "Enter file or directory or press Enter to finish" } };
9819
9895
  const fileChip$3 = { "removeFileTooltip": "Remove file" };
9820
9896
  const fileEditor$3 = { "errorLoading": "Failed to load file", "requestChangeOnLine": "Request a change on this line", "saved": "File saved", "errorSaving": "Failed to save file: {{error}}", "errorSubmitting": "Failed to submit change requests: {{error}}", "saveBeforeSubmitting": "Save the file before submitting change requests.", "unsavedChanges": "Unsaved changes", "saveShortcut": "Save (Ctrl+S)", "saveAll": "Save all", "saveAllTooltip": "Save all open files", "savedAll": "Saved {{count}} files", "closeTab": "Close tab {{file}}", "discardTitle": "Discard unsaved changes?", "discard": "Discard", "discardMessage": "Your unsaved file changes will be lost.", "title": "Editor" };
9821
- const contextFiles$3 = { "workspaceTitle": "Workspace", "title": "Context Files", "updatedFiles": "Updated Files", "uncommittedChanges": "Uncommitted Changes", "updated": "Updated", "viewChanges": "View changes", "viewAllFiles": "View all files", "viewSingleFile": "View single file", "allFiles": "All files", "add": "Add context files", "addFileTooltip": "Add file (use Ctrl/Cmd to add as Read-only)", "addFileTooltip.ctrl": "Add file (use Ctrl to add as Read-only)", "addFileTooltip.cmd": "Add file (use Cmd to add as Read-only)", "readOnly": "Read-only file", "showAllFiles": "Show all files", "hideAllFiles": "Hide all files", "expandAll": "Expand all", "collapseAll": "Collapse all", "dropAll": "Drop all context files", "globalRule": "Global rule file", "projectRule": "Project rule file", "agentRule": "Agent rule file", "projectFiles": "Project Files", "rules": "Rule Files", "skills": "Skills", "noSkills": "No skills available", "editSections": "Reorder & hide sections", "done": "Done", "skillActivated": "Active", "skillActivate": "Activate", "skillDeactivate": "Deactivate", "skillActivating": "...", "skillDisable": "Disable skill", "skillEnable": "Enable skill", "globalSkill": "Global skill", "projectSkill": "Project skill", "builtinSkill": "Built-in skill", "extensionSkill": "Extension skill", "manualSkillOnly": "Manual invocation only (disable-model-invocation)", "agentSkillOnly": "Agent-only skill (user-invocable: false)", "disableRuleFile": "Disable rule file", "enableRuleFile": "Enable rule file", "disableAllRuleFiles": "Disable all rule files in folder", "enableAllRuleFiles": "Enable all rule files in folder", "diffViewer": { "file": "File" }, "search": "Search files", "searchPlaceholder": "Search files...", "refresh": "Refresh", "useGit": "Use Git", "useGitEnabled": "Git enabled - Click to use filesystem", "useGitDisabled": "Filesystem enabled - Click to use Git", "revertFile": "Revert changes", "expandContext": "Expand context", "collapseContext": "Collapse context", "addFileToGit": "Add file to Git", "fileHasConflicts": "File has merge conflicts", "confirmRevertTitle": "Revert file changes?", "confirmRevertMessage": "This will discard all changes to this file. This action cannot be undone.", "revert": "Revert", "commitSection": "Commit Changes", "commitMessage": "Commit message", "commitMessagePlaceholder": "Enter commit message...", "commitMessagePlaceholderAmend": "Keep empty to use previous commit message, or enter a new one", "generateMessage": "Generate Message", "amend": "Amend", "amendTooltip": "Amend the last commit instead of creating a new one", "skipGitHooks": "Skip Git hooks", "skipGitHooksTooltip": "Create the commit without running Git hooks (git commit --no-verify)", "commit": "Commit", "generatingMessage": "Generating...", "committing": "Committing...", "cancelCommit": "Cancel commit", "commitSuccess": "Changes committed successfully", "commitError": "Commit Error", "selectedFilesToCommit": "{{count}} of {{total}} files selected to be committed", "groupByCommit": "Switch to group by commit view", "flatView": "Switch to flat view (diff from base)", "uncommitted": "Uncommitted", "group": "Group {{hash}}", "updatedFilesWindowTitle": "Updated Files - {{name}}", "largeDiffMessage": "This file has {{count}} changed lines - loading the full diff may be slow.", "largeDiffLoad": "Load diff", "commentsPanel": "Change Requests", "noComments": "No change requests yet. Click on a line in the diff viewer to add one.", "editComment": "Edit", "removeComment": "Remove", "submitAllRequests": "Request Changes", "submittingRequests": "Submitting...", "collapseComments": "Collapse panel", "expandComments": "Expand panel", "empty": { "title": "No Context Files", "aiderMode": { "description": "Add files here that you want to read or modify. Aider can only access files that are in the context.", "hint": "Tip: Add related files (imports, types) for better understanding." }, "agentMode": { "description": "The agent can access any file in your project using tools. Adding files here is optional but can speed up tasks by providing immediate context.", "hint": "Tip: Add files here when using Aider tools or when you want file contents included in the prompt.", "includeContextFiles": "When 'Include Context Files' is enabled in agent settings, file contents are embedded directly in the prompt for immediate access." } } };
9897
+ const contextFiles$3 = { "renamedFrom": "Renamed from {{path}}", "workspaceTitle": "Workspace", "title": "Context Files", "updatedFiles": "Updated Files", "uncommittedChanges": "Uncommitted Changes", "updated": "Updated", "viewChanges": "View changes", "viewAllFiles": "View all files", "viewSingleFile": "View single file", "allFiles": "All files", "add": "Add context files", "addFileTooltip": "Add file (use Ctrl/Cmd to add as Read-only)", "addFileTooltip.ctrl": "Add file (use Ctrl to add as Read-only)", "addFileTooltip.cmd": "Add file (use Cmd to add as Read-only)", "readOnly": "Read-only file", "showAllFiles": "Show all files", "hideAllFiles": "Hide all files", "expandAll": "Expand all", "collapseAll": "Collapse all", "dropAll": "Drop all context files", "globalRule": "Global rule file", "projectRule": "Project rule file", "agentRule": "Agent rule file", "projectFiles": "Project Files", "rules": "Rule Files", "skills": "Skills", "noSkills": "No skills available", "editSections": "Reorder & hide sections", "done": "Done", "skillActivated": "Active", "skillActivate": "Activate", "skillDeactivate": "Deactivate", "skillActivating": "...", "skillDisable": "Disable skill", "skillEnable": "Enable skill", "globalSkill": "Global skill", "projectSkill": "Project skill", "builtinSkill": "Built-in skill", "extensionSkill": "Extension skill", "manualSkillOnly": "Manual invocation only (disable-model-invocation)", "agentSkillOnly": "Agent-only skill (user-invocable: false)", "disableRuleFile": "Disable rule file", "enableRuleFile": "Enable rule file", "disableAllRuleFiles": "Disable all rule files in folder", "enableAllRuleFiles": "Enable all rule files in folder", "diffViewer": { "file": "File" }, "search": "Search files", "searchPlaceholder": "Search files...", "refresh": "Refresh", "useGit": "Use Git", "useGitEnabled": "Git enabled - Click to use filesystem", "useGitDisabled": "Filesystem enabled - Click to use Git", "revertFile": "Revert changes", "expandContext": "Expand context", "collapseContext": "Collapse context", "addFileToGit": "Add file to Git", "fileHasConflicts": "File has merge conflicts", "confirmRevertTitle": "Revert file changes?", "confirmRevertMessage": "This will discard all changes to this file. This action cannot be undone.", "revert": "Revert", "commitSection": "Commit Changes", "commitMessage": "Commit message", "commitMessagePlaceholder": "Enter commit message...", "commitMessagePlaceholderAmend": "Keep empty to use previous commit message, or enter a new one", "generateMessage": "Generate Message", "amend": "Amend", "amendTooltip": "Amend the last commit instead of creating a new one", "skipGitHooks": "Skip Git hooks", "skipGitHooksTooltip": "Create the commit without running Git hooks (git commit --no-verify)", "commit": "Commit", "generatingMessage": "Generating...", "committing": "Committing...", "cancelCommit": "Cancel commit", "commitSuccess": "Changes committed successfully", "commitError": "Commit Error", "selectedFilesToCommit": "{{count}} of {{total}} files selected to be committed", "groupByCommit": "Switch to group by commit view", "flatView": "Switch to flat view (diff from base)", "uncommitted": "Uncommitted", "group": "Group {{hash}}", "updatedFilesWindowTitle": "Updated Files - {{name}}", "largeDiffMessage": "This file has {{count}} changed lines - loading the full diff may be slow.", "largeDiffLoad": "Load diff", "commentsPanel": "Change Requests", "noComments": "No change requests yet. Click on a line in the diff viewer to add one.", "editComment": "Edit", "removeComment": "Remove", "submitAllRequests": "Request Changes", "submittingRequests": "Submitting...", "collapseComments": "Collapse panel", "expandComments": "Expand panel", "empty": { "title": "No Context Files", "aiderMode": { "description": "Add files here that you want to read or modify. Aider can only access files that are in the context.", "hint": "Tip: Add related files (imports, types) for better understanding." }, "agentMode": { "description": "The agent can access any file in your project using tools. Adding files here is optional but can speed up tasks by providing immediate context.", "hint": "Tip: Add files here when using Aider tools or when you want file contents included in the prompt.", "includeContextFiles": "When 'Include Context Files' is enabled in agent settings, file contents are embedded directly in the prompt for immediate access." } } };
9822
9898
  const modelSelector$3 = { "mainModel": "Main model", "editorModel": "Editor model", "weakModel": "Weak model", "architectModel": "Architect model", "agentModel": "Agent model", "reasoning": "Reasoning", "thinkingTokens": "Thinking tokens", "loadingModel": "Loading model...", "searchPlaceholder": "Search models...", "searchPlaceholderOrCustom": "Search models or enter custom name...", "removePreferred": "Remove from preferred models", "invalidModelSelection": "Invalid format of the model. Expected format is 'provider/model', e.g. 'openai/gpt-4'.", "providerNotConfigured": "Provider '{{provider}}' not configured. Configured providers are: {{providers}}.", "selectModel": "Select model...", "weakModelLock": "Lock weak model", "weakModelUnlock": "Unlock weak model", "noModelSelected": "No model selected" };
9823
9899
  const modelInfo$3 = { "noInfo": "No model information available.", "maxInputTokens": "Max Input Tokens", "maxOutputTokens": "Max Output Tokens", "inputCostPerMillion": "Input Cost / 1M Tokens", "outputCostPerMillion": "Output Cost / 1M Tokens" };
9824
9900
  const mcp$3 = { "initializingServers": "Initializing MCP servers...", "serverToolStatus": "{{enabledCount}} of {{count}} tools enabled", "toolsCount_one": "{{count}} tool", "toolsCount_other": "{{count}} tools", "loadToolsError": "Failed to load MCP server tools", "noToolsFound": "No tools could be found. Check your configuration.", "servers": "MCP servers", "selectServer": "Select an MCP server from the list to view its tools", "reloadServer": "Reload server", "reload": "Reload", "tools": "Tools", "all": "All", "oauth": { "connect": "Connect", "reopen": "Reopen", "connected": "Connected with OAuth", "disconnect": "Disconnect", "authorizing": "Complete authentication in the opened browser window.", "authenticationRequired": "OAuth authentication is required.", "authenticationRequiredMessage": "MCP server '{{serverName}}' requires OAuth authentication. Connect it in Settings → MCP Servers.", "windowTitle": "MCP authentication", "connectError": "Failed to start MCP authentication.", "disconnectError": "Failed to disconnect MCP authentication." } };
@@ -9859,8 +9935,9 @@ const hideModelSelector$3 = "Hide model selector";
9859
9935
  const logs$3 = { "title": "System Logs", "level": "Level", "allExtensions": "All extensions", "searchPlaceholder": "Search logs...", "debugTooltip": "Debug logs are visible only when LOG_LEVEL environment variable is set to 'debug'.", "autoScroll": "Auto-scroll", "showing": "Showing", "clear": "Clear logs", "noLogs": "No logs to display", "metadata": "Metadata", "clearConfirm": { "title": "Clear logs", "message": "Are you sure you want to clear all buffered logs? This action cannot be undone.", "confirm": "Clear", "cancel": "Cancel" } };
9860
9936
  const readonly$3 = { "noTasks": "No tasks", "unnamedTask": "Unnamed task", "archived": "Archived", "loading": "Loading readonly project…", "selectTask": "Select a task to inspect its trace.", "noProjects": "No projects are configured.", "label": "Readonly", "searchTasks": "Search tasks", "allStates": "All states", "bootstrapError": "Unable to load the browser application.", "projectError": "Unable to load this project.", "projects": "Projects", "openTasks": "Open tasks" };
9861
9937
  const providerTls$3 = { "title": "TLS settings", "disableCertificateVerification": "Disable certificate verification", "disableCertificateVerificationInfo": "Skip TLS certificate validation for this provider endpoint. Use only for trusted servers with self-signed certificates (e.g. local model servers).", "caCertPath": "CA certificate path", "caCertPathInfo": "Absolute path to a CA certificate file (PEM) used to verify the provider endpoint. Prefer this over disabling verification when using self-signed or private CA certificates.", "caCertPathPlaceholder": "/path/to/ca.pem" };
9862
- const git$3 = { "askpass": { "passwordTitle": "Git Authentication", "usernameTitle": "Git Username", "confirmationTitle": "Git Confirmation", "rememberSession": "Remember for this session" }, "gitBranchLabel": "Git branch: {{branch}}", "upToDate": "Up to date", "outgoingCommitsTooltip": "Outgoing commits ({{count}}):", "incomingCommitsTooltip": "Incoming commits ({{count}}):", "noCurrentBranch": "No branch", "searchBranches": "Search branches", "noBranchesFound": "No branches found", "localBranches": "Local", "remoteBranches": "Remote", "newBranch": "New Branch", "newBranchNamePlaceholder": "New branch name", "initializeGit": "Initialize Git", "initializeGitTooltip": "This project has no git repository. Initialize one to use branches, worktrees and version tracking.", "initializingGit": "Initializing...", "gitInitialized": "Git repository initialized", "branchCreated": "Branch '{{branch}}' created", "checkedOutBranch": "Checked out '{{branch}}'", "confirmCheckoutTitle": "Checkout branch", "confirmCheckoutMessage": "This branch is checked out in another task's worktree. Confirming will detach it there (switching that worktree to a detached HEAD, keeping its changes) so it can be checked out here. Continue?", "checkout": "Checkout", "mergeIntoCurrent": "Merge into current branch", "rebaseCurrentOnto": "Rebase current branch onto this", "merge": "Merge", "rebase": "Rebase", "confirmMergeTitle": "Merge branch", "confirmMergeMessage": "Merge '{{branch}}' into the current branch?", "mergedIntoCurrent": "Merged '{{branch}}' into current branch", "mergeConflicts": "Merge conflicts in: {{files}}", "confirmRebaseTitle": "Rebase branch", "confirmRebaseMessage": "Rebase the current branch onto '{{branch}}'?", "rebasedOnto": "Rebased onto '{{branch}}'", "rebaseConflicts": "Rebase conflicts in: {{files}}. Abort the rebase to return to the previous state.", "deleteBranch": "Delete branch", "deleteForce": "Delete forcefully", "confirmDeleteTitle": "Delete branch", "confirmDeleteMessage": "Delete branch '{{branch}}'?", "confirmForceDeleteMessage": "Branch '{{branch}}' has unmerged commits. Delete it forcefully and discard those commits?", "branchDeleted": "Branch '{{branch}}' deleted", "updateProject": "Update Project (Pull)", "pullUpToDate": "Project is already up to date — nothing to pull", "pullSuccess": "Project updated successfully", "confirmPullTitle": "Pull changes", "confirmPullMessage": "Your branch has diverged from the remote ({{outgoing}} outgoing, {{incoming}} incoming commits). Choose how to reconcile the branches:", "pullRebaseAutostashHint": "Uncommitted changes will be stashed and automatically restored after the pull.", "push": "Push", "pushSuccess": "Changes have been successfully pushed", "pushRejectedPullFirst": "Push rejected: the remote branch has new commits. Pull changes first and try again.", "resolveWithAI": "Resolve with AI", "confirmPushTitle": "Push commits", "confirmPushMessage_one": "Push {{count}} commit to remote?", "confirmPushMessage_other": "Push {{count}} commits to remote?", "noCommitsToPush": "No commits to push", "confirmPushSetUpstreamMessage": "Branch '{{branch}}' has no upstream. Push it to the remote and set the remote branch as its upstream?", "force": "Force", "aheadCommits_one": "{{count}} commit ahead", "aheadCommits_other": "{{count}} commits ahead", "behindCommits_one": "{{count}} commit behind", "behindCommits_other": "{{count}} commits behind", "recentBranches": "Recent", "checkoutBranch": "Checkout '{{branch}}'", "newBranchFrom": "New branch from '{{branch}}'...", "mergeBranchInto": "Merge '{{branch}}' into '{{current}}'", "rebaseOnto": "Rebase '{{current}}' onto '{{branch}}'", "deleteBranchName": "Delete '{{branch}}'", "rebaseWorktreeOnto": "Rebase worktree onto '{{branch}}'", "actionNotAvailableInWorktree": "This action is not available in worktree mode", "updateFromRemote": "Update from '{{upstream}}'", "branchUpdated": "Branch '{{branch}}' updated from remote" };
9938
+ const git$3 = { "askpass": { "passwordTitle": "Git Authentication", "usernameTitle": "Git Username", "confirmationTitle": "Git Confirmation", "rememberSession": "Remember for this session" }, "gitBranchLabel": "Git branch: {{branch}}", "upToDate": "Up to date", "outgoingCommitsTooltip": "Outgoing commits ({{count}}):", "incomingCommitsTooltip": "Incoming commits ({{count}}):", "noCurrentBranch": "No branch", "searchBranches": "Search branches", "noBranchesFound": "No branches found", "localBranches": "Local", "remoteBranches": "Remote", "newBranch": "New Branch", "newBranchNamePlaceholder": "New branch name", "initializeGit": "Initialize Git", "initializeGitTooltip": "This project has no git repository. Initialize one to use branches, worktrees and version tracking.", "initializingGit": "Initializing...", "gitInitialized": "Git repository initialized", "branchCreated": "Branch '{{branch}}' created", "checkedOutBranch": "Checked out '{{branch}}'", "confirmCheckoutTitle": "Checkout branch", "confirmCheckoutMessage": "This branch is checked out in another task's worktree. Confirming will detach it there (switching that worktree to a detached HEAD, keeping its changes) so it can be checked out here. Continue?", "checkout": "Checkout", "mergeIntoCurrent": "Merge into current branch", "rebaseCurrentOnto": "Rebase current branch onto this", "merge": "Merge", "rebase": "Rebase", "confirmMergeTitle": "Merge branch", "confirmMergeMessage": "Merge '{{branch}}' into the current branch?", "mergedIntoCurrent": "Merged '{{branch}}' into current branch", "mergeConflicts": "Merge conflicts in: {{files}}", "confirmRebaseTitle": "Rebase branch", "confirmRebaseMessage": "Rebase the current branch onto '{{branch}}'?", "rebasedOnto": "Rebased onto '{{branch}}'", "rebaseConflicts": "Rebase conflicts in: {{files}}. Abort the rebase to return to the previous state.", "deleteBranch": "Delete branch", "deleteForce": "Delete forcefully", "confirmDeleteTitle": "Delete branch", "confirmDeleteMessage": "Delete branch '{{branch}}'?", "confirmForceDeleteMessage": "Branch '{{branch}}' has unmerged commits. Delete it forcefully and discard those commits?", "branchDeleted": "Branch '{{branch}}' deleted", "updateProject": "Update Project (Pull)", "pullUpToDate": "Project is already up to date — nothing to pull", "pullSuccess": "Project updated successfully", "confirmPullTitle": "Pull changes", "confirmPullMessage": "Your branch has diverged from the remote ({{outgoing}} outgoing, {{incoming}} incoming commits). Choose how to reconcile the branches:", "pullRebaseAutostashHint": "Uncommitted changes will be stashed and automatically restored after the pull.", "push": "Push", "pushSuccess": "Changes have been successfully pushed", "pushRejectedPullFirst": "Push rejected: the remote branch has new commits. Pull changes first and try again.", "resolveWithAI": "Resolve with AI", "confirmPushTitle": "Push commits", "confirmPushMessage_one": "Push {{count}} commit to remote?", "confirmPushMessage_other": "Push {{count}} commits to remote?", "noCommitsToPush": "No commits to push", "confirmPushSetUpstreamMessage": "Branch '{{branch}}' has no upstream. Push it to the remote and set the remote branch as its upstream?", "force": "Force", "aheadCommits_one": "{{count}} commit ahead", "aheadCommits_other": "{{count}} commits ahead", "behindCommits_one": "{{count}} commit behind", "behindCommits_other": "{{count}} commits behind", "recentBranches": "Recent", "checkoutBranch": "Checkout '{{branch}}'", "newBranchFrom": "New branch from '{{branch}}'...", "createWorktreeFrom": "Create worktree from '{{branch}}'", "mergeBranchInto": "Merge '{{branch}}' into '{{current}}'", "rebaseOnto": "Rebase '{{current}}' onto '{{branch}}'", "deleteBranchName": "Delete '{{branch}}'", "rebaseWorktreeOnto": "Rebase worktree onto '{{branch}}'", "actionNotAvailableInWorktree": "This action is not available in worktree mode", "updateFromRemote": "Update from '{{upstream}}'", "branchUpdated": "Branch '{{branch}}' updated from remote" };
9863
9939
  const en = {
9940
+ projectTrust: projectTrust$3,
9864
9941
  languages: languages$3,
9865
9942
  commandPalette: commandPalette$3,
9866
9943
  uiActions: uiActions$3,
@@ -9953,9 +10030,10 @@ const en = {
9953
10030
  providerTls: providerTls$3,
9954
10031
  git: git$3
9955
10032
  };
10033
+ const projectTrust$2 = { "title": "이 프로젝트를 신뢰하시겠습니까?", "warning": "이 프로젝트에는 에이전트, MCP 서버 또는 확장 기능이 포함되어 있습니다. 사용자 권한으로 악성 코드를 실행하거나, 파일과 인증 정보에 접근하거나, 외부 서비스로 데이터를 전송할 수 있습니다.", "review": "계속하기 전에 아래 파일을 검토하세요. 출처를 신뢰하는 경우에만 이 프로젝트를 신뢰하세요. 취소하면 프로젝트가 열리지 않습니다.", "confirm": "프로젝트 신뢰", "agents": "에이전트", "mcpServers": "MCP 서버", "extensions": "확장 기능", "checking": "프로젝트 설정 확인 중…", "checkFailed": "프로젝트 설정을 확인할 수 없어 프로젝트를 열지 않았습니다. 파일 권한과 설정 파일을 확인한 후 다시 시도하세요." };
9956
10034
  const languages$2 = { "en": "English", "zh": "中文", "ru": "Русский", "ko": "한국어" };
9957
10035
  const commandPalette$2 = { "title": "명령 팔레트", "placeholder": "검색어를 입력하세요...", "noResults": "일치하는 결과가 없습니다", "scrollForMore": "더 많은 결과를 보려면 스크롤하세요", "tabs": { "all": "전체", "file": "파일", "action": "작업", "task": "태스크", "project": "프로젝트" } };
9958
- const uiActions$2 = { "openModelSelector": "모델 선택기 열기", "changeAgentProfile": "에이전트 프로필 변경", "setAutonomyMode": "자율 모드 전환", "openSettingsPage": "설정 페이지 열기", "showLogs": "로그 표시", "showArchivedTasks": "보관된 작업 표시", "hideArchivedTasks": "보관된 작업 숨기기", "createNewTask": "새 작업 만들기", "createNewSubtask": "새 하위 작업 만들기", "createNewSiblingTask": "새 형제 작업 만들기", "renameTask": "작업 이름 바꾸기", "archiveTask": "작업 보관", "unarchiveTask": "작업 보관 해제", "deleteTask": "작업 삭제", "duplicateTask": "작업 복제", "exportTaskImage": "작업을 이미지로 내보내기", "exportTaskMarkdown": "작업을 Markdown으로 내보내기", "copyTaskMarkdown": "작업을 Markdown으로 복사", "copyTaskId": "작업 ID 복사", "copyTaskIdFailed": "작업 ID 복사 실패", "interruptResponse": "응답 중단", "restartConnector": "Aider 커넥터 재시작", "togglePin": "고정 전환", "moveToTop": "맨 위로 이동", "switchToLocal": "로컬 모드로 전환", "switchToWorktree": "워크트리 모드로 전환", "switchWorkingMode": "작업 모드 전환", "gitAction": "Git 작업", "gitBranches": "Git 브랜치 표시" };
10036
+ const uiActions$2 = { "openModelSelector": "모델 선택기 열기", "changeAgentProfile": "에이전트 프로필 변경", "setAutonomyMode": "자율 모드 전환", "openSettingsPage": "설정 페이지 열기", "showLogs": "로그 표시", "showArchivedTasks": "보관된 작업 표시", "hideArchivedTasks": "보관된 작업 숨기기", "createNewTask": "새 작업 만들기", "createNewSubtask": "새 하위 작업 만들기", "createNewSiblingTask": "새 형제 작업 만들기", "renameTask": "작업 이름 바꾸기", "archiveTask": "작업 보관", "unarchiveTask": "작업 보관 해제", "deleteTask": "작업 삭제", "duplicateTask": "작업 복제", "exportTaskImage": "작업을 이미지로 내보내기", "exportTaskMarkdown": "작업을 Markdown으로 내보내기", "copyTaskMarkdown": "작업을 Markdown으로 복사", "copyTaskId": "작업 ID 복사", "copyTaskIdFailed": "작업 ID 복사 실패", "interruptResponse": "응답 중단", "restartConnector": "Aider 커넥터 재시작", "togglePin": "고정 전환", "moveToTop": "맨 위로 이동", "switchToLocal": "로컬 모드로 전환", "switchToWorktree": "워크트리 모드로 전환", "switchWorkingMode": "작업 모드 전환", "switchToAgentMode": "에이전트 모드로 전환", "switchToCodeMode": "코드 모드로 전환", "switchToAskMode": "질문 모드로 전환", "switchToArchitectMode": "아키텍트 모드로 전환", "switchToContextMode": "컨텍스트 모드로 전환", "switchToMode": "{{mode}} 모드로 전환", "gitAction": "Git 작업", "gitBranches": "Git 브랜치 표시" };
9959
10037
  const common$2 = { "settings": "설정", "cancel": "취소", "save": "저장", "delete": "삭제", "edit": "편집", "add": "추가", "remove": "제거", "close": "닫기", "confirm": "확인", "back": "뒤로", "undo": "실행 취소", "next": "다음", "previous": "이전", "of": "/", "finish": "완료", "loading": "불러오는 중...", "startingUp": "시작하는 중...", "loadingProjectSettings": "프로젝트 설정을 불러오는 중...", "loadingProject": "프로젝트를 불러오는 중...", "loadingTask": "작업을 불러오는 중...", "loadingMessages": "메시지를 불러오는 중...", "error": "오류", "success": "성공", "warning": "경고", "info": "정보", "yes": "예", "no": "아니요", "refresh": "새로고침", "retry": "재시도", "open": "열기", "openProject": "프로젝트 열기", "lock": "잠금", "default": "기본값", "suffix.billion": "B", "suffix.million": "M", "suffix.thousand": "K", "suffix.tokens": "토큰", "ok": "확인", "collapse": "접기", "expand": "펼치기", "enabled": "사용", "noFiles": "파일 없음", "loadingFiles": "파일 로드 중...", "closeTasks": "작업 닫기", "toggleTasks": "작업 토글", "submit": "제출", "inputPrompt": "입력 필요", "rememberSession": "이 세션 동안 기억", "enterPassword": "비밀번호 입력...", "showPassword": "비밀번호 표시", "hidePassword": "비밀번호 숨기기", "clone": "복제" };
9960
10038
  const search$2 = { "placeholder": "검색...", "previousResult": "이전 결과 (SHIFT + F3)", "nextResult": "다음 결과 (F3)" };
9961
10039
  const onboarding$2 = { "title": "AiderDesk에 오신 것을 환영합니다", "description": "전문 소프트웨어 엔지니어를 위한 투명하고 제어 가능한 AI 오케스트레이션입니다. 단순한 Aider용 GUI를 넘어, 다음을 도와주는 완전한 오케스트레이션 레이어입니다:", "skipForNow": "나중에 하기", "finish": "설정 완료", "features": { "1": "격리된 환경에서 프로젝트, 작업, Git 워크트리 관리", "2": "풍부한 diff 뷰어와 승인 게이트로 모든 변경 사항을 적용 전에 검토", "3": "도구 승인 게이트, 메시지 편집, 작업 분기로 AI 동작 제어", "4": "시맨틱 검색과 벡터 임베딩으로 스마트 컨텍스트와 메모리 활용", "5": "MCP, 사용자 지정 확장, 다중 모델 서브에이전트로 모든 것을 확장" }, "getStarted": "AI 모델을 연결하여 시작해 보세요.", "steps": { "welcome": "환영", "connectModel": "AI 모델 연결", "language": "언어", "aider": "Aider", "agent": "AI 에이전트", "providers": "공급자", "finish": "완료", "choosePath": "경로 선택", "configure": "구성" }, "choice": { "title": "AiderDesk를 어떻게 사용하실 건가요?", "description": "이 선택에 따라 설정 과정이 맞춤화되고 기본 모드가 지정됩니다. 설정 → 일반에서 언제든 변경할 수 있습니다.", "recommended": "추천", "agent": { "title": "에이전트 우선", "subtitle": "기본값", "description": "전체 도구 접근 권한을 가진 자율 에이전트. 결과만 설명하면 계획하고 실행합니다.", "feature1": "다단계 계획 및 파일 편집", "feature2": "파워 도구, MCP 서버 및 스킬", "feature3": "Aider 모드도 한 번에 전환 가능", "modeLabel": "기본 모드 → 에이전트" }, "aider": { "title": "Aider 사용자", "subtitle": "Aider 모드 중심", "description": "이미 Aider에 익숙하다면 Code, Ask, Architect를 중심으로 사용하세요.", "feature1": "Aider 설정을 바로 구성", "feature2": "편집 형식, 자동 커밋, 환경 변수", "feature3": "필요할 때 에이전트 모드 사용 가능", "modeLabel": "기본 모드 → Code" } }, "language": { "title": "언어 선택", "description": "애플리케이션 인터페이스에서 사용할 언어를 선택하세요." }, "aider": { "title": "Aider 구성", "description": "시작하려면 Aider 설정을 구성해야 합니다. 다음이 필요합니다:", "options": { "1": "사용하려는 LLM 공급자의 API 키 추가", "2": "Aider에 대한 추가 옵션 설정", "3": "Aider와 마찬가지로 .env 및 .aider.conf.yaml 파일도 읽습니다" }, "configureLater": "이 작업은 나중에 설정에서도 할 수 있습니다.", "fineTuneTitle": "Aider 세부 조정 (선택 사항)", "fineTuneDescription": "고급 사용자는 추가 Aider 설정과 환경 변수를 구성할 수 있습니다. 이 단계는 완전히 선택 사항이며 건너뛰어도 안전합니다.", "fineTuneNote": "참고: 이 설정은 Aider의 동작을 사용자 지정하려는 고급 사용자를 위한 것입니다. 대부분의 사용자는 이 단계를 건너뛰고 필요할 때 설정에서 나중에 구성해도 됩니다.", "agentSwitchNote": "팁: 에이전트 모드는 한 번에 전환할 수 있습니다 — 완전한 자율성이 필요할 때 프롬프트 위의 모드 선택기를 사용하세요." }, "providers": { "title": "모델 공급자", "description": "Aider와 에이전트 모드에서 함께 사용할 LLM 공급자를 구성하세요. 다양한 공급자에 대한 API 키와 추가 설정을 지정할 수 있습니다.", "configureLater": "원하는 경우 나중에 설정에서 구성할 수 있습니다.", "connectTitle": "AI 모델 연결", "connectDescription": "AiderDesk는 OpenAI, Anthropic, Google Gemini 등 여러 AI 공급자를 지원합니다. API 키는 로컬 컴퓨터에 안전하게 저장되며 절대 공유되지 않습니다.", "advancedUsersNote": "고급 사용자: 다음 단계의 Aider 구성 섹션에서 환경 변수를 사용하여 공급자를 구성할 수도 있습니다.", "advancedSettings": "고급 설정", "order": "순서", "orderDescription": '순서대로 시도할 공급자 슬러그 목록입니다 (예: ["anthropic", "openai"]).', "allowFallbacks": "대체 공급자 허용", "allowFallbacksDescription": "기본 공급자를 사용할 수 없을 때 백업 공급자를 허용할지 여부입니다.", "dataCollection": "데이터 수집", "dataCollectionDescription": "데이터를 저장할 수 있는 공급자를 사용할지 여부를 제어합니다.", "only": "허용 목록", "onlyDescription": "허용할 공급자 슬러그 목록입니다.", "ignore": "무시 목록", "ignoreDescription": "건너뛸 공급자 슬러그 목록입니다.", "quantizations": "양자화", "quantizationsDescription": '필터링할 양자화 수준 목록입니다 (예: ["int4", "int8"]).', "sort": "정렬", "sortDescription": "가격 또는 처리량 기준으로 공급자를 정렬합니다.", "requireParameters": "매개변수 필수", "requireParametersDescription": "요청의 모든 매개변수를 지원하는 공급자만 사용합니다.", "setupLater": "나중에 모델 라이브러리에서 공급자와 모델을 구성할 수도 있습니다." }, "agent": { "title": "AI 에이전트 소개", "description": "AiderDesk의 에이전트 모드로 자율 AI 지원의 힘을 경험해 보세요. AI 에이전트는 복잡한 작업을 독립적으로 수행할 수 있습니다.", "capabilities": "에이전트 기능:", "autonomousPlanning": "자율 작업 계획:", "autonomousPlanningDesc": "복잡한 요청을 관리 가능한 단계로 나누어 체계적으로 실행합니다.", "toolUse": "도구 사용:", "toolUseDesc": "파일 작업, 웹 검색, 코드 분석을 위해 다양한 도구를 활용합니다.", "extensible": "MCP를 통한 확장:", "extensibleDesc": "MCP(Model Context Protocol) 서버에 연결하여 기능을 확장합니다.", "configureAgent": "에이전트 구성", "finishLater": "설정 완료 (에이전트는 나중에 구성)", "configureTitle": "에이전트 구성 (선택 사항)", "configureDescription": "워크플로에 맞게 기본 에이전트 프로필을 사용자 지정하세요. 도구 권한, 컨텍스트 기본 설정, 동작 규칙과 같은 설정을 조정할 수 있습니다." }, "complete": { "title": "설정 완료!", "description": "축하합니다! AiderDesk 설정을 성공적으로 완료했습니다. 이제 완전한 투명성과 제어로 AI 지원 개발을 이끌어 나갈 준비가 되었습니다.", "ready": "'설정 완료'를 클릭하여 코딩 여정을 시작하세요.", "success": "온보딩이 성공적으로 완료되었습니다! AiderDesk에 오신 것을 환영합니다.", "mode": "새 작업은 {{mode}} 모드로 시작됩니다 — 설정 → 일반에서 언제든 변경할 수 있습니다.", "modeAgent": "에이전트", "modeCode": "Code", "customizeTitle": "AiderDesk를 나에게 맞게", "customizeDescription": "더 살펴볼 만한 곳들이 있습니다:", "general": { "title": "설정 → 일반", "description": "외관, 언어, 기본 모드 및 시작 동작" }, "mcp": { "title": "설정 → MCP", "description": "MCP 서버를 연결해 에이전트에 더 많은 도구 제공" }, "tasks": { "title": "설정 → 작업", "description": "작업 동작, 자동화 및 스마트 상태" } }, "errors": { "navigationFailed": "이동에 실패했습니다. 다시 시도해 주세요.", "finishFailed": "온보딩을 완료하지 못했습니다. 다시 시도해 주세요." } };
@@ -10002,7 +10080,7 @@ const addFileDialog$2 = { "title": "컨텍스트 파일 추가", "browse": "파
10002
10080
  const fileFinder$2 = { "addPathTooltip": "경로 추가", "browseFile": "파일 찾아보기", "browseDirectory": "디렉터리 찾아보기", "placeholder": { "filesOnly": "추가할 파일 입력", "directoriesOnly": "추가할 디렉터리 입력", "filesAndDirectories": "추가할 파일 또는 디렉터리 입력" }, "placeholderFinish": { "filesOnly": "파일을 입력하거나 Enter를 눌러 완료하세요", "directoriesOnly": "디렉터리를 입력하거나 Enter를 눌러 완료하세요", "filesAndDirectories": "파일 또는 디렉터리를 입력하거나 Enter를 눌러 완료하세요" } };
10003
10081
  const fileChip$2 = { "removeFileTooltip": "파일 제거" };
10004
10082
  const fileEditor$2 = { "errorLoading": "파일을 불러오지 못했습니다", "requestChangeOnLine": "이 줄의 변경 요청", "saved": "파일이 저장되었습니다", "errorSaving": "파일을 저장하지 못했습니다: {{error}}", "errorSubmitting": "변경 요청을 제출하지 못했습니다: {{error}}", "saveBeforeSubmitting": "변경 요청을 제출하기 전에 파일을 저장하세요.", "unsavedChanges": "저장되지 않은 변경 사항", "saveShortcut": "저장 (Ctrl+S)", "saveAll": "모두 저장", "saveAllTooltip": "열려 있는 모든 파일 저장", "savedAll": "{{count}}개 파일 저장됨", "closeTab": "탭 닫기 {{file}}", "discardTitle": "저장되지 않은 변경 사항을 취소하시겠습니까?", "discard": "취소", "discardMessage": "저장되지 않은 파일 변경 사항이 손실됩니다.", "title": "에디터" };
10005
- const contextFiles$2 = { "workspaceTitle": "워크스페이스", "title": "컨텍스트 파일", "updatedFiles": "업데이트된 파일", "uncommittedChanges": "커밋되지 않은 변경 사항", "updated": "업데이트됨", "viewChanges": "변경 사항 보기", "viewAllFiles": "모든 파일 보기", "viewSingleFile": "단일 파일 보기", "allFiles": "모든 파일", "add": "컨텍스트 파일 추가", "addFileTooltip": "파일 추가 (Ctrl/Cmd를 사용하면 읽기 전용으로 추가)", "addFileTooltip.ctrl": "파일 추가 (Ctrl을 사용하면 읽기 전용으로 추가)", "addFileTooltip.cmd": "파일 추가 (Cmd를 사용하면 읽기 전용으로 추가)", "readOnly": "읽기 전용 파일", "showAllFiles": "모든 파일 표시", "hideAllFiles": "모든 파일 숨기기", "expandAll": "모두 펼치기", "collapseAll": "모두 접기", "dropAll": "모든 컨텍스트 파일 제거", "globalRule": "전역 규칙 파일", "projectRule": "프로젝트 규칙 파일", "agentRule": "에이전트 규칙 파일", "projectFiles": "프로젝트 파일", "rules": "규칙 파일", "skills": "스킬", "noSkills": "사용 가능한 스킬 없음", "editSections": "섹션 재정렬 및 숨기기", "done": "완료", "skillActivated": "활성", "skillActivate": "활성화", "skillDeactivate": "비활성화", "skillActivating": "...", "skillDisable": "스킬 비활성화", "skillEnable": "스킬 활성화", "globalSkill": "전역 스킬", "projectSkill": "프로젝트 스킬", "builtinSkill": "내장 스킬", "extensionSkill": "확장 스킬", "manualSkillOnly": "수동 호출 전용 (disable-model-invocation)", "agentSkillOnly": "에이전트 전용 (user-invocable: false)", "disableRuleFile": "규칙 파일 비활성화", "enableRuleFile": "규칙 파일 활성화", "disableAllRuleFiles": "폴더의 모든 규칙 파일 비활성화", "enableAllRuleFiles": "폴더의 모든 규칙 파일 활성화", "diffViewer": { "file": "파일" }, "search": "파일 검색", "searchPlaceholder": "파일 검색...", "refresh": "새로고침", "useGit": "Git 사용", "useGitEnabled": "Git 사용 중 - 클릭하면 파일 시스템 사용", "useGitDisabled": "파일 시스템 사용 중 - 클릭하면 Git 사용", "revertFile": "변경 사항 되돌리기", "expandContext": "컨텍스트 펼치기", "collapseContext": "컨텍스트 접기", "addFileToGit": "Git에 파일 추가", "fileHasConflicts": "파일에 병합 충돌이 있습니다", "confirmRevertTitle": "파일 변경 사항을 되돌리시겠습니까?", "confirmRevertMessage": "이 파일의 모든 변경 사항이 취소됩니다. 이 작업은 되돌릴 수 없습니다.", "revert": "되돌리기", "commitSection": "변경 사항 커밋", "commitMessage": "커밋 메시지", "commitMessagePlaceholder": "커밋 메시지를 입력하세요...", "commitMessagePlaceholderAmend": "이전 커밋 메시지를 사용하려면 비워두거나, 새 메시지를 입력하세요", "generateMessage": "메시지 생성", "amend": "수정(Amend)", "amendTooltip": "새 커밋을 만드는 대신 마지막 커밋을 수정합니다", "skipGitHooks": "Git 훅 건너뛰기", "skipGitHooksTooltip": "Git 훅을 실행하지 않고 커밋을 생성합니다 (git commit --no-verify)", "commit": "커밋", "generatingMessage": "생성하는 중...", "committing": "커밋하는 중...", "cancelCommit": "커밋 취소", "commitSuccess": "변경 사항이 커밋되었습니다", "commitError": "커밋 오류", "selectedFilesToCommit": "{{total}}개 파일 중 {{count}}개가 커밋될 파일로 선택되었습니다", "groupByCommit": "커밋별 그룹 보기로 전환", "flatView": "평면 보기로 전환 (기준 브랜치와의 diff)", "uncommitted": "커밋되지 않음", "group": "그룹 {{hash}}", "updatedFilesWindowTitle": "업데이트된 파일 - {{name}}", "commentsPanel": "변경 요청", "noComments": "아직 변경 요청이 없습니다. Diff 뷰어에서 줄을 클릭하여 추가하세요.", "editComment": "편집", "removeComment": "제거", "submitAllRequests": "변경 요청", "submittingRequests": "제출하는 중...", "collapseComments": "패널 접기", "expandComments": "패널 펼치기", "empty": { "title": "컨텍스트 파일 없음", "aiderMode": { "description": "읽거나 수정하려는 파일을 여기에 추가하세요. Aider는 컨텍스트에 있는 파일에만 접근할 수 있습니다.", "hint": "팁: 더 나은 이해를 위해 관련 파일(import, 타입 등)을 추가하세요." }, "agentMode": { "description": "에이전트는 도구를 사용하여 프로젝트의 모든 파일에 접근할 수 있습니다. 여기에 파일을 추가하는 것은 선택 사항이지만, 즉시 컨텍스트를 제공하여 작업 속도를 높일 수 있습니다.", "hint": "팁: Aider 도구를 사용하거나 프롬프트에 파일 내용을 포함하고 싶을 때 여기에 파일을 추가하세요.", "includeContextFiles": "에이전트 설정에서 '컨텍스트 파일 포함'이 활성화되어 있으면 파일 내용이 프롬프트에 직접 포함되어 즉시 사용할 수 있습니다." } } };
10083
+ const contextFiles$2 = { "renamedFrom": "{{path}}에서 이름 변경됨", "workspaceTitle": "워크스페이스", "title": "컨텍스트 파일", "updatedFiles": "업데이트된 파일", "uncommittedChanges": "커밋되지 않은 변경 사항", "updated": "업데이트됨", "viewChanges": "변경 사항 보기", "viewAllFiles": "모든 파일 보기", "viewSingleFile": "단일 파일 보기", "allFiles": "모든 파일", "add": "컨텍스트 파일 추가", "addFileTooltip": "파일 추가 (Ctrl/Cmd를 사용하면 읽기 전용으로 추가)", "addFileTooltip.ctrl": "파일 추가 (Ctrl을 사용하면 읽기 전용으로 추가)", "addFileTooltip.cmd": "파일 추가 (Cmd를 사용하면 읽기 전용으로 추가)", "readOnly": "읽기 전용 파일", "showAllFiles": "모든 파일 표시", "hideAllFiles": "모든 파일 숨기기", "expandAll": "모두 펼치기", "collapseAll": "모두 접기", "dropAll": "모든 컨텍스트 파일 제거", "globalRule": "전역 규칙 파일", "projectRule": "프로젝트 규칙 파일", "agentRule": "에이전트 규칙 파일", "projectFiles": "프로젝트 파일", "rules": "규칙 파일", "skills": "스킬", "noSkills": "사용 가능한 스킬 없음", "editSections": "섹션 재정렬 및 숨기기", "done": "완료", "skillActivated": "활성", "skillActivate": "활성화", "skillDeactivate": "비활성화", "skillActivating": "...", "skillDisable": "스킬 비활성화", "skillEnable": "스킬 활성화", "globalSkill": "전역 스킬", "projectSkill": "프로젝트 스킬", "builtinSkill": "내장 스킬", "extensionSkill": "확장 스킬", "manualSkillOnly": "수동 호출 전용 (disable-model-invocation)", "agentSkillOnly": "에이전트 전용 (user-invocable: false)", "disableRuleFile": "규칙 파일 비활성화", "enableRuleFile": "규칙 파일 활성화", "disableAllRuleFiles": "폴더의 모든 규칙 파일 비활성화", "enableAllRuleFiles": "폴더의 모든 규칙 파일 활성화", "diffViewer": { "file": "파일" }, "search": "파일 검색", "searchPlaceholder": "파일 검색...", "refresh": "새로고침", "useGit": "Git 사용", "useGitEnabled": "Git 사용 중 - 클릭하면 파일 시스템 사용", "useGitDisabled": "파일 시스템 사용 중 - 클릭하면 Git 사용", "revertFile": "변경 사항 되돌리기", "expandContext": "컨텍스트 펼치기", "collapseContext": "컨텍스트 접기", "addFileToGit": "Git에 파일 추가", "fileHasConflicts": "파일에 병합 충돌이 있습니다", "confirmRevertTitle": "파일 변경 사항을 되돌리시겠습니까?", "confirmRevertMessage": "이 파일의 모든 변경 사항이 취소됩니다. 이 작업은 되돌릴 수 없습니다.", "revert": "되돌리기", "commitSection": "변경 사항 커밋", "commitMessage": "커밋 메시지", "commitMessagePlaceholder": "커밋 메시지를 입력하세요...", "commitMessagePlaceholderAmend": "이전 커밋 메시지를 사용하려면 비워두거나, 새 메시지를 입력하세요", "generateMessage": "메시지 생성", "amend": "수정(Amend)", "amendTooltip": "새 커밋을 만드는 대신 마지막 커밋을 수정합니다", "skipGitHooks": "Git 훅 건너뛰기", "skipGitHooksTooltip": "Git 훅을 실행하지 않고 커밋을 생성합니다 (git commit --no-verify)", "commit": "커밋", "generatingMessage": "생성하는 중...", "committing": "커밋하는 중...", "cancelCommit": "커밋 취소", "commitSuccess": "변경 사항이 커밋되었습니다", "commitError": "커밋 오류", "selectedFilesToCommit": "{{total}}개 파일 중 {{count}}개가 커밋될 파일로 선택되었습니다", "groupByCommit": "커밋별 그룹 보기로 전환", "flatView": "평면 보기로 전환 (기준 브랜치와의 diff)", "uncommitted": "커밋되지 않음", "group": "그룹 {{hash}}", "updatedFilesWindowTitle": "업데이트된 파일 - {{name}}", "commentsPanel": "변경 요청", "noComments": "아직 변경 요청이 없습니다. Diff 뷰어에서 줄을 클릭하여 추가하세요.", "editComment": "편집", "removeComment": "제거", "submitAllRequests": "변경 요청", "submittingRequests": "제출하는 중...", "collapseComments": "패널 접기", "expandComments": "패널 펼치기", "empty": { "title": "컨텍스트 파일 없음", "aiderMode": { "description": "읽거나 수정하려는 파일을 여기에 추가하세요. Aider는 컨텍스트에 있는 파일에만 접근할 수 있습니다.", "hint": "팁: 더 나은 이해를 위해 관련 파일(import, 타입 등)을 추가하세요." }, "agentMode": { "description": "에이전트는 도구를 사용하여 프로젝트의 모든 파일에 접근할 수 있습니다. 여기에 파일을 추가하는 것은 선택 사항이지만, 즉시 컨텍스트를 제공하여 작업 속도를 높일 수 있습니다.", "hint": "팁: Aider 도구를 사용하거나 프롬프트에 파일 내용을 포함하고 싶을 때 여기에 파일을 추가하세요.", "includeContextFiles": "에이전트 설정에서 '컨텍스트 파일 포함'이 활성화되어 있으면 파일 내용이 프롬프트에 직접 포함되어 즉시 사용할 수 있습니다." } } };
10006
10084
  const modelSelector$2 = { "mainModel": "메인 모델", "editorModel": "편집기 모델", "weakModel": "약한 모델", "architectModel": "아키텍트 모델", "agentModel": "에이전트 모델", "reasoning": "추론", "thinkingTokens": "사고 토큰", "loadingModel": "모델을 불러오는 중...", "searchPlaceholder": "모델 검색...", "searchPlaceholderOrCustom": "모델 검색 또는 사용자 지정 이름 입력...", "removePreferred": "선호 모델에서 제거", "invalidModelSelection": "모델 형식이 잘못되었습니다. 예상 형식은 'provider/model'입니다 (예: 'openai/gpt-4').", "providerNotConfigured": "공급자 '{{provider}}'가 구성되지 않았습니다. 구성된 공급자: {{providers}}.", "selectModel": "모델 선택...", "weakModelLock": "약한 모델 잠금", "weakModelUnlock": "약한 모델 잠금 해제", "noModelSelected": "선택된 모델 없음" };
10007
10085
  const modelInfo$2 = { "noInfo": "사용 가능한 모델 정보가 없습니다.", "maxInputTokens": "최대 입력 토큰", "maxOutputTokens": "최대 출력 토큰", "inputCostPerMillion": "입력 비용 / 100만 토큰", "outputCostPerMillion": "출력 비용 / 100만 토큰" };
10008
10086
  const mcp$2 = { "initializingServers": "MCP 서버를 초기화하는 중...", "serverToolStatus": "{{count}}개 중 {{enabledCount}}개 도구 사용 중", "toolsCount_one": "도구 {{count}}개", "toolsCount_other": "도구 {{count}}개", "loadToolsError": "MCP 서버 도구를 불러오지 못했습니다", "noToolsFound": "도구를 찾을 수 없습니다. 구성을 확인하세요.", "servers": "MCP 서버", "selectServer": "목록에서 MCP 서버를 선택하여 도구를 확인하세요", "reloadServer": "서버 다시 로드", "reload": "새로고침", "tools": "도구", "oauth": { "connect": "연결", "reopen": "다시 열기", "connected": "OAuth로 연결됨", "disconnect": "연결 끊기", "authorizing": "열린 브라우저 창에서 인증을 완료하세요.", "authenticationRequired": "OAuth 인증이 필요합니다.", "authenticationRequiredMessage": "MCP 서버 '{{serverName}}'에 OAuth 인증이 필요합니다. 설정 → MCP 서버에서 연결하세요.", "windowTitle": "MCP 인증", "connectError": "MCP 인증을 시작하지 못했습니다.", "disconnectError": "MCP 인증 연결을 끊지 못했습니다." } };
@@ -10035,7 +10113,7 @@ const menu$2 = { "file": { "newWindow": "새 창" } };
10035
10113
  const taskSidebar$2 = { "title": "작업", "noTasks": "사용 가능한 작업 없음", "deleteTask": "작업 삭제", "deleteConfirm": "이 작업을 삭제하시겠습니까?", "createTask": "새 작업 만들기", "rename": "이름 바꾸기", "pinTask": "작업 고정", "unpinTask": "작업 고정 해제", "moveToTop": "맨 위로 이동", "taskNamePlaceholder": "작업 이름을 입력하세요...", "untitled": "[제목 없음]", "exportAsMarkdown": "마크다운으로 내보내기", "copyAsMarkdown": "마크다운으로 복사", "copiedAsMarkdown": "마크다운으로 복사됨", "exportAsImage": "이미지로 내보내기", "taskIdCopied": "작업 ID {{taskId}}이(가) 클립보드에 복사되었습니다", "duplicateTask": "작업 복제", "search": "작업 검색", "searchPlaceholder": "작업 검색...", "today": "오늘", "yesterday": "어제", "noDate": "날짜 없음", "archiveTask": "작업 보관", "unarchiveTask": "작업 보관 해제", "filterStates": "상태별 필터링", "showArchived": "보관된 항목 표시", "hideArchived": "보관된 항목 숨기기", "archived": "보관됨", "multiselectMode": "다중 선택 모드", "selectedCount": "{{count}}개 선택됨", "closeMultiselect": "다중 선택 종료", "deleteSelected": "선택 항목 삭제", "archiveSelected": "선택 항목 보관", "unarchiveSelected": "선택 항목 보관 해제", "deleteSelectedConfirm": "선택한 {{count}}개의 작업을 삭제하시겠습니까?", "archiveSelectedConfirm": "선택한 {{count}}개의 작업을 보관하시겠습니까?", "unarchiveSelectedConfirm": "선택한 {{count}}개의 작업을 보관 해제하시겠습니까?", "generatingName": "이름 생성 중...", "changeState": "상태 변경", "createSubtask": "하위 작업 만들기", "deleteConfirmWithSubtasks": "이 작업에는 {{count}}개의 하위 작업이 있습니다. 그래도 삭제하시겠습니까?", "dropToRoot": "여기에 놓으면 최상위 수준으로 이동합니다", "dropToSubtask": "하위 작업으로 만들기" };
10036
10114
  const taskInfo$2 = { "createdAt": "생성일", "updatedAt": "수정일", "worktreeDirectory": "워크트리 디렉터리", "baseBranch": "기준 브랜치", "baseCommit": "기준 커밋", "currentBranch": "브랜치", "targetBranch": "대상 브랜치", "lastMergeState": "마지막 병합 상태", "beforeMergeCommit": "병합 전 커밋", "mergeTimestamp": "병합 시각", "openFolder": "폴더 열기", "taskId": "작업 ID", "state": "상태", "messageCount": "메시지 수" };
10037
10115
  const taskState$2 = { "DELEGATED": "위임됨", "DONE": "완료됨", "IN_PROGRESS": "진행 중", "INTERRUPTED": "중단됨", "MORE_INFO_NEEDED": "추가 정보 필요", "READY_FOR_REVIEW": "검토 준비 완료", "READY_FOR_IMPLEMENTATION": "구현 준비 완료", "TODO": "할 일" };
10038
- const git$2 = { "askpass": { "passwordTitle": "Git 인증", "usernameTitle": "Git 사용자 이름", "confirmationTitle": "Git 확인", "rememberSession": "이 세션 동안 기억" }, "pullUpToDate": "프로젝트가 이미 최신 상태입니다 — 가져올 변경 사항이 없습니다", "pullSuccess": "프로젝트가 성공적으로 업데이트되었습니다", "confirmPullTitle": "변경 사항 가져오기", "confirmPullMessage": "브랜치가 원격 브랜치와 갈라졌습니다 (보내는 커밋 {{outgoing}}개, 받는 커밋 {{incoming}}개). 브랜치를 조정할 방식을 선택하세요:", "pullRebaseAutostashHint": "커밋하지 않은 변경 사항은 임시 저장 후 가져오기가 완료되면 자동으로 복원됩니다.", "pushSuccess": "변경 사항이 성공적으로 푸시되었습니다", "pushRejectedPullFirst": "푸시가 거부되었습니다: 원격 브랜치에 새 커밋이 있습니다. 먼저 변경 사항을 가져온 후 다시 시도하세요.", "resolveWithAI": "AI로 해결", "outgoingCommitsTooltip": "보낼 커밋 ({{count}}개):", "incomingCommitsTooltip": "가져올 커밋 ({{count}}개):", "gitBranchLabel": "Git 브랜치: {{branch}}", "upToDate": "최신 상태", "noCurrentBranch": "브랜치 없음", "searchBranches": "브랜치 검색", "noBranchesFound": "브랜치를 찾을 수 없습니다", "localBranches": "로컬", "remoteBranches": "원격", "newBranch": "새 브랜치", "newBranchNamePlaceholder": "새 브랜치 이름", "initializeGit": "Git 초기화", "initializeGitTooltip": "이 프로젝트에는 Git 저장소가 없습니다. 초기화하면 브랜치, 워크트리, 버전 관리를 사용할 수 있습니다.", "initializingGit": "초기화 중...", "gitInitialized": "Git 저장소가 초기화되었습니다.", "branchCreated": "'{{branch}}' 브랜치가 생성되었습니다", "checkedOutBranch": "'{{branch}}' 브랜치로 전환했습니다", "confirmCheckoutTitle": "브랜치 체크아웃", "confirmCheckoutMessage": "이 브랜치는 다른 작업의 워크트리에서 체크아웃되어 있습니다. 확인하면 그곳에서 브랜치가 분리되고(해당 워크트리가 detached HEAD로 전환되며 변경 사항은 유지됨) 여기서 체크아웃할 수 있게 됩니다. 계속하시겠습니까?", "checkout": "체크아웃", "mergeIntoCurrent": "현재 브랜치에 병합", "rebaseCurrentOnto": "현재 브랜치를 이 브랜치 위로 리베이스", "merge": "병합", "rebase": "리베이스", "confirmMergeTitle": "브랜치 병합", "confirmMergeMessage": "'{{branch}}' 브랜치를 현재 브랜치에 병합하시겠습니까?", "mergedIntoCurrent": "'{{branch}}' 브랜치를 현재 브랜치에 병합했습니다", "mergeConflicts": "다음 파일에서 병합 충돌 발생: {{files}}", "confirmRebaseTitle": "브랜치 리베이스", "confirmRebaseMessage": "현재 브랜치를 '{{branch}}' 위로 리베이스하시겠습니까?", "rebasedOnto": "'{{branch}}' 위로 리베이스했습니다", "rebaseConflicts": "다음 파일에서 리베이스 충돌 발생: {{files}}. 이전 상태로 돌아가려면 리베이스를 중단하세요.", "deleteBranch": "브랜치 삭제", "deleteForce": "강제 삭제", "confirmDeleteTitle": "브랜치 삭제", "confirmDeleteMessage": "'{{branch}}' 브랜치를 삭제하시겠습니까?", "confirmForceDeleteMessage": "'{{branch}}' 브랜치에 병합되지 않은 커밋이 있습니다. 강제로 삭제하고 해당 커밋을 버리시겠습니까?", "branchDeleted": "'{{branch}}' 브랜치가 삭제되었습니다", "updateProject": "프로젝트 업데이트 (가져오기)", "push": "푸시", "confirmPushTitle": "커밋 푸시", "confirmPushMessage_one": "커밋 {{count}}개를 원격에 푸시하시겠습니까?", "confirmPushMessage_other": "커밋 {{count}}개를 원격에 푸시하시겠습니까?", "noCommitsToPush": "푸시할 커밋이 없습니다", "confirmPushSetUpstreamMessage": "'{{branch}}' 브랜치에 업스트림이 없습니다. 원격에 푸시하고 원격 브랜치를 업스트림으로 설정하시겠습니까?", "force": "강제", "aheadCommits_one": "{{count}}개 커밋 앞섬", "aheadCommits_other": "{{count}}개 커밋 앞섬", "behindCommits_one": "{{count}}개 커밋 뒤처짐", "behindCommits_other": "{{count}}개 커밋 뒤처짐", "recentBranches": "최근", "checkoutBranch": "'{{branch}}' 체크아웃", "newBranchFrom": "'{{branch}}'에서 새 브랜치...", "mergeBranchInto": "'{{branch}}' 브랜치를 '{{current}}'에 병합", "rebaseOnto": "'{{current}}' 브랜치를 '{{branch}}' 위로 리베이스", "deleteBranchName": "'{{branch}}' 삭제", "rebaseWorktreeOnto": "워크트리를 '{{branch}}' 위로 리베이스", "actionNotAvailableInWorktree": "이 작업은 워크트리 모드에서 사용할 수 없습니다", "updateFromRemote": "'{{upstream}}'에서 업데이트", "branchUpdated": "'{{branch}}' 브랜치가 원격에서 업데이트되었습니다" };
10116
+ const git$2 = { "askpass": { "passwordTitle": "Git 인증", "usernameTitle": "Git 사용자 이름", "confirmationTitle": "Git 확인", "rememberSession": "이 세션 동안 기억" }, "pullUpToDate": "프로젝트가 이미 최신 상태입니다 — 가져올 변경 사항이 없습니다", "pullSuccess": "프로젝트가 성공적으로 업데이트되었습니다", "confirmPullTitle": "변경 사항 가져오기", "confirmPullMessage": "브랜치가 원격 브랜치와 갈라졌습니다 (보내는 커밋 {{outgoing}}개, 받는 커밋 {{incoming}}개). 브랜치를 조정할 방식을 선택하세요:", "pullRebaseAutostashHint": "커밋하지 않은 변경 사항은 임시 저장 후 가져오기가 완료되면 자동으로 복원됩니다.", "pushSuccess": "변경 사항이 성공적으로 푸시되었습니다", "pushRejectedPullFirst": "푸시가 거부되었습니다: 원격 브랜치에 새 커밋이 있습니다. 먼저 변경 사항을 가져온 후 다시 시도하세요.", "resolveWithAI": "AI로 해결", "outgoingCommitsTooltip": "보낼 커밋 ({{count}}개):", "incomingCommitsTooltip": "가져올 커밋 ({{count}}개):", "gitBranchLabel": "Git 브랜치: {{branch}}", "upToDate": "최신 상태", "noCurrentBranch": "브랜치 없음", "searchBranches": "브랜치 검색", "noBranchesFound": "브랜치를 찾을 수 없습니다", "localBranches": "로컬", "remoteBranches": "원격", "newBranch": "새 브랜치", "newBranchNamePlaceholder": "새 브랜치 이름", "initializeGit": "Git 초기화", "initializeGitTooltip": "이 프로젝트에는 Git 저장소가 없습니다. 초기화하면 브랜치, 워크트리, 버전 관리를 사용할 수 있습니다.", "initializingGit": "초기화 중...", "gitInitialized": "Git 저장소가 초기화되었습니다.", "branchCreated": "'{{branch}}' 브랜치가 생성되었습니다", "checkedOutBranch": "'{{branch}}' 브랜치로 전환했습니다", "confirmCheckoutTitle": "브랜치 체크아웃", "confirmCheckoutMessage": "이 브랜치는 다른 작업의 워크트리에서 체크아웃되어 있습니다. 확인하면 그곳에서 브랜치가 분리되고(해당 워크트리가 detached HEAD로 전환되며 변경 사항은 유지됨) 여기서 체크아웃할 수 있게 됩니다. 계속하시겠습니까?", "checkout": "체크아웃", "mergeIntoCurrent": "현재 브랜치에 병합", "rebaseCurrentOnto": "현재 브랜치를 이 브랜치 위로 리베이스", "merge": "병합", "rebase": "리베이스", "confirmMergeTitle": "브랜치 병합", "confirmMergeMessage": "'{{branch}}' 브랜치를 현재 브랜치에 병합하시겠습니까?", "mergedIntoCurrent": "'{{branch}}' 브랜치를 현재 브랜치에 병합했습니다", "mergeConflicts": "다음 파일에서 병합 충돌 발생: {{files}}", "confirmRebaseTitle": "브랜치 리베이스", "confirmRebaseMessage": "현재 브랜치를 '{{branch}}' 위로 리베이스하시겠습니까?", "rebasedOnto": "'{{branch}}' 위로 리베이스했습니다", "rebaseConflicts": "다음 파일에서 리베이스 충돌 발생: {{files}}. 이전 상태로 돌아가려면 리베이스를 중단하세요.", "deleteBranch": "브랜치 삭제", "deleteForce": "강제 삭제", "confirmDeleteTitle": "브랜치 삭제", "confirmDeleteMessage": "'{{branch}}' 브랜치를 삭제하시겠습니까?", "confirmForceDeleteMessage": "'{{branch}}' 브랜치에 병합되지 않은 커밋이 있습니다. 강제로 삭제하고 해당 커밋을 버리시겠습니까?", "branchDeleted": "'{{branch}}' 브랜치가 삭제되었습니다", "updateProject": "프로젝트 업데이트 (가져오기)", "push": "푸시", "confirmPushTitle": "커밋 푸시", "confirmPushMessage_one": "커밋 {{count}}개를 원격에 푸시하시겠습니까?", "confirmPushMessage_other": "커밋 {{count}}개를 원격에 푸시하시겠습니까?", "noCommitsToPush": "푸시할 커밋이 없습니다", "confirmPushSetUpstreamMessage": "'{{branch}}' 브랜치에 업스트림이 없습니다. 원격에 푸시하고 원격 브랜치를 업스트림으로 설정하시겠습니까?", "force": "강제", "aheadCommits_one": "{{count}}개 커밋 앞섬", "aheadCommits_other": "{{count}}개 커밋 앞섬", "behindCommits_one": "{{count}}개 커밋 뒤처짐", "behindCommits_other": "{{count}}개 커밋 뒤처짐", "recentBranches": "최근", "checkoutBranch": "'{{branch}}' 체크아웃", "newBranchFrom": "'{{branch}}'에서 새 브랜치...", "createWorktreeFrom": "'{{branch}}'에서 워크트리 생성", "mergeBranchInto": "'{{branch}}' 브랜치를 '{{current}}'에 병합", "rebaseOnto": "'{{current}}' 브랜치를 '{{branch}}' 위로 리베이스", "deleteBranchName": "'{{branch}}' 삭제", "rebaseWorktreeOnto": "워크트리를 '{{branch}}' 위로 리베이스", "actionNotAvailableInWorktree": "이 작업은 워크트리 모드에서 사용할 수 없습니다", "updateFromRemote": "'{{upstream}}'에서 업데이트", "branchUpdated": "'{{branch}}' 브랜치가 원격에서 업데이트되었습니다" };
10039
10117
  const worktree$2 = { "uncommittedFiles": "파일 {{count}}개", "conflicts": "충돌", "conflictsPredicted": "충돌 예상됨", "conflictsPresent": "충돌 있음", "merge": "병합", "squash": "스쿼시 후 병합", "onlyUncommitted": "커밋되지 않은 것만", "rebaseFromBranch": "브랜치에서 리베이스...", "rebase": "리베이스", "abortRebase": "리베이스 중단", "continueRebase": "리베이스 계속", "rebaseConflictsDescription": "다음 파일에서 리베이스 충돌이 감지되었습니다. 직접 해결하고 계속하거나 AI 에이전트의 도움을 받으세요.", "rebasePausedDueToConflicts": "충돌로 인해 리베이스가 일시 중지되었습니다. 충돌을 해결하고 리베이스를 계속하거나 중단하여 워크트리를 복원하세요.", "rebaseConflictsResolvedDescription": "충돌이 해결되어 스테이징되었습니다. 이제 리베이스를 계속할 수 있습니다.", "switchToLocalRebaseInProgress": "리베이스가 진행 중일 때는 로컬 모드로 전환할 수 없습니다. 먼저 리베이스를 계속하거나 중단하세요.", "switchToLocalUncommittedChanges": "워크트리에 커밋되지 않은 변경 사항이 있습니다. 로컬 모드로 전환하기 전에 병합하거나 명시적으로 폐기하세요.", "confirmRebaseTitle": "워크트리 리베이스", "confirmRebaseMessage": "워크트리가 선택한 브랜치를 기준으로 리베이스됩니다. 충돌이 있으면 직접 해결해야 합니다.", "confirmAbortRebaseTitle": "리베이스 중단", "confirmAbortRebaseMessage": "진행 중인 리베이스를 중단하고 워크트리를 리베이스 이전 상태로 복원합니다.", "confirmContinueRebaseTitle": "리베이스 계속", "confirmContinueRebaseMessage": "리베이스를 계속 진행합니다. 모든 충돌이 해결되고 스테이징되었는지 확인하세요.", "resolveConflictsWithAgent": "에이전트로 충돌 해결", "confirmResolveConflictsWithAgentTitle": "에이전트로 충돌 해결", "confirmResolveConflictsWithAgentMessage": "충돌이 있는 모든 파일을 자동으로 해결하고 스테이징합니다. 리베이스를 계속하기 전에 결과를 신중히 검토하세요.", "commitMessage": "커밋 메시지", "commitMessagePlaceholder": "커밋 메시지를 입력하세요...", "selectBranch": "브랜치 선택", "selectTargetBranchTitle": "대상 브랜치 선택", "selectSourceBranchTitle": "소스 브랜치 선택", "branchCurrent": "현재 브랜치", "mergeTooltip": "워크트리 변경 사항을 브랜치로 병합", "revertTooltip": "마지막으로 병합된 변경 사항 되돌리기", "confirmMerge": "워크트리 변경 사항을 메인 브랜치로 {{action}}하시겠습니까? 커밋되지 않은 변경 사항도 포함됩니다.", "confirmRevert": "마지막 병합을 되돌리시겠습니까? 메인 브랜치가 이전 상태로 재설정됩니다.", "confirmMergeTitle": "병합 확인", "confirmSquashTitle": "스쿼시 확인", "confirmOnlyUncommittedTitle": "커밋되지 않은 변경 사항 적용", "confirmMergeMessage": "워크트리 변경 사항을 선택한 브랜치로 병합하시겠습니까?", "confirmSquashMessage": "워크트리 변경 사항을 선택한 브랜치로 스쿼시 후 병합하시겠습니까?", "confirmOnlyUncommittedMessage": "워크트리의 커밋되지 않은 변경 사항을 프로젝트 디렉토리에 현재 체크아웃된 브랜치 {{branch}}에 적용하시겠습니까? git 병합은 수행되지 않으며 프로젝트 디렉토리는 현재 브랜치에 유지됩니다.", "mergeConflicts": "워크트리와 대상 브랜치 간의 충돌로 인해 병합에 실패했습니다. 먼저 워크트리를 리베이스하여 충돌을 해결하세요.", "applyUncommittedConflicts": "대상 브랜치와의 충돌로 인해 커밋되지 않은 변경 사항을 적용하지 못했습니다. 먼저 워크트리를 리베이스하여 변경 사항을 맞추세요.", "switchToLocalApplyUncommittedConflicts": "충돌로 인해 워크트리의 커밋되지 않은 변경 사항을 프로젝트 디렉토리에 적용하지 못했습니다. 로컬 모드 전환이 중단되었습니다 - 워크트리와 그 변경 사항은 그대로 유지됩니다.", "dontAskAgain": "다시 묻지 않기", "confirmRevertTitle": "되돌리기 확인", "confirmRevertMessage": "마지막 병합을 되돌리시겠습니까? 워크트리에서 메인 브랜치로 병합되었던 변경 사항이 취소됩니다.", "revert": "되돌리기", "noChanges": "변경 사항 없음", "renameBranch": "브랜치 이름 바꾸기", "branchNamePlaceholder": "브랜치 이름을 입력하세요...", "basedOn": "기준", "rebaseFromCurrentBranch": "'{{branch}}'에서 리베이스", "mergeIntoBranch": "브랜치로 병합...", "squashIntoBranch": "브랜치로 스쿼시 후 병합...", "applyUncommittedChanges": "커밋되지 않은 변경 사항 적용", "mergeIntoBranchTooltip": "이 워크트리의 모든 커밋과 커밋되지 않은 변경 사항을 대상 브랜치로 병합합니다(병합 커밋 생성).", "squashIntoBranchTooltip": "모든 워크트리 커밋과 커밋되지 않은 변경 사항을 대상 브랜치의 단일 새 커밋으로 압축하여 결합합니다.", "applyUncommittedChangesTooltip": "커밋을 병합하지 않고 이 워크트리의 커밋되지 않은 변경 사항만 프로젝트 디렉토리에 현재 체크아웃된 브랜치에 적용합니다.", "rebaseFromCurrentBranchTooltip": "'{{branch}}' 브랜치 위로 워크트리 커밋을 다시 적용하고 베이스 참조를 업데이트합니다.", "aheadCommitsTooltip": "'{{branch}}'보다 앞선 커밋 ({{count}}개):", "behindCommitsTooltip": "'{{branch}}'보다 뒤처진 커밋 ({{count}}개):", "behindCommitsSyncHint": "동기화하려면 '{{branch}}'에서 리베이스를 사용하세요" };
10040
10118
  const welcomeMessage$2 = { "title": "AiderDesk", "subtitle": "AI 기반 코딩 어시스턴트", "features": { "title": "할 수 있는 것들", "aiCoding": "AI 지원으로 코드 생성 및 수정", "contextManagement": "더 나은 결과를 위해 컨텍스트에 파일 추가", "multiModel": "다양한 AI 모델과 공급자 중에서 선택", "commands": "명령 실행 및 테스트 실행" }, "tips": { "title": "시작하기", "addFiles": "사이드바 또는 /add 명령을 사용하여 컨텍스트에 파일 추가", "askQuestion": "아래 프롬프트 입력창에 요청을 입력하세요", "useCommands": "빠른 작업을 위해 / 명령을 사용하세요", "switchMode": "아래 모드 선택기를 사용하여 모드 전환" }, "modes": { "title": "올바른 모드 선택하기", "agent": { "title": "에이전트 모드", "description": "자율적인 작업, 복잡한 워크플로, 다단계 작업에 사용하세요. 에이전트가 사용 가능한 도구를 사용하여 독립적으로 작업을 계획하고 실행합니다." }, "code": { "title": "코드 모드", "description": "직접적인 코드 변경과 특정 작업에 사용하세요. 중요: AI가 올바른 파일에서 작업하도록 컨텍스트에 파일을 추가하세요." } }, "selectMode": "선택" };
10041
10119
  const aiderConnector$2 = { "starting": "Aider 커넥터를 시작하는 중...", "restart": "Aider 커넥터 재시작" };
@@ -10045,6 +10123,7 @@ const logs$2 = { "title": "시스템 로그", "level": "레벨", "allExtensions"
10045
10123
  const readonly$2 = { "noTasks": "작업 없음", "unnamedTask": "이름 없는 작업", "archived": "보관됨", "loading": "읽기 전용 프로젝트 로드 중…", "selectTask": "추적을 확인할 작업을 선택하세요.", "noProjects": "구성된 프로젝트가 없습니다.", "label": "읽기 전용", "searchTasks": "작업 검색", "allStates": "모든 상태", "bootstrapError": "브라우저 애플리케이션을 불러올 수 없습니다.", "projectError": "이 프로젝트를 불러올 수 없습니다.", "projects": "프로젝트", "openTasks": "작업 열기" };
10046
10124
  const providerTls$2 = { "title": "TLS 설정", "disableCertificateVerification": "인증서 검증 비활성화", "disableCertificateVerificationInfo": "이 공급자 엔드포인트에 대한 TLS 인증서 검증을 건너뜁니다. 자체 서명 인증서를 사용하는 신뢰할 수 있는 서버(예: 로컬 모델 서버)에만 사용하세요.", "caCertPath": "CA 인증서 경로", "caCertPathInfo": "공급자 엔드포인트를 검증하는 데 사용되는 CA 인증서 파일(PEM)의 절대 경로입니다. 자체 서명 또는 사설 CA 인증서를 사용할 때는 검증 비활성화보다 이 방법을 권장합니다.", "caCertPathPlaceholder": "/path/to/ca.pem" };
10047
10125
  const ko = {
10126
+ projectTrust: projectTrust$2,
10048
10127
  languages: languages$2,
10049
10128
  commandPalette: commandPalette$2,
10050
10129
  uiActions: uiActions$2,
@@ -10137,9 +10216,10 @@ const ko = {
10137
10216
  readonly: readonly$2,
10138
10217
  providerTls: providerTls$2
10139
10218
  };
10219
+ const projectTrust$1 = { "title": "Доверять этому проекту?", "warning": "Этот проект содержит агентов, MCP-серверы или расширения. Они могут выполнять вредоносный код с вашими правами, получать доступ к файлам и учётным данным или отправлять данные внешним сервисам.", "review": "Перед продолжением проверьте перечисленные файлы. Доверяйте проекту только в том случае, если доверяете его источнику. При отмене проект не будет открыт.", "confirm": "Доверять проекту", "agents": "Агенты", "mcpServers": "MCP-серверы", "extensions": "Расширения", "checking": "Проверка конфигурации проекта…", "checkFailed": "Не удалось проверить конфигурацию проекта. Проект не открыт. Проверьте права доступа и файлы конфигурации и повторите попытку." };
10140
10220
  const languages$1 = { "en": "English", "zh": "中文", "ru": "Русский", "ko": "한국어" };
10141
10221
  const commandPalette$1 = { "title": "Палитра команд", "placeholder": "Введите запрос...", "noResults": "Подходящих результатов не найдено", "scrollForMore": "Прокрутите, чтобы увидеть больше результатов", "tabs": { "all": "Все", "file": "Файлы", "action": "Действия", "task": "Задачи", "project": "Проекты" } };
10142
- const uiActions$1 = { "openModelSelector": "Открыть выбор модели", "changeAgentProfile": "Сменить профиль агента", "setAutonomyMode": "Переключить режим автономности", "openSettingsPage": "Открыть страницу настроек", "showLogs": "Показать логи", "showArchivedTasks": "Показать архивированные задачи", "hideArchivedTasks": "Скрыть архивированные задачи", "createNewTask": "Создать новую задачу", "createNewSubtask": "Создать новую подзадачу", "createNewSiblingTask": "Создать соседнюю задачу", "renameTask": "Переименовать задачу", "archiveTask": "Архивировать задачу", "unarchiveTask": "Разархивировать задачу", "deleteTask": "Удалить задачу", "duplicateTask": "Дублировать задачу", "exportTaskImage": "Экспортировать задачу как изображение", "exportTaskMarkdown": "Экспортировать задачу как Markdown", "copyTaskMarkdown": "Копировать задачу как Markdown", "copyTaskId": "Копировать ID задачи", "copyTaskIdFailed": "Не удалось скопировать ID задачи", "interruptResponse": "Прервать ответ", "restartConnector": "Перезапустить коннектор Aider", "togglePin": "Переключить закрепление", "moveToTop": "Переместить наверх", "switchToLocal": "Переключить на локальный режим", "switchToWorktree": "Переключить на режим worktree", "switchWorkingMode": "Переключить рабочий режим", "gitAction": "Действие Git", "gitBranches": "Показать ветки Git" };
10222
+ const uiActions$1 = { "openModelSelector": "Открыть выбор модели", "changeAgentProfile": "Сменить профиль агента", "setAutonomyMode": "Переключить режим автономности", "openSettingsPage": "Открыть страницу настроек", "showLogs": "Показать логи", "showArchivedTasks": "Показать архивированные задачи", "hideArchivedTasks": "Скрыть архивированные задачи", "createNewTask": "Создать новую задачу", "createNewSubtask": "Создать новую подзадачу", "createNewSiblingTask": "Создать соседнюю задачу", "renameTask": "Переименовать задачу", "archiveTask": "Архивировать задачу", "unarchiveTask": "Разархивировать задачу", "deleteTask": "Удалить задачу", "duplicateTask": "Дублировать задачу", "exportTaskImage": "Экспортировать задачу как изображение", "exportTaskMarkdown": "Экспортировать задачу как Markdown", "copyTaskMarkdown": "Копировать задачу как Markdown", "copyTaskId": "Копировать ID задачи", "copyTaskIdFailed": "Не удалось скопировать ID задачи", "interruptResponse": "Прервать ответ", "restartConnector": "Перезапустить коннектор Aider", "togglePin": "Переключить закрепление", "moveToTop": "Переместить наверх", "switchToLocal": "Переключить на локальный режим", "switchToWorktree": "Переключить на режим worktree", "switchWorkingMode": "Переключить рабочий режим", "switchToAgentMode": "Переключить на режим Агент", "switchToCodeMode": "Переключить на режим Код", "switchToAskMode": "Переключить на режим Вопрос", "switchToArchitectMode": "Переключить на режим Архитектор", "switchToContextMode": "Переключить на режим Контекст", "switchToMode": "Переключить на режим {{mode}}", "gitAction": "Действие Git", "gitBranches": "Показать ветки Git" };
10143
10223
  const common$1 = { "settings": "Настройки", "cancel": "Отмена", "save": "Сохранить", "delete": "Удалить", "edit": "Редактировать", "add": "Добавить", "remove": "Удалить", "close": "Закрыть", "confirm": "Подтвердить", "back": "Назад", "undo": "Отменить", "next": "Далее", "previous": "Назад", "of": "из", "finish": "Завершить", "loading": "Загрузка...", "startingUp": "Запуск...", "loadingProjectSettings": "Загрузка настроек проекта...", "loadingProject": "Загрузка проекта...", "loadingTask": "Загрузка задачи...", "loadingMessages": "Загрузка сообщений...", "error": "Ошибка", "success": "Успешно", "warning": "Предупреждение", "info": "Информация", "yes": "Да", "no": "Нет", "refresh": "Обновить", "retry": "Повторить", "open": "Открыть", "openProject": "Открыть проект", "clone": "Клонировать", "lock": "Заблокировать", "default": "По умолчанию", "suffix.billion": "Млрд", "suffix.million": "Млн", "suffix.thousand": "К", "suffix.tokens": "токенов", "ok": "ОК", "collapse": "Свернуть", "expand": "Развернуть", "enabled": "Включено", "noFiles": "Нет файлов", "loadingFiles": "Загрузка файлов...", "closeTasks": "Закрыть задачи", "toggleTasks": "Переключить задачи", "submit": "Отправить", "inputPrompt": "Требуется ввод", "rememberSession": "Запомнить на время этой сессии", "enterPassword": "Введите пароль...", "showPassword": "Показать пароль", "hidePassword": "Скрыть пароль" };
10144
10224
  const search$1 = { "placeholder": "Поиск...", "previousResult": "Предыдущий результат (SHIFT + F3)", "nextResult": "Следующий результат (F3)" };
10145
10225
  const onboarding$1 = { "title": "Добро пожаловать в AiderDesk", "description": "AiderDesk — это ваш настольный помощник для AI-ассистирования при программировании. Это приложение привносит мощь AI-ассистента Aider в удобный интерфейс, помогая вам:", "skipForNow": "Пропустить на время", "finish": "Завершить настройку", "features": { "1": "Управление несколькими проектами", "2": "Отслеживание использования AI и затрат", "3": "Взаимодействие с AI-моделями структурированным способом", "4": "Визуализация и управление файлами кода", "5": "Использование агентных потоков для автоматизации задач и подключение к MCP-серверам" }, "getStarted": "Давайте начнём с настройки Aider.", "steps": { "welcome": "Добро пожаловать", "connectModel": "Подключение AI-модели", "language": "Язык", "aider": "Aider", "agent": "AI-агент", "providers": "Провайдеры", "finish": "Завершить", "choosePath": "Выбор режима", "configure": "Настройка" }, "choice": { "title": "Как вы будете использовать AiderDesk?", "description": "Это настроит процесс установки и определит режим по умолчанию. Изменить можно в любой момент в «Настройки → Общие».", "recommended": "Рекомендуется", "agent": { "title": "Агент", "subtitle": "По умолчанию", "description": "Автономный агент с полным доступом к инструментам. Опишите результат — он спланирует и выполнит.", "feature1": "Многошаговое планирование и правка файлов", "feature2": "Power-инструменты, MCP-серверы и навыки", "feature3": "Режимы Aider по-прежнему в одном переключателе", "modeLabel": "Режим по умолчанию → Агент" }, "aider": { "title": "Пришли из Aider", "subtitle": "Режимы Aider на первом месте", "description": "Вы уже знакомы с Aider — оставьте Code, Ask и Architect на переднем плане.", "feature1": "Настройки Aider настраиваются сразу", "feature2": "Форматы правок, автокоммиты, переменные окружения", "feature3": "Режим агента доступен, когда понадобится", "modeLabel": "Режим по умолчанию → Code" } }, "language": { "title": "Выберите язык", "description": "Выберите предпочитаемый язык интерфейса приложения." }, "aider": { "title": "Настройка Aider", "description": "Для начала работы настройте параметры Aider. Вам нужно:", "options": { "1": "Добавьте API-ключи для провайдера LLM, который хотите использовать", "2": "Установите любые дополнительные параметры для Aider", "3": "Файлы .env и .aider.conf.yaml также считываются как при обычном использовании Aider" }, "configureLater": "Вы также можете сделать это позже в Настройках.", "fineTuneTitle": "Тонкая настройка Aider (необязательно)", "fineTuneDescription": "Продвинутые пользователи могут настроить дополнительные параметры Aider и переменные окружения. Этот шаг полностью необязателен и его можно безопасно пропустить.", "fineTuneNote": "Примечание: эти настройки предназначены для продвинутых пользователей, которые хотят настроить поведение Aider. Большинство пользователей могут пропустить этот шаг и настроить это позже в Настройках, если потребуется.", "agentSwitchNote": "Совет: режим агента всегда под рукой — используйте переключатель режимов над полем ввода, когда нужна полная автономность." }, "providers": { "title": "Провайдеры моделей", "description": "Настройте провайдеров LLM для использования в режимах Aider и Agent. Вы можете настроить API-ключи и дополнительные параметры для различных провайдеров.", "configureLater": "Вы можете настроить это позже в Настройках.", "connectTitle": "Подключите вашу AI-модель", "connectDescription": "AiderDesk поддерживает множество AI-провайдеров, включая OpenAI, Anthropic, Google Gemini и другие. Ваши API-ключи хранятся безопасно на вашем локальном компьютере и никогда не передаются третьим лицам.", "advancedUsersNote": "Продвинутые пользователи: также можно настроить провайдеры с помощью переменных окружения в разделе настройки Aider на следующем шаге.", "advancedSettings": "Расширенные настройки", "order": "Порядок", "orderDescription": 'Список slug провайдеров для попытки по порядку (например, ["anthropic", "openai"]).', "allowFallbacks": "Разрешить резервные провайдеры", "allowFallbacksDescription": "Разрешать ли использовать резервные провайдеры, когда основной недоступен.", "dataCollection": "Сбор данных", "dataCollectionDescription": "Контролируйте, используются ли провайдеры, которые могут сохранять данные.", "only": "Только", "onlyDescription": "Список slug провайдеров, которые разрешены.", "ignore": "Игнорировать", "ignoreDescription": "Список slug провайдеров, которые нужно пропустить.", "quantizations": "Квантизации", "quantizationsDescription": 'Список уровней квантизации для фильтрации (например, ["int4", "int8"]).', "sort": "Сортировка", "sortDescription": "Сортировать провайдеров по цене или производительности.", "requireParameters": "Требуемые параметры", "requireParametersDescription": "Использовать только провайдеров, поддерживающих все параметры в вашем запросе.", "setupLater": "Вы также можете настроить провайдеров и модели в Библиотеке моделей позже." }, "agent": { "title": "Знакомьтесь с вашим AI-агентом", "description": "Откройте возможности автономной AI-помощи с помощью режима Agent в AiderDesk. Ваш AI-агент может самостоятельно работать над сложными задачами.", "capabilities": "Возможности агента:", "autonomousPlanning": "Автономное планирование задач:", "autonomousPlanningDesc": "Разбивает сложные запросы на управляемые этапы и систематически их выполняет.", "toolUse": "Использование инструментов:", "toolUseDesc": "Использует различные инструменты для работы с файлами, веб-поиска и анализа кода.", "extensible": "Расширяемость через MCP:", "extensibleDesc": "Подключение к серверам Model Context Protocol для расширенных возможностей.", "configureAgent": "Настройка агента", "finishLater": "Завершить настройку (настроить агента позже)", "configureTitle": "Настройка вашего агента (необязательно)", "configureDescription": "Настройте профиль агента по умолчанию под ваш рабочий процесс. Вы можете настроить параметры, такие как разрешения на инструменты, предпочтения контекста и правила поведения." }, "complete": { "title": "Настройка завершена!", "description": "Поздравляем! Вы успешно настроили AiderDesk. Теперь вы готовы начать программирование с помощью AI.", "ready": "Нажмите «Завершить настройку», чтобы начать ваш путь программирования.", "success": "Оформление завершено успешно! Добро пожаловать в AiderDesk.", "mode": "Новые задачи будут начинаться в режиме «{{mode}}» — изменить можно в любой момент в «Настройки → Общие».", "modeAgent": "агента", "modeCode": "Code", "customizeTitle": "Настройте AiderDesk под себя", "customizeDescription": "Есть ещё что изучить — стоит заглянуть сюда:", "general": { "title": "Настройки → Общие", "description": "Внешний вид, язык, режим по умолчанию и поведение при запуске" }, "mcp": { "title": "Настройки → MCP", "description": "Подключайте MCP-серверы, чтобы дать агенту больше инструментов" }, "tasks": { "title": "Настройки → Задачи", "description": "Поведение задач, автоматизация и умные состояния" } }, "errors": { "navigationFailed": "Навигация не удалась. Пожалуйста, попробуйте снова.", "finishFailed": "Не удалось завершить оформление. Пожалуйста, попробуйте снова." } };
@@ -10186,7 +10266,7 @@ const addFileDialog$1 = { "title": "Добавить файлы контекст
10186
10266
  const fileFinder$1 = { "addPathTooltip": "Добавить путь", "browseFile": "Выбрать файл", "browseDirectory": "Выбрать каталог", "placeholder": { "filesOnly": "Введите файл для добавления", "directoriesOnly": "Введите каталог для добавления", "filesAndDirectories": "Введите файл или каталог для добавления" }, "placeholderFinish": { "filesOnly": "Введите файл или нажмите Enter для завершения", "directoriesOnly": "Введите каталог или нажмите Enter для завершения", "filesAndDirectories": "Введите файл или каталог, или нажмите Enter для завершения" } };
10187
10267
  const fileChip$1 = { "removeFileTooltip": "Удалить файл" };
10188
10268
  const fileEditor$1 = { "errorLoading": "Не удалось загрузить файл", "requestChangeOnLine": "Запросить изменение этой строки", "saved": "Файл сохранён", "errorSaving": "Не удалось сохранить файл: {{error}}", "errorSubmitting": "Не удалось отправить запросы на изменение: {{error}}", "saveBeforeSubmitting": "Сохраните файл перед отправкой запросов на изменение.", "unsavedChanges": "Есть несохранённые изменения", "saveShortcut": "Сохранить (Ctrl+S)", "saveAll": "Сохранить все", "saveAllTooltip": "Сохранить все открытые файлы", "savedAll": "Сохранено файлов: {{count}}", "closeTab": "Закрыть вкладку {{file}}", "discardTitle": "Отменить несохранённые изменения?", "discard": "Отменить", "discardMessage": "Несохранённые изменения файла будут потеряны.", "title": "Редактор" };
10189
- const contextFiles$1 = { "workspaceTitle": "Рабочая область", "title": "Файлы контекста", "updatedFiles": "Обновлённые файлы", "uncommittedChanges": "Незакоммиченные изменения", "updated": "Обновлён", "viewChanges": "Просмотреть изменения", "viewAllFiles": "Просмотреть все файлы", "viewSingleFile": "Просмотреть одиночный файл", "allFiles": "Все файлы", "add": "Добавить файлы контекста", "addFileTooltip": "Добавить файл (Ctrl/Cmd для добавления как «только для чтения»)", "addFileTooltip.ctrl": "Добавить файл (Ctrl для добавления как «только для чтения»)", "addFileTooltip.cmd": "Добавить файл (Cmd для добавления как «только для чтения»)", "readOnly": "Файл только для чтения", "showAllFiles": "Показать все файлы", "hideAllFiles": "Скрыть все файлы", "expandAll": "Развернуть все", "collapseAll": "Свернуть все", "dropAll": "Удалить все файлы контекста", "globalRule": "Глобальный файл правил", "projectRule": "Проектный файл правил", "agentRule": "Файл правил агента", "projectFiles": "Файлы проекта", "rules": "Файлы правил", "skills": "Навыки", "noSkills": "Навыки недоступны", "editSections": "Переупорядочить и скрыть разделы", "done": "Готово", "skillActivated": "Активен", "skillActivate": "Активировать", "skillDeactivate": "Деактивировать", "skillActivating": "...", "skillDisable": "Отключить навык", "skillEnable": "Включить навык", "globalSkill": "Глобальный навык", "projectSkill": "Проектный навык", "builtinSkill": "Встроенный навык", "extensionSkill": "Навык расширения", "manualSkillOnly": "Только ручной вызов (disable-model-invocation)", "agentSkillOnly": "Только для агента (user-invocable: false)", "disableRuleFile": "Отключить файл правил", "enableRuleFile": "Включить файл правил", "disableAllRuleFiles": "Отключить все файлы правил в папке", "enableAllRuleFiles": "Включить все файлы правил в папке", "diffViewer": { "file": "Файл" }, "search": "Поиск файлов", "searchPlaceholder": "Поиск файлов...", "refresh": "Обновить", "useGit": "Использовать Git", "useGitEnabled": "Git включён — нажмите для использования файловой системы", "useGitDisabled": "Файловая система включена — нажмите для использования Git", "revertFile": "Отменить изменения", "expandContext": "Развернуть контекст", "collapseContext": "Свернуть контекст", "addFileToGit": "Добавить файл в Git", "fileHasConflicts": "Файл содержит конфликты слияния", "confirmRevertTitle": "Отменить изменения файла?", "confirmRevertMessage": "Это отменит все изменения в этом файле. Данное действие нельзя отменить.", "revert": "Отменить", "commitSection": "Зафиксировать изменения", "commitMessage": "Сообщение о коммите", "commitMessagePlaceholder": "Введите сообщение о коммите...", "commitMessagePlaceholderAmend": "Оставьте пустым для использования предыдущего сообщения или введите новое", "generateMessage": "Сгенерировать сообщение", "amend": "Изменить", "amendTooltip": "Изменить последний коммит вместо создания нового", "skipGitHooks": "Пропустить Git-хуки", "skipGitHooksTooltip": "Создать коммит без запуска Git-хуков (git commit --no-verify)", "commit": "Закоммитить", "generatingMessage": "Генерация...", "committing": "Коммит...", "cancelCommit": "Отменить коммит", "commitSuccess": "Изменения закоммичены", "commitError": "Ошибка коммита", "selectedFilesToCommit": "Выбрано файлов для коммита: {{count}} из {{total}}", "groupByCommit": "Переключить на группировку по коммитам", "flatView": "Переключить на плоский вид (различие от базы)", "uncommitted": "Незакоммиченные", "group": "Группа {{hash}}", "updatedFilesWindowTitle": "Обновлённые файлы — {{name}}", "commentsPanel": "Запросы на изменение", "noComments": "Пока нет запросов на изменение. Нажмите на строку в просмотрщике diff, чтобы добавить.", "editComment": "Редактировать", "removeComment": "Удалить", "submitAllRequests": "Запросить изменения", "submittingRequests": "Отправка...", "collapseComments": "Свернуть панель", "expandComments": "Развернуть панель", "empty": { "title": "Нет файлов контекста", "aiderMode": { "description": "Добавьте сюда файлы, которые хотите прочитать или изменить. Aider может обращаться только к файлам, находящимся в контексте.", "hint": "Совет: добавьте связанные файлы (импорты, типы) для лучшего понимания." }, "agentMode": { "description": "Агент может обращаться к любому файлу в вашем проекте с помощью инструментов. Добавление файлов сюда необязательно, но может ускорить задачи, предоставив непосредственный контекст.", "hint": "Совет: добавляйте файлы сюда при использовании инструментов Aider или когда хотите, чтобы содержимое файлов было включено в запрос.", "includeContextFiles": "Когда включено «Включить файлы контекста» в настройках агента, содержимое файлов контекста встраивается непосредственно в запрос." } } };
10269
+ const contextFiles$1 = { "renamedFrom": "Переименован из {{path}}", "workspaceTitle": "Рабочая область", "title": "Файлы контекста", "updatedFiles": "Обновлённые файлы", "uncommittedChanges": "Незакоммиченные изменения", "updated": "Обновлён", "viewChanges": "Просмотреть изменения", "viewAllFiles": "Просмотреть все файлы", "viewSingleFile": "Просмотреть одиночный файл", "allFiles": "Все файлы", "add": "Добавить файлы контекста", "addFileTooltip": "Добавить файл (Ctrl/Cmd для добавления как «только для чтения»)", "addFileTooltip.ctrl": "Добавить файл (Ctrl для добавления как «только для чтения»)", "addFileTooltip.cmd": "Добавить файл (Cmd для добавления как «только для чтения»)", "readOnly": "Файл только для чтения", "showAllFiles": "Показать все файлы", "hideAllFiles": "Скрыть все файлы", "expandAll": "Развернуть все", "collapseAll": "Свернуть все", "dropAll": "Удалить все файлы контекста", "globalRule": "Глобальный файл правил", "projectRule": "Проектный файл правил", "agentRule": "Файл правил агента", "projectFiles": "Файлы проекта", "rules": "Файлы правил", "skills": "Навыки", "noSkills": "Навыки недоступны", "editSections": "Переупорядочить и скрыть разделы", "done": "Готово", "skillActivated": "Активен", "skillActivate": "Активировать", "skillDeactivate": "Деактивировать", "skillActivating": "...", "skillDisable": "Отключить навык", "skillEnable": "Включить навык", "globalSkill": "Глобальный навык", "projectSkill": "Проектный навык", "builtinSkill": "Встроенный навык", "extensionSkill": "Навык расширения", "manualSkillOnly": "Только ручной вызов (disable-model-invocation)", "agentSkillOnly": "Только для агента (user-invocable: false)", "disableRuleFile": "Отключить файл правил", "enableRuleFile": "Включить файл правил", "disableAllRuleFiles": "Отключить все файлы правил в папке", "enableAllRuleFiles": "Включить все файлы правил в папке", "diffViewer": { "file": "Файл" }, "search": "Поиск файлов", "searchPlaceholder": "Поиск файлов...", "refresh": "Обновить", "useGit": "Использовать Git", "useGitEnabled": "Git включён — нажмите для использования файловой системы", "useGitDisabled": "Файловая система включена — нажмите для использования Git", "revertFile": "Отменить изменения", "expandContext": "Развернуть контекст", "collapseContext": "Свернуть контекст", "addFileToGit": "Добавить файл в Git", "fileHasConflicts": "Файл содержит конфликты слияния", "confirmRevertTitle": "Отменить изменения файла?", "confirmRevertMessage": "Это отменит все изменения в этом файле. Данное действие нельзя отменить.", "revert": "Отменить", "commitSection": "Зафиксировать изменения", "commitMessage": "Сообщение о коммите", "commitMessagePlaceholder": "Введите сообщение о коммите...", "commitMessagePlaceholderAmend": "Оставьте пустым для использования предыдущего сообщения или введите новое", "generateMessage": "Сгенерировать сообщение", "amend": "Изменить", "amendTooltip": "Изменить последний коммит вместо создания нового", "skipGitHooks": "Пропустить Git-хуки", "skipGitHooksTooltip": "Создать коммит без запуска Git-хуков (git commit --no-verify)", "commit": "Закоммитить", "generatingMessage": "Генерация...", "committing": "Коммит...", "cancelCommit": "Отменить коммит", "commitSuccess": "Изменения закоммичены", "commitError": "Ошибка коммита", "selectedFilesToCommit": "Выбрано файлов для коммита: {{count}} из {{total}}", "groupByCommit": "Переключить на группировку по коммитам", "flatView": "Переключить на плоский вид (различие от базы)", "uncommitted": "Незакоммиченные", "group": "Группа {{hash}}", "updatedFilesWindowTitle": "Обновлённые файлы — {{name}}", "commentsPanel": "Запросы на изменение", "noComments": "Пока нет запросов на изменение. Нажмите на строку в просмотрщике diff, чтобы добавить.", "editComment": "Редактировать", "removeComment": "Удалить", "submitAllRequests": "Запросить изменения", "submittingRequests": "Отправка...", "collapseComments": "Свернуть панель", "expandComments": "Развернуть панель", "empty": { "title": "Нет файлов контекста", "aiderMode": { "description": "Добавьте сюда файлы, которые хотите прочитать или изменить. Aider может обращаться только к файлам, находящимся в контексте.", "hint": "Совет: добавьте связанные файлы (импорты, типы) для лучшего понимания." }, "agentMode": { "description": "Агент может обращаться к любому файлу в вашем проекте с помощью инструментов. Добавление файлов сюда необязательно, но может ускорить задачи, предоставив непосредственный контекст.", "hint": "Совет: добавляйте файлы сюда при использовании инструментов Aider или когда хотите, чтобы содержимое файлов было включено в запрос.", "includeContextFiles": "Когда включено «Включить файлы контекста» в настройках агента, содержимое файлов контекста встраивается непосредственно в запрос." } } };
10190
10270
  const modelSelector$1 = { "mainModel": "Основная модель", "editorModel": "Редакторская модель", "weakModel": "Слабая модель", "architectModel": "Архитекторская модель", "agentModel": "Модель агента", "reasoning": "Рассуждения", "thinkingTokens": "Токены рассуждений", "loadingModel": "Загрузка модели...", "searchPlaceholder": "Поиск моделей...", "searchPlaceholderOrCustom": "Поиск моделей или ввод пользовательского имени...", "removePreferred": "Удалить из предпочитаемых моделей", "invalidModelSelection": "Недопустимый формат модели. Ожидается формат 'провайдер/модель', например 'openai/gpt-4'.", "providerNotConfigured": "Провайдер «{{provider}}» не настроен. Настроенные провайдеры: {{providers}}.", "selectModel": "Выбрать модель...", "weakModelLock": "Заблокировать слабую модель", "weakModelUnlock": "Разблокировать слабую модель", "noModelSelected": "Модель не выбрана" };
10191
10271
  const modelInfo$1 = { "noInfo": "Информация о модели недоступна.", "maxInputTokens": "Максимум входных токенов", "maxOutputTokens": "Максимум выходных токенов", "inputCostPerMillion": "Стоимость ввода на 1M токенов", "outputCostPerMillion": "Стоимость вывода на 1M токенов" };
10192
10272
  const mcp$1 = { "initializingServers": "Инициализация MCP-серверов...", "serverToolStatus": "{{enabledCount}} из {{count}} инструментов включено", "toolsCount_one": "{{count}} инструмент", "toolsCount_other": "{{count}} инструментов", "loadToolsError": "Не удалось загрузить инструменты MCP-сервера", "noToolsFound": "Инструменты не найдены. Проверьте вашу конфигурацию.", "servers": "MCP-серверы", "selectServer": "Выберите MCP-сервер из списка, чтобы просмотреть его инструменты", "reloadServer": "Перезагрузить сервер", "reload": "Перезагрузить", "tools": "Инструменты", "oauth": { "connect": "Подключить", "reopen": "Переоткрыть", "connected": "Подключено через OAuth", "disconnect": "Отключить", "authorizing": "Завершите аутентификацию в открывшемся окне браузера.", "authenticationRequired": "Требуется аутентификация OAuth.", "authenticationRequiredMessage": "MCP-сервер '{{serverName}}' требует аутентификацию OAuth. Подключите его в разделе «Настройки → MCP-серверы».", "windowTitle": "Аутентификация MCP", "connectError": "Не удалось запустить аутентификацию MCP.", "disconnectError": "Не удалось отключить аутентификацию MCP." } };
@@ -10219,7 +10299,7 @@ const menu$1 = { "file": { "newWindow": "Новое окно" } };
10219
10299
  const taskSidebar$1 = { "title": "Задачи", "noTasks": "Нет доступных задач", "deleteTask": "Удалить задачу", "deleteConfirm": "Вы уверены, что хотите удалить эту задачу?", "createTask": "Создать новую задачу", "rename": "Переименовать", "pinTask": "Закрепить задачу", "unpinTask": "Открепить задачу", "moveToTop": "Переместить наверх", "taskNamePlaceholder": "Введите название задачи...", "untitled": "[Без названия]", "exportAsMarkdown": "Экспортировать как Markdown", "copyAsMarkdown": "Копировать как Markdown", "copiedAsMarkdown": "Скопировано как Markdown", "exportAsImage": "Экспортировать как изображение", "taskIdCopied": "Идентификатор задачи {{taskId}} скопирован в буфер обмена", "duplicateTask": "Дублировать задачу", "search": "Поиск задач", "searchPlaceholder": "Поиск задач...", "today": "Сегодня", "yesterday": "Вчера", "noDate": "Без даты", "archiveTask": "Архивировать задачу", "unarchiveTask": "Разархивировать задачу", "filterStates": "Фильтр по состоянию", "showArchived": "Показать архивные", "hideArchived": "Скрыть архивные", "archived": "Заархивирована", "multiselectMode": "Режим мультивыбора", "selectedCount": "Выбрано {{count}}", "closeMultiselect": "Выйти из мультивыбора", "deleteSelected": "Удалить выбранные", "archiveSelected": "Архивировать выбранные", "unarchiveSelected": "Разархивировать выбранные", "deleteSelectedConfirm": "Вы уверены, что хотите удалить {{count}} выбранных задач?", "archiveSelectedConfirm": "Вы уверены, что хотите архивировать {{count}} выбранных задач?", "unarchiveSelectedConfirm": "Вы уверены, что хотите разархивировать {{count}} выбранных задач?", "generatingName": "Генерация имени...", "changeState": "Изменить состояние", "createSubtask": "Создать подзадачу", "dropToRoot": "Перетащите сюда, чтобы переместить на верхний уровень", "dropToSubtask": "Сделать подзадачей", "deleteConfirmWithSubtasks": "Эта задача содержит {{count}} подзадач. Всё равно удалить?" };
10220
10300
  const taskInfo$1 = { "createdAt": "Создана", "updatedAt": "Обновлена", "worktreeDirectory": "Каталог рабочего дерева", "baseBranch": "Базовая ветка", "baseCommit": "Базовый коммит", "currentBranch": "Ветка", "targetBranch": "Целевая ветка", "lastMergeState": "Последнее состояние слияния", "beforeMergeCommit": "Коммит до слияния", "mergeTimestamp": "Временная метка слияния", "openFolder": "Открыть папку", "taskId": "Идентификатор задачи", "state": "Состояние", "messageCount": "Количество сообщений" };
10221
10301
  const taskState$1 = { "DELEGATED": "Делегирована", "DONE": "Завершена", "IN_PROGRESS": "В процессе", "INTERRUPTED": "Прервана", "MORE_INFO_NEEDED": "Нужна дополнительная информация", "READY_FOR_REVIEW": "Готова к проверке", "READY_FOR_IMPLEMENTATION": "Готова к реализации", "TODO": "К выполнению" };
10222
- const git$1 = { "askpass": { "passwordTitle": "Аутентификация Git", "usernameTitle": "Имя пользователя Git", "confirmationTitle": "Подтверждение Git", "rememberSession": "Запомнить на время этой сессии" }, "pullUpToDate": "Проект уже актуален — нет изменений для загрузки", "pullSuccess": "Проект успешно обновлён", "confirmPullTitle": "Загрузка изменений", "confirmPullMessage": "Ваша ветка расходится с удалённой ({{outgoing}} исходящих, {{incoming}} входящих коммитов). Выберите способ согласования веток:", "pullRebaseAutostashHint": "Незакоммиченные изменения будут спрятаны и автоматически восстановлены после загрузки.", "pushSuccess": "Изменения успешно отправлены", "pushRejectedPullFirst": "Отправка отклонена: в удалённой ветке есть новые коммиты. Сначала загрузите изменения и повторите попытку.", "resolveWithAI": "Решить с помощью ИИ", "outgoingCommitsTooltip": "Исходящие коммиты ({{count}}):", "incomingCommitsTooltip": "Входящие коммиты ({{count}}):", "gitBranchLabel": "Git-ветка: {{branch}}", "upToDate": "Актуальна", "noCurrentBranch": "Нет ветки", "searchBranches": "Поиск веток", "noBranchesFound": "Ветки не найдены", "localBranches": "Локальные", "remoteBranches": "Удалённые", "newBranch": "Новая ветка", "newBranchNamePlaceholder": "Имя новой ветки", "initializeGit": "Инициализировать Git", "initializeGitTooltip": "В этом проекте нет git-репозитория. Инициализируйте его, чтобы использовать ветки, worktree и отслеживание версий.", "initializingGit": "Инициализация...", "gitInitialized": "Git-репозиторий инициализирован", "branchCreated": "Ветка '{{branch}}' создана", "checkedOutBranch": "Переключено на '{{branch}}'", "confirmCheckoutTitle": "Переключение ветки", "confirmCheckoutMessage": "Эта ветка уже используется в рабочем дереве другой задачи. После подтверждения она будет отсоединена там (это рабочее дерево перейдёт в состояние detached HEAD с сохранением изменений), чтобы её можно было переключить здесь. Продолжить?", "checkout": "Переключить", "mergeIntoCurrent": "Слить в текущую ветку", "rebaseCurrentOnto": "Перебазировать текущую ветку на эту", "merge": "Слить", "rebase": "Перебазировать", "confirmMergeTitle": "Слияние ветки", "confirmMergeMessage": "Слить '{{branch}}' в текущую ветку?", "mergedIntoCurrent": "'{{branch}}' слита в текущую ветку", "mergeConflicts": "Конфликты слияния в: {{files}}", "confirmRebaseTitle": "Перебазирование ветки", "confirmRebaseMessage": "Перебазировать текущую ветку на '{{branch}}'?", "rebasedOnto": "Перебазировано на '{{branch}}'", "rebaseConflicts": "Конфликты перебазирования в: {{files}}. Прервите перебазирование, чтобы вернуться в предыдущее состояние.", "deleteBranch": "Удалить ветку", "deleteForce": "Удалить принудительно", "confirmDeleteTitle": "Удаление ветки", "confirmDeleteMessage": "Удалить ветку '{{branch}}'?", "confirmForceDeleteMessage": "Ветка '{{branch}}' содержит неслитые коммиты. Удалить её принудительно и потерять эти коммиты?", "branchDeleted": "Ветка '{{branch}}' удалена", "updateProject": "Обновить проект (Pull)", "push": "Отправить", "confirmPushTitle": "Отправка коммитов", "confirmPushMessage_one": "Отправить {{count}} коммит на удалённый репозиторий?", "confirmPushMessage_other": "Отправить {{count}} коммитов на удалённый репозиторий?", "noCommitsToPush": "Нет коммитов для отправки", "confirmPushSetUpstreamMessage": "У ветки '{{branch}}' нет вышестоящей ветки. Отправить её на удалённый репозиторий и назначить удалённую ветку вышестоящей?", "force": "Принудительно", "aheadCommits_one": "На {{count}} коммит впереди", "aheadCommits_other": "На {{count}} коммитов впереди", "behindCommits_one": "На {{count}} коммит позади", "behindCommits_other": "На {{count}} коммитов позади", "recentBranches": "Недавние", "checkoutBranch": "Переключиться на '{{branch}}'", "newBranchFrom": "Новая ветка от '{{branch}}'...", "mergeBranchInto": "Слить '{{branch}}' в '{{current}}'", "rebaseOnto": "Перебазировать '{{current}}' на '{{branch}}'", "deleteBranchName": "Удалить '{{branch}}'", "rebaseWorktreeOnto": "Перебазировать рабочее дерево на '{{branch}}'", "actionNotAvailableInWorktree": "Это действие недоступно в режиме рабочего дерева", "updateFromRemote": "Обновить из '{{upstream}}'", "branchUpdated": "Ветка '{{branch}}' обновлена из удалённого репозитория" };
10302
+ const git$1 = { "askpass": { "passwordTitle": "Аутентификация Git", "usernameTitle": "Имя пользователя Git", "confirmationTitle": "Подтверждение Git", "rememberSession": "Запомнить на время этой сессии" }, "pullUpToDate": "Проект уже актуален — нет изменений для загрузки", "pullSuccess": "Проект успешно обновлён", "confirmPullTitle": "Загрузка изменений", "confirmPullMessage": "Ваша ветка расходится с удалённой ({{outgoing}} исходящих, {{incoming}} входящих коммитов). Выберите способ согласования веток:", "pullRebaseAutostashHint": "Незакоммиченные изменения будут спрятаны и автоматически восстановлены после загрузки.", "pushSuccess": "Изменения успешно отправлены", "pushRejectedPullFirst": "Отправка отклонена: в удалённой ветке есть новые коммиты. Сначала загрузите изменения и повторите попытку.", "resolveWithAI": "Решить с помощью ИИ", "outgoingCommitsTooltip": "Исходящие коммиты ({{count}}):", "incomingCommitsTooltip": "Входящие коммиты ({{count}}):", "gitBranchLabel": "Git-ветка: {{branch}}", "upToDate": "Актуальна", "noCurrentBranch": "Нет ветки", "searchBranches": "Поиск веток", "noBranchesFound": "Ветки не найдены", "localBranches": "Локальные", "remoteBranches": "Удалённые", "newBranch": "Новая ветка", "newBranchNamePlaceholder": "Имя новой ветки", "initializeGit": "Инициализировать Git", "initializeGitTooltip": "В этом проекте нет git-репозитория. Инициализируйте его, чтобы использовать ветки, worktree и отслеживание версий.", "initializingGit": "Инициализация...", "gitInitialized": "Git-репозиторий инициализирован", "branchCreated": "Ветка '{{branch}}' создана", "checkedOutBranch": "Переключено на '{{branch}}'", "confirmCheckoutTitle": "Переключение ветки", "confirmCheckoutMessage": "Эта ветка уже используется в рабочем дереве другой задачи. После подтверждения она будет отсоединена там (это рабочее дерево перейдёт в состояние detached HEAD с сохранением изменений), чтобы её можно было переключить здесь. Продолжить?", "checkout": "Переключить", "mergeIntoCurrent": "Слить в текущую ветку", "rebaseCurrentOnto": "Перебазировать текущую ветку на эту", "merge": "Слить", "rebase": "Перебазировать", "confirmMergeTitle": "Слияние ветки", "confirmMergeMessage": "Слить '{{branch}}' в текущую ветку?", "mergedIntoCurrent": "'{{branch}}' слита в текущую ветку", "mergeConflicts": "Конфликты слияния в: {{files}}", "confirmRebaseTitle": "Перебазирование ветки", "confirmRebaseMessage": "Перебазировать текущую ветку на '{{branch}}'?", "rebasedOnto": "Перебазировано на '{{branch}}'", "rebaseConflicts": "Конфликты перебазирования в: {{files}}. Прервите перебазирование, чтобы вернуться в предыдущее состояние.", "deleteBranch": "Удалить ветку", "deleteForce": "Удалить принудительно", "confirmDeleteTitle": "Удаление ветки", "confirmDeleteMessage": "Удалить ветку '{{branch}}'?", "confirmForceDeleteMessage": "Ветка '{{branch}}' содержит неслитые коммиты. Удалить её принудительно и потерять эти коммиты?", "branchDeleted": "Ветка '{{branch}}' удалена", "updateProject": "Обновить проект (Pull)", "push": "Отправить", "confirmPushTitle": "Отправка коммитов", "confirmPushMessage_one": "Отправить {{count}} коммит на удалённый репозиторий?", "confirmPushMessage_other": "Отправить {{count}} коммитов на удалённый репозиторий?", "noCommitsToPush": "Нет коммитов для отправки", "confirmPushSetUpstreamMessage": "У ветки '{{branch}}' нет вышестоящей ветки. Отправить её на удалённый репозиторий и назначить удалённую ветку вышестоящей?", "force": "Принудительно", "aheadCommits_one": "На {{count}} коммит впереди", "aheadCommits_other": "На {{count}} коммитов впереди", "behindCommits_one": "На {{count}} коммит позади", "behindCommits_other": "На {{count}} коммитов позади", "recentBranches": "Недавние", "checkoutBranch": "Переключиться на '{{branch}}'", "newBranchFrom": "Новая ветка от '{{branch}}'...", "createWorktreeFrom": "Создать рабочее дерево от '{{branch}}'", "mergeBranchInto": "Слить '{{branch}}' в '{{current}}'", "rebaseOnto": "Перебазировать '{{current}}' на '{{branch}}'", "deleteBranchName": "Удалить '{{branch}}'", "rebaseWorktreeOnto": "Перебазировать рабочее дерево на '{{branch}}'", "actionNotAvailableInWorktree": "Это действие недоступно в режиме рабочего дерева", "updateFromRemote": "Обновить из '{{upstream}}'", "branchUpdated": "Ветка '{{branch}}' обновлена из удалённого репозитория" };
10223
10303
  const worktree$1 = { "uncommittedFiles": "{{count}} файлов", "conflicts": "конфликтов", "conflictsPredicted": "Прогнозируемые конфликты", "conflictsPresent": "Есть конфликты", "merge": "Слияние", "squash": "Сквош и слияние", "onlyUncommitted": "Только незакоммиченные", "rebaseFromBranch": "Перебазировать из ветки...", "rebase": "Перебазировать", "abortRebase": "Прервать перебазирование", "continueRebase": "Продолжить перебазирование", "rebaseConflictsDescription": "Обнаружены конфликты перебазирования в следующих файлах. Разрешите их вручную и продолжите, или используйте AI-агента для помощи.", "rebasePausedDueToConflicts": "Перебазирование приостановлено из-за конфликтов. Разрешите их и продолжите перебазирование или прервите его, чтобы восстановить рабочее дерево.", "rebaseConflictsResolvedDescription": "Конфликты решены и проиндексированы. Теперь можно продолжить перебазирование.", "switchToLocalRebaseInProgress": "Нельзя переключиться в локальный режим во время перебазирования. Сначала продолжите или прервите перебазирование.", "switchToLocalUncommittedChanges": "В рабочем дереве есть незафиксированные изменения. Сначала выполните слияние или явно отклоните изменения перед переключением в локальный режим.", "confirmRebaseTitle": "Перебазировать рабочее дерево", "confirmRebaseMessage": "Это перебазирует рабочее дерево на выбранную ветку. При наличии конфликтов их нужно будет разрешить.", "confirmAbortRebaseTitle": "Прервать перебазирование", "confirmAbortRebaseMessage": "Это прервёт перебазирование и вернёт рабочее дерево в состояние до перебазирования.", "confirmContinueRebaseTitle": "Продолжить перебазирование", "confirmContinueRebaseMessage": "Это попытается продолжить перебазирование. Убедитесь, что все конфликты разрешены и проиндексированы.", "resolveConflictsWithAgent": "Разрешить конфликты с помощью агента", "confirmResolveConflictsWithAgentTitle": "Разрешить конфликты с помощью агента", "confirmResolveConflictsWithAgentMessage": "Это попытается автоматически разрешить все конфликтные файлы и проиндексировать их. Внимательно проверьте результат перед продолжением.", "commitMessage": "Сообщение о коммите", "commitMessagePlaceholder": "Введите сообщение о коммите...", "selectBranch": "Выбрать ветку", "selectTargetBranchTitle": "Выбор целевой ветки", "selectSourceBranchTitle": "Выбор исходной ветки", "branchCurrent": "текущая ветка", "mergeTooltip": "Объединить изменения рабочего дерева в ветку", "revertTooltip": "Отменить последние объединённые изменения", "confirmMerge": "Вы уверены, что хотите {{action}} изменения рабочего дерева в основную ветку? Это включит все незакоммиченные изменения.", "confirmRevert": "Вы уверены, что хотите отменить последнее слияние? Это вернёт основную ветку в предыдущее состояние.", "confirmMergeTitle": "Подтверждение слияния", "confirmSquashTitle": "Подтверждение сквоша", "confirmOnlyUncommittedTitle": "Применить незакоммиченные изменения", "confirmMergeMessage": "Вы уверены, что хотите объединить изменения рабочего дерева с выбранной веткой?", "confirmSquashMessage": "Вы уверены, что хотите скомпоновать и объединить изменения рабочего дерева с выбранной веткой?", "confirmOnlyUncommittedMessage": "Вы уверены, что хотите применить незакоммиченные изменения из рабочего дерева к текущей ветке {{branch}}? Слияние git выполняться не будет, проект останется на текущей ветке.", "mergeConflicts": "Слияние не удалось из-за конфликтов между рабочим деревом и целевой веткой. Сначала перебазируйте рабочее дерево для разрешения конфликтов.", "applyUncommittedConflicts": "Не удалось применить незакоммиченные изменения из-за конфликтов с целевой веткой. Сначала перебазируйте рабочее дерево для согласования изменений.", "switchToLocalApplyUncommittedConflicts": "Не удалось применить незакоммиченные изменения рабочего дерева в директорию проекта из-за конфликтов. Переключение в локальный режим отменено — рабочее дерево и его изменения сохранены.", "dontAskAgain": "Не спрашивать снова", "confirmRevertTitle": "Подтверждение отмены", "confirmRevertMessage": "Вы уверены, что хотите отменить последнее слияние? Это отменит изменения, внесённые из рабочего дерева обратно в основную ветку.", "revert": "Отменить", "noChanges": "Нет изменений", "renameBranch": "Переименовать ветку", "branchNamePlaceholder": "Введите название ветки...", "basedOn": "На основе", "rebaseFromCurrentBranch": "Перебазировать из '{{branch}}'", "mergeIntoBranch": "Слияние в ветку...", "squashIntoBranch": "Сквош и слияние в ветку...", "applyUncommittedChanges": "Применить незакоммиченные изменения", "mergeIntoBranchTooltip": "Выполняет слияние всех коммитов и незакоммиченных изменений из этого рабочего дерева в целевую ветку (создаёт коммит слияния).", "squashIntoBranchTooltip": "Объединяет все коммиты рабочего дерева и незакоммиченные изменения в один новый коммит в целевой ветке.", "applyUncommittedChangesTooltip": "Применяет только незакоммиченные изменения из этого рабочего дерева к ветке, которая сейчас проверена в директории проекта, без слияния коммитов.", "rebaseFromCurrentBranchTooltip": "Переносит коммиты рабочего дерева поверх '{{branch}}' и обновляет базовую ссылку.", "aheadCommitsTooltip": "Коммиты впереди '{{branch}}' ({{count}}):", "behindCommitsTooltip": "Коммиты позади '{{branch}}' ({{count}}):", "behindCommitsSyncHint": "Используйте «Перебазировать из '{{branch}}'» для синхронизации" };
10224
10304
  const welcomeMessage$1 = { "title": "AiderDesk", "subtitle": "Ваш AI-помощник при программировании", "features": { "title": "Что вы можете делать", "aiCoding": "Генерация и модификация кода с помощью AI", "contextManagement": "Добавление файлов в контекст для лучших результатов", "multiModel": "Выбор из множества AI-моделей и провайдеров", "commands": "Выполнение команд и запуск тестов" }, "tips": { "title": "Начало работы", "addFiles": "Добавляйте файлы в контекст через боковую панель или команду /add", "askQuestion": "Введите ваш запрос в поле ввода ниже", "useCommands": "Используйте команды / для быстрых действий", "switchMode": "Переключайтесь между режимами с помощью селектора ниже" }, "modes": { "title": "Выбор правильного режима", "agent": { "title": "Режим агента", "description": "Используйте для автономных задач, сложных рабочих процессов и многоэтапных операций. Агент самостоятельно планирует и выполняет задачи с помощью доступных инструментов." }, "code": { "title": "Режим кода", "description": "Используйте для прямых изменений кода и выполнения конкретных задач. Важно: добавляйте файлы в контекст, чтобы AI работал с правильными файлами." } }, "selectMode": "Выбрать" };
10225
10305
  const aiderConnector$1 = { "starting": "Коннектор Aider запускается...", "restart": "Перезапустить коннектор Aider" };
@@ -10229,6 +10309,7 @@ const logs$1 = { "title": "Системные журналы", "level": "Уро
10229
10309
  const readonly$1 = { "noTasks": "Нет задач", "unnamedTask": "Задача без названия", "archived": "В архиве", "loading": "Загрузка проекта…", "selectTask": "Выберите задачу для просмотра истории.", "noProjects": "Проекты не настроены.", "label": "Только чтение", "searchTasks": "Поиск задач", "allStates": "Все состояния", "bootstrapError": "Не удалось загрузить приложение.", "projectError": "Не удалось загрузить проект.", "projects": "Проекты", "openTasks": "Открыть задачи" };
10230
10310
  const providerTls$1 = { "title": "Настройки TLS", "disableCertificateVerification": "Отключить проверку сертификата", "disableCertificateVerificationInfo": "Пропустить проверку TLS-сертификата для эндпоинта этого провайдера. Используйте только для доверенных серверов с самоподписанными сертификатами (например, локальные серверы моделей).", "caCertPath": "Путь к CA-сертификату", "caCertPathInfo": "Абсолютный путь к файлу CA-сертификата (PEM) для проверки эндпоинта провайдера. Для самоподписанных или приватных CA-сертификатов предпочтительнее, чем отключение проверки.", "caCertPathPlaceholder": "/path/to/ca.pem" };
10231
10311
  const ru = {
10312
+ projectTrust: projectTrust$1,
10232
10313
  languages: languages$1,
10233
10314
  commandPalette: commandPalette$1,
10234
10315
  uiActions: uiActions$1,
@@ -10321,9 +10402,10 @@ const ru = {
10321
10402
  readonly: readonly$1,
10322
10403
  providerTls: providerTls$1
10323
10404
  };
10405
+ const projectTrust = { "title": "信任此项目?", "warning": "此项目包含代理、MCP 服务器或扩展。它们可能以您的用户权限运行恶意代码、访问文件和凭据,或将数据发送到外部服务。", "review": "继续前请检查下列文件。仅在信任项目来源时才信任此项目。取消将不会打开项目。", "confirm": "信任此项目", "agents": "代理", "mcpServers": "MCP 服务器", "extensions": "扩展", "checking": "正在检查项目配置…", "checkFailed": "无法检查项目配置。项目未打开。请检查文件权限和配置文件后重试。" };
10324
10406
  const languages = { "en": "English", "zh": "中文", "ru": "俄语", "ko": "한국어" };
10325
10407
  const commandPalette = { "title": "命令面板", "placeholder": "输入以搜索...", "noResults": "没有匹配的结果", "scrollForMore": "滚动以查看更多结果", "tabs": { "all": "全部", "file": "文件", "action": "操作", "task": "任务", "project": "项目" } };
10326
- const uiActions = { "openModelSelector": "打开模型选择器", "changeAgentProfile": "更改代理配置", "setAutonomyMode": "切换自主模式", "openSettingsPage": "打开设置页面", "showLogs": "显示日志", "showArchivedTasks": "显示已归档任务", "hideArchivedTasks": "隐藏已归档任务", "createNewTask": "创建新任务", "createNewSubtask": "创建新子任务", "createNewSiblingTask": "创建新的同级任务", "renameTask": "重命名任务", "archiveTask": "归档任务", "unarchiveTask": "取消归档任务", "deleteTask": "删除任务", "duplicateTask": "复制任务", "exportTaskImage": "导出任务为图片", "exportTaskMarkdown": "导出任务为Markdown", "copyTaskMarkdown": "复制任务为Markdown", "copyTaskId": "复制任务 ID", "copyTaskIdFailed": "复制任务 ID 失败", "interruptResponse": "中断响应", "restartConnector": "重启Aider连接器", "togglePin": "切换固定", "moveToTop": "移至顶部", "switchToLocal": "切换到本地模式", "switchToWorktree": "切换到工作树模式", "switchWorkingMode": "切换工作模式", "gitAction": "Git 操作", "gitBranches": "显示 Git 分支" };
10408
+ const uiActions = { "openModelSelector": "打开模型选择器", "changeAgentProfile": "更改代理配置", "setAutonomyMode": "切换自主模式", "openSettingsPage": "打开设置页面", "showLogs": "显示日志", "showArchivedTasks": "显示已归档任务", "hideArchivedTasks": "隐藏已归档任务", "createNewTask": "创建新任务", "createNewSubtask": "创建新子任务", "createNewSiblingTask": "创建新的同级任务", "renameTask": "重命名任务", "archiveTask": "归档任务", "unarchiveTask": "取消归档任务", "deleteTask": "删除任务", "duplicateTask": "复制任务", "exportTaskImage": "导出任务为图片", "exportTaskMarkdown": "导出任务为Markdown", "copyTaskMarkdown": "复制任务为Markdown", "copyTaskId": "复制任务 ID", "copyTaskIdFailed": "复制任务 ID 失败", "interruptResponse": "中断响应", "restartConnector": "重启Aider连接器", "togglePin": "切换固定", "moveToTop": "移至顶部", "switchToLocal": "切换到本地模式", "switchToWorktree": "切换到工作树模式", "switchWorkingMode": "切换工作模式", "switchToAgentMode": "切换到代理模式", "switchToCodeMode": "切换到代码模式", "switchToAskMode": "切换到提问模式", "switchToArchitectMode": "切换到架构模式", "switchToContextMode": "切换到上下文模式", "switchToMode": "切换到 {{mode}} 模式", "gitAction": "Git 操作", "gitBranches": "显示 Git 分支" };
10327
10409
  const common = { "settings": "设置", "cancel": "取消", "save": "保存", "delete": "删除", "edit": "编辑", "add": "添加", "remove": "移除", "close": "关闭", "confirm": "确认", "back": "返回", "undo": "撤销", "next": "下一步", "previous": "上一个", "of": "共", "finish": "完成", "loading": "加载中...", "startingUp": "正在启动...", "loadingProjectSettings": "正在加载项目设置...", "loadingProject": "加载项目中...", "loadingTask": "正在加载任务...", "loadingMessages": "正在加载消息...", "error": "错误", "success": "成功", "warning": "警告", "info": "信息", "yes": "是", "no": "否", "refresh": "刷新", "retry": "重试", "open": "打开", "openProject": "打开项目", "clone": "克隆", "lock": "锁定", "default": "默认", "suffix.billion": "十亿", "suffix.million": "百万", "suffix.thousand": "千", "suffix.tokens": "令牌", "ok": "确定", "collapse": "收起", "expand": "展开", "enabled": "已启用", "noFiles": "没有找到文件", "loadingFiles": "正在加载文件...", "closeTasks": "关闭任务", "toggleTasks": "切换任务", "submit": "提交", "inputPrompt": "需要输入", "rememberSession": "在本次会话中记住", "enterPassword": "输入密码...", "showPassword": "显示密码", "hidePassword": "隐藏密码" };
10328
10410
  const search = { "placeholder": "查找...", "previousResult": "上一个结果 (SHIFT + F3)", "nextResult": "下一个结果 (F3)" };
10329
10411
  const onboarding = { "title": "欢迎使用 AiderDesk", "description": "面向专业软件工程师的透明、可操控的 AI 编排平台。不仅是 Aider 的图形界面——更是一个完整的编排层,帮助您:", "skipForNow": "暂时跳过", "finish": "完成设置", "features": { "1": "在隔离环境中管理项目、任务和 Git 工作树", "2": "通过丰富的差异查看器和审批门控,在每次变更落地前进行审查", "3": "通过工具审批门控、消息编辑和任务分叉来掌控 AI 行为", "4": "利用语义搜索和向量嵌入实现智能上下文和记忆", "5": "通过 MCP、自定义扩展和多模型子代理扩展一切" }, "getStarted": "让我们从连接您的 AI 模型开始。", "steps": { "welcome": "欢迎", "connectModel": "连接AI模型", "language": "语言", "aider": "Aider", "agent": "AI代理", "providers": "提供商", "finish": "完成", "choosePath": "选择使用方式", "configure": "配置" }, "choice": { "title": "您打算如何使用 AiderDesk?", "description": "这将定制您的设置流程并设置默认模式。您可以随时在“设置 → 常规”中更改。", "recommended": "推荐", "agent": { "title": "Agent 优先", "subtitle": "默认", "description": "拥有完整工具权限的自主 Agent。描述目标,它会规划并执行。", "feature1": "多步骤规划与文件编辑", "feature2": "Power 工具、MCP 服务器和技能", "feature3": "Aider 模式仍可一键切换", "modeLabel": "默认模式设为 Agent" }, "aider": { "title": "来自 Aider", "subtitle": "Aider 模式为主", "description": "您已经熟悉 Aider——让 Code、Ask 和 Architect 保持核心地位。", "feature1": "Aider 设置直接配置", "feature2": "编辑格式、自动提交、环境变量", "feature3": "需要时可随时使用 Agent 模式", "modeLabel": "默认模式设为 Code" } }, "language": { "title": "选择您的语言", "description": "为应用程序界面选择您的首选语言。" }, "aider": { "title": "配置 Aider", "description": "要开始使用,请配置您的 Aider 设置。您需要:", "options": { "1": "添加您想要使用的 LLM 提供商的 API 密钥", "2": "为 Aider 设置任何其他选项", "3": ".env 和 .aider.conf.yaml 文件也会像使用 Aider 一样被读取" }, "configureLater": "您也可以稍后在设置中进行配置。", "fineTuneTitle": "微调 Aider(可选)", "fineTuneDescription": "高级用户可以配置额外的 Aider 设置和环境变量。此步骤完全可选,可以安全跳过。", "fineTuneNote": "注意:这些设置适用于想要自定义 Aider 行为的高级用户。大多数用户可以跳过此步骤,如需要可稍后在设置中配置。", "agentSwitchNote": "提示:Agent 模式一键即可切换——随时使用输入框上方的模式选择器即可获得完全自主能力。" }, "providers": { "title": "模型提供商", "description": "配置您的 LLM 提供商以在 Aider 和 Agent 模式中使用。您可以为各种提供商设置 API 密钥和其他设置。", "configureLater": "如果您愿意,可以稍后在设置中配置这些。", "connectTitle": "连接您的AI模型", "connectDescription": "AiderDesk 支持多个AI提供商,包括OpenAI、Anthropic、Google Gemini等。您的API密钥安全存储在本地机器上,绝不会被共享。", "advancedUsersNote": "高级用户:您也可以在下一步的Aider配置部分使用环境变量配置提供商。", "advancedSettings": "高级设置", "order": "排序", "orderDescription": '按顺序尝试的提供商列表(例如 ["anthropic", "openai"])', "allowFallbacks": "允许备用选项", "allowFallbacksDescription": "当主提供商不可用时是否允许使用备用提供商", "dataCollection": "数据收集", "dataCollectionDescription": "控制是否使用可能存储数据的提供商", "only": "仅限", "onlyDescription": "仅允许用于此请求的提供商列表", "ignore": "忽略", "ignoreDescription": "为此请求跳过的提供商列表", "quantizations": "量化", "quantizationsDescription": '按量化级别过滤的列表(例如 ["int4", "int8"])', "sort": "排序", "sortDescription": "按价格或吞吐量对提供商进行排序", "requireParameters": "要求参数", "requireParametersDescription": "是否要求提供商支持模型参数。", "setupLater": "您也可以稍后在设置中配置这些。" }, "agent": { "title": "认识您的AI代理", "description": "通过 AiderDesk 的代理模式发现自主AI辅助的强大功能。您的AI代理可以独立工作来完成复杂任务。", "capabilities": "代理功能:", "autonomousPlanning": "自主任务规划:", "autonomousPlanningDesc": "将复杂请求分解为可管理的步骤并系统性地执行它们。", "toolUse": "工具使用:", "toolUseDesc": "利用各种工具进行文件操作、网络搜索和代码分析。", "extensible": "通过MCP扩展:", "extensibleDesc": "连接到模型上下文协议服务器以增强功能。", "configureAgent": "配置代理", "finishLater": "完成设置(稍后配置代理)", "configureTitle": "配置您的代理(可选)", "configureDescription": "自定义您的默认代理配置以匹配您的工作流程。您可以调整工具权限、上下文偏好和行为规则等设置。" }, "complete": { "title": "设置完成!", "description": "恭喜!您已成功设置 AiderDesk。现在您可以以完全透明和可控的方式驾驭 AI 辅助开发。", "ready": "点击'完成设置'开始您的编程之旅。", "success": "引导完成成功!欢迎使用 AiderDesk。", "mode": "新任务将以 {{mode}} 模式开始——您可以随时在“设置 → 常规”中更改。", "modeAgent": "Agent", "modeCode": "Code", "customizeTitle": "定制你的 AiderDesk", "customizeDescription": "还有更多可探索的设置——推荐看看这几处:", "general": { "title": "设置 → 常规", "description": "外观、语言、默认模式和启动行为" }, "mcp": { "title": "设置 → MCP", "description": "连接 MCP 服务器,为 Agent 提供更多工具" }, "tasks": { "title": "设置 → 任务", "description": "任务行为、自动化和智能状态" } }, "errors": { "navigationFailed": "导航失败。请重试。", "finishFailed": "完成引导失败。请重试。" } };
@@ -10370,7 +10452,7 @@ const addFileDialog = { "title": "添加上下文文件", "browse": "浏览文
10370
10452
  const fileFinder = { "addPathTooltip": "添加路径", "browseFile": "浏览文件", "browseDirectory": "浏览目录", "placeholder": { "filesOnly": "输入要添加的文件", "directoriesOnly": "输入要添加的目录", "filesAndDirectories": "输入要添加的文件或目录" }, "placeholderFinish": { "filesOnly": "输入文件或按 Enter 键完成", "directoriesOnly": "输入目录或按 Enter 键完成", "filesAndDirectories": "输入文件或目录,或按 Enter 键完成" } };
10371
10453
  const fileChip = { "removeFileTooltip": "移除文件" };
10372
10454
  const fileEditor = { "errorLoading": "加载文件失败", "requestChangeOnLine": "请求更改此行", "saved": "文件已保存", "errorSaving": "保存文件失败:{{error}}", "errorSubmitting": "提交更改请求失败:{{error}}", "saveBeforeSubmitting": "请先保存文件,再提交更改请求。", "unsavedChanges": "有未保存的更改", "saveShortcut": "保存 (Ctrl+S)", "saveAll": "全部保存", "saveAllTooltip": "保存所有打开的文件", "savedAll": "已保存 {{count}} 个文件", "closeTab": "关闭标签页 {{file}}", "discardTitle": "放弃未保存的更改?", "discard": "放弃", "discardMessage": "未保存的文件更改将丢失。", "title": "编辑器" };
10373
- const contextFiles = { "workspaceTitle": "工作区", "title": "上下文文件", "updatedFiles": "已更新文件", "uncommittedChanges": "未提交的更改", "updated": "已更新", "viewChanges": "查看更改", "viewAllFiles": "查看所有文件", "viewSingleFile": "查看单个文件", "allFiles": "所有文件", "add": "添加上下文文件", "addFileTooltip": "添加文件 (按 Ctrl/Cmd 键添加为只读)", "addFileTooltip.ctrl": "添加文件 (按 Ctrl 键添加为只读)", "addFileTooltip.cmd": "添加文件 (按 Cmd 键添加为只读)", "readOnly": "只读文件", "showAllFiles": "显示所有文件", "hideAllFiles": "隐藏所有文件", "expandAll": "全部展开", "collapseAll": "全部折叠", "dropAll": "删除所有上下文文件", "globalRule": "全局规则文件", "projectRule": "项目规则文件", "agentRule": "代理规则文件", "projectFiles": "项目文件", "rules": "规则文件", "skills": "技能", "noSkills": "无可用技能", "editSections": "重新排序和隐藏分区", "done": "完成", "skillActivated": "已激活", "skillActivate": "激活", "skillDeactivate": "停用", "skillActivating": "...", "skillDisable": "禁用技能", "skillEnable": "启用技能", "globalSkill": "全局技能", "projectSkill": "项目技能", "builtinSkill": "内置技能", "extensionSkill": "扩展技能", "manualSkillOnly": "仅限手动调用 (disable-model-invocation)", "agentSkillOnly": "仅限代理调用 (user-invocable: false)", "disableRuleFile": "禁用规则文件", "enableRuleFile": "启用规则文件", "disableAllRuleFiles": "禁用文件夹中的所有规则文件", "enableAllRuleFiles": "启用文件夹中的所有规则文件", "diffViewer": { "file": "文件" }, "search": "搜索文件", "searchPlaceholder": "搜索文件...", "refresh": "刷新", "useGit": "使用 Git", "useGitEnabled": "Git 已启用 - 点击使用文件系统", "useGitDisabled": "文件系统已启用 - 点击使用 Git", "revertFile": "恢复更改", "expandContext": "展开上下文", "collapseContext": "折叠上下文", "addFileToGit": "添加文件到 Git", "fileHasConflicts": "文件存在合并冲突", "confirmRevertTitle": "恢复文件更改?", "confirmRevertMessage": "这将丢弃此文件的所有更改。此操作无法撤销。", "revert": "恢复", "commitSection": "提交更改", "commitMessage": "提交信息", "commitMessagePlaceholder": "输入提交信息...", "commitMessagePlaceholderAmend": "保持空白以使用上一次提交信息,或输入新的信息", "generateMessage": "生成信息", "amend": "修改", "amendTooltip": "修改上一次提交而不是创建新提交", "skipGitHooks": "跳过 Git 钩子", "skipGitHooksTooltip": "创建提交时不运行 Git 钩子(git commit --no-verify)", "commit": "提交", "generatingMessage": "生成中...", "committing": "提交中...", "cancelCommit": "取消提交", "commitSuccess": "提交成功", "commitError": "提交错误", "selectedFilesToCommit": "已选择 {{count}}/{{total}} 个文件将被提交", "groupByCommit": "按提交分组", "flatView": "平铺视图(与基线的差异)", "uncommitted": "未提交", "group": "分组 {{hash}}", "updatedFilesWindowTitle": "已更新文件 - {{name}}", "largeDiffMessage": "该文件有 {{count}} 行变更,加载完整差异可能较慢。", "largeDiffLoad": "加载差异", "commentsPanel": "变更请求", "noComments": "暂无变更请求。点击差异查看器中的行以添加请求。", "editComment": "编辑", "removeComment": "移除", "submitAllRequests": "请求更改", "submittingRequests": "提交中...", "collapseComments": "收起面板", "expandComments": "展开面板", "empty": { "title": "没有上下文文件", "aiderMode": { "description": "在此处添加您想要读取或修改的文件。Aider 只能访问上下文中的文件。", "hint": "提示:添加相关文件(导入、类型)以获得更好的理解。" }, "agentMode": { "description": "代理可以使用工具访问项目中的任何文件。在此处添加文件是可选的,但可以通过提供即时上下文来加快任务速度。", "hint": "提示:使用 Aider 工具时或希望将文件内容包含在提示中时,在此处添加文件。", "includeContextFiles": "当在代理设置中启用'包含上下文文件'时,文件内容会直接嵌入到提示中以便立即访问。" } } };
10455
+ const contextFiles = { "renamedFrom": "重命名自 {{path}}", "workspaceTitle": "工作区", "title": "上下文文件", "updatedFiles": "已更新文件", "uncommittedChanges": "未提交的更改", "updated": "已更新", "viewChanges": "查看更改", "viewAllFiles": "查看所有文件", "viewSingleFile": "查看单个文件", "allFiles": "所有文件", "add": "添加上下文文件", "addFileTooltip": "添加文件 (按 Ctrl/Cmd 键添加为只读)", "addFileTooltip.ctrl": "添加文件 (按 Ctrl 键添加为只读)", "addFileTooltip.cmd": "添加文件 (按 Cmd 键添加为只读)", "readOnly": "只读文件", "showAllFiles": "显示所有文件", "hideAllFiles": "隐藏所有文件", "expandAll": "全部展开", "collapseAll": "全部折叠", "dropAll": "删除所有上下文文件", "globalRule": "全局规则文件", "projectRule": "项目规则文件", "agentRule": "代理规则文件", "projectFiles": "项目文件", "rules": "规则文件", "skills": "技能", "noSkills": "无可用技能", "editSections": "重新排序和隐藏分区", "done": "完成", "skillActivated": "已激活", "skillActivate": "激活", "skillDeactivate": "停用", "skillActivating": "...", "skillDisable": "禁用技能", "skillEnable": "启用技能", "globalSkill": "全局技能", "projectSkill": "项目技能", "builtinSkill": "内置技能", "extensionSkill": "扩展技能", "manualSkillOnly": "仅限手动调用 (disable-model-invocation)", "agentSkillOnly": "仅限代理调用 (user-invocable: false)", "disableRuleFile": "禁用规则文件", "enableRuleFile": "启用规则文件", "disableAllRuleFiles": "禁用文件夹中的所有规则文件", "enableAllRuleFiles": "启用文件夹中的所有规则文件", "diffViewer": { "file": "文件" }, "search": "搜索文件", "searchPlaceholder": "搜索文件...", "refresh": "刷新", "useGit": "使用 Git", "useGitEnabled": "Git 已启用 - 点击使用文件系统", "useGitDisabled": "文件系统已启用 - 点击使用 Git", "revertFile": "恢复更改", "expandContext": "展开上下文", "collapseContext": "折叠上下文", "addFileToGit": "添加文件到 Git", "fileHasConflicts": "文件存在合并冲突", "confirmRevertTitle": "恢复文件更改?", "confirmRevertMessage": "这将丢弃此文件的所有更改。此操作无法撤销。", "revert": "恢复", "commitSection": "提交更改", "commitMessage": "提交信息", "commitMessagePlaceholder": "输入提交信息...", "commitMessagePlaceholderAmend": "保持空白以使用上一次提交信息,或输入新的信息", "generateMessage": "生成信息", "amend": "修改", "amendTooltip": "修改上一次提交而不是创建新提交", "skipGitHooks": "跳过 Git 钩子", "skipGitHooksTooltip": "创建提交时不运行 Git 钩子(git commit --no-verify)", "commit": "提交", "generatingMessage": "生成中...", "committing": "提交中...", "cancelCommit": "取消提交", "commitSuccess": "提交成功", "commitError": "提交错误", "selectedFilesToCommit": "已选择 {{count}}/{{total}} 个文件将被提交", "groupByCommit": "按提交分组", "flatView": "平铺视图(与基线的差异)", "uncommitted": "未提交", "group": "分组 {{hash}}", "updatedFilesWindowTitle": "已更新文件 - {{name}}", "largeDiffMessage": "该文件有 {{count}} 行变更,加载完整差异可能较慢。", "largeDiffLoad": "加载差异", "commentsPanel": "变更请求", "noComments": "暂无变更请求。点击差异查看器中的行以添加请求。", "editComment": "编辑", "removeComment": "移除", "submitAllRequests": "请求更改", "submittingRequests": "提交中...", "collapseComments": "收起面板", "expandComments": "展开面板", "empty": { "title": "没有上下文文件", "aiderMode": { "description": "在此处添加您想要读取或修改的文件。Aider 只能访问上下文中的文件。", "hint": "提示:添加相关文件(导入、类型)以获得更好的理解。" }, "agentMode": { "description": "代理可以使用工具访问项目中的任何文件。在此处添加文件是可选的,但可以通过提供即时上下文来加快任务速度。", "hint": "提示:使用 Aider 工具时或希望将文件内容包含在提示中时,在此处添加文件。", "includeContextFiles": "当在代理设置中启用'包含上下文文件'时,文件内容会直接嵌入到提示中以便立即访问。" } } };
10374
10456
  const modelSelector = { "mainModel": "主模型", "editorModel": "编辑器模型", "weakModel": "弱模型:", "architectModel": "架构模型", "agentModel": "代理模型", "reasoning": "推理", "thinkingTokens": "思考令牌", "loadingModel": "加载模型中...", "searchPlaceholder": "搜索模型...", "searchPlaceholderOrCustom": "搜索模型或输入自定义名称...", "removePreferred": "从首选模型中移除", "invalidModelSelection": "模型格式无效。期望的格式为 '提供商/模型',例如 'openai/gpt-4'。", "providerNotConfigured": "提供商 '{{provider}}' 未配置。已配置的提供商为:{{providers}}。", "selectModel": "选择模型...", "weakModelLock": "锁定弱模型", "weakModelUnlock": "解锁弱模型", "noModelSelected": "未选择模型" };
10375
10457
  const modelInfo = { "noInfo": "无模型信息可用。", "maxInputTokens": "最大输入令牌数", "maxOutputTokens": "最大输出令牌数", "inputCostPerMillion": "每百万输入令牌成本", "outputCostPerMillion": "每百万输出令牌成本" };
10376
10458
  const mcp = { "noDescription": "无描述", "initializingServers": "正在初始化 MCP 服务器...", "serverToolStatus": "已启用{{enabledCount}}个工具,共{{count}}个", "loading": "加载中...", "toolsCount_one": "{{count}}个工具", "toolsCount_other": "{{count}}个工具", "loadToolsError": "加载MCP服务器工具失败", "noToolsFound": "未找到工具。请检查您的配置。", "server_one": "服务器", "server_other": "服务器", "aider": "aider", "aiderOnly": "仅aider", "withFiles": "包含文件", "useAiderTools": "使用Aider工具", "usePowerTools": "使用 Power 工具", "powerToolsTooltip": "允许代理使用强大的工具进行直接文件操作(读、写、编辑)、搜索(glob、grep、语义搜索)和执行 shell 命令(bash)。", "aiderToolsTooltip": "代理可以使用Aider执行添加/删除上下文文件操作和运行提示。", "includeContextFiles": "包含上下文文件", "includeFilesTooltip": "将上下文文件内容添加到代理的聊天中。这将增加令牌使用量。", "includeRepoMap": "包含仓库地图", "includeRepoMapTooltip": "在代理的上下文中包含仓库地图。这有助于代理理解项目结构,但可能会增加token使用量。", "servers": "MCP服务器", "selectServer": "从列表中选择一个 MCP 服务器以查看其工具", "reloadServer": "重新加载服务器", "reload": "重新加载", "configureServers": "配置服务器", "approval": { "never": "从不", "always": "总是", "ask": "询问" }, "tools": "工具", "all": "全部", "oauth": { "connect": "连接", "reopen": "重新打开", "connected": "已通过 OAuth 连接", "disconnect": "断开连接", "authorizing": "请在打开的浏览器窗口中完成身份验证。", "authenticationRequired": "需要 OAuth 身份验证。", "authenticationRequiredMessage": "MCP 服务器 '{{serverName}}' 需要 OAuth 身份验证。请在 设置 → MCP 服务器 中连接。", "windowTitle": "MCP 身份验证", "connectError": "无法启动 MCP 身份验证。", "disconnectError": "无法断开 MCP 身份验证。" } };
@@ -10414,8 +10496,9 @@ const hideModelSelector = "隐藏模型选择器";
10414
10496
  const logs = { "title": "系统日志", "level": "级别", "allExtensions": "所有扩展", "searchPlaceholder": "搜索日志...", "debugTooltip": "仅当 LOG_LEVEL 环境变量设置为 'debug' 时,调试日志才可见。", "autoScroll": "自动滚动", "showing": "显示", "clear": "清除日志", "noLogs": "没有日志可显示", "metadata": "元数据", "clearConfirm": { "title": "清除日志", "message": "您确定要清除所有缓冲的日志吗?此操作无法撤销。", "confirm": "清除", "cancel": "取消" } };
10415
10497
  const readonly = { "noTasks": "没有任务", "unnamedTask": "未命名任务", "archived": "已归档", "loading": "正在加载只读项目…", "selectTask": "选择任务以查看其完整记录。", "noProjects": "未配置项目。", "label": "只读", "searchTasks": "搜索任务", "allStates": "所有状态", "bootstrapError": "无法加载浏览器应用程序。", "projectError": "无法加载此项目。", "projects": "项目", "openTasks": "打开任务" };
10416
10498
  const providerTls = { "title": "TLS 设置", "disableCertificateVerification": "禁用证书验证", "disableCertificateVerificationInfo": "跳过此提供商端点的 TLS 证书验证。仅用于使用自签名证书的可信服务器(例如本地模型服务器)。", "caCertPath": "CA 证书路径", "caCertPathInfo": "用于验证提供商端点的 CA 证书文件(PEM)的绝对路径。使用自签名或私有 CA 证书时,建议使用此项而非禁用验证。", "caCertPathPlaceholder": "/path/to/ca.pem" };
10417
- const git = { "askpass": { "passwordTitle": "Git 身份验证", "usernameTitle": "Git 用户名", "confirmationTitle": "Git 确认", "rememberSession": "在本次会话中记住" }, "gitBranchLabel": "Git 分支:{{branch}}", "upToDate": "已是最新", "outgoingCommitsTooltip": "传出提交({{count}}):", "incomingCommitsTooltip": "传入提交({{count}}):", "noCurrentBranch": "无分支", "searchBranches": "搜索分支", "noBranchesFound": "未找到分支", "localBranches": "本地分支", "remoteBranches": "远程分支", "newBranch": "新建分支", "newBranchNamePlaceholder": "新分支名称", "initializeGit": "初始化 Git", "initializeGitTooltip": "该项目尚未初始化 Git 仓库。初始化后即可使用分支、工作树和版本跟踪功能。", "initializingGit": "初始化中...", "gitInitialized": "Git 仓库已初始化", "branchCreated": "分支 '{{branch}}' 已创建", "checkedOutBranch": "已切换到 '{{branch}}'", "confirmCheckoutTitle": "检出分支", "confirmCheckoutMessage": "该分支已在另一个任务的工作树中检出。确认后,该工作树将被分离(切换到分离 HEAD 状态,保留其更改),以便在此处检出该分支。是否继续?", "checkout": "检出", "mergeIntoCurrent": "合并到当前分支", "rebaseCurrentOnto": "将当前分支变基到此分支", "merge": "合并", "rebase": "变基", "confirmMergeTitle": "合并分支", "confirmMergeMessage": "将 '{{branch}}' 合并到当前分支?", "mergedIntoCurrent": "已将 '{{branch}}' 合并到当前分支", "mergeConflicts": "合并冲突:{{files}}", "confirmRebaseTitle": "变基分支", "confirmRebaseMessage": "将当前分支变基到 '{{branch}}'?", "rebasedOnto": "已变基到 '{{branch}}'", "rebaseConflicts": "变基冲突:{{files}}。中止变基可返回之前的状态。", "deleteBranch": "删除分支", "deleteForce": "强制删除", "confirmDeleteTitle": "删除分支", "confirmDeleteMessage": "确定删除分支 '{{branch}}' 吗?", "confirmForceDeleteMessage": "分支 '{{branch}}' 包含未合并的提交。强制删除将丢弃这些提交,是否继续?", "branchDeleted": "分支 '{{branch}}' 已删除", "updateProject": "更新项目(拉取)", "pullUpToDate": "项目已是最新,无需拉取", "pullSuccess": "项目更新成功", "confirmPullTitle": "拉取更改", "confirmPullMessage": "你的分支与远程分支存在分歧({{outgoing}} 个本地提交,{{incoming}} 个远程提交)。请选择合并方式:", "pullRebaseAutostashHint": "未提交的更改将被贮藏,并在拉取完成后自动恢复。", "push": "推送", "pushSuccess": "更改已成功推送", "pushRejectedPullFirst": "推送被拒绝:远程分支有新的提交。请先拉取更改后重试。", "resolveWithAI": "用 AI 解决", "confirmPushTitle": "推送提交", "confirmPushMessage_one": "推送 {{count}} 个提交到远程?", "confirmPushMessage_other": "推送 {{count}} 个提交到远程?", "noCommitsToPush": "没有要推送的提交", "confirmPushSetUpstreamMessage": "分支 '{{branch}}' 尚无上游分支。将其推送到远程并设置远程分支为上游?", "force": "强制", "aheadCommits_one": "领先 {{count}} 个提交", "aheadCommits_other": "领先 {{count}} 个提交", "behindCommits_one": "落后 {{count}} 个提交", "behindCommits_other": "落后 {{count}} 个提交", "recentBranches": "最近", "checkoutBranch": "检出 '{{branch}}'", "newBranchFrom": "从 '{{branch}}' 新建分支...", "mergeBranchInto": "将 '{{branch}}' 合并到 '{{current}}'", "rebaseOnto": "将 '{{current}}' 变基到 '{{branch}}'", "deleteBranchName": "删除 '{{branch}}'", "rebaseWorktreeOnto": "将工作树变基到 '{{branch}}'", "actionNotAvailableInWorktree": "此操作在工作树模式下不可用", "updateFromRemote": "从 '{{upstream}}' 更新", "branchUpdated": "分支 '{{branch}}' 已从远程更新" };
10499
+ const git = { "askpass": { "passwordTitle": "Git 身份验证", "usernameTitle": "Git 用户名", "confirmationTitle": "Git 确认", "rememberSession": "在本次会话中记住" }, "gitBranchLabel": "Git 分支:{{branch}}", "upToDate": "已是最新", "outgoingCommitsTooltip": "传出提交({{count}}):", "incomingCommitsTooltip": "传入提交({{count}}):", "noCurrentBranch": "无分支", "searchBranches": "搜索分支", "noBranchesFound": "未找到分支", "localBranches": "本地分支", "remoteBranches": "远程分支", "newBranch": "新建分支", "newBranchNamePlaceholder": "新分支名称", "initializeGit": "初始化 Git", "initializeGitTooltip": "该项目尚未初始化 Git 仓库。初始化后即可使用分支、工作树和版本跟踪功能。", "initializingGit": "初始化中...", "gitInitialized": "Git 仓库已初始化", "branchCreated": "分支 '{{branch}}' 已创建", "checkedOutBranch": "已切换到 '{{branch}}'", "confirmCheckoutTitle": "检出分支", "confirmCheckoutMessage": "该分支已在另一个任务的工作树中检出。确认后,该工作树将被分离(切换到分离 HEAD 状态,保留其更改),以便在此处检出该分支。是否继续?", "checkout": "检出", "mergeIntoCurrent": "合并到当前分支", "rebaseCurrentOnto": "将当前分支变基到此分支", "merge": "合并", "rebase": "变基", "confirmMergeTitle": "合并分支", "confirmMergeMessage": "将 '{{branch}}' 合并到当前分支?", "mergedIntoCurrent": "已将 '{{branch}}' 合并到当前分支", "mergeConflicts": "合并冲突:{{files}}", "confirmRebaseTitle": "变基分支", "confirmRebaseMessage": "将当前分支变基到 '{{branch}}'?", "rebasedOnto": "已变基到 '{{branch}}'", "rebaseConflicts": "变基冲突:{{files}}。中止变基可返回之前的状态。", "deleteBranch": "删除分支", "deleteForce": "强制删除", "confirmDeleteTitle": "删除分支", "confirmDeleteMessage": "确定删除分支 '{{branch}}' 吗?", "confirmForceDeleteMessage": "分支 '{{branch}}' 包含未合并的提交。强制删除将丢弃这些提交,是否继续?", "branchDeleted": "分支 '{{branch}}' 已删除", "updateProject": "更新项目(拉取)", "pullUpToDate": "项目已是最新,无需拉取", "pullSuccess": "项目更新成功", "confirmPullTitle": "拉取更改", "confirmPullMessage": "你的分支与远程分支存在分歧({{outgoing}} 个本地提交,{{incoming}} 个远程提交)。请选择合并方式:", "pullRebaseAutostashHint": "未提交的更改将被贮藏,并在拉取完成后自动恢复。", "push": "推送", "pushSuccess": "更改已成功推送", "pushRejectedPullFirst": "推送被拒绝:远程分支有新的提交。请先拉取更改后重试。", "resolveWithAI": "用 AI 解决", "confirmPushTitle": "推送提交", "confirmPushMessage_one": "推送 {{count}} 个提交到远程?", "confirmPushMessage_other": "推送 {{count}} 个提交到远程?", "noCommitsToPush": "没有要推送的提交", "confirmPushSetUpstreamMessage": "分支 '{{branch}}' 尚无上游分支。将其推送到远程并设置远程分支为上游?", "force": "强制", "aheadCommits_one": "领先 {{count}} 个提交", "aheadCommits_other": "领先 {{count}} 个提交", "behindCommits_one": "落后 {{count}} 个提交", "behindCommits_other": "落后 {{count}} 个提交", "recentBranches": "最近", "checkoutBranch": "检出 '{{branch}}'", "newBranchFrom": "从 '{{branch}}' 新建分支...", "createWorktreeFrom": "从 '{{branch}}' 创建工作树", "mergeBranchInto": "将 '{{branch}}' 合并到 '{{current}}'", "rebaseOnto": "将 '{{current}}' 变基到 '{{branch}}'", "deleteBranchName": "删除 '{{branch}}'", "rebaseWorktreeOnto": "将工作树变基到 '{{branch}}'", "actionNotAvailableInWorktree": "此操作在工作树模式下不可用", "updateFromRemote": "从 '{{upstream}}' 更新", "branchUpdated": "分支 '{{branch}}' 已从远程更新" };
10418
10500
  const zh = {
10501
+ projectTrust,
10419
10502
  languages,
10420
10503
  commandPalette,
10421
10504
  uiActions,
@@ -12257,7 +12340,8 @@ const GetUpdatedFileDiffSchema = zod.z.object({
12257
12340
  projectDir: zod.z.string().min(1, "Project directory is required"),
12258
12341
  taskId: zod.z.string().min(1, "Task ID is required"),
12259
12342
  filePath: zod.z.string().min(1, "File path is required"),
12260
- commitHash: zod.z.string().optional()
12343
+ commitHash: zod.z.string().optional(),
12344
+ previousPath: zod.z.string().min(1).optional()
12261
12345
  });
12262
12346
  const RefreshContextFilesSchema = zod.z.object({
12263
12347
  projectDir: zod.z.string().min(1, "Project directory is required"),
@@ -12357,8 +12441,8 @@ class ContextApi extends BaseApi {
12357
12441
  if (!parsed) {
12358
12442
  return;
12359
12443
  }
12360
- const { projectDir, taskId, filePath, commitHash } = parsed;
12361
- const diff = await this.eventsHandler.getUpdatedFileDiff(projectDir, taskId, filePath, commitHash);
12444
+ const { projectDir, taskId, filePath, commitHash, previousPath } = parsed;
12445
+ const diff = await this.eventsHandler.getUpdatedFileDiff(projectDir, taskId, filePath, commitHash, previousPath);
12362
12446
  res.status(200).json({ diff });
12363
12447
  })
12364
12448
  );
@@ -12369,8 +12453,8 @@ class ContextApi extends BaseApi {
12369
12453
  if (!parsed) {
12370
12454
  return;
12371
12455
  }
12372
- const { projectDir, taskId, filePath, commitHash } = parsed;
12373
- const contents = await this.eventsHandler.getUpdatedFileContents(projectDir, taskId, filePath, commitHash);
12456
+ const { projectDir, taskId, filePath, commitHash, previousPath } = parsed;
12457
+ const contents = await this.eventsHandler.getUpdatedFileContents(projectDir, taskId, filePath, commitHash, previousPath);
12374
12458
  res.status(200).json(contents);
12375
12459
  })
12376
12460
  );
@@ -13004,6 +13088,7 @@ const SwitchToLocalWorkingModeSchema = zod.z.object({
13004
13088
  discardWorktreeChanges: zod.z.boolean().optional()
13005
13089
  });
13006
13090
  const SwitchToWorktreeWorkingModeSchema = zod.z.object({
13091
+ baseBranch: zod.z.string().min(1).optional(),
13007
13092
  projectDir: zod.z.string().min(1, "Project directory is required"),
13008
13093
  taskId: zod.z.string().min(1, "Task id is required"),
13009
13094
  carryOverUncommittedChanges: zod.z.boolean().optional(),
@@ -13029,7 +13114,8 @@ const AddFileToGitSchema = zod.z.object({
13029
13114
  const RestoreFileSchema = zod.z.object({
13030
13115
  projectDir: zod.z.string().min(1, "Project directory is required"),
13031
13116
  taskId: zod.z.string().min(1, "Task id is required"),
13032
- filePath: zod.z.string().min(1, "File path is required")
13117
+ filePath: zod.z.string().min(1, "File path is required"),
13118
+ previousPath: zod.z.string().min(1).optional()
13033
13119
  });
13034
13120
  const ReadFileSchema = zod.z.object({
13035
13121
  projectDir: zod.z.string().min(1, "Project directory is required"),
@@ -13608,8 +13694,8 @@ class ProjectApi extends BaseApi {
13608
13694
  if (!parsed) {
13609
13695
  return;
13610
13696
  }
13611
- const { projectDir, taskId, carryOverUncommittedChanges, dropSourceChanges } = parsed;
13612
- await this.eventsHandler.switchToWorktreeWorkingMode(projectDir, taskId, { carryOverUncommittedChanges, dropSourceChanges });
13697
+ const { projectDir, taskId, baseBranch, carryOverUncommittedChanges, dropSourceChanges } = parsed;
13698
+ await this.eventsHandler.switchToWorktreeWorkingMode(projectDir, taskId, { baseBranch, carryOverUncommittedChanges, dropSourceChanges });
13613
13699
  res.status(200).json({ message: "Switched to worktree working mode" });
13614
13700
  })
13615
13701
  );
@@ -13668,8 +13754,8 @@ class ProjectApi extends BaseApi {
13668
13754
  if (!parsed) {
13669
13755
  return;
13670
13756
  }
13671
- const { projectDir, taskId, filePath } = parsed;
13672
- await this.eventsHandler.restoreFile(projectDir, taskId, filePath);
13757
+ const { projectDir, taskId, filePath, previousPath } = parsed;
13758
+ await this.eventsHandler.restoreFile(projectDir, taskId, filePath, previousPath);
13673
13759
  res.status(200).json({ message: "File restored" });
13674
13760
  })
13675
13761
  );
@@ -14290,6 +14376,16 @@ class ProjectApi extends BaseApi {
14290
14376
  res.status(200).json({ message: "Project stopped" });
14291
14377
  })
14292
14378
  );
14379
+ router.post(
14380
+ "/project/check",
14381
+ this.handleRequest(async (req, res) => {
14382
+ const parsed = this.validateRequest(AddOpenProjectSchema, req.body, res);
14383
+ if (!parsed) {
14384
+ return;
14385
+ }
14386
+ res.status(200).json(await this.eventsHandler.checkProject(parsed.projectDir));
14387
+ })
14388
+ );
14293
14389
  router.post(
14294
14390
  "/project/add-open",
14295
14391
  this.handleRequest(async (req, res) => {
@@ -17156,17 +17252,9 @@ class ContextManager {
17156
17252
  content: subAgentsPrompt
17157
17253
  }
17158
17254
  ];
17159
- if (part.output.value && Array.isArray(part.output.value) && part.output.value.length > 0) {
17160
- const lastMessage = part.output.value[part.output.value.length - 1];
17161
- if (lastMessage && typeof lastMessage === "object" && "role" in lastMessage && lastMessage.role === MessageRole.Assistant) {
17162
- const content = extractTextContent(lastMessage.content);
17163
- if (content) {
17164
- messages2.push({
17165
- role: MessageRole.Assistant,
17166
- content
17167
- });
17168
- }
17169
- }
17255
+ const content = getSubagentFinalText(part.output.value);
17256
+ if (content) {
17257
+ messages2.push({ role: MessageRole.Assistant, content });
17170
17258
  }
17171
17259
  return messages2;
17172
17260
  } else {
@@ -17481,15 +17569,15 @@ ${JSON.stringify(part.output.value)}`
17481
17569
  commitMessage: response.commitMessage,
17482
17570
  diff: response.diff,
17483
17571
  usageReport: response.usageReport,
17484
- promptContext: message.promptContext,
17572
+ promptContext,
17485
17573
  timestamp: message.timestamp
17486
17574
  };
17487
17575
  messagesData.push(responseCompletedData);
17488
17576
  });
17489
17577
  }
17490
17578
  }
17491
- if (serverName === SUBAGENTS_TOOL_GROUP_NAME && toolName === SUBAGENTS_TOOL_RUN_TASK && part.output?.value && typeof part.output.value === "object" && "messages" in part.output.value) {
17492
- const messages2 = part.output.value.messages;
17579
+ if (serverName === SUBAGENTS_TOOL_GROUP_NAME && toolName === SUBAGENTS_TOOL_RUN_TASK && getSubagentMessages(part.output?.value) !== void 0) {
17580
+ const messages2 = getSubagentMessages(part.output.value);
17493
17581
  if (Array.isArray(messages2)) {
17494
17582
  messages2.forEach((subMessage) => {
17495
17583
  if (subMessage.role === "assistant") {
@@ -18832,6 +18920,19 @@ class GitManager {
18832
18920
  } catch {
18833
18921
  await execWithShellPath("git init", { cwd: projectPath });
18834
18922
  }
18923
+ let selectedBaseCommit;
18924
+ if (baseBranch !== "HEAD") {
18925
+ const refs = await simpleGit.simpleGit(projectPath).raw(["for-each-ref", "--format=%(refname)", "refs/heads/", "refs/remotes/"]);
18926
+ const candidates = refs.trim().split("\n");
18927
+ const baseRef2 = candidates.find((ref) => ref === `refs/heads/${baseBranch}`) || candidates.find((ref) => ref === `refs/remotes/${baseBranch}`);
18928
+ if (!baseRef2) {
18929
+ throw new Error(`Base branch '${baseBranch}' does not exist`);
18930
+ }
18931
+ selectedBaseCommit = (await simpleGit.simpleGit(projectPath).raw(["rev-parse", "--verify", "--end-of-options", `${baseRef2}^{commit}`])).trim();
18932
+ }
18933
+ if (selectedBaseCommit && branch) {
18934
+ branch = await this.findUniqueBranchName(projectPath, branch);
18935
+ }
18835
18936
  try {
18836
18937
  await execWithShellPath("git worktree prune", { cwd: projectPath });
18837
18938
  } catch (error) {
@@ -18864,7 +18965,7 @@ class GitManager {
18864
18965
  if (branch) {
18865
18966
  let branchExists = false;
18866
18967
  try {
18867
- await execWithShellPath(`git show-ref --verify --quiet refs/heads/${branch}`, { cwd: projectPath });
18968
+ await execWithShellPath(["git", "show-ref", "--verify", "--quiet", `refs/heads/${branch}`], { cwd: projectPath });
18868
18969
  branchExists = true;
18869
18970
  } catch (error) {
18870
18971
  logger.debug(`Branch ${branch} not found, will create it from ${baseRef}:`, error);
@@ -18873,31 +18974,24 @@ class GitManager {
18873
18974
  let branchToAdd = branch;
18874
18975
  if (await this.isBranchCheckedOutInOtherWorktree(projectPath, branch, worktreePath)) {
18875
18976
  branchToAdd = await this.findUniqueBranchName(projectPath, branch);
18876
- await execWithShellPath(`git worktree add -b ${branchToAdd} "${worktreePath}" ${branch}`, { cwd: projectPath });
18977
+ await execWithShellPath(["git", "worktree", "add", "-b", branchToAdd, worktreePath, branch], { cwd: projectPath });
18877
18978
  } else {
18878
- await execWithShellPath(`git worktree add "${worktreePath}" ${branch}`, { cwd: projectPath });
18979
+ await execWithShellPath(["git", "worktree", "add", worktreePath, branch], { cwd: projectPath });
18879
18980
  }
18880
- baseCommit = (await execWithShellPath(`git rev-parse ${branchToAdd}`, {
18981
+ baseCommit = (await execWithShellPath(["git", "rev-parse", "--verify", "--end-of-options", branchToAdd], {
18881
18982
  cwd: projectPath
18882
18983
  })).stdout.trim();
18883
18984
  newBranchName = branchToAdd;
18884
18985
  } else {
18885
- if (baseBranch !== "HEAD") {
18886
- try {
18887
- await execWithShellPath(`git show-ref --verify --quiet refs/heads/${baseBranch}`, { cwd: projectPath });
18888
- } catch {
18889
- throw new Error(`Base branch '${baseBranch}' does not exist`);
18890
- }
18891
- }
18892
- baseCommit = (await execWithShellPath(`git rev-parse ${baseRef}`, {
18986
+ baseCommit = selectedBaseCommit || (await execWithShellPath(["git", "rev-parse", "--verify", "--end-of-options", baseRef], {
18893
18987
  cwd: projectPath
18894
18988
  })).stdout.trim();
18895
- await execWithShellPath(`git worktree add -b ${branch} "${worktreePath}" ${baseRef}`, { cwd: projectPath });
18989
+ await execWithShellPath(["git", "worktree", "add", "-b", branch, worktreePath, selectedBaseCommit || baseRef], { cwd: projectPath });
18896
18990
  newBranchName = branch;
18897
18991
  }
18898
18992
  } else {
18899
- await execWithShellPath(`git worktree add "${worktreePath}" ${baseRef}`, { cwd: projectPath });
18900
- baseCommit = (await execWithShellPath(`git rev-parse ${baseRef}`, {
18993
+ await execWithShellPath(["git", "worktree", "add", worktreePath, selectedBaseCommit || baseRef], { cwd: projectPath });
18994
+ baseCommit = (await execWithShellPath(["git", "rev-parse", "--verify", "--end-of-options", baseRef], {
18901
18995
  cwd: projectPath
18902
18996
  })).stdout.trim();
18903
18997
  if (baseRef === "HEAD") {
@@ -19432,7 +19526,7 @@ ${conflictedFiles.join("\n")}`;
19432
19526
  }
19433
19527
  async getCommitHash(worktreePath, ref) {
19434
19528
  try {
19435
- const { stdout } = await execWithShellPath(`git rev-parse ${ref}`, { cwd: worktreePath });
19529
+ const { stdout } = await execWithShellPath(["git", "rev-parse", "--verify", "--end-of-options", ref], { cwd: worktreePath });
19436
19530
  return stdout.trim();
19437
19531
  } catch {
19438
19532
  return void 0;
@@ -19507,7 +19601,7 @@ ${conflictedFiles.join("\n")}`;
19507
19601
  try {
19508
19602
  let stdout = "0";
19509
19603
  try {
19510
- const result = await execWithShellPath(`git rev-list --count HEAD..${mainBranch}`, { cwd: worktreePath });
19604
+ const result = await execWithShellPath(["git", "rev-list", "--count", `HEAD..${mainBranch}`, "--"], { cwd: worktreePath });
19511
19605
  stdout = result.stdout;
19512
19606
  } catch {
19513
19607
  stdout = "0";
@@ -19525,20 +19619,20 @@ ${conflictedFiles.join("\n")}`;
19525
19619
  if (!hasChanges) {
19526
19620
  return { hasConflicts: false, canAutoMerge: true };
19527
19621
  }
19528
- const { stdout: mergeBase } = await execWithShellPath(`git merge-base HEAD ${mainBranch}`, { cwd: worktreePath });
19622
+ const { stdout: mergeBase } = await execWithShellPath(["git", "merge-base", "HEAD", mainBranch], { cwd: worktreePath });
19529
19623
  const base = mergeBase.trim();
19530
19624
  try {
19531
- const { stdout: mergeTreeOutput } = await execWithShellPath(`git merge-tree ${base} HEAD ${mainBranch}`, { cwd: worktreePath });
19625
+ const { stdout: mergeTreeOutput } = await execWithShellPath(["git", "merge-tree", base, "HEAD", mainBranch], { cwd: worktreePath });
19532
19626
  const conflictMarkers = mergeTreeOutput.match(/<<<<<<< /g);
19533
19627
  const hasConflicts = conflictMarkers && conflictMarkers.length > 0;
19534
19628
  if (hasConflicts) {
19535
19629
  const { stdout: diffOutput } = await execWithShellPath(`git diff --name-only ${base}...HEAD`, { cwd: worktreePath });
19536
19630
  const ourFiles = diffOutput.trim().split("\n").filter((f) => f);
19537
- const { stdout: theirDiffOutput } = await execWithShellPath(`git diff --name-only ${base}...${mainBranch}`, { cwd: worktreePath });
19631
+ const { stdout: theirDiffOutput } = await execWithShellPath(["git", "diff", "--name-only", `${base}...${mainBranch}`, "--"], { cwd: worktreePath });
19538
19632
  const theirFiles = theirDiffOutput.trim().split("\n").filter((f) => f);
19539
19633
  const conflictingFiles = ourFiles.filter((f) => theirFiles.includes(f));
19540
19634
  const { stdout: ourCommits } = await execWithShellPath(`git log --oneline ${base}..HEAD`, { cwd: worktreePath });
19541
- const { stdout: theirCommits } = await execWithShellPath(`git log --oneline ${base}..${mainBranch}`, { cwd: worktreePath });
19635
+ const { stdout: theirCommits } = await execWithShellPath(["git", "log", "--oneline", `${base}..${mainBranch}`, "--"], { cwd: worktreePath });
19542
19636
  logger.info(`Found conflicts in files: ${conflictingFiles.join(", ")}`);
19543
19637
  return {
19544
19638
  hasConflicts: true,
@@ -19557,12 +19651,12 @@ ${conflictedFiles.join("\n")}`;
19557
19651
  });
19558
19652
  const { stdout: diffOutput } = await execWithShellPath(`git diff --name-only ${base}...HEAD`, { cwd: worktreePath });
19559
19653
  const ourFiles = diffOutput.trim().split("\n").filter((f) => f);
19560
- const { stdout: theirDiffOutput } = await execWithShellPath(`git diff --name-only ${base}...${mainBranch}`, { cwd: worktreePath });
19654
+ const { stdout: theirDiffOutput } = await execWithShellPath(["git", "diff", "--name-only", `${base}...${mainBranch}`, "--"], { cwd: worktreePath });
19561
19655
  const theirFiles = theirDiffOutput.trim().split("\n").filter((f) => f);
19562
19656
  const conflictingFiles = ourFiles.filter((f) => theirFiles.includes(f));
19563
19657
  if (conflictingFiles.length > 0) {
19564
19658
  const { stdout: ourCommits } = await execWithShellPath(`git log --oneline ${base}..HEAD`, { cwd: worktreePath });
19565
- const { stdout: theirCommits } = await execWithShellPath(`git log --oneline ${base}..${mainBranch}`, { cwd: worktreePath });
19659
+ const { stdout: theirCommits } = await execWithShellPath(["git", "log", "--oneline", `${base}..${mainBranch}`, "--"], { cwd: worktreePath });
19566
19660
  logger.info(`Potential conflicts in files: ${conflictingFiles.join(", ")}`);
19567
19661
  return {
19568
19662
  hasConflicts: true,
@@ -19633,9 +19727,12 @@ ${conflictedFiles.join("\n")}`;
19633
19727
  }
19634
19728
  const command = effectiveBaseCommit ? `git rebase --onto ${mainBranch} ${effectiveBaseCommit}` : `git rebase ${mainBranch}`;
19635
19729
  executedCommands.push(`${command} (in ${worktreePath})`);
19636
- const rebaseResult = await execWithShellPath(command, {
19637
- cwd: worktreePath
19638
- });
19730
+ const rebaseResult = await execWithShellPath(
19731
+ effectiveBaseCommit ? ["git", "rebase", "--onto", mainBranch, effectiveBaseCommit] : ["git", "rebase", mainBranch],
19732
+ {
19733
+ cwd: worktreePath
19734
+ }
19735
+ );
19639
19736
  lastOutput = rebaseResult.stdout || rebaseResult.stderr || "";
19640
19737
  if (hadUncommittedChanges) {
19641
19738
  await this.resetTempCommitIfExists(worktreePath);
@@ -19734,7 +19831,7 @@ ${conflictedFiles.join("\n")}`;
19734
19831
  lastOutput = currentBranch || stderr1 || "";
19735
19832
  const branchName = currentBranch.trim() || "detached HEAD";
19736
19833
  command = `git log --oneline ${mainBranch}..HEAD`;
19737
- const { stdout: commits, stderr: stderr2 } = await execWithShellPath(command, { cwd: worktreePath });
19834
+ const { stdout: commits, stderr: stderr2 } = await execWithShellPath(["git", "log", "--oneline", `${mainBranch}..HEAD`, "--"], { cwd: worktreePath });
19738
19835
  lastOutput = commits || stderr2 || "";
19739
19836
  if (!commits.trim()) {
19740
19837
  return;
@@ -19753,9 +19850,12 @@ ${conflictedFiles.join("\n")}`;
19753
19850
  command = effectiveBaseCommit ? `git rebase --onto ${mainBranch} ${effectiveBaseCommit}` : `git rebase ${mainBranch}`;
19754
19851
  executedCommands.push(`${command} (in ${worktreePath})`);
19755
19852
  try {
19756
- const rebaseWorktreeResult = await execWithShellPath(command, {
19757
- cwd: worktreePath
19758
- });
19853
+ const rebaseWorktreeResult = await execWithShellPath(
19854
+ effectiveBaseCommit ? ["git", "rebase", "--onto", mainBranch, effectiveBaseCommit] : ["git", "rebase", mainBranch],
19855
+ {
19856
+ cwd: worktreePath
19857
+ }
19858
+ );
19759
19859
  lastOutput = rebaseWorktreeResult.stdout || rebaseWorktreeResult.stderr || "";
19760
19860
  logger.debug(`Successfully rebased worktree onto ${mainBranch} before squashing`);
19761
19861
  } catch (error) {
@@ -19783,9 +19883,11 @@ ${conflictedFiles.join("\n")}`;
19783
19883
  if (checkoutless) {
19784
19884
  const { stdout: worktreeTree } = await execWithShellPath(`git rev-parse '${worktreeCommitHash}^{tree}'`, { cwd: worktreePath });
19785
19885
  const treeHash = worktreeTree.trim();
19786
- const { stdout: targetHead } = await execWithShellPath(`git rev-parse ${mainBranch}`, { cwd: projectPath });
19886
+ const { stdout: targetHead } = await execWithShellPath(["git", "rev-parse", "--verify", "--end-of-options", mainBranch], { cwd: projectPath });
19787
19887
  const targetHeadHash = targetHead.trim();
19788
- const { stdout: targetTree } = await execWithShellPath(`git rev-parse '${mainBranch}^{tree}'`, { cwd: projectPath });
19888
+ const { stdout: targetTree } = await execWithShellPath(["git", "rev-parse", "--verify", "--end-of-options", `${mainBranch}^{tree}`], {
19889
+ cwd: projectPath
19890
+ });
19789
19891
  if (treeHash === targetTree.trim()) {
19790
19892
  logger.info("No changes to squash merge (worktree tree is identical to target branch tree)");
19791
19893
  return;
@@ -19802,7 +19904,7 @@ ${conflictedFiles.join("\n")}`;
19802
19904
  const newCommitHash = commitResult.stdout.trim();
19803
19905
  command = `git update-ref refs/heads/${mainBranch} ${newCommitHash} ${targetHeadHash}`;
19804
19906
  executedCommands.push(`git update-ref refs/heads/${mainBranch} ${newCommitHash} <old-hash> (in ${projectPath})`);
19805
- await execWithShellPath(command, {
19907
+ await execWithShellPath(["git", "update-ref", `refs/heads/${mainBranch}`, newCommitHash, targetHeadHash], {
19806
19908
  cwd: projectPath
19807
19909
  });
19808
19910
  logger.info(`Successfully squash merged ${branchName} into ${mainBranch} (${newCommitHash}) without checkout`);
@@ -19813,7 +19915,7 @@ ${conflictedFiles.join("\n")}`;
19813
19915
  }
19814
19916
  command = `git checkout ${mainBranch}`;
19815
19917
  executedCommands.push(`git checkout ${mainBranch} (in ${projectPath})`);
19816
- const checkoutResult = await execWithShellPath(command, {
19918
+ const checkoutResult = await execWithShellPath(["git", "checkout", mainBranch], {
19817
19919
  cwd: projectPath
19818
19920
  });
19819
19921
  lastOutput = checkoutResult.stdout || checkoutResult.stderr || "";
@@ -19890,7 +19992,7 @@ Git output: ${err.stderr || err.stdout || err.message}`);
19890
19992
  lastOutput = currentBranch || stderr1 || "";
19891
19993
  const branchName = currentBranch.trim() || "detached HEAD";
19892
19994
  command = `git log --oneline ${mainBranch}..HEAD`;
19893
- const { stdout: commits, stderr: stderr2 } = await execWithShellPath(command, { cwd: worktreePath });
19995
+ const { stdout: commits, stderr: stderr2 } = await execWithShellPath(["git", "log", "--oneline", `${mainBranch}..HEAD`, "--"], { cwd: worktreePath });
19894
19996
  lastOutput = commits || stderr2 || "";
19895
19997
  if (!commits.trim()) {
19896
19998
  return;
@@ -19898,7 +20000,7 @@ Git output: ${err.stderr || err.stdout || err.message}`);
19898
20000
  command = `git rebase ${mainBranch}`;
19899
20001
  executedCommands.push(`git rebase ${mainBranch} (in ${worktreePath})`);
19900
20002
  try {
19901
- const rebaseWorktreeResult = await execWithShellPath(command, {
20003
+ const rebaseWorktreeResult = await execWithShellPath(["git", "rebase", mainBranch], {
19902
20004
  cwd: worktreePath
19903
20005
  });
19904
20006
  lastOutput = rebaseWorktreeResult.stdout || rebaseWorktreeResult.stderr || "";
@@ -19927,7 +20029,7 @@ Git output: ${err.stderr || err.stdout || err.message}`);
19927
20029
  const worktreeCommitHash = worktreeHead.trim();
19928
20030
  if (checkoutless) {
19929
20031
  try {
19930
- await execWithShellPath(`git merge-base --is-ancestor ${mainBranch} ${worktreeCommitHash}`, {
20032
+ await execWithShellPath(["git", "merge-base", "--is-ancestor", mainBranch, worktreeCommitHash], {
19931
20033
  cwd: projectPath
19932
20034
  });
19933
20035
  } catch {
@@ -19935,10 +20037,10 @@ Git output: ${err.stderr || err.stdout || err.message}`);
19935
20037
  `Failed to fast-forward ${mainBranch} to ${branchName}: ${mainBranch} is not an ancestor of the worktree HEAD. The branch may have diverged - rebase the worktree onto ${mainBranch} first.`
19936
20038
  );
19937
20039
  }
19938
- const { stdout: targetHead } = await execWithShellPath(`git rev-parse ${mainBranch}`, { cwd: projectPath });
20040
+ const { stdout: targetHead } = await execWithShellPath(["git", "rev-parse", "--verify", "--end-of-options", mainBranch], { cwd: projectPath });
19939
20041
  command = `git update-ref refs/heads/${mainBranch} ${worktreeCommitHash} ${targetHead.trim()}`;
19940
20042
  executedCommands.push(`git update-ref refs/heads/${mainBranch} ${worktreeCommitHash} <old-hash> (in ${projectPath})`);
19941
- await execWithShellPath(command, {
20043
+ await execWithShellPath(["git", "update-ref", `refs/heads/${mainBranch}`, worktreeCommitHash, targetHead.trim()], {
19942
20044
  cwd: projectPath
19943
20045
  });
19944
20046
  logger.info(`Successfully fast-forwarded ${mainBranch} to ${branchName} (${worktreeCommitHash}) without checkout`);
@@ -19946,7 +20048,7 @@ Git output: ${err.stderr || err.stdout || err.message}`);
19946
20048
  }
19947
20049
  command = `git checkout ${mainBranch}`;
19948
20050
  executedCommands.push(`git checkout ${mainBranch} (in ${projectPath})`);
19949
- const checkoutResult = await execWithShellPath(command, {
20051
+ const checkoutResult = await execWithShellPath(["git", "checkout", mainBranch], {
19950
20052
  cwd: projectPath
19951
20053
  });
19952
20054
  lastOutput = checkoutResult.stdout || checkoutResult.stderr || "";
@@ -20180,7 +20282,7 @@ Git output: ${err.stderr || err.stdout || err.message}`
20180
20282
  async getChangesDiff(projectPath, worktreePath, targetBranch) {
20181
20283
  try {
20182
20284
  const mainBranch = targetBranch || await this.getProjectMainBranch(projectPath);
20183
- const { stdout: commits } = await execWithShellPath(`git log --oneline ${mainBranch}..HEAD`, { cwd: worktreePath });
20285
+ const { stdout: commits } = await execWithShellPath(["git", "log", "--oneline", `${mainBranch}..HEAD`, "--"], { cwd: worktreePath });
20184
20286
  if (!commits.trim()) {
20185
20287
  return "";
20186
20288
  }
@@ -20376,6 +20478,12 @@ Git output: ${err.stderr || err.stdout || err.message}`
20376
20478
  logger.error(`Failed to drop stash ${stashId}:`, error);
20377
20479
  }
20378
20480
  }
20481
+ async requireLocalIntegrationTarget(projectPath, branch) {
20482
+ const localRefs = await simpleGit.simpleGit(projectPath).raw(["for-each-ref", "--format=%(refname)", "refs/heads/"]);
20483
+ if (!localRefs.trim().split("\n").includes(`refs/heads/${branch}`)) {
20484
+ throw new Error(`Select an existing local branch as the integration target; '${branch}' is not a local branch`);
20485
+ }
20486
+ }
20379
20487
  /**
20380
20488
  * Merge worktree to main branch with uncommitted changes support
20381
20489
  * Returns MergeState for potential revert
@@ -20390,11 +20498,12 @@ Git output: ${err.stderr || err.stdout || err.message}`
20390
20498
  let mainOriginalStashId;
20391
20499
  let mergeStarted = false;
20392
20500
  const mainBranch = targetBranch || await this.getProjectMainBranch(projectPath);
20501
+ await this.requireLocalIntegrationTarget(projectPath, mainBranch);
20393
20502
  const projectCurrentBranch = await this.getProjectMainBranch(projectPath).catch(() => "");
20394
20503
  const checkoutless = Boolean(targetBranch) && projectCurrentBranch !== mainBranch;
20395
20504
  try {
20396
20505
  logger.info(`Starting ${squash ? "squash" : "merge"} operation with uncommitted changes support`);
20397
- const { stdout: mainCommit } = await execWithShellPath(`git rev-parse ${mainBranch}`, { cwd: projectPath });
20506
+ const { stdout: mainCommit } = await execWithShellPath(["git", "rev-parse", "--verify", "--end-of-options", mainBranch], { cwd: projectPath });
20398
20507
  beforeMergeCommitHash = mainCommit.trim();
20399
20508
  const { stdout: worktreeCommit } = await execWithShellPath("git rev-parse HEAD", { cwd: worktreePath });
20400
20509
  worktreeBranchCommitHash = worktreeCommit.trim();
@@ -20449,7 +20558,7 @@ Git output: ${err.stderr || err.stdout || err.message}`
20449
20558
  if (checkoutless) {
20450
20559
  if (beforeMergeCommitHash) {
20451
20560
  try {
20452
- await execWithShellPath(`git update-ref refs/heads/${mainBranch} ${beforeMergeCommitHash}`, { cwd: projectPath });
20561
+ await execWithShellPath(["git", "update-ref", `refs/heads/${mainBranch}`, beforeMergeCommitHash], { cwd: projectPath });
20453
20562
  logger.info("Reverted target branch ref to pre-merge state");
20454
20563
  } catch (recoveryError) {
20455
20564
  logger.error("Failed to reset target branch ref to pre-merge state:", { error: recoveryError });
@@ -20525,7 +20634,7 @@ Git output: ${err.stderr || err.stdout || err.message}`
20525
20634
  let unmergedCommitCount = 0;
20526
20635
  let unmergedCommits = [];
20527
20636
  try {
20528
- const { stdout: commits } = await execWithShellPath(`git log --oneline ${effectiveTargetBranch}..HEAD`, { cwd: worktreePath });
20637
+ const { stdout: commits } = await execWithShellPath(["git", "log", "--oneline", `${effectiveTargetBranch}..HEAD`, "--"], { cwd: worktreePath });
20529
20638
  const commitLines = commits.trim().split("\n").filter((line) => line.trim());
20530
20639
  unmergedCommitCount = commitLines.length;
20531
20640
  unmergedCommits = commitLines;
@@ -20552,7 +20661,7 @@ Git output: ${err.stderr || err.stdout || err.message}`
20552
20661
  }
20553
20662
  }
20554
20663
  async getAheadCommits(worktreePath, targetBranch) {
20555
- const { stdout } = await execWithShellPath(`git log --oneline ${targetBranch}..HEAD`, { cwd: worktreePath });
20664
+ const { stdout } = await execWithShellPath(["git", "log", "--oneline", `${targetBranch}..HEAD`, "--"], { cwd: worktreePath });
20556
20665
  const commits = stdout.trim().split("\n").map((l) => l.trim()).filter((l) => l.length > 0);
20557
20666
  return {
20558
20667
  count: commits.length,
@@ -20586,8 +20695,8 @@ Git output: ${err.stderr || err.stdout || err.message}`
20586
20695
  await this.fetchRemote(repoPath);
20587
20696
  const parseCommits = (stdout) => stdout.trim().split("\n").map((l) => l.trim()).filter((l) => l.length > 0);
20588
20697
  const [outgoing, incoming] = await Promise.all([
20589
- execWithShellPath(`git log --oneline ${baseRef}..HEAD`, { cwd: repoPath }),
20590
- execWithShellPath(`git log --oneline HEAD..${baseRef}`, { cwd: repoPath })
20698
+ execWithShellPath(["git", "log", "--oneline", `${baseRef}..HEAD`, "--"], { cwd: repoPath }),
20699
+ execWithShellPath(["git", "log", "--oneline", `HEAD..${baseRef}`, "--"], { cwd: repoPath })
20591
20700
  ]);
20592
20701
  const outgoingCommits = parseCommits(outgoing.stdout);
20593
20702
  const incomingCommits = parseCommits(incoming.stdout);
@@ -20745,6 +20854,29 @@ Git output: ${err.stderr || err.stdout || err.message}`
20745
20854
  formatDiffPath(filePath) {
20746
20855
  return /[\s"\\]/.test(filePath) ? JSON.stringify(filePath) : filePath;
20747
20856
  }
20857
+ parseUpdatedFileNumstat(worktreePath, output) {
20858
+ const entries = output.split("\0");
20859
+ const files = [];
20860
+ for (let index = 0; index < entries.length; index++) {
20861
+ const parts = entries[index].split(" ");
20862
+ if (parts.length < 3) {
20863
+ continue;
20864
+ }
20865
+ const additions = parts[0] === "-" ? 0 : Number.parseInt(parts[0], 10);
20866
+ const deletions = parts[1] === "-" ? 0 : Number.parseInt(parts[1], 10);
20867
+ let filePath = parts.slice(2).join(" ");
20868
+ let previousPath;
20869
+ if (!filePath) {
20870
+ previousPath = entries[++index];
20871
+ filePath = entries[++index];
20872
+ }
20873
+ if (!filePath || !Number.isFinite(additions) || !Number.isFinite(deletions) || this.isSymlinkPath(worktreePath, filePath)) {
20874
+ continue;
20875
+ }
20876
+ files.push({ path: filePath, ...previousPath ? { previousPath } : {}, additions, deletions, diff: "" });
20877
+ }
20878
+ return files;
20879
+ }
20748
20880
  /**
20749
20881
  * Worktree mode: separate committed (per-commit) and uncommitted file diffs.
20750
20882
  */
@@ -20752,7 +20884,9 @@ Git output: ${err.stderr || err.stdout || err.message}`
20752
20884
  const files = [];
20753
20885
  const commits = [];
20754
20886
  try {
20755
- const { stdout: logOutput } = await execWithShellPath(`git log --reverse --pretty=format:'%H|%s' ${mainBranch}..HEAD`, { cwd: worktreePath });
20887
+ const { stdout: logOutput } = await execWithShellPath(["git", "log", "--reverse", "--pretty=format:%H|%s", `${mainBranch}..HEAD`, "--"], {
20888
+ cwd: worktreePath
20889
+ });
20756
20890
  for (const line of logOutput.split("\n")) {
20757
20891
  const trimmed = line.trim();
20758
20892
  if (!trimmed || !trimmed.includes("|")) {
@@ -20766,35 +20900,11 @@ Git output: ${err.stderr || err.stdout || err.message}`
20766
20900
  }
20767
20901
  for (const commit of commits) {
20768
20902
  try {
20769
- const { stdout: numstatOutput } = await execWithShellPath(`git diff-tree --no-commit-id -r --numstat ${commit.hash}`, { cwd: worktreePath });
20770
- const fileStats = /* @__PURE__ */ new Map();
20771
- for (const line of numstatOutput.split("\n")) {
20772
- const trimmed = line.trim();
20773
- if (!trimmed) {
20774
- continue;
20775
- }
20776
- const parts = trimmed.split(" ");
20777
- if (parts.length >= 3) {
20778
- const additions = parts[0] === "-" ? 0 : parseInt(parts[0], 10);
20779
- const deletions = parts[1] === "-" ? 0 : parseInt(parts[1], 10);
20780
- const filePath = parts.slice(2).join(" ");
20781
- if (filePath) {
20782
- fileStats.set(filePath, { additions, deletions });
20783
- }
20784
- }
20785
- }
20786
- for (const [filePath, stats] of fileStats.entries()) {
20787
- if (this.isSymlinkPath(worktreePath, filePath)) {
20788
- continue;
20789
- }
20790
- files.push({
20791
- path: filePath,
20792
- additions: stats.additions,
20793
- deletions: stats.deletions,
20794
- diff: "",
20795
- commitHash: commit.hash,
20796
- commitMessage: commit.message
20797
- });
20903
+ const { stdout: numstatOutput } = await execWithShellPath(["git", "diff-tree", "--no-commit-id", "-r", "-M", "--numstat", "-z", commit.hash, "--"], {
20904
+ cwd: worktreePath
20905
+ });
20906
+ for (const file of this.parseUpdatedFileNumstat(worktreePath, numstatOutput)) {
20907
+ files.push({ ...file, commitHash: commit.hash, commitMessage: commit.message });
20798
20908
  }
20799
20909
  } catch (commitError) {
20800
20910
  logger.warn(`Failed to get files for commit ${commit.hash}:`, commitError);
@@ -20806,26 +20916,10 @@ Git output: ${err.stderr || err.stdout || err.message}`
20806
20916
  return files.concat(await this.getNoHeadUpdatedFiles(worktreePath));
20807
20917
  }
20808
20918
  try {
20809
- const { stdout: uncommittedNumstat } = await execWithShellPath("git diff --numstat -z HEAD", {
20919
+ const { stdout: uncommittedNumstat } = await execWithShellPath("git diff --numstat -z -M HEAD", {
20810
20920
  cwd: worktreePath
20811
20921
  });
20812
- const entries = uncommittedNumstat.split("\0").filter((entry) => entry.trim() !== "");
20813
- for (const entry of entries) {
20814
- const parts = entry.split(" ");
20815
- if (parts.length < 3) {
20816
- continue;
20817
- }
20818
- const additions = parts[0] === "-" ? 0 : parseInt(parts[0], 10);
20819
- const deletions = parts[1] === "-" ? 0 : parseInt(parts[1], 10);
20820
- const filePath = parts.slice(2).join(" ");
20821
- if (!filePath) {
20822
- continue;
20823
- }
20824
- if (this.isSymlinkPath(worktreePath, filePath)) {
20825
- continue;
20826
- }
20827
- files.push({ path: filePath, additions, deletions, diff: "" });
20828
- }
20922
+ files.push(...this.parseUpdatedFileNumstat(worktreePath, uncommittedNumstat));
20829
20923
  } catch (uncommittedError) {
20830
20924
  logger.warn("Failed to get uncommitted changes:", uncommittedError);
20831
20925
  }
@@ -20839,33 +20933,17 @@ Git output: ${err.stderr || err.stdout || err.message}`
20839
20933
  const files = [];
20840
20934
  let base = mainBranch;
20841
20935
  try {
20842
- const { stdout: mergeBase } = await execWithShellPath(`git merge-base HEAD ${mainBranch}`, { cwd: worktreePath });
20936
+ const { stdout: mergeBase } = await execWithShellPath(["git", "merge-base", "HEAD", mainBranch], { cwd: worktreePath });
20843
20937
  if (mergeBase.trim()) {
20844
20938
  base = mergeBase.trim();
20845
20939
  }
20846
20940
  } catch {
20847
20941
  }
20848
20942
  try {
20849
- const { stdout: numstatOutput } = await execWithShellPath(`git diff --numstat -z ${base}`, {
20943
+ const { stdout: numstatOutput } = await execWithShellPath(["git", "diff", "--numstat", "-z", "-M", base, "--"], {
20850
20944
  cwd: worktreePath
20851
20945
  });
20852
- const entries = numstatOutput.split("\0").filter((entry) => entry.trim() !== "");
20853
- for (const entry of entries) {
20854
- const parts = entry.split(" ");
20855
- if (parts.length < 3) {
20856
- continue;
20857
- }
20858
- const additions = parts[0] === "-" ? 0 : parseInt(parts[0], 10);
20859
- const deletions = parts[1] === "-" ? 0 : parseInt(parts[1], 10);
20860
- const filePath = parts.slice(2).join(" ");
20861
- if (!filePath) {
20862
- continue;
20863
- }
20864
- if (this.isSymlinkPath(worktreePath, filePath)) {
20865
- continue;
20866
- }
20867
- files.push({ path: filePath, additions, deletions, diff: "" });
20868
- }
20946
+ files.push(...this.parseUpdatedFileNumstat(worktreePath, numstatOutput));
20869
20947
  } catch (baseDiffError) {
20870
20948
  logger.warn("Failed to get base diff for worktree:", baseDiffError);
20871
20949
  }
@@ -20880,27 +20958,10 @@ Git output: ${err.stderr || err.stdout || err.message}`
20880
20958
  } catch {
20881
20959
  return await this.getNoHeadUpdatedFiles(worktreePath);
20882
20960
  }
20883
- const { stdout } = await execWithShellPath("git diff --numstat -z HEAD", {
20961
+ const { stdout } = await execWithShellPath("git diff --numstat -z -M HEAD", {
20884
20962
  cwd: worktreePath
20885
20963
  });
20886
- const entries = stdout.split("\0").filter((entry) => entry.trim() !== "");
20887
- const files = [];
20888
- for (const entry of entries) {
20889
- const parts = entry.split(" ");
20890
- if (parts.length >= 3) {
20891
- const additions = parts[0] === "-" ? 0 : parseInt(parts[0], 10);
20892
- const deletions = parts[1] === "-" ? 0 : parseInt(parts[1], 10);
20893
- const filePath = parts.slice(2).join(" ");
20894
- if (!filePath) {
20895
- continue;
20896
- }
20897
- if (this.isSymlinkPath(worktreePath, filePath)) {
20898
- continue;
20899
- }
20900
- files.push({ path: filePath, additions, deletions, diff: "" });
20901
- }
20902
- }
20903
- return files;
20964
+ return this.parseUpdatedFileNumstat(worktreePath, stdout);
20904
20965
  }
20905
20966
  /**
20906
20967
  * No-HEAD mode: repo has no commits yet. Uses the well-known empty tree hash
@@ -20913,26 +20974,10 @@ Git output: ${err.stderr || err.stdout || err.message}`
20913
20974
  const EMPTY_TREE_HASH = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
20914
20975
  const files = [];
20915
20976
  try {
20916
- const { stdout } = await execWithShellPath(`git diff --numstat -z ${EMPTY_TREE_HASH}`, {
20977
+ const { stdout } = await execWithShellPath(`git diff --numstat -z -M ${EMPTY_TREE_HASH}`, {
20917
20978
  cwd: worktreePath
20918
20979
  });
20919
- const entries = stdout.split("\0").filter((entry) => entry.trim() !== "");
20920
- for (const entry of entries) {
20921
- const parts = entry.split(" ");
20922
- if (parts.length < 3) {
20923
- continue;
20924
- }
20925
- const additions = parts[0] === "-" ? 0 : parseInt(parts[0], 10);
20926
- const deletions = parts[1] === "-" ? 0 : parseInt(parts[1], 10);
20927
- const filePath = parts.slice(2).join(" ");
20928
- if (!filePath) {
20929
- continue;
20930
- }
20931
- if (this.isSymlinkPath(worktreePath, filePath)) {
20932
- continue;
20933
- }
20934
- files.push({ path: filePath, additions, deletions, diff: "" });
20935
- }
20980
+ files.push(...this.parseUpdatedFileNumstat(worktreePath, stdout));
20936
20981
  } catch (error) {
20937
20982
  logger.warn("Failed to get updated files for repo with no commits:", {
20938
20983
  error: error instanceof Error ? error.message : String(error)
@@ -20947,7 +20992,7 @@ Git output: ${err.stderr || err.stdout || err.message}`
20947
20992
  * - No commitHash: untracked file diff (synthesized) or file diff against HEAD,
20948
20993
  * merge-base (worktree flat mode) or the empty tree hash (no commits yet).
20949
20994
  */
20950
- async getFileDiff(worktreePath, workingMode2, mainBranch, filePath, commitHash) {
20995
+ async getFileDiff(worktreePath, workingMode2, mainBranch, filePath, commitHash, previousPath) {
20951
20996
  if (!await this.ensureGitRepository(worktreePath, "get file diff")) {
20952
20997
  return "";
20953
20998
  }
@@ -20955,12 +21000,12 @@ Git output: ${err.stderr || err.stdout || err.message}`
20955
21000
  return "";
20956
21001
  }
20957
21002
  try {
20958
- const escapedPath = filePath.replace(/"/g, '\\"');
21003
+ const paths = previousPath ? [previousPath, filePath] : [filePath];
20959
21004
  if (commitHash) {
20960
21005
  if (await this.checkBinaryOrSkip(worktreePath, filePath)) {
20961
21006
  return "";
20962
21007
  }
20963
- const { stdout: stdout2 } = await execWithShellPath(`git diff-tree -p -r --unified=3 ${commitHash} -- "${escapedPath}"`, {
21008
+ const { stdout: stdout2 } = await execWithShellPath(["git", "diff-tree", "-p", "-r", "-M", "--unified=3", commitHash, "--", ...paths], {
20964
21009
  cwd: worktreePath,
20965
21010
  maxBuffer: 10 * 1024 * 1024
20966
21011
  });
@@ -20968,7 +21013,7 @@ Git output: ${err.stderr || err.stdout || err.message}`
20968
21013
  }
20969
21014
  let isTracked = false;
20970
21015
  try {
20971
- await execWithShellPath(`git ls-files --error-unmatch -- "${escapedPath}"`, { cwd: worktreePath });
21016
+ await execWithShellPath(["git", "ls-files", "--error-unmatch", "--", filePath], { cwd: worktreePath });
20972
21017
  isTracked = true;
20973
21018
  } catch {
20974
21019
  isTracked = false;
@@ -20980,7 +21025,7 @@ Git output: ${err.stderr || err.stdout || err.message}`
20980
21025
  let base = "HEAD";
20981
21026
  if (workingMode2 === "worktree" && mainBranch) {
20982
21027
  try {
20983
- const { stdout: mergeBase } = await execWithShellPath(`git merge-base HEAD ${mainBranch}`, { cwd: worktreePath });
21028
+ const { stdout: mergeBase } = await execWithShellPath(["git", "merge-base", "HEAD", mainBranch], { cwd: worktreePath });
20984
21029
  if (mergeBase.trim()) {
20985
21030
  base = mergeBase.trim();
20986
21031
  } else {
@@ -20999,7 +21044,7 @@ Git output: ${err.stderr || err.stdout || err.message}`
20999
21044
  if (await this.checkBinaryOrSkip(worktreePath, filePath)) {
21000
21045
  return "";
21001
21046
  }
21002
- const { stdout } = await execWithShellPath(`git diff --unified=3 ${base} -- "${escapedPath}"`, {
21047
+ const { stdout } = await execWithShellPath(["git", "diff", "-M", "--unified=3", base, "--", ...paths], {
21003
21048
  cwd: worktreePath,
21004
21049
  maxBuffer: 10 * 1024 * 1024
21005
21050
  });
@@ -21014,27 +21059,26 @@ Git output: ${err.stderr || err.stdout || err.message}`
21014
21059
  * commitHash group: old = parent commit version, new = commit version.
21015
21060
  * Uncommitted group: old = base (merge-base/HEAD) version, new = working tree.
21016
21061
  */
21017
- async getFileContents(worktreePath, workingMode2, mainBranch, filePath, commitHash) {
21062
+ async getFileContents(worktreePath, workingMode2, mainBranch, filePath, commitHash, previousPath) {
21018
21063
  const emptyContents = { oldContent: "", newContent: "" };
21019
21064
  if (!filePath) {
21020
21065
  return emptyContents;
21021
21066
  }
21022
21067
  try {
21023
- const escapedPath = filePath.replace(/"/g, '\\"');
21024
21068
  if (await this.checkBinaryOrSkip(worktreePath, filePath)) {
21025
21069
  return emptyContents;
21026
21070
  }
21027
21071
  if (commitHash) {
21028
21072
  const { stdout: parent } = await execWithShellPath(`git rev-parse ${commitHash}^`, { cwd: worktreePath });
21029
21073
  const parentHash = parent.trim();
21030
- const newContent2 = await this.safeGitShow(worktreePath, `${commitHash}`, escapedPath);
21031
- const oldContent2 = await this.safeGitShow(worktreePath, parentHash, escapedPath);
21074
+ const newContent2 = await this.safeGitShow(worktreePath, `${commitHash}`, filePath);
21075
+ const oldContent2 = await this.safeGitShow(worktreePath, parentHash, previousPath ?? filePath);
21032
21076
  return { oldContent: oldContent2, newContent: newContent2 };
21033
21077
  }
21034
21078
  let base = "HEAD";
21035
21079
  if (workingMode2 === "worktree" && mainBranch) {
21036
21080
  try {
21037
- const { stdout: mergeBase } = await execWithShellPath(`git merge-base HEAD ${mainBranch}`, { cwd: worktreePath });
21081
+ const { stdout: mergeBase } = await execWithShellPath(["git", "merge-base", "HEAD", mainBranch], { cwd: worktreePath });
21038
21082
  if (mergeBase.trim()) {
21039
21083
  base = mergeBase.trim();
21040
21084
  } else {
@@ -21051,16 +21095,16 @@ Git output: ${err.stderr || err.stdout || err.message}`
21051
21095
  }
21052
21096
  }
21053
21097
  const newContent = await fs.readFile(path.join(worktreePath, filePath)).then((data) => data.toString("utf8")).catch(() => "");
21054
- const oldContent = await this.safeGitShow(worktreePath, base, escapedPath);
21098
+ const oldContent = await this.safeGitShow(worktreePath, base, previousPath ?? filePath);
21055
21099
  return { oldContent, newContent };
21056
21100
  } catch (error) {
21057
21101
  logger.warn(`Failed to get file contents for ${filePath}:`, error);
21058
21102
  return emptyContents;
21059
21103
  }
21060
21104
  }
21061
- async safeGitShow(worktreePath, ref, escapedPath) {
21105
+ async safeGitShow(worktreePath, ref, filePath) {
21062
21106
  try {
21063
- const { stdout } = await execWithShellPath(`git show ${ref}:"${escapedPath}"`, { cwd: worktreePath, maxBuffer: 10 * 1024 * 1024 });
21107
+ const { stdout } = await execWithShellPath(["git", "show", `${ref}:${filePath}`], { cwd: worktreePath, maxBuffer: 10 * 1024 * 1024 });
21064
21108
  return stdout;
21065
21109
  } catch {
21066
21110
  return "";
@@ -21144,10 +21188,18 @@ Git output: ${err.stderr || err.stdout || err.message}`
21144
21188
  await gitRootDir.reset(["--soft", "HEAD~1"]);
21145
21189
  return { commitHash: commitHash.trim(), commitMessage: commitMessage.trim() };
21146
21190
  }
21147
- async restoreFile(worktreePath, filePath) {
21191
+ async restoreFile(worktreePath, filePath, previousPath) {
21148
21192
  if (!await this.ensureGitRepository(worktreePath, "restore file")) {
21149
21193
  return;
21150
21194
  }
21195
+ if (previousPath && previousPath !== filePath) {
21196
+ const uncommittedFiles = await this.getNonWorktreeUpdatedFiles(worktreePath);
21197
+ const sourcePath = uncommittedFiles.find((file) => file.path === filePath)?.previousPath;
21198
+ if (sourcePath) {
21199
+ await execWithShellPath(["git", "restore", "--staged", "--worktree", "--source=HEAD", "--", sourcePath, filePath], { cwd: worktreePath });
21200
+ return;
21201
+ }
21202
+ }
21151
21203
  try {
21152
21204
  logger.info(`Restoring file: ${filePath}`, { worktreePath });
21153
21205
  const escapedPath = filePath.replace(/"/g, '\\"');
@@ -21506,6 +21558,7 @@ Git output: ${err.stderr || err.stdout || err.message}`
21506
21558
  try {
21507
21559
  logger.info("Starting merge revert operation", { mergeState });
21508
21560
  const targetBranch = mergeState.targetBranch || await this.getProjectMainBranch(projectPath);
21561
+ await this.requireLocalIntegrationTarget(projectPath, targetBranch);
21509
21562
  const projectCurrentBranch = await this.getProjectMainBranch(projectPath).catch(() => "");
21510
21563
  const checkoutlessRevert = Boolean(mergeState.checkoutless) && projectCurrentBranch !== targetBranch;
21511
21564
  worktreeRevertStashId = await this.stashUncommittedChanges(
@@ -21516,10 +21569,10 @@ Git output: ${err.stderr || err.stdout || err.message}`
21516
21569
  );
21517
21570
  if (checkoutlessRevert) {
21518
21571
  logger.info(`Resetting ${targetBranch} branch to ${mergeState.beforeMergeCommitHash} (without checkout)`);
21519
- await execWithShellPath(`git update-ref refs/heads/${targetBranch} ${mergeState.beforeMergeCommitHash}`, { cwd: projectPath });
21572
+ await execWithShellPath(["git", "update-ref", `refs/heads/${targetBranch}`, mergeState.beforeMergeCommitHash], { cwd: projectPath });
21520
21573
  } else {
21521
21574
  mainRevertStashId = await this.stashUncommittedChanges(currentMainStashId, projectPath, "Current uncommitted changes before revert", []);
21522
- await execWithShellPath(`git checkout ${targetBranch}`, {
21575
+ await execWithShellPath(["git", "checkout", targetBranch], {
21523
21576
  cwd: projectPath
21524
21577
  });
21525
21578
  logger.info(`Resetting ${targetBranch} branch to ${mergeState.beforeMergeCommitHash}`);
@@ -23932,21 +23985,21 @@ ${contentText}</agent-response>`;
23932
23985
  const groupMode = projectSettings.updatedFilesGroupMode || UpdatedFilesGroupMode.Grouped;
23933
23986
  return await this.gitManager.getUpdatedFiles(this.getTaskDir(), this.task.workingMode, mainBranch, groupMode);
23934
23987
  }
23935
- async getUpdatedFileDiff(filePath, commitHash) {
23988
+ async getUpdatedFileDiff(filePath, commitHash, previousPath) {
23936
23989
  const worktreePath = this.getTaskDir();
23937
23990
  let mainBranch = void 0;
23938
23991
  if (this.task.workingMode === "worktree") {
23939
23992
  mainBranch = this.task.worktree?.baseBranch || await this.gitManager.getProjectMainBranch(this.project.baseDir);
23940
23993
  }
23941
- return await this.gitManager.getFileDiff(worktreePath, this.task.workingMode, mainBranch, filePath, commitHash);
23994
+ return await this.gitManager.getFileDiff(worktreePath, this.task.workingMode, mainBranch, filePath, commitHash, previousPath);
23942
23995
  }
23943
- async getUpdatedFileContents(filePath, commitHash) {
23996
+ async getUpdatedFileContents(filePath, commitHash, previousPath) {
23944
23997
  const worktreePath = this.getTaskDir();
23945
23998
  let mainBranch = void 0;
23946
23999
  if (this.task.workingMode === "worktree") {
23947
24000
  mainBranch = this.task.worktree?.baseBranch || await this.gitManager.getProjectMainBranch(this.project.baseDir);
23948
24001
  }
23949
- return await this.gitManager.getFileContents(worktreePath, this.task.workingMode, mainBranch, filePath, commitHash);
24002
+ return await this.gitManager.getFileContents(worktreePath, this.task.workingMode, mainBranch, filePath, commitHash, previousPath);
23950
24003
  }
23951
24004
  async getContextFiles(includeRuleFiles = false) {
23952
24005
  const contextFiles2 = await this.contextManager.getContextFilesEnsureLoaded();
@@ -25258,7 +25311,7 @@ ${error.stderr}`,
25258
25311
  async restartAiderConnector() {
25259
25312
  await this.aiderManager.start(true);
25260
25313
  }
25261
- async updateTask(updates) {
25314
+ async updateTask(updates, updateTimestamps = true) {
25262
25315
  const previousTaskString = JSON.stringify(this.task);
25263
25316
  if (updates.workingMode !== void 0 && updates.workingMode !== this.task.workingMode) {
25264
25317
  if (!await this.applyWorkingMode(updates.workingMode)) {
@@ -25295,8 +25348,10 @@ ${error.stderr}`,
25295
25348
  });
25296
25349
  return this.task;
25297
25350
  }
25298
- this.task.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
25299
- return this.saveTask(updates, !!this.task.createdAt);
25351
+ if (updateTimestamps) {
25352
+ this.task.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
25353
+ }
25354
+ return this.saveTask(updates, updateTimestamps && !!this.task.createdAt);
25300
25355
  }
25301
25356
  async sendTaskGitStatusUpdated() {
25302
25357
  try {
@@ -25324,9 +25379,9 @@ ${error.stderr}`,
25324
25379
  const skills = await this.getSkills();
25325
25380
  this.eventManager.sendSkillsUpdated(this.project.baseDir, this.taskId, skills);
25326
25381
  }
25327
- async initWorktree() {
25382
+ async initWorktree(baseBranch) {
25328
25383
  const branchName = this.generateBranchName();
25329
- this.task.worktree = await this.gitManager.createWorktree(this.project.baseDir, this.taskId, branchName);
25384
+ this.task.worktree = await this.gitManager.createWorktree(this.project.baseDir, this.taskId, branchName, baseBranch);
25330
25385
  const settings2 = this.store.getSettings();
25331
25386
  if (settings2.taskSettings.worktreeSymlinkFolders && settings2.taskSettings.worktreeSymlinkFolders.length > 0) {
25332
25387
  await this.gitManager.createSymlinks(this.project.baseDir, this.task.worktree.path, settings2.taskSettings.worktreeSymlinkFolders);
@@ -25621,7 +25676,7 @@ Only answer with the commit message, nothing else.`,
25621
25676
  const existingWorktree = await this.gitManager.getTaskWorktree(this.project.baseDir, this.taskId);
25622
25677
  if (!existingWorktree && !this.task.worktree) {
25623
25678
  try {
25624
- await this.initWorktree();
25679
+ await this.initWorktree(options?.baseBranch);
25625
25680
  } catch (error) {
25626
25681
  if (stashId) {
25627
25682
  try {
@@ -25756,13 +25811,13 @@ Only answer with the commit message, nothing else.`,
25756
25811
  await this.sendUpdatedFilesUpdated();
25757
25812
  await this.sendTaskGitStatusUpdated();
25758
25813
  }
25759
- async restoreFile(filePath) {
25814
+ async restoreFile(filePath, previousPath) {
25760
25815
  logger.info("Restoring file", {
25761
25816
  baseDir: this.project.baseDir,
25762
25817
  taskId: this.taskId,
25763
25818
  filePath
25764
25819
  });
25765
- await this.gitManager.restoreFile(this.getTaskDir(), filePath);
25820
+ await this.gitManager.restoreFile(this.getTaskDir(), filePath, previousPath);
25766
25821
  await this.sendUpdatedFilesUpdated();
25767
25822
  await this.sendTaskGitStatusUpdated();
25768
25823
  }
@@ -33935,8 +33990,8 @@ class TaskContextImpl {
33935
33990
  async getUpdatedFiles() {
33936
33991
  return this.task.getUpdatedFiles();
33937
33992
  }
33938
- async getUpdatedFileDiff(filePath, commitHash) {
33939
- return this.task.getUpdatedFileDiff(filePath, commitHash);
33993
+ async getUpdatedFileDiff(filePath, commitHash, previousPath) {
33994
+ return this.task.getUpdatedFileDiff(filePath, commitHash, previousPath);
33940
33995
  }
33941
33996
  async getUpdatedFileContents(filePath, commitHash) {
33942
33997
  return this.task.getUpdatedFileContents(filePath, commitHash);
@@ -34954,7 +35009,8 @@ class ExtensionManager {
34954
35009
  * @returns Filtered extensions excluding disabled ones
34955
35010
  */
34956
35011
  filterEnabledExtensions(extensions) {
34957
- return extensions.filter((ext) => !this.isExtensionDisabled(ext.filePath));
35012
+ const disabledExtensions = this.store.getSettings().extensions?.disabled || [];
35013
+ return extensions.filter((ext) => !disabledExtensions.includes(ext.filePath));
34958
35014
  }
34959
35015
  /**
34960
35016
  * Handle settings changes. Detects when extensions are enabled/disabled
@@ -36603,6 +36659,67 @@ class ExtensionManager {
36603
36659
  return [...global2, ...projectSpecific];
36604
36660
  }
36605
36661
  }
36662
+ const isMissing = (error) => error instanceof Error && "code" in error && error.code === "ENOENT";
36663
+ const readDirectory = async (directory) => {
36664
+ try {
36665
+ return (await fs.readdir(directory)).sort();
36666
+ } catch (error) {
36667
+ if (isMissing(error)) {
36668
+ return [];
36669
+ }
36670
+ throw error;
36671
+ }
36672
+ };
36673
+ const exists = async (filePath) => {
36674
+ try {
36675
+ await fs.stat(filePath);
36676
+ return true;
36677
+ } catch (error) {
36678
+ if (isMissing(error)) {
36679
+ return false;
36680
+ }
36681
+ throw error;
36682
+ }
36683
+ };
36684
+ const checkProject = async (baseDir) => {
36685
+ const result = { agents: [], mcpServers: [], extensions: [] };
36686
+ const agentsDir = path.join(baseDir, AIDER_DESK_AGENTS_DIR);
36687
+ for (const name of await readDirectory(agentsDir)) {
36688
+ const agentPath = path.join(agentsDir, name);
36689
+ if ((await fs.stat(agentPath)).isDirectory()) {
36690
+ result.agents.push({ name, path: path.relative(baseDir, agentPath) });
36691
+ }
36692
+ }
36693
+ const mcpPath = path.join(baseDir, AIDER_DESK_DIR, AIDER_DESK_MCP_SERVERS_FILE);
36694
+ if (await exists(mcpPath)) {
36695
+ const config = JSON.parse(await fs.readFile(mcpPath, "utf-8"));
36696
+ if (typeof config !== "object" || config === null || Array.isArray(config)) {
36697
+ throw new Error(`Invalid MCP configuration: ${mcpPath}`);
36698
+ }
36699
+ const servers = "mcpServers" in config ? config.mcpServers : {};
36700
+ if (typeof servers !== "object" || servers === null || Array.isArray(servers)) {
36701
+ throw new Error(`Invalid MCP servers: ${mcpPath}`);
36702
+ }
36703
+ result.mcpServers = Object.keys(servers).sort().map((name) => ({ name, path: path.relative(baseDir, mcpPath) }));
36704
+ }
36705
+ const extensionsDir = path.join(baseDir, AIDER_DESK_EXTENSIONS_DIR);
36706
+ for (const name of await readDirectory(extensionsDir)) {
36707
+ const extensionPath = path.join(extensionsDir, name);
36708
+ const stat = await fs.stat(extensionPath);
36709
+ if (stat.isDirectory()) {
36710
+ for (const entry of ["index.ts", "index.js"]) {
36711
+ const entryPath = path.join(extensionPath, entry);
36712
+ if (await exists(entryPath)) {
36713
+ result.extensions.push({ name, path: path.relative(baseDir, entryPath) });
36714
+ break;
36715
+ }
36716
+ }
36717
+ } else if (stat.isFile() && /\.(ts|js)$/.test(name)) {
36718
+ result.extensions.push({ name, path: path.relative(baseDir, extensionPath) });
36719
+ }
36720
+ }
36721
+ return result;
36722
+ };
36606
36723
  class EventsHandler {
36607
36724
  constructor(projectManager, store, mcpManager, mcpConfigManager, versionsManager, modelManager, telemetryManager, dataManager, terminalManager, cloudflareTunnelManager, eventManager, agentProfileManager, memoryManager, extensionManager, networkManager, promptsManager, windowManager, gitAskpassManager) {
36608
36725
  this.projectManager = projectManager;
@@ -36714,6 +36831,7 @@ class EventsHandler {
36714
36831
  getOpenProjects() {
36715
36832
  return this.store.getOpenProjects();
36716
36833
  }
36834
+ checkProject = checkProject;
36717
36835
  async addOpenProject(baseDir) {
36718
36836
  const projects = this.store.getOpenProjects();
36719
36837
  const existingProject = projects.find((p) => compareBaseDirs$1(p.baseDir, baseDir));
@@ -36845,19 +36963,19 @@ class EventsHandler {
36845
36963
  }
36846
36964
  return await task.getUpdatedFiles();
36847
36965
  }
36848
- async getUpdatedFileDiff(baseDir, taskId, filePath, commitHash) {
36966
+ async getUpdatedFileDiff(baseDir, taskId, filePath, commitHash, previousPath) {
36849
36967
  const task = this.projectManager.getProject(baseDir).getTask(taskId);
36850
36968
  if (!task) {
36851
36969
  return "";
36852
36970
  }
36853
- return await task.getUpdatedFileDiff(filePath, commitHash);
36971
+ return await task.getUpdatedFileDiff(filePath, commitHash, previousPath);
36854
36972
  }
36855
- async getUpdatedFileContents(baseDir, taskId, filePath, commitHash) {
36973
+ async getUpdatedFileContents(baseDir, taskId, filePath, commitHash, previousPath) {
36856
36974
  const task = this.projectManager.getProject(baseDir).getTask(taskId);
36857
36975
  if (!task) {
36858
36976
  return { oldContent: "", newContent: "" };
36859
36977
  }
36860
- return await task.getUpdatedFileContents(filePath, commitHash);
36978
+ return await task.getUpdatedFileContents(filePath, commitHash, previousPath);
36861
36979
  }
36862
36980
  async addFile(baseDir, taskId, filePath, readOnly = false) {
36863
36981
  void this.projectManager.getProject(baseDir).getTask(taskId)?.addFiles({ path: filePath, readOnly });
@@ -37156,9 +37274,9 @@ class EventsHandler {
37156
37274
  const task = this.getTaskOrThrow(baseDir, taskId);
37157
37275
  await task.addFileToGit(filePath);
37158
37276
  }
37159
- async restoreFile(baseDir, taskId, filePath) {
37277
+ async restoreFile(baseDir, taskId, filePath, previousPath) {
37160
37278
  const task = this.getTaskOrThrow(baseDir, taskId);
37161
- await task.restoreFile(filePath);
37279
+ await task.restoreFile(filePath, previousPath);
37162
37280
  }
37163
37281
  async readFile(baseDir, taskId, filePath) {
37164
37282
  const task = this.projectManager.getProject(baseDir).getTask(taskId);
@@ -39234,6 +39352,7 @@ const CURRENT_SETTINGS_VERSION = 22;
39234
39352
  class Store {
39235
39353
  // @ts-expect-error expected to be initialized
39236
39354
  store;
39355
+ cachedSettings = null;
39237
39356
  async init(path2) {
39238
39357
  const { default: Conf } = await import("conf");
39239
39358
  this.store = new Conf({
@@ -39260,6 +39379,12 @@ class Store {
39260
39379
  };
39261
39380
  }
39262
39381
  getSettings() {
39382
+ if (!this.cachedSettings) {
39383
+ this.cachedSettings = this.loadSettings();
39384
+ }
39385
+ return structuredClone(this.cachedSettings);
39386
+ }
39387
+ loadSettings() {
39263
39388
  const settings2 = this.store.get("settings");
39264
39389
  if (!settings2) {
39265
39390
  return this.createDefaultSettings();
@@ -39393,6 +39518,7 @@ class Store {
39393
39518
  settingsVersion = 22;
39394
39519
  }
39395
39520
  this.store.set("settings", settings2);
39521
+ this.cachedSettings = null;
39396
39522
  this.store.set("openProjects", openProjects || []);
39397
39523
  this.store.set("providers", providers2 || []);
39398
39524
  }
@@ -39417,6 +39543,7 @@ class Store {
39417
39543
  }
39418
39544
  saveSettings(settings2) {
39419
39545
  this.store.set("settings", settings2);
39546
+ this.cachedSettings = null;
39420
39547
  }
39421
39548
  getOpenProjects() {
39422
39549
  return this.store.get("openProjects") || [];