gitcoach-cli 1.0.11 → 1.0.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/index.d.ts.map +1 -1
- package/dist/commands/index.js +3 -6
- package/dist/commands/index.js.map +1 -1
- package/dist/commands/init.js +4 -4
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/quick.d.ts.map +1 -1
- package/dist/commands/quick.js +2 -1
- package/dist/commands/quick.js.map +1 -1
- package/dist/i18n/locales/en.json +103 -11
- package/dist/i18n/locales/es.json +103 -11
- package/dist/i18n/locales/fr.json +103 -11
- package/dist/services/copilot-service.d.ts +1 -0
- package/dist/services/copilot-service.d.ts.map +1 -1
- package/dist/services/copilot-service.js +53 -24
- package/dist/services/copilot-service.js.map +1 -1
- package/dist/services/git-service.d.ts +10 -1
- package/dist/services/git-service.d.ts.map +1 -1
- package/dist/services/git-service.js +93 -2
- package/dist/services/git-service.js.map +1 -1
- package/dist/services/prevention-service.d.ts +5 -0
- package/dist/services/prevention-service.d.ts.map +1 -1
- package/dist/services/prevention-service.js +103 -5
- package/dist/services/prevention-service.js.map +1 -1
- package/dist/ui/components/prompt.d.ts +0 -1
- package/dist/ui/components/prompt.d.ts.map +1 -1
- package/dist/ui/components/prompt.js +0 -8
- package/dist/ui/components/prompt.js.map +1 -1
- package/dist/ui/menus/add-menu.d.ts.map +1 -1
- package/dist/ui/menus/add-menu.js +7 -4
- package/dist/ui/menus/add-menu.js.map +1 -1
- package/dist/ui/menus/branch-menu.d.ts.map +1 -1
- package/dist/ui/menus/branch-menu.js +7 -6
- package/dist/ui/menus/branch-menu.js.map +1 -1
- package/dist/ui/menus/commit-menu.d.ts.map +1 -1
- package/dist/ui/menus/commit-menu.js +12 -10
- package/dist/ui/menus/commit-menu.js.map +1 -1
- package/dist/ui/menus/config-menu.d.ts +1 -1
- package/dist/ui/menus/config-menu.d.ts.map +1 -1
- package/dist/ui/menus/config-menu.js +22 -6
- package/dist/ui/menus/config-menu.js.map +1 -1
- package/dist/ui/menus/detached-head-menu.d.ts.map +1 -1
- package/dist/ui/menus/detached-head-menu.js +7 -6
- package/dist/ui/menus/detached-head-menu.js.map +1 -1
- package/dist/ui/menus/help-menu.js +3 -2
- package/dist/ui/menus/help-menu.js.map +1 -1
- package/dist/ui/menus/history-menu.d.ts.map +1 -1
- package/dist/ui/menus/history-menu.js +27 -22
- package/dist/ui/menus/history-menu.js.map +1 -1
- package/dist/ui/menus/main-menu.d.ts.map +1 -1
- package/dist/ui/menus/main-menu.js +5 -4
- package/dist/ui/menus/main-menu.js.map +1 -1
- package/dist/ui/menus/pull-menu.d.ts.map +1 -1
- package/dist/ui/menus/pull-menu.js +163 -50
- package/dist/ui/menus/pull-menu.js.map +1 -1
- package/dist/ui/menus/push-menu.d.ts.map +1 -1
- package/dist/ui/menus/push-menu.js +5 -6
- package/dist/ui/menus/push-menu.js.map +1 -1
- package/dist/ui/menus/remote-menu.d.ts.map +1 -1
- package/dist/ui/menus/remote-menu.js +6 -4
- package/dist/ui/menus/remote-menu.js.map +1 -1
- package/dist/ui/menus/setup-menu.d.ts.map +1 -1
- package/dist/ui/menus/setup-menu.js +4 -7
- package/dist/ui/menus/setup-menu.js.map +1 -1
- package/dist/ui/menus/stash-menu.d.ts.map +1 -1
- package/dist/ui/menus/stash-menu.js +6 -15
- package/dist/ui/menus/stash-menu.js.map +1 -1
- package/dist/ui/menus/undo-menu.d.ts.map +1 -1
- package/dist/ui/menus/undo-menu.js +5 -12
- package/dist/ui/menus/undo-menu.js.map +1 -1
- package/dist/utils/error-mapper.d.ts +7 -0
- package/dist/utils/error-mapper.d.ts.map +1 -0
- package/dist/utils/error-mapper.js +96 -0
- package/dist/utils/error-mapper.js.map +1 -0
- package/dist/utils/helpers.d.ts.map +1 -1
- package/dist/utils/helpers.js +5 -3
- package/dist/utils/helpers.js.map +1 -1
- package/dist/utils/logger.d.ts +3 -0
- package/dist/utils/logger.d.ts.map +1 -1
- package/dist/utils/logger.js +26 -14
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/validators.d.ts.map +1 -1
- package/dist/utils/validators.js +4 -2
- package/dist/utils/validators.js.map +1 -1
- package/dist/utils/version.d.ts +1 -1
- package/dist/utils/version.js +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/history-menu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAc,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAIpE,SAAS,kBAAkB,CAAC,UAAkB;IAC5C,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;IAClC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"history-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/history-menu.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/main-menu.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"main-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/main-menu.ts"],"names":[],"mappings":"AAwBA,MAAM,MAAM,cAAc,GACtB,QAAQ,GACR,KAAK,GACL,QAAQ,GACR,MAAM,GACN,MAAM,GACN,QAAQ,GACR,QAAQ,GACR,MAAM,GACN,SAAS,GACT,OAAO,GACP,QAAQ,GACR,OAAO,GACP,MAAM,GACN,MAAM,CAAC;AAEX,wBAAsB,YAAY,IAAI,OAAO,CAAC,cAAc,CAAC,CAuF5D;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAkEtD"}
|
|
@@ -5,6 +5,7 @@ import { promptSelect } from '../components/prompt.js';
|
|
|
5
5
|
import { analysisService } from '../../services/analysis-service.js';
|
|
6
6
|
import { gitService } from '../../services/git-service.js';
|
|
7
7
|
import { logger } from '../../utils/logger.js';
|
|
8
|
+
import { mapGitError } from '../../utils/error-mapper.js';
|
|
8
9
|
import { APP_VERSION } from '../../utils/version.js';
|
|
9
10
|
import { showDetachedHeadMenu, handleDetachedHead } from './detached-head-menu.js';
|
|
10
11
|
import { getLevel } from '../../utils/level-helper.js';
|
|
@@ -32,7 +33,7 @@ export async function showMainMenu() {
|
|
|
32
33
|
}
|
|
33
34
|
}
|
|
34
35
|
catch {
|
|
35
|
-
|
|
36
|
+
logger.debug('Error checking detached HEAD state');
|
|
36
37
|
}
|
|
37
38
|
// Show ASCII art banner
|
|
38
39
|
logger.raw(banner(APP_VERSION, t('app.tagline')));
|
|
@@ -42,7 +43,7 @@ export async function showMainMenu() {
|
|
|
42
43
|
logger.raw(theme.textMuted(` ${quickStatus}\n`));
|
|
43
44
|
}
|
|
44
45
|
catch {
|
|
45
|
-
|
|
46
|
+
logger.debug('Error fetching quick status');
|
|
46
47
|
}
|
|
47
48
|
const choices = [
|
|
48
49
|
{
|
|
@@ -155,12 +156,12 @@ export async function showStatusScreen() {
|
|
|
155
156
|
}
|
|
156
157
|
// Show tip if available
|
|
157
158
|
if (analysis.tip) {
|
|
158
|
-
logger.raw('\n' + infoBox(analysis.tip, '
|
|
159
|
+
logger.raw('\n' + infoBox(analysis.tip, t('tipTitle')));
|
|
159
160
|
}
|
|
160
161
|
logger.raw('');
|
|
161
162
|
}
|
|
162
163
|
catch (error) {
|
|
163
|
-
logger.error(
|
|
164
|
+
logger.error(mapGitError(error));
|
|
164
165
|
}
|
|
165
166
|
}
|
|
166
167
|
//# sourceMappingURL=main-menu.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/main-menu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD;;;;;GAKG;AACH,SAAS,YAAY,CAAC,GAAW;IAC/B,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,QAAQ,GAAG,QAAQ,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAChF,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;AACrB,CAAC;AAkBD,MAAM,CAAC,KAAK,UAAU,YAAY;IAChC,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IAEzB,gCAAgC;IAChC,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,cAAc,EAAE,CAAC;QACrD,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,MAAM,GAAG,MAAM,oBAAoB,EAAE,CAAC;YAC5C,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACxB,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,
|
|
1
|
+
{"version":3,"file":"main-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/main-menu.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/pull-menu.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pull-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/pull-menu.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAOD,wBAAsB,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,CA+PxD"}
|
|
@@ -1,29 +1,140 @@
|
|
|
1
1
|
import { t } from '../../i18n/index.js';
|
|
2
2
|
import { getTheme } from '../themes/index.js';
|
|
3
|
-
import { promptConfirm, promptSelect } from '../components/prompt.js';
|
|
3
|
+
import { promptConfirm, promptSelect, promptInput } from '../components/prompt.js';
|
|
4
4
|
import { successBox, warningBox, errorBox, infoBox } from '../components/box.js';
|
|
5
5
|
import { withSpinner } from '../components/spinner.js';
|
|
6
6
|
import { gitService } from '../../services/git-service.js';
|
|
7
|
-
import { preventionService } from '../../services/prevention-service.js';
|
|
8
7
|
import { logger } from '../../utils/logger.js';
|
|
9
|
-
import {
|
|
8
|
+
import { mapGitError } from '../../utils/error-mapper.js';
|
|
9
|
+
import { isValidRemoteUrl } from '../../utils/validators.js';
|
|
10
|
+
import { shouldShowExplanation, shouldConfirm, isLevel } from '../../utils/level-helper.js';
|
|
10
11
|
export async function showPullMenu() {
|
|
11
12
|
const theme = getTheme();
|
|
12
13
|
logger.raw('\n' + theme.title(t('commands.pull.title')) + '\n');
|
|
13
14
|
try {
|
|
14
|
-
|
|
15
|
-
const currentBranch = status.current;
|
|
16
|
-
const remote = 'origin';
|
|
17
|
-
// Show explanation for beginners
|
|
15
|
+
// 1. Show explanation for beginners
|
|
18
16
|
if (shouldShowExplanation()) {
|
|
19
17
|
logger.raw(infoBox(t('tips.beginner.pull'), t('commands.pull.title')));
|
|
20
18
|
}
|
|
19
|
+
// 2. Check if merge/rebase is already in progress
|
|
20
|
+
const mergeInProgress = await gitService.isMergeInProgress();
|
|
21
|
+
if (mergeInProgress) {
|
|
22
|
+
logger.raw(warningBox(t('warnings.mergeInProgress') + '\n' + t('warnings.mergeInProgressAction'), t('warnings.title')));
|
|
23
|
+
const abortMerge = await promptConfirm(t('commands.pull.abortMerge'), false);
|
|
24
|
+
if (abortMerge) {
|
|
25
|
+
await gitService.abortMerge();
|
|
26
|
+
logger.raw(successBox(t('commands.pull.abortSuccess')));
|
|
27
|
+
}
|
|
28
|
+
return { pulled: false };
|
|
29
|
+
}
|
|
30
|
+
const rebaseInProgress = await gitService.isRebaseInProgress();
|
|
31
|
+
if (rebaseInProgress) {
|
|
32
|
+
logger.raw(warningBox(t('warnings.rebaseInProgress') + '\n' + t('warnings.rebaseInProgressAction'), t('warnings.title')));
|
|
33
|
+
return { pulled: false };
|
|
34
|
+
}
|
|
35
|
+
// 3. Check remotes
|
|
36
|
+
const remotes = await gitService.getRemotes();
|
|
37
|
+
if (remotes.length === 0) {
|
|
38
|
+
logger.raw(warningBox(t('commands.pull.noRemoteConfigured'), t('warnings.title')));
|
|
39
|
+
const addRemote = await promptConfirm(t('commands.push.addRemoteQuestion'), true);
|
|
40
|
+
if (!addRemote) {
|
|
41
|
+
return { pulled: false };
|
|
42
|
+
}
|
|
43
|
+
const url = await promptInput(t('setup.remoteUrlPrompt'), undefined, (value) => {
|
|
44
|
+
if (!value || value.trim().length === 0) {
|
|
45
|
+
return t('setup.remoteUrlRequired');
|
|
46
|
+
}
|
|
47
|
+
if (!isValidRemoteUrl(value)) {
|
|
48
|
+
return t('setup.remoteUrlInvalid');
|
|
49
|
+
}
|
|
50
|
+
return true;
|
|
51
|
+
});
|
|
52
|
+
if (!url || url.trim().length === 0) {
|
|
53
|
+
return { pulled: false };
|
|
54
|
+
}
|
|
55
|
+
await gitService.addRemote('origin', url);
|
|
56
|
+
logger.raw(successBox(t('setup.remoteAdded', { url })));
|
|
57
|
+
}
|
|
58
|
+
// Select remote if multiple
|
|
59
|
+
let remote = 'origin';
|
|
60
|
+
if (remotes.length > 1) {
|
|
61
|
+
remote = await promptSelect(t('commands.pull.selectRemote'), remotes.map(r => ({ name: r, value: r })));
|
|
62
|
+
}
|
|
63
|
+
else if (remotes.length === 1) {
|
|
64
|
+
remote = remotes[0];
|
|
65
|
+
}
|
|
66
|
+
const status = await gitService.getStatus();
|
|
67
|
+
const currentBranch = status.current;
|
|
68
|
+
// 4. Check tracking branch / upstream
|
|
69
|
+
const hasUpstream = await gitService.hasUpstream();
|
|
70
|
+
if (!hasUpstream && currentBranch) {
|
|
71
|
+
logger.raw(infoBox(t('commands.pull.noUpstream', { branch: currentBranch }), t('warnings.title')));
|
|
72
|
+
const setUpstream = await promptConfirm(t('commands.pull.setUpstreamQuestion', { remote, branch: currentBranch }), true);
|
|
73
|
+
if (!setUpstream) {
|
|
74
|
+
return { pulled: false };
|
|
75
|
+
}
|
|
76
|
+
// Will use --set-upstream-to during pull
|
|
77
|
+
}
|
|
78
|
+
// 5. Check uncommitted changes (WARNING level)
|
|
79
|
+
if (!status.isClean) {
|
|
80
|
+
logger.raw(warningBox(t('commands.pull.uncommittedWarning'), t('warnings.title')));
|
|
81
|
+
const uncommittedAction = await promptSelect(t('commands.pull.uncommittedOptions'), [
|
|
82
|
+
{ name: t('commands.pull.optionStash'), value: 'stash' },
|
|
83
|
+
{ name: t('commands.pull.optionContinue'), value: 'continue' },
|
|
84
|
+
{ name: theme.menuItem('R', t('menu.back')), value: 'commit' }
|
|
85
|
+
]);
|
|
86
|
+
if (uncommittedAction === 'commit') {
|
|
87
|
+
// User wants to go back and commit first
|
|
88
|
+
return { pulled: false };
|
|
89
|
+
}
|
|
90
|
+
if (uncommittedAction === 'stash') {
|
|
91
|
+
await withSpinner(t('commands.stash.save'), async () => { await gitService.stash('Auto-stash before pull'); }, t('commands.stash.saveSuccess'));
|
|
92
|
+
}
|
|
93
|
+
// 'continue' = proceed anyway
|
|
94
|
+
}
|
|
95
|
+
// Fetch to get latest remote state
|
|
96
|
+
try {
|
|
97
|
+
await gitService.fetch(remote);
|
|
98
|
+
}
|
|
99
|
+
catch {
|
|
100
|
+
logger.debug('Fetch failed, continuing with local state');
|
|
101
|
+
}
|
|
102
|
+
// Re-check status after fetch
|
|
103
|
+
const updatedStatus = await gitService.getStatus();
|
|
104
|
+
// 6. Check divergence
|
|
105
|
+
if (updatedStatus.ahead > 0 && updatedStatus.behind > 0) {
|
|
106
|
+
logger.raw(warningBox(t('commands.pull.diverged') + '\n' +
|
|
107
|
+
t('commands.pull.divergedExplain', { ahead: updatedStatus.ahead, behind: updatedStatus.behind }), t('warnings.title')));
|
|
108
|
+
const divergenceAction = await promptSelect(t('commands.pull.mergeOrRebase'), [
|
|
109
|
+
{ name: t('commands.pull.optionMerge'), value: 'merge' },
|
|
110
|
+
{ name: t('commands.pull.optionRebase'), value: 'rebase' },
|
|
111
|
+
{ name: t('prompts.cancel'), value: 'cancel' }
|
|
112
|
+
]);
|
|
113
|
+
if (divergenceAction === 'cancel') {
|
|
114
|
+
return { pulled: false };
|
|
115
|
+
}
|
|
116
|
+
if (divergenceAction === 'rebase') {
|
|
117
|
+
// Pull with rebase
|
|
118
|
+
logger.command(`git pull --rebase ${remote} ${currentBranch || ''}`);
|
|
119
|
+
try {
|
|
120
|
+
await withSpinner(t('commands.pull.pulling', { remote }), async () => {
|
|
121
|
+
await gitService.pull(remote, currentBranch || undefined);
|
|
122
|
+
}, t('commands.pull.success', { count: updatedStatus.behind }));
|
|
123
|
+
}
|
|
124
|
+
catch (error) {
|
|
125
|
+
// Check for conflicts after rebase pull
|
|
126
|
+
return await handlePostPullConflicts(theme, error);
|
|
127
|
+
}
|
|
128
|
+
logger.raw('\n' + successBox(t('commands.pull.success', { count: updatedStatus.behind }), t('success.title')));
|
|
129
|
+
return { pulled: true, remote, branch: currentBranch || undefined };
|
|
130
|
+
}
|
|
131
|
+
// Fall through to merge (default pull behavior)
|
|
132
|
+
}
|
|
21
133
|
// Check if there's anything to pull
|
|
22
|
-
if (
|
|
134
|
+
if (updatedStatus.behind === 0 && updatedStatus.ahead >= 0) {
|
|
23
135
|
logger.raw(infoBox(t('commands.pull.upToDate')));
|
|
24
136
|
return { pulled: false };
|
|
25
137
|
}
|
|
26
|
-
logger.raw(theme.info(`${status.behind} commit(s) to download from ${remote}/${currentBranch}`) + '\n');
|
|
27
138
|
// Expert mode: show action menu
|
|
28
139
|
if (isLevel('expert')) {
|
|
29
140
|
const action = await promptSelect(t('commands.pull.title'), [
|
|
@@ -40,35 +151,6 @@ export async function showPullMenu() {
|
|
|
40
151
|
return { pulled: false };
|
|
41
152
|
}
|
|
42
153
|
}
|
|
43
|
-
// Validate pull
|
|
44
|
-
const validation = await preventionService.validatePull();
|
|
45
|
-
if (validation.warnings.length > 0) {
|
|
46
|
-
let hasVisibleWarnings = false;
|
|
47
|
-
for (const warning of validation.warnings) {
|
|
48
|
-
const category = warning.level === 'critical' ? 'critical' :
|
|
49
|
-
warning.level === 'warning' ? 'warning' : 'info';
|
|
50
|
-
if (warning.level === 'critical') {
|
|
51
|
-
logger.raw(errorBox(warning.message, warning.title));
|
|
52
|
-
return { pulled: false };
|
|
53
|
-
}
|
|
54
|
-
if (shouldShowWarning(category)) {
|
|
55
|
-
if (warning.level === 'warning') {
|
|
56
|
-
logger.raw(warningBox(warning.message, warning.title));
|
|
57
|
-
}
|
|
58
|
-
else {
|
|
59
|
-
logger.raw(infoBox(warning.message));
|
|
60
|
-
}
|
|
61
|
-
hasVisibleWarnings = true;
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
// Ask to continue if there are uncommitted changes (visible warnings)
|
|
65
|
-
if (hasVisibleWarnings && validation.warnings.some(w => w.message.includes('uncommitted'))) {
|
|
66
|
-
const proceed = await promptConfirm(t('prompts.continue'), false);
|
|
67
|
-
if (!proceed) {
|
|
68
|
-
return { pulled: false };
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
154
|
// Confirm before pull (level-based)
|
|
73
155
|
if (shouldConfirm(false)) {
|
|
74
156
|
const confirm = await promptConfirm(t('commands.pull.pulling', { remote }) + ' ?', true);
|
|
@@ -76,12 +158,18 @@ export async function showPullMenu() {
|
|
|
76
158
|
return { pulled: false };
|
|
77
159
|
}
|
|
78
160
|
}
|
|
79
|
-
//
|
|
161
|
+
// 7. Execute the pull
|
|
80
162
|
logger.command(`git pull ${remote} ${currentBranch || ''}`);
|
|
81
|
-
|
|
82
|
-
await
|
|
83
|
-
|
|
84
|
-
|
|
163
|
+
try {
|
|
164
|
+
await withSpinner(t('commands.pull.pulling', { remote }), async () => {
|
|
165
|
+
await gitService.pull(remote, currentBranch || undefined);
|
|
166
|
+
}, t('commands.pull.success', { count: updatedStatus.behind || 1 }));
|
|
167
|
+
}
|
|
168
|
+
catch (error) {
|
|
169
|
+
// 8. Check for conflicts post-pull
|
|
170
|
+
return await handlePostPullConflicts(theme, error);
|
|
171
|
+
}
|
|
172
|
+
logger.raw('\n' + successBox(t('commands.pull.success', { count: updatedStatus.behind || 1 }), t('success.title')));
|
|
85
173
|
return {
|
|
86
174
|
pulled: true,
|
|
87
175
|
remote,
|
|
@@ -89,15 +177,40 @@ export async function showPullMenu() {
|
|
|
89
177
|
};
|
|
90
178
|
}
|
|
91
179
|
catch (error) {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
180
|
+
logger.raw(errorBox(mapGitError(error)));
|
|
181
|
+
return { pulled: false };
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
async function handlePostPullConflicts(theme, error) {
|
|
185
|
+
// Check if conflicts exist
|
|
186
|
+
const hasConflicts = await gitService.hasConflicts();
|
|
187
|
+
if (hasConflicts) {
|
|
188
|
+
const conflictedFiles = await gitService.getConflictedFiles();
|
|
189
|
+
logger.raw('\n' + errorBox(t('commands.pull.conflictsDetected', { count: conflictedFiles.length }), t('warnings.title')));
|
|
190
|
+
// List conflicted files
|
|
191
|
+
logger.raw(theme.warning(t('commands.pull.conflictedFiles')));
|
|
192
|
+
conflictedFiles.forEach(f => logger.raw(theme.file(f, 'conflict')));
|
|
193
|
+
logger.raw('');
|
|
194
|
+
// Show resolve instructions
|
|
195
|
+
logger.raw(infoBox(t('commands.pull.resolveInstructions')));
|
|
196
|
+
// Offer options
|
|
197
|
+
const action = await promptSelect(t('commands.pull.resolveOptions'), [
|
|
198
|
+
{ name: t('commands.pull.abortMerge'), value: 'abort' },
|
|
199
|
+
{ name: t('commands.pull.continueMerge'), value: 'manual' }
|
|
200
|
+
]);
|
|
201
|
+
if (action === 'abort') {
|
|
202
|
+
try {
|
|
203
|
+
await gitService.abortMerge();
|
|
204
|
+
logger.raw(successBox(t('commands.pull.abortSuccess')));
|
|
205
|
+
}
|
|
206
|
+
catch {
|
|
207
|
+
logger.raw(warningBox(mapGitError(error)));
|
|
208
|
+
}
|
|
99
209
|
}
|
|
100
210
|
return { pulled: false };
|
|
101
211
|
}
|
|
212
|
+
// Not a conflict error - show generic mapped error
|
|
213
|
+
logger.raw(errorBox(mapGitError(error)));
|
|
214
|
+
return { pulled: false };
|
|
102
215
|
}
|
|
103
216
|
//# sourceMappingURL=pull-menu.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/pull-menu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"pull-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/pull-menu.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/push-menu.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"push-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/push-menu.ts"],"names":[],"mappings":"AAcA,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAID,wBAAsB,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,CAiMxD;AAED,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,UAAU,CAAC,CAqD7D"}
|
|
@@ -6,6 +6,7 @@ import { withSpinner } from '../components/spinner.js';
|
|
|
6
6
|
import { gitService } from '../../services/git-service.js';
|
|
7
7
|
import { preventionService } from '../../services/prevention-service.js';
|
|
8
8
|
import { logger } from '../../utils/logger.js';
|
|
9
|
+
import { mapGitError } from '../../utils/error-mapper.js';
|
|
9
10
|
import { shouldConfirm, shouldShowWarning, shouldShowExplanation } from '../../utils/level-helper.js';
|
|
10
11
|
import { isValidRemoteUrl } from '../../utils/validators.js';
|
|
11
12
|
export async function showPushMenu() {
|
|
@@ -147,8 +148,7 @@ export async function showPushMenu() {
|
|
|
147
148
|
};
|
|
148
149
|
}
|
|
149
150
|
catch (error) {
|
|
150
|
-
|
|
151
|
-
logger.raw(errorBox(t('commands.push.failed', { error: errorMessage })));
|
|
151
|
+
logger.raw(errorBox(mapGitError(error)));
|
|
152
152
|
return { pushed: false };
|
|
153
153
|
}
|
|
154
154
|
}
|
|
@@ -166,7 +166,7 @@ export async function showForcePushMenu() {
|
|
|
166
166
|
if (!confirmFirst) {
|
|
167
167
|
return { pushed: false };
|
|
168
168
|
}
|
|
169
|
-
const confirmSecond = await promptConfirm('
|
|
169
|
+
const confirmSecond = await promptConfirm(t('commands.push.forceConfirmFinal'), false);
|
|
170
170
|
if (!confirmSecond) {
|
|
171
171
|
return { pushed: false };
|
|
172
172
|
}
|
|
@@ -175,7 +175,7 @@ export async function showForcePushMenu() {
|
|
|
175
175
|
const remote = 'origin';
|
|
176
176
|
try {
|
|
177
177
|
logger.command(`git push --force ${remote} ${currentBranch || ''}`);
|
|
178
|
-
await withSpinner(
|
|
178
|
+
await withSpinner(t('commands.push.forcePushing', { remote }), async () => {
|
|
179
179
|
await gitService.push(remote, currentBranch || undefined, true);
|
|
180
180
|
}, t('commands.push.success', { remote, branch: currentBranch }));
|
|
181
181
|
logger.raw('\n' + successBox(t('commands.push.success', { remote, branch: currentBranch }), t('success.title')));
|
|
@@ -186,8 +186,7 @@ export async function showForcePushMenu() {
|
|
|
186
186
|
};
|
|
187
187
|
}
|
|
188
188
|
catch (error) {
|
|
189
|
-
|
|
190
|
-
logger.raw(errorBox(t('commands.push.failed', { error: errorMessage })));
|
|
189
|
+
logger.raw(errorBox(mapGitError(error)));
|
|
191
190
|
return { pushed: false };
|
|
192
191
|
}
|
|
193
192
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/push-menu.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"push-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/push-menu.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/remote-menu.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"remote-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/remote-menu.ts"],"names":[],"mappings":"AAWA,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CA8CpD"}
|
|
@@ -4,10 +4,12 @@ import { promptSelect, promptConfirm, promptInput } from '../components/prompt.j
|
|
|
4
4
|
import { successBox, warningBox, infoBox } from '../components/box.js';
|
|
5
5
|
import { gitService } from '../../services/git-service.js';
|
|
6
6
|
import { logger } from '../../utils/logger.js';
|
|
7
|
+
import { mapGitError } from '../../utils/error-mapper.js';
|
|
7
8
|
import { isValidRemoteUrl } from '../../utils/validators.js';
|
|
8
9
|
export async function showRemoteMenu() {
|
|
9
10
|
const theme = getTheme();
|
|
10
|
-
|
|
11
|
+
let running = true;
|
|
12
|
+
while (running) {
|
|
11
13
|
logger.raw('\n' + theme.title(t('commands.remote.title')) + '\n');
|
|
12
14
|
const remoteUrl = await gitService.getRemoteUrl('origin');
|
|
13
15
|
const hasRemote = !!remoteUrl;
|
|
@@ -27,7 +29,8 @@ export async function showRemoteMenu() {
|
|
|
27
29
|
choices.push({ name: theme.menuItem('B', t('menu.back')), value: 'back' });
|
|
28
30
|
const action = await promptSelect(t('commands.remote.selectAction'), choices);
|
|
29
31
|
if (action === 'back') {
|
|
30
|
-
|
|
32
|
+
running = false;
|
|
33
|
+
continue;
|
|
31
34
|
}
|
|
32
35
|
await handleRemoteAction(action);
|
|
33
36
|
}
|
|
@@ -90,8 +93,7 @@ async function promptAndAddRemote() {
|
|
|
90
93
|
logger.raw(successBox(t('setup.remoteAdded', { url })));
|
|
91
94
|
}
|
|
92
95
|
catch (error) {
|
|
93
|
-
|
|
94
|
-
logger.raw(warningBox(t('errors.generic', { message: errorMessage })));
|
|
96
|
+
logger.raw(warningBox(mapGitError(error)));
|
|
95
97
|
}
|
|
96
98
|
}
|
|
97
99
|
//# sourceMappingURL=remote-menu.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/remote-menu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAI7D,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"remote-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/remote-menu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAI7D,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,IAAI,OAAO,GAAG,IAAI,CAAC;IAEnB,OAAO,OAAO,EAAE,CAAC;QACf,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QAElE,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC;QAE9B,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,+BAA+B,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9E,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,OAAO,GAA4C,EAAE,CAAC;QAE5D,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,CAAC,IAAI,CACV,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,6BAA6B,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAC9E,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,2BAA2B,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAC9E,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,8BAA8B,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAClF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CACV,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,2BAA2B,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAC5E,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,IAAI,CACV,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAC7D,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,YAAY,CAC/B,CAAC,CAAC,8BAA8B,CAAC,EACjC,OAAO,CACR,CAAC;QAEF,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;YACtB,OAAO,GAAG,KAAK,CAAC;YAChB,SAAS;QACX,CAAC;QAED,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;AACH,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,MAAoB;IACpD,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YACpD,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,+BAA+B,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;YACnE,CAAC;YACD,MAAM;QACR,CAAC;QAED,KAAK,KAAK,CAAC,CAAC,CAAC;YACX,MAAM,kBAAkB,EAAE,CAAC;YAC3B,MAAM;QACR,CAAC;QAED,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,CAAC,CAAC,qCAAqC,CAAC,EAAE,KAAK,CAAC,CAAC;YACrF,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM;YACR,CAAC;YAED,MAAM,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YACxC,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;YACzB,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YAClE,MAAM,kBAAkB,EAAE,CAAC;YAC3B,MAAM;QACR,CAAC;QAED,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,SAAS,EAAE,CAAC;YAC/C,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAAC,CAAC;gBAC9D,MAAM;YACR,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,CAAC,CAAC,+BAA+B,CAAC,EAAE,KAAK,CAAC,CAAC;YAC/E,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM;YACR,CAAC;YAED,MAAM,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YACxC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC;YAC3D,MAAM;QACR,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,kBAAkB;IAC/B,MAAM,GAAG,GAAG,MAAM,WAAW,CAC3B,CAAC,CAAC,uBAAuB,CAAC,EAC1B,SAAS,EACT,CAAC,KAAa,EAAE,EAAE;QAChB,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxC,OAAO,CAAC,CAAC,yBAAyB,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,CAAC,wBAAwB,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CACF,CAAC;IAEF,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpC,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC1C,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/setup-menu.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/setup-menu.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAkHxD,wBAAsB,aAAa,IAAI,OAAO,CAAC,eAAe,CAAC,CAyB9D;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC,CAmDtD;AA6BD,wBAAsB,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAkCvD"}
|
|
@@ -6,6 +6,7 @@ import { banner } from '../components/box.js';
|
|
|
6
6
|
import { promptSelect, promptConfirm, promptInput } from '../components/prompt.js';
|
|
7
7
|
import { gitService } from '../../services/git-service.js';
|
|
8
8
|
import { logger } from '../../utils/logger.js';
|
|
9
|
+
import { mapGitError } from '../../utils/error-mapper.js';
|
|
9
10
|
const GITIGNORE_TEMPLATES = {
|
|
10
11
|
node: `# Dependencies
|
|
11
12
|
node_modules/
|
|
@@ -176,9 +177,7 @@ export async function handleGitInit() {
|
|
|
176
177
|
return true;
|
|
177
178
|
}
|
|
178
179
|
catch (error) {
|
|
179
|
-
logger.raw(theme.error(
|
|
180
|
-
message: error instanceof Error ? error.message : 'Unknown error'
|
|
181
|
-
})) + '\n');
|
|
180
|
+
logger.raw(theme.error(mapGitError(error)) + '\n');
|
|
182
181
|
return false;
|
|
183
182
|
}
|
|
184
183
|
}
|
|
@@ -195,7 +194,7 @@ async function createGitignoreFile() {
|
|
|
195
194
|
const gitignorePath = join(process.cwd(), '.gitignore');
|
|
196
195
|
// Check if .gitignore already exists
|
|
197
196
|
if (existsSync(gitignorePath)) {
|
|
198
|
-
const overwrite = await promptConfirm('.
|
|
197
|
+
const overwrite = await promptConfirm(t('setup.gitignoreOverwrite'));
|
|
199
198
|
if (!overwrite) {
|
|
200
199
|
return;
|
|
201
200
|
}
|
|
@@ -225,9 +224,7 @@ export async function handleGitClone() {
|
|
|
225
224
|
return true;
|
|
226
225
|
}
|
|
227
226
|
catch (error) {
|
|
228
|
-
logger.raw(theme.error(
|
|
229
|
-
message: error instanceof Error ? error.message : 'Unknown error'
|
|
230
|
-
})) + '\n');
|
|
227
|
+
logger.raw(theme.error(mapGitError(error)) + '\n');
|
|
231
228
|
return false;
|
|
232
229
|
}
|
|
233
230
|
}
|