gitcoach-cli 1.0.12 → 1.0.14

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 (90) hide show
  1. package/dist/commands/index.d.ts.map +1 -1
  2. package/dist/commands/index.js +3 -6
  3. package/dist/commands/index.js.map +1 -1
  4. package/dist/commands/init.js +4 -4
  5. package/dist/commands/init.js.map +1 -1
  6. package/dist/commands/quick.d.ts.map +1 -1
  7. package/dist/commands/quick.js +2 -1
  8. package/dist/commands/quick.js.map +1 -1
  9. package/dist/i18n/locales/en.json +66 -3
  10. package/dist/i18n/locales/es.json +66 -3
  11. package/dist/i18n/locales/fr.json +66 -3
  12. package/dist/services/copilot-service.d.ts +1 -0
  13. package/dist/services/copilot-service.d.ts.map +1 -1
  14. package/dist/services/copilot-service.js +53 -24
  15. package/dist/services/copilot-service.js.map +1 -1
  16. package/dist/services/git-service.d.ts +12 -2
  17. package/dist/services/git-service.d.ts.map +1 -1
  18. package/dist/services/git-service.js +116 -4
  19. package/dist/services/git-service.js.map +1 -1
  20. package/dist/services/prevention-service.d.ts +5 -0
  21. package/dist/services/prevention-service.d.ts.map +1 -1
  22. package/dist/services/prevention-service.js +103 -5
  23. package/dist/services/prevention-service.js.map +1 -1
  24. package/dist/ui/components/prompt.d.ts +0 -1
  25. package/dist/ui/components/prompt.d.ts.map +1 -1
  26. package/dist/ui/components/prompt.js +0 -8
  27. package/dist/ui/components/prompt.js.map +1 -1
  28. package/dist/ui/menus/add-menu.d.ts.map +1 -1
  29. package/dist/ui/menus/add-menu.js +3 -1
  30. package/dist/ui/menus/add-menu.js.map +1 -1
  31. package/dist/ui/menus/branch-menu.d.ts.map +1 -1
  32. package/dist/ui/menus/branch-menu.js +2 -1
  33. package/dist/ui/menus/branch-menu.js.map +1 -1
  34. package/dist/ui/menus/commit-menu.d.ts.map +1 -1
  35. package/dist/ui/menus/commit-menu.js +3 -1
  36. package/dist/ui/menus/commit-menu.js.map +1 -1
  37. package/dist/ui/menus/config-menu.d.ts +1 -1
  38. package/dist/ui/menus/config-menu.d.ts.map +1 -1
  39. package/dist/ui/menus/config-menu.js +18 -2
  40. package/dist/ui/menus/config-menu.js.map +1 -1
  41. package/dist/ui/menus/conflict-resolution-menu.d.ts +13 -0
  42. package/dist/ui/menus/conflict-resolution-menu.d.ts.map +1 -0
  43. package/dist/ui/menus/conflict-resolution-menu.js +204 -0
  44. package/dist/ui/menus/conflict-resolution-menu.js.map +1 -0
  45. package/dist/ui/menus/detached-head-menu.d.ts.map +1 -1
  46. package/dist/ui/menus/detached-head-menu.js +2 -1
  47. package/dist/ui/menus/detached-head-menu.js.map +1 -1
  48. package/dist/ui/menus/help-menu.js +1 -0
  49. package/dist/ui/menus/help-menu.js.map +1 -1
  50. package/dist/ui/menus/history-menu.d.ts.map +1 -1
  51. package/dist/ui/menus/history-menu.js +23 -18
  52. package/dist/ui/menus/history-menu.js.map +1 -1
  53. package/dist/ui/menus/main-menu.d.ts.map +1 -1
  54. package/dist/ui/menus/main-menu.js +4 -3
  55. package/dist/ui/menus/main-menu.js.map +1 -1
  56. package/dist/ui/menus/pull-menu.d.ts.map +1 -1
  57. package/dist/ui/menus/pull-menu.js +173 -49
  58. package/dist/ui/menus/pull-menu.js.map +1 -1
  59. package/dist/ui/menus/push-menu.d.ts.map +1 -1
  60. package/dist/ui/menus/push-menu.js +3 -4
  61. package/dist/ui/menus/push-menu.js.map +1 -1
  62. package/dist/ui/menus/remote-menu.d.ts.map +1 -1
  63. package/dist/ui/menus/remote-menu.js +6 -4
  64. package/dist/ui/menus/remote-menu.js.map +1 -1
  65. package/dist/ui/menus/setup-menu.d.ts.map +1 -1
  66. package/dist/ui/menus/setup-menu.js +3 -6
  67. package/dist/ui/menus/setup-menu.js.map +1 -1
  68. package/dist/ui/menus/stash-menu.d.ts.map +1 -1
  69. package/dist/ui/menus/stash-menu.js +6 -15
  70. package/dist/ui/menus/stash-menu.js.map +1 -1
  71. package/dist/ui/menus/undo-menu.d.ts.map +1 -1
  72. package/dist/ui/menus/undo-menu.js +5 -12
  73. package/dist/ui/menus/undo-menu.js.map +1 -1
  74. package/dist/utils/error-mapper.d.ts +7 -0
  75. package/dist/utils/error-mapper.d.ts.map +1 -0
  76. package/dist/utils/error-mapper.js +96 -0
  77. package/dist/utils/error-mapper.js.map +1 -0
  78. package/dist/utils/helpers.d.ts.map +1 -1
  79. package/dist/utils/helpers.js +5 -3
  80. package/dist/utils/helpers.js.map +1 -1
  81. package/dist/utils/logger.d.ts +3 -0
  82. package/dist/utils/logger.d.ts.map +1 -1
  83. package/dist/utils/logger.js +26 -14
  84. package/dist/utils/logger.js.map +1 -1
  85. package/dist/utils/validators.d.ts.map +1 -1
  86. package/dist/utils/validators.js +4 -2
  87. package/dist/utils/validators.js.map +1 -1
  88. package/dist/utils/version.d.ts +1 -1
  89. package/dist/utils/version.js +1 -1
  90. package/package.json +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AA6BtC,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,OAAO;IACxC,OAAgB,WAAW,SAA+C;IAE1E,OAAgB,QAAQ,WAKtB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YAkDZ,eAAe;YA0Cf,YAAY;CA8D3B"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AA8BtC,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,OAAO;IACxC,OAAgB,WAAW,SAA+C;IAE1E,OAAgB,QAAQ,WAKtB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YAgDZ,eAAe;YAwCf,YAAY;CA8D3B"}
@@ -3,6 +3,7 @@ import { initI18n, t } from '../i18n/index.js';
3
3
  import { userConfig } from '../config/user-config.js';
4
4
  import { gitService } from '../services/git-service.js';
5
5
  import { logger } from '../utils/logger.js';
6
+ import { mapGitError } from '../utils/error-mapper.js';
6
7
  import { getTheme } from '../ui/themes/index.js';
7
8
  import { showMainMenu, showStatusScreen } from '../ui/menus/main-menu.js';
8
9
  import { showAddMenu } from '../ui/menus/add-menu.js';
@@ -59,9 +60,7 @@ export default class Index extends Command {
59
60
  running = false;
60
61
  }
61
62
  else {
62
- logger.error(t('errors.generic', {
63
- message: error instanceof Error ? error.message : 'Unknown error'
64
- }));
63
+ logger.error(mapGitError(error));
65
64
  }
66
65
  }
67
66
  }
@@ -99,9 +98,7 @@ export default class Index extends Command {
99
98
  running = false;
100
99
  }
101
100
  else {
102
- logger.error(t('errors.generic', {
103
- message: error instanceof Error ? error.message : 'Unknown error'
104
- }));
101
+ logger.error(mapGitError(error));
105
102
  }
106
103
  }
107
104
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"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"}
@@ -26,16 +26,16 @@ export default class Init extends Command {
26
26
  await initI18n();
27
27
  // Select theme
28
28
  const selectedTheme = await promptSelect(t('setup.selectTheme'), THEMES.map(th => ({
29
- name: th.theme === 'colored' ? 'Colored (with syntax highlighting)' : 'Monochrome (plain text)',
29
+ name: t(`themes.${th.theme}`),
30
30
  value: th.theme,
31
- description: th.description
31
+ description: t(`themes.${th.theme}Desc`)
32
32
  })));
33
33
  userConfig.setTheme(selectedTheme);
34
34
  // Select experience level
35
35
  const level = await promptSelect(t('setup.selectLevel'), EXPERIENCE_LEVELS.map(l => ({
36
- name: l.level.charAt(0).toUpperCase() + l.level.slice(1),
36
+ name: t(`levels.${l.level}`),
37
37
  value: l.level,
38
- description: l.description
38
+ description: t(`levels.${l.level}Desc`)
39
39
  })));
40
40
  userConfig.setExperienceLevel(level);
41
41
  // Check for Copilot CLI availability
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,MAAM,EAIP,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,OAAO;IACvC,MAAM,CAAU,WAAW,GAAG,sCAAsC,CAAC;IAErE,MAAM,CAAU,QAAQ,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAEtD,KAAK,CAAC,GAAG;QACP,MAAM,QAAQ,EAAE,CAAC;QAEjB,kBAAkB;QAClB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEf,kBAAkB;QAClB,MAAM,QAAQ,GAAG,MAAM,YAAY,CACjC,CAAC,CAAC,sBAAsB,CAAC,EACzB,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC5B,IAAI,EAAE,GAAG,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,IAAI,GAAG;YACnC,KAAK,EAAE,CAAC,CAAC,IAAI;SACd,CAAC,CAAC,CACJ,CAAC;QAEF,cAAc,CAAC,QAAQ,CAAC,CAAC;QAEzB,sDAAsD;QACtD,MAAM,QAAQ,EAAE,CAAC;QAEjB,eAAe;QACf,MAAM,aAAa,GAAG,MAAM,YAAY,CACtC,CAAC,CAAC,mBAAmB,CAAC,EACtB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAChB,IAAI,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC,yBAAyB;YAC/F,KAAK,EAAE,EAAE,CAAC,KAAK;YACf,WAAW,EAAE,EAAE,CAAC,WAAW;SAC5B,CAAC,CAAC,CACJ,CAAC;QAEF,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAEnC,0BAA0B;QAC1B,MAAM,KAAK,GAAG,MAAM,YAAY,CAC9B,CAAC,CAAC,mBAAmB,CAAC,EACtB,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC1B,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YACxD,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,WAAW,EAAE,CAAC,CAAC,WAAW;SAC3B,CAAC,CAAC,CACJ,CAAC;QAEF,UAAU,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAErC,qCAAqC;QACrC,MAAM,IAAI,CAAC,gCAAgC,EAAE,CAAC;QAE9C,6BAA6B;QAC7B,UAAU,CAAC,mBAAmB,EAAE,CAAC;QAEjC,kBAAkB;QAClB,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,UAAU,CAC1B,GAAG,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,EAAE,EAC7C,CAAC,CAAC,eAAe,CAAC,CACnB,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,gCAAgC;QAC5C,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;QAEzB,4CAA4C;QAC5C,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,CAAC;QAE5D,IAAI,gBAAgB,EAAE,CAAC;YACrB,mCAAmC;YACnC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;YACpE,OAAO;QACT,CAAC;QAED,2DAA2D;QAC3D,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,OAAO,CACvB,CAAC,CAAC,2BAA2B,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,uBAAuB,CAAC,EACpE,CAAC,CAAC,oBAAoB,CAAC,CACxB,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,MAAM,aAAa,CACvC,CAAC,CAAC,8BAA8B,CAAC,EACjC,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,2CAA2C;YAC3C,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;YACvD,OAAO;QACT,CAAC;QAED,oDAAoD;QACpD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACf,MAAM,OAAO,GAAG,aAAa,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,yBAAyB,CAAC,EAAE,CAAC,CAAC;QACtE,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,iBAAiB,EAAE,CAAC;QAExD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC;YAClD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC;YAC9C,MAAM,CAAC,GAAG,CAAC,UAAU,CACnB,CAAC,CAAC,kCAAkC,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,4BAA4B,CAAC,EAChF,CAAC,CAAC,gBAAgB,CAAC,CACpB,CAAC,CAAC;QACL,CAAC;IACH,CAAC"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"quick.d.ts","sourceRoot":"","sources":["../../src/commands/quick.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAY7C,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,OAAO;IACxC,OAAgB,WAAW,SAAyC;IAEpE,OAAgB,QAAQ,WAItB;IAEF,OAAgB,KAAK;;;;MAenB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA2G3B"}
1
+ {"version":3,"file":"quick.d.ts","sourceRoot":"","sources":["../../src/commands/quick.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAa7C,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,OAAO;IACxC,OAAgB,WAAW,SAAyC;IAEpE,OAAgB,QAAQ,WAItB;IAEF,OAAgB,KAAK;;;;MAenB;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAyG3B"}
@@ -9,6 +9,7 @@ import { getTheme } from '../ui/themes/index.js';
9
9
  import { successBox, errorBox, warningBox } from '../ui/components/box.js';
10
10
  import { withSpinner } from '../ui/components/spinner.js';
11
11
  import { promptConfirm, promptInput } from '../ui/components/prompt.js';
12
+ import { mapGitError } from '../utils/error-mapper.js';
12
13
  export default class Quick extends Command {
13
14
  static description = 'Quick commit and push (expert mode)';
14
15
  static examples = [
@@ -105,7 +106,7 @@ export default class Quick extends Command {
105
106
  logger.raw('\n' + successBox('Quick commit complete!'));
106
107
  }
107
108
  catch (error) {
108
- logger.raw(errorBox(t('errors.generic', { message: error instanceof Error ? error.message : 'Unknown error' })));
109
+ logger.raw(errorBox(mapGitError(error)));
109
110
  }
110
111
  }
111
112
  }
@@ -1 +1 @@
1
- {"version":3,"file":"quick.js","sourceRoot":"","sources":["../../src/commands/quick.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"quick.js","sourceRoot":"","sources":["../../src/commands/quick.ts"],"names":[],"mappings":"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"}
@@ -189,7 +189,48 @@
189
189
  "success": "Successfully pulled {{count}} commit(s).",
190
190
  "upToDate": "Already up to date.",
191
191
  "conflicts": "Merge conflicts detected. Please resolve them manually.",
192
- "failed": "Pull failed: {{error}}"
192
+ "failed": "Pull failed: {{error}}",
193
+ "noRemoteConfigured": "No remote repository configured. You need to add a remote to pull from.",
194
+ "selectRemote": "Select the remote to pull from:",
195
+ "noUpstream": "Branch '{{branch}}' has no upstream tracking branch configured.",
196
+ "setUpstreamQuestion": "Set upstream to {{remote}}/{{branch}}?",
197
+ "diverged": "Your branch and the remote have diverged.",
198
+ "divergedExplain": "You have {{ahead}} local commit(s) and {{behind}} remote commit(s) to integrate.",
199
+ "mergeOrRebase": "How would you like to integrate the remote changes?",
200
+ "optionMerge": "Merge (creates a merge commit)",
201
+ "optionRebase": "Rebase (replay your commits on top)",
202
+ "conflictsDetected": "{{count}} file(s) have merge conflicts that need to be resolved.",
203
+ "conflictedFiles": "Files with conflicts:",
204
+ "resolveInstructions": "To resolve conflicts:\n1. Open each conflicted file in your editor\n2. Look for conflict markers: <<<<<<< (your changes), ======= (separator), >>>>>>> (remote changes)\n3. Choose which version to keep (or combine both), then delete ALL markers\n4. Save the file\n5. Run 'git add' on each resolved file\n6. Run 'git commit' to finalize the merge",
205
+ "resolveOptions": "What would you like to do?",
206
+ "abortMerge": "Abort merge and restore previous state",
207
+ "abortSuccess": "Merge aborted successfully. Your branch is back to its previous state.",
208
+ "continueMerge": "I'll resolve the conflicts manually",
209
+ "mergeInProgress": "A merge is currently in progress.",
210
+ "rebaseInProgress": "A rebase is currently in progress.",
211
+ "uncommittedWarning": "You have uncommitted changes. They may be lost during pull.",
212
+ "uncommittedOptions": "What would you like to do with your uncommitted changes?",
213
+ "optionCommit": "Commit changes first",
214
+ "optionStash": "Stash changes temporarily",
215
+ "optionContinue": "Continue anyway (risky)",
216
+ "guidedResolution": "Resolve conflicts step by step (guided)"
217
+ },
218
+ "conflicts": {
219
+ "title": "Conflict Resolution",
220
+ "fileProgress": "File {{current}}/{{total}}:",
221
+ "localVersion": "Your version (local):",
222
+ "remoteVersion": "Remote version:",
223
+ "chooseResolution": "What do you want to keep?",
224
+ "keepLocal": "Keep my version (local)",
225
+ "keepRemote": "Keep the remote version",
226
+ "keepBoth": "Keep both (combine)",
227
+ "editManually": "Edit manually in my editor",
228
+ "fileResolved": "{{file}} resolved ({{current}}/{{total}})",
229
+ "allResolved": "All {{count}} conflict(s) resolved!",
230
+ "finalizeCommit": "Finalize the merge with git commit?",
231
+ "markersRemaining": "Conflict markers still found in {{file}}. Please remove all <<<<<<< ======= >>>>>>> markers.",
232
+ "pressEnterWhenDone": "Press Enter when you are done editing...",
233
+ "editInstructions": "Open {{file}} in your editor, resolve the conflicts, save, then come back here."
193
234
  },
194
235
  "branch": {
195
236
  "title": "Branch Management",
@@ -337,7 +378,15 @@
337
378
  "detachedHeadAction": "Create a branch to save your work.",
338
379
  "noRemote": "No remote repository configured.",
339
380
  "notGitRepo": "This directory is not a Git repository.",
340
- "copilotUnavailable": "GitHub Copilot CLI is not available. Some features may be limited."
381
+ "copilotUnavailable": "GitHub Copilot CLI is not available. Some features may be limited.",
382
+ "mergeInProgress": "A merge is currently in progress.",
383
+ "mergeInProgressAction": "Complete the merge with 'git commit' or abort with 'git merge --abort'.",
384
+ "rebaseInProgress": "A rebase is currently in progress.",
385
+ "rebaseInProgressAction": "Continue with 'git rebase --continue' or abort with 'git rebase --abort'.",
386
+ "cherryPickInProgress": "A cherry-pick is currently in progress.",
387
+ "cherryPickInProgressAction": "Continue with 'git cherry-pick --continue' or abort with 'git cherry-pick --abort'.",
388
+ "bisectInProgress": "A bisect session is currently in progress.",
389
+ "bisectInProgressAction": "Continue bisecting or end with 'git bisect reset'."
341
390
  },
342
391
  "errors": {
343
392
  "title": "Error",
@@ -349,6 +398,16 @@
349
398
  "branchExists": "Branch '{{branch}}' already exists.",
350
399
  "branchNotFound": "Branch '{{branch}}' not found.",
351
400
  "mergeConflict": "Merge conflict in {{file}}.",
401
+ "unknownError": "An unknown error occurred.",
402
+ "authenticationFailed": "Authentication failed. Check your credentials or SSH key. Run 'git config --list' to verify your remote URL.",
403
+ "pushRejected": "Push was rejected. The remote contains commits you don't have locally. Pull first, then push again.",
404
+ "alreadyExists": "The resource already exists. Choose a different name or delete the existing one first.",
405
+ "fileNotFound": "File or path not found. Check the file name and make sure it exists in the repository.",
406
+ "diskFull": "No disk space left. Free up some space and try again.",
407
+ "lockFileExists": "A Git lock file exists (.git/index.lock). Another Git process may be running. If not, delete the lock file manually.",
408
+ "timeout": "The operation timed out. Check your network connection and try again.",
409
+ "rateLimited": "Rate limit reached. Wait a moment and try again.",
410
+ "detachedHead": "You are in a detached HEAD state. Create a branch to save your work before continuing.",
352
411
  "explainWithAI": "Would you like an AI explanation of this error?",
353
412
  "analyzing": "Analyzing error...",
354
413
  "explanation": "Explanation",
@@ -420,7 +479,11 @@
420
479
  "autoCommitMsg": "Auto-generate Commit Messages",
421
480
  "defaultBranch": "Default Branch",
422
481
  "reset": "Reset to Defaults",
423
- "resetConfirm": "Reset all settings to defaults?"
482
+ "resetConfirm": "Reset all settings to defaults?",
483
+ "copilotRefresh": "Re-check Copilot CLI",
484
+ "copilotAvailable": "GitHub Copilot CLI is available and ready!",
485
+ "copilotNotAvailable": "GitHub Copilot CLI is not available.",
486
+ "copilotChecking": "Checking Copilot CLI availability..."
424
487
  },
425
488
  "stats": {
426
489
  "title": "Your Statistics",
@@ -189,7 +189,48 @@
189
189
  "success": "{{count}} commit(s) descargado(s) exitosamente.",
190
190
  "upToDate": "Ya esta actualizado.",
191
191
  "conflicts": "Conflictos de fusion detectados. Por favor, resuelvalos manualmente.",
192
- "failed": "Fallo al descargar: {{error}}"
192
+ "failed": "Fallo al descargar: {{error}}",
193
+ "noRemoteConfigured": "No hay repositorio remoto configurado. Necesitas agregar un remote para hacer pull.",
194
+ "selectRemote": "Selecciona el remote del cual descargar:",
195
+ "noUpstream": "La rama '{{branch}}' no tiene una rama de seguimiento configurada.",
196
+ "setUpstreamQuestion": "Configurar seguimiento hacia {{remote}}/{{branch}}?",
197
+ "diverged": "Tu rama y el remoto han divergido.",
198
+ "divergedExplain": "Tienes {{ahead}} commit(s) local(es) y {{behind}} commit(s) remoto(s) por integrar.",
199
+ "mergeOrRebase": "Como quieres integrar los cambios remotos?",
200
+ "optionMerge": "Merge (crea un commit de fusion)",
201
+ "optionRebase": "Rebase (reaplica tus commits encima)",
202
+ "conflictsDetected": "{{count}} archivo(s) tienen conflictos de fusion que necesitan ser resueltos.",
203
+ "conflictedFiles": "Archivos con conflictos:",
204
+ "resolveInstructions": "Para resolver los conflictos:\n1. Abra cada archivo en conflicto en su editor\n2. Busque los marcadores de conflicto: <<<<<<< (sus cambios), ======= (separador), >>>>>>> (cambios remotos)\n3. Elija que version conservar (o combine ambas), luego elimine TODOS los marcadores\n4. Guarde el archivo\n5. Ejecute 'git add' en cada archivo resuelto\n6. Ejecute 'git commit' para finalizar el merge",
205
+ "resolveOptions": "Que te gustaria hacer?",
206
+ "abortMerge": "Abortar merge y restaurar el estado anterior",
207
+ "abortSuccess": "Merge abortado exitosamente. Tu rama volvio a su estado anterior.",
208
+ "continueMerge": "Resolvere los conflictos manualmente",
209
+ "mergeInProgress": "Un merge esta actualmente en progreso.",
210
+ "rebaseInProgress": "Un rebase esta actualmente en progreso.",
211
+ "uncommittedWarning": "Tienes cambios sin commitear. Podrian perderse durante el pull.",
212
+ "uncommittedOptions": "Que quieres hacer con tus cambios sin commitear?",
213
+ "optionCommit": "Commitear primero",
214
+ "optionStash": "Guardar temporalmente (stash)",
215
+ "optionContinue": "Continuar de todos modos (riesgoso)",
216
+ "guidedResolution": "Resolver conflictos paso a paso (guiado)"
217
+ },
218
+ "conflicts": {
219
+ "title": "Resolucion de Conflictos",
220
+ "fileProgress": "Archivo {{current}}/{{total}}:",
221
+ "localVersion": "Tu version (local):",
222
+ "remoteVersion": "Version remota:",
223
+ "chooseResolution": "Que quieres conservar?",
224
+ "keepLocal": "Conservar mi version (local)",
225
+ "keepRemote": "Conservar la version remota",
226
+ "keepBoth": "Conservar ambas (combinar)",
227
+ "editManually": "Editar manualmente en mi editor",
228
+ "fileResolved": "{{file}} resuelto ({{current}}/{{total}})",
229
+ "allResolved": "Los {{count}} conflicto(s) han sido resueltos!",
230
+ "finalizeCommit": "Finalizar el merge con git commit?",
231
+ "markersRemaining": "Aun se encuentran marcadores de conflicto en {{file}}. Elimine todos los marcadores <<<<<<< ======= >>>>>>>.",
232
+ "pressEnterWhenDone": "Presione Enter cuando haya terminado de editar...",
233
+ "editInstructions": "Abra {{file}} en su editor, resuelva los conflictos, guarde y vuelva aqui."
193
234
  },
194
235
  "branch": {
195
236
  "title": "Gestion de Ramas",
@@ -337,7 +378,15 @@
337
378
  "detachedHeadAction": "Crea una rama para guardar tu trabajo.",
338
379
  "noRemote": "No hay repositorio remoto configurado.",
339
380
  "notGitRepo": "Este directorio no es un repositorio Git.",
340
- "copilotUnavailable": "GitHub Copilot CLI no esta disponible. Algunas funciones pueden estar limitadas."
381
+ "copilotUnavailable": "GitHub Copilot CLI no esta disponible. Algunas funciones pueden estar limitadas.",
382
+ "mergeInProgress": "Un merge esta actualmente en progreso.",
383
+ "mergeInProgressAction": "Completa el merge con 'git commit' o aborta con 'git merge --abort'.",
384
+ "rebaseInProgress": "Un rebase esta actualmente en progreso.",
385
+ "rebaseInProgressAction": "Continua con 'git rebase --continue' o aborta con 'git rebase --abort'.",
386
+ "cherryPickInProgress": "Un cherry-pick esta actualmente en progreso.",
387
+ "cherryPickInProgressAction": "Continua con 'git cherry-pick --continue' o aborta con 'git cherry-pick --abort'.",
388
+ "bisectInProgress": "Una sesion de bisect esta en progreso.",
389
+ "bisectInProgressAction": "Continua el bisect o termina con 'git bisect reset'."
341
390
  },
342
391
  "errors": {
343
392
  "title": "Error",
@@ -349,6 +398,16 @@
349
398
  "branchExists": "La rama '{{branch}}' ya existe.",
350
399
  "branchNotFound": "Rama '{{branch}}' no encontrada.",
351
400
  "mergeConflict": "Conflicto de fusion en {{file}}.",
401
+ "unknownError": "Ocurrio un error desconocido.",
402
+ "authenticationFailed": "Error de autenticacion. Verifica tus credenciales o tu clave SSH. Ejecuta 'git config --list' para verificar la URL del remote.",
403
+ "pushRejected": "El push fue rechazado. El remoto contiene commits que no tienes. Haz pull primero y luego intenta el push de nuevo.",
404
+ "alreadyExists": "El recurso ya existe. Elige otro nombre o elimina el existente primero.",
405
+ "fileNotFound": "Archivo o ruta no encontrado. Verifica el nombre del archivo y asegurate de que existe en el repositorio.",
406
+ "diskFull": "No queda espacio en disco. Libera espacio e intentalo de nuevo.",
407
+ "lockFileExists": "Existe un archivo de bloqueo Git (.git/index.lock). Otro proceso Git puede estar ejecutandose. Si no, elimina el archivo manualmente.",
408
+ "timeout": "La operacion expiro. Verifica tu conexion de red e intentalo de nuevo.",
409
+ "rateLimited": "Limite de solicitudes alcanzado. Espera un momento e intentalo de nuevo.",
410
+ "detachedHead": "Estas en un estado HEAD separado. Crea una rama para guardar tu trabajo antes de continuar.",
352
411
  "explainWithAI": "Te gustaria una explicacion IA de este error?",
353
412
  "analyzing": "Analizando error...",
354
413
  "explanation": "Explicacion",
@@ -420,7 +479,11 @@
420
479
  "autoCommitMsg": "Auto-generar Mensajes de Commit",
421
480
  "defaultBranch": "Rama por Defecto",
422
481
  "reset": "Restablecer Valores Predeterminados",
423
- "resetConfirm": "Restablecer todas las configuraciones?"
482
+ "resetConfirm": "Restablecer todas las configuraciones?",
483
+ "copilotRefresh": "Re-verificar Copilot CLI",
484
+ "copilotAvailable": "GitHub Copilot CLI esta disponible y listo!",
485
+ "copilotNotAvailable": "GitHub Copilot CLI no esta disponible.",
486
+ "copilotChecking": "Verificando Copilot CLI..."
424
487
  },
425
488
  "stats": {
426
489
  "title": "Tus Estadisticas",
@@ -189,7 +189,48 @@
189
189
  "success": "{{count}} commit(s) recupere(s) avec succes.",
190
190
  "upToDate": "Deja a jour.",
191
191
  "conflicts": "Conflits de fusion detectes. Veuillez les resoudre manuellement.",
192
- "failed": "Echec de la recuperation : {{error}}"
192
+ "failed": "Echec de la recuperation : {{error}}",
193
+ "noRemoteConfigured": "Aucun depot distant configure. Ajoutez un remote pour pouvoir pull.",
194
+ "selectRemote": "Selectionnez le remote depuis lequel recuperer :",
195
+ "noUpstream": "La branche '{{branch}}' n'a pas de branche de suivi configuree.",
196
+ "setUpstreamQuestion": "Configurer le suivi vers {{remote}}/{{branch}} ?",
197
+ "diverged": "Votre branche et le remote ont diverge.",
198
+ "divergedExplain": "Vous avez {{ahead}} commit(s) local(aux) et {{behind}} commit(s) distant(s) a integrer.",
199
+ "mergeOrRebase": "Comment souhaitez-vous integrer les modifications distantes ?",
200
+ "optionMerge": "Merge (cree un commit de fusion)",
201
+ "optionRebase": "Rebase (rejoue vos commits par-dessus)",
202
+ "conflictsDetected": "{{count}} fichier(s) ont des conflits de fusion a resoudre.",
203
+ "conflictedFiles": "Fichiers en conflit :",
204
+ "resolveInstructions": "Pour resoudre les conflits :\n1. Ouvrez chaque fichier en conflit dans votre editeur\n2. Cherchez les marqueurs de conflit : <<<<<<< (vos modifications), ======= (separateur), >>>>>>> (modifications distantes)\n3. Choisissez la version a garder (ou combinez les deux), puis supprimez TOUS les marqueurs\n4. Sauvegardez le fichier\n5. Lancez 'git add' sur chaque fichier resolu\n6. Lancez 'git commit' pour finaliser le merge",
205
+ "resolveOptions": "Que souhaitez-vous faire ?",
206
+ "abortMerge": "Annuler le merge et restaurer l'etat precedent",
207
+ "abortSuccess": "Merge annule avec succes. Votre branche est revenue a son etat precedent.",
208
+ "continueMerge": "Je vais resoudre les conflits manuellement",
209
+ "mergeInProgress": "Un merge est actuellement en cours.",
210
+ "rebaseInProgress": "Un rebase est actuellement en cours.",
211
+ "uncommittedWarning": "Vous avez des modifications non commitees. Elles pourraient etre perdues pendant le pull.",
212
+ "uncommittedOptions": "Que faire de vos modifications non commitees ?",
213
+ "optionCommit": "Commiter d'abord",
214
+ "optionStash": "Mettre de cote temporairement (stash)",
215
+ "optionContinue": "Continuer quand meme (risque)",
216
+ "guidedResolution": "Resoudre les conflits pas a pas (guide)"
217
+ },
218
+ "conflicts": {
219
+ "title": "Resolution des Conflits",
220
+ "fileProgress": "Fichier {{current}}/{{total}} :",
221
+ "localVersion": "Votre version (locale) :",
222
+ "remoteVersion": "Version distante :",
223
+ "chooseResolution": "Que voulez-vous garder ?",
224
+ "keepLocal": "Garder ma version (locale)",
225
+ "keepRemote": "Garder la version distante",
226
+ "keepBoth": "Garder les deux (combiner)",
227
+ "editManually": "Editer manuellement dans mon editeur",
228
+ "fileResolved": "{{file}} resolu ({{current}}/{{total}})",
229
+ "allResolved": "Les {{count}} conflit(s) ont ete resolus !",
230
+ "finalizeCommit": "Finaliser le merge avec git commit ?",
231
+ "markersRemaining": "Des marqueurs de conflit sont encore presents dans {{file}}. Supprimez tous les marqueurs <<<<<<< ======= >>>>>>>.",
232
+ "pressEnterWhenDone": "Appuyez sur Entree quand vous avez fini d'editer...",
233
+ "editInstructions": "Ouvrez {{file}} dans votre editeur, resolvez les conflits, sauvegardez, puis revenez ici."
193
234
  },
194
235
  "branch": {
195
236
  "title": "Gestion des Branches",
@@ -337,7 +378,15 @@
337
378
  "detachedHeadAction": "Creez une branche pour sauvegarder votre travail.",
338
379
  "noRemote": "Aucun depot distant configure.",
339
380
  "notGitRepo": "Ce repertoire n'est pas un depot Git.",
340
- "copilotUnavailable": "GitHub Copilot CLI n'est pas disponible. Certaines fonctionnalites peuvent etre limitees."
381
+ "copilotUnavailable": "GitHub Copilot CLI n'est pas disponible. Certaines fonctionnalites peuvent etre limitees.",
382
+ "mergeInProgress": "Un merge est actuellement en cours.",
383
+ "mergeInProgressAction": "Terminez le merge avec 'git commit' ou annulez avec 'git merge --abort'.",
384
+ "rebaseInProgress": "Un rebase est actuellement en cours.",
385
+ "rebaseInProgressAction": "Continuez avec 'git rebase --continue' ou annulez avec 'git rebase --abort'.",
386
+ "cherryPickInProgress": "Un cherry-pick est actuellement en cours.",
387
+ "cherryPickInProgressAction": "Continuez avec 'git cherry-pick --continue' ou annulez avec 'git cherry-pick --abort'.",
388
+ "bisectInProgress": "Une session de bisect est en cours.",
389
+ "bisectInProgressAction": "Continuez le bisect ou terminez avec 'git bisect reset'."
341
390
  },
342
391
  "errors": {
343
392
  "title": "Erreur",
@@ -349,6 +398,16 @@
349
398
  "branchExists": "La branche '{{branch}}' existe deja.",
350
399
  "branchNotFound": "Branche '{{branch}}' introuvable.",
351
400
  "mergeConflict": "Conflit de fusion dans {{file}}.",
401
+ "unknownError": "Une erreur inconnue s'est produite.",
402
+ "authenticationFailed": "Echec d'authentification. Verifiez vos identifiants ou votre cle SSH. Lancez 'git config --list' pour verifier l'URL du remote.",
403
+ "pushRejected": "Le push a ete rejete. Le remote contient des commits que vous n'avez pas. Faites un pull d'abord, puis reessayez le push.",
404
+ "alreadyExists": "La ressource existe deja. Choisissez un autre nom ou supprimez celle existante.",
405
+ "fileNotFound": "Fichier ou chemin introuvable. Verifiez le nom du fichier et assurez-vous qu'il existe dans le depot.",
406
+ "diskFull": "Plus d'espace disque disponible. Liberez de l'espace et reessayez.",
407
+ "lockFileExists": "Un fichier de verrouillage Git existe (.git/index.lock). Un autre processus Git est peut-etre en cours. Sinon, supprimez le fichier manuellement.",
408
+ "timeout": "L'operation a expire. Verifiez votre connexion reseau et reessayez.",
409
+ "rateLimited": "Limite de requetes atteinte. Attendez un moment et reessayez.",
410
+ "detachedHead": "Vous etes en etat HEAD detache. Creez une branche pour sauvegarder votre travail avant de continuer.",
352
411
  "explainWithAI": "Voulez-vous une explication IA de cette erreur ?",
353
412
  "analyzing": "Analyse de l'erreur...",
354
413
  "explanation": "Explication",
@@ -420,7 +479,11 @@
420
479
  "autoCommitMsg": "Generer les Messages Automatiquement",
421
480
  "defaultBranch": "Branche par Defaut",
422
481
  "reset": "Reinitialiser par Defaut",
423
- "resetConfirm": "Reinitialiser tous les parametres ?"
482
+ "resetConfirm": "Reinitialiser tous les parametres ?",
483
+ "copilotRefresh": "Re-verifier Copilot CLI",
484
+ "copilotAvailable": "GitHub Copilot CLI est disponible et pret !",
485
+ "copilotNotAvailable": "GitHub Copilot CLI n'est pas disponible.",
486
+ "copilotChecking": "Verification de Copilot CLI..."
424
487
  },
425
488
  "stats": {
426
489
  "title": "Vos Statistiques",
@@ -29,6 +29,7 @@ declare class CopilotService {
29
29
  * Explain a Git error and suggest solutions
30
30
  */
31
31
  explainGitError(errorMessage: string, command?: string): Promise<CopilotSuggestion>;
32
+ private executeWithRetry;
32
33
  private parseAnswer;
33
34
  private parseCommitMessage;
34
35
  private parseSuggestion;
@@ -1 +1 @@
1
- {"version":3,"file":"copilot-service.d.ts","sourceRoot":"","sources":["../../src/services/copilot-service.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,cAAM,cAAc;IAClB,OAAO,CAAC,SAAS,CAAwB;IAEnC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAwBrC,iBAAiB,IAAI,IAAI;IAIzB;;;OAGG;IACG,iBAAiB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAoCnE,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAuDrE,OAAO,CAAC,aAAa;IAuCrB,OAAO,CAAC,cAAc;IAUhB,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EAAE,EACrB,aAAa,EAAE,MAAM,EAAE,GACtB,OAAO,CAAC,iBAAiB,CAAC;IA+BvB,eAAe,CACnB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,OAAO,GACtB,OAAO,CAAC,iBAAiB,CAAC;IA+BvB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA8BjE;;OAEG;IACG,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA0ClE;;OAEG;IACG,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA8CzF,OAAO,CAAC,WAAW;IAuCnB,OAAO,CAAC,kBAAkB;IAuE1B,OAAO,CAAC,eAAe;CAiCxB;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC;AACnD,eAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"copilot-service.d.ts","sourceRoot":"","sources":["../../src/services/copilot-service.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,cAAM,cAAc;IAClB,OAAO,CAAC,SAAS,CAAwB;IAEnC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAwBrC,iBAAiB,IAAI,IAAI;IAIzB;;;OAGG;IACG,iBAAiB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAoCnE,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA4DrE,OAAO,CAAC,aAAa;IAuCrB,OAAO,CAAC,cAAc;IAUhB,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EAAE,EACrB,aAAa,EAAE,MAAM,EAAE,GACtB,OAAO,CAAC,iBAAiB,CAAC;IA+BvB,eAAe,CACnB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,OAAO,GACtB,OAAO,CAAC,iBAAiB,CAAC;IA+BvB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA8BjE;;OAEG;IACG,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA0ClE;;OAEG;IACG,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;YA8C3E,gBAAgB;IAiB9B,OAAO,CAAC,WAAW;IAuCnB,OAAO,CAAC,kBAAkB;IAuE1B,OAAO,CAAC,eAAe;CAiCxB;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC;AACnD,eAAe,cAAc,CAAC"}