gitcoach-cli 1.0.5 → 1.0.8
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/README.md +55 -143
- package/dist/i18n/locales/en.json +53 -1
- package/dist/i18n/locales/es.json +53 -1
- package/dist/i18n/locales/fr.json +53 -1
- package/dist/ui/menus/add-menu.d.ts.map +1 -1
- package/dist/ui/menus/add-menu.js +102 -15
- 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 +24 -10
- 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 +110 -51
- package/dist/ui/menus/commit-menu.js.map +1 -1
- package/dist/ui/menus/history-menu.d.ts.map +1 -1
- package/dist/ui/menus/history-menu.js +7 -0
- 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 +25 -13
- 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 +47 -13
- 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 +15 -5
- package/dist/ui/menus/push-menu.js.map +1 -1
- package/dist/ui/menus/stash-menu.d.ts.map +1 -1
- package/dist/ui/menus/stash-menu.js +13 -6
- 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 +16 -8
- package/dist/ui/menus/undo-menu.js.map +1 -1
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +1 -0
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/level-helper.d.ts +42 -0
- package/dist/utils/level-helper.d.ts.map +1 -0
- package/dist/utils/level-helper.js +58 -0
- package/dist/utils/level-helper.js.map +1 -0
- package/dist/utils/version.d.ts +1 -1
- package/dist/utils/version.js +1 -1
- package/package.json +1 -1
|
@@ -7,6 +7,18 @@ import { gitService } from '../../services/git-service.js';
|
|
|
7
7
|
import { logger } from '../../utils/logger.js';
|
|
8
8
|
import { APP_VERSION } from '../../utils/version.js';
|
|
9
9
|
import { showDetachedHeadMenu, handleDetachedHead } from './detached-head-menu.js';
|
|
10
|
+
import { getLevel } from '../../utils/level-helper.js';
|
|
11
|
+
/**
|
|
12
|
+
* Get menu label based on user experience level
|
|
13
|
+
* - Beginner: Full description
|
|
14
|
+
* - Intermediate: Short description
|
|
15
|
+
* - Expert: Git command
|
|
16
|
+
*/
|
|
17
|
+
function getMenuLabel(key) {
|
|
18
|
+
const level = getLevel();
|
|
19
|
+
const levelKey = `menu.${key}${level.charAt(0).toUpperCase() + level.slice(1)}`;
|
|
20
|
+
return t(levelKey);
|
|
21
|
+
}
|
|
10
22
|
export async function showMainMenu() {
|
|
11
23
|
const theme = getTheme();
|
|
12
24
|
// Check for detached HEAD state
|
|
@@ -34,55 +46,55 @@ export async function showMainMenu() {
|
|
|
34
46
|
}
|
|
35
47
|
const choices = [
|
|
36
48
|
{
|
|
37
|
-
name: theme.menuItem('S',
|
|
49
|
+
name: theme.menuItem('S', getMenuLabel('status')),
|
|
38
50
|
value: 'status'
|
|
39
51
|
},
|
|
40
52
|
{
|
|
41
|
-
name: theme.menuItem('A',
|
|
53
|
+
name: theme.menuItem('A', getMenuLabel('add')),
|
|
42
54
|
value: 'add'
|
|
43
55
|
},
|
|
44
56
|
{
|
|
45
|
-
name: theme.menuItem('C',
|
|
57
|
+
name: theme.menuItem('C', getMenuLabel('commit')),
|
|
46
58
|
value: 'commit'
|
|
47
59
|
},
|
|
48
60
|
{
|
|
49
|
-
name: theme.menuItem('P',
|
|
61
|
+
name: theme.menuItem('P', getMenuLabel('push')),
|
|
50
62
|
value: 'push'
|
|
51
63
|
},
|
|
52
64
|
{
|
|
53
|
-
name: theme.menuItem('L',
|
|
65
|
+
name: theme.menuItem('L', getMenuLabel('pull')),
|
|
54
66
|
value: 'pull'
|
|
55
67
|
},
|
|
56
68
|
{
|
|
57
|
-
name: theme.menuItem('B',
|
|
69
|
+
name: theme.menuItem('B', getMenuLabel('branch')),
|
|
58
70
|
value: 'branch'
|
|
59
71
|
},
|
|
60
72
|
{
|
|
61
|
-
name: theme.menuItem('U',
|
|
73
|
+
name: theme.menuItem('U', getMenuLabel('undo')),
|
|
62
74
|
value: 'undo'
|
|
63
75
|
},
|
|
64
76
|
{
|
|
65
|
-
name: theme.menuItem('H',
|
|
77
|
+
name: theme.menuItem('H', getMenuLabel('history')),
|
|
66
78
|
value: 'history'
|
|
67
79
|
},
|
|
68
80
|
{
|
|
69
|
-
name: theme.menuItem('W',
|
|
81
|
+
name: theme.menuItem('W', getMenuLabel('stash')),
|
|
70
82
|
value: 'stash'
|
|
71
83
|
},
|
|
72
84
|
{
|
|
73
|
-
name: theme.menuItem('G',
|
|
85
|
+
name: theme.menuItem('G', getMenuLabel('config')),
|
|
74
86
|
value: 'config'
|
|
75
87
|
},
|
|
76
88
|
{
|
|
77
|
-
name: theme.menuItem('T',
|
|
89
|
+
name: theme.menuItem('T', getMenuLabel('stats')),
|
|
78
90
|
value: 'stats'
|
|
79
91
|
},
|
|
80
92
|
{
|
|
81
|
-
name: theme.menuItem('?',
|
|
93
|
+
name: theme.menuItem('?', getMenuLabel('help')),
|
|
82
94
|
value: 'help'
|
|
83
95
|
},
|
|
84
96
|
{
|
|
85
|
-
name: theme.menuItem('Q',
|
|
97
|
+
name: theme.menuItem('Q', getMenuLabel('quit')),
|
|
86
98
|
value: 'quit'
|
|
87
99
|
}
|
|
88
100
|
];
|
|
@@ -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;
|
|
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":"AAUA,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,CAyHxD"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { t } from '../../i18n/index.js';
|
|
2
2
|
import { getTheme } from '../themes/index.js';
|
|
3
|
-
import { promptConfirm } from '../components/prompt.js';
|
|
3
|
+
import { promptConfirm, promptSelect } 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
7
|
import { preventionService } from '../../services/prevention-service.js';
|
|
8
8
|
import { logger } from '../../utils/logger.js';
|
|
9
|
+
import { shouldShowWarning, shouldShowExplanation, shouldConfirm, isLevel } from '../../utils/level-helper.js';
|
|
9
10
|
export async function showPullMenu() {
|
|
10
11
|
const theme = getTheme();
|
|
11
12
|
logger.raw('\n' + theme.title(t('commands.pull.title')) + '\n');
|
|
@@ -13,35 +14,68 @@ export async function showPullMenu() {
|
|
|
13
14
|
const status = await gitService.getStatus();
|
|
14
15
|
const currentBranch = status.current;
|
|
15
16
|
const remote = 'origin';
|
|
17
|
+
// Show explanation for beginners
|
|
18
|
+
if (shouldShowExplanation()) {
|
|
19
|
+
logger.raw(infoBox(t('tips.beginner.pull'), t('commands.pull.title')));
|
|
20
|
+
}
|
|
21
|
+
// Check if there's anything to pull
|
|
22
|
+
if (status.behind === 0) {
|
|
23
|
+
logger.raw(infoBox(t('commands.pull.upToDate')));
|
|
24
|
+
return { pulled: false };
|
|
25
|
+
}
|
|
26
|
+
logger.raw(theme.info(`${status.behind} commit(s) to download from ${remote}/${currentBranch}`) + '\n');
|
|
27
|
+
// Expert mode: show action menu
|
|
28
|
+
if (isLevel('expert')) {
|
|
29
|
+
const action = await promptSelect(t('commands.pull.title'), [
|
|
30
|
+
{
|
|
31
|
+
name: theme.menuItem('P', `git pull ${remote} ${currentBranch || ''}`),
|
|
32
|
+
value: 'pull'
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
|
+
name: theme.menuItem('R', t('menu.back')),
|
|
36
|
+
value: 'back'
|
|
37
|
+
}
|
|
38
|
+
]);
|
|
39
|
+
if (action === 'back') {
|
|
40
|
+
return { pulled: false };
|
|
41
|
+
}
|
|
42
|
+
}
|
|
16
43
|
// Validate pull
|
|
17
44
|
const validation = await preventionService.validatePull();
|
|
18
45
|
if (validation.warnings.length > 0) {
|
|
46
|
+
let hasVisibleWarnings = false;
|
|
19
47
|
for (const warning of validation.warnings) {
|
|
48
|
+
const category = warning.level === 'critical' ? 'critical' :
|
|
49
|
+
warning.level === 'warning' ? 'warning' : 'info';
|
|
20
50
|
if (warning.level === 'critical') {
|
|
21
51
|
logger.raw(errorBox(warning.message, warning.title));
|
|
22
52
|
return { pulled: false };
|
|
23
53
|
}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
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;
|
|
29
62
|
}
|
|
30
63
|
}
|
|
31
|
-
// Ask to continue if there are uncommitted changes
|
|
32
|
-
if (validation.warnings.some(w => w.message.includes('uncommitted'))) {
|
|
64
|
+
// Ask to continue if there are uncommitted changes (visible warnings)
|
|
65
|
+
if (hasVisibleWarnings && validation.warnings.some(w => w.message.includes('uncommitted'))) {
|
|
33
66
|
const proceed = await promptConfirm(t('prompts.continue'), false);
|
|
34
67
|
if (!proceed) {
|
|
35
68
|
return { pulled: false };
|
|
36
69
|
}
|
|
37
70
|
}
|
|
38
71
|
}
|
|
39
|
-
//
|
|
40
|
-
if (
|
|
41
|
-
|
|
42
|
-
|
|
72
|
+
// Confirm before pull (level-based)
|
|
73
|
+
if (shouldConfirm(false)) {
|
|
74
|
+
const confirm = await promptConfirm(t('commands.pull.pulling', { remote }) + ' ?', true);
|
|
75
|
+
if (!confirm) {
|
|
76
|
+
return { pulled: false };
|
|
77
|
+
}
|
|
43
78
|
}
|
|
44
|
-
logger.raw(theme.info(`${status.behind} commit(s) to download from ${remote}/${currentBranch}`) + '\n');
|
|
45
79
|
// Perform pull
|
|
46
80
|
logger.command(`git pull ${remote} ${currentBranch || ''}`);
|
|
47
81
|
await withSpinner(t('commands.pull.pulling', { remote }), async () => {
|
|
@@ -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,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":"AAYA,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,CAkKxD;AAED,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,UAAU,CAAC,CAsD7D"}
|
|
@@ -6,10 +6,15 @@ 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 { shouldConfirm, shouldShowWarning, shouldShowExplanation } from '../../utils/level-helper.js';
|
|
9
10
|
export async function showPushMenu() {
|
|
10
11
|
const theme = getTheme();
|
|
11
12
|
logger.raw('\n' + theme.title(t('commands.push.title')) + '\n');
|
|
12
13
|
try {
|
|
14
|
+
// Show explanation for beginners
|
|
15
|
+
if (shouldShowExplanation()) {
|
|
16
|
+
logger.raw(infoBox(t('tips.beginner.push'), t('commands.push.title')));
|
|
17
|
+
}
|
|
13
18
|
const status = await gitService.getStatus();
|
|
14
19
|
const currentBranch = status.current;
|
|
15
20
|
const remote = 'origin';
|
|
@@ -71,10 +76,13 @@ export async function showPushMenu() {
|
|
|
71
76
|
const validation = await preventionService.validatePush(false);
|
|
72
77
|
if (validation.warnings.length > 0) {
|
|
73
78
|
for (const warning of validation.warnings) {
|
|
79
|
+
const category = warning.level === 'critical' ? 'critical' :
|
|
80
|
+
warning.level === 'warning' ? 'warning' : 'info';
|
|
81
|
+
// Critical warnings always shown
|
|
74
82
|
if (warning.level === 'critical') {
|
|
75
83
|
logger.raw(errorBox(warning.message, warning.title));
|
|
76
84
|
}
|
|
77
|
-
else {
|
|
85
|
+
else if (shouldShowWarning(category)) {
|
|
78
86
|
logger.raw(warningBox(warning.message, warning.title));
|
|
79
87
|
}
|
|
80
88
|
}
|
|
@@ -90,10 +98,12 @@ export async function showPushMenu() {
|
|
|
90
98
|
remote,
|
|
91
99
|
branch: currentBranch
|
|
92
100
|
})) + '\n');
|
|
93
|
-
// Confirm push
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
101
|
+
// Confirm push (level-based: experts skip confirmation for non-destructive push)
|
|
102
|
+
if (shouldConfirm(false)) {
|
|
103
|
+
const confirmPush = await promptConfirm(t('prompts.confirm'), true);
|
|
104
|
+
if (!confirmPush) {
|
|
105
|
+
return { pushed: false };
|
|
106
|
+
}
|
|
97
107
|
}
|
|
98
108
|
// Perform push (with -u flag if no upstream is set)
|
|
99
109
|
if (needsSetUpstream) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/push-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;AACtE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;
|
|
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":"stash-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/stash-menu.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stash-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/stash-menu.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;AAE9E,wBAAsB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAoEnD"}
|
|
@@ -4,6 +4,7 @@ import { promptSelect, promptConfirm, promptInput } from '../components/prompt.j
|
|
|
4
4
|
import { successBox, warningBox, errorBox, infoBox } from '../components/box.js';
|
|
5
5
|
import { gitService } from '../../services/git-service.js';
|
|
6
6
|
import { logger } from '../../utils/logger.js';
|
|
7
|
+
import { shouldShowExplanation } from '../../utils/level-helper.js';
|
|
7
8
|
export async function showStashMenu() {
|
|
8
9
|
const theme = getTheme();
|
|
9
10
|
let running = true;
|
|
@@ -76,8 +77,10 @@ async function handleStashSave() {
|
|
|
76
77
|
logger.raw(infoBox(t('commands.stash.nothingToStash')));
|
|
77
78
|
return;
|
|
78
79
|
}
|
|
79
|
-
// Show explanation
|
|
80
|
-
|
|
80
|
+
// Show explanation for beginners only
|
|
81
|
+
if (shouldShowExplanation()) {
|
|
82
|
+
logger.raw(infoBox(t('commands.stash.saveExplain'), t('commands.stash.whatItDoes')));
|
|
83
|
+
}
|
|
81
84
|
// Ask for optional message
|
|
82
85
|
const message = await promptInput(t('commands.stash.enterMessage'), '');
|
|
83
86
|
try {
|
|
@@ -126,8 +129,10 @@ async function handleStashApply() {
|
|
|
126
129
|
logger.raw(infoBox(t('commands.stash.noStashes')));
|
|
127
130
|
return;
|
|
128
131
|
}
|
|
129
|
-
// Show explanation
|
|
130
|
-
|
|
132
|
+
// Show explanation for beginners only
|
|
133
|
+
if (shouldShowExplanation()) {
|
|
134
|
+
logger.raw(infoBox(t('commands.stash.applyExplain'), t('commands.stash.whatItDoes')));
|
|
135
|
+
}
|
|
131
136
|
const choices = stashes.map((stash, index) => ({
|
|
132
137
|
name: `${theme.info(`stash@{${index}}`)} ${stash}`,
|
|
133
138
|
value: index
|
|
@@ -151,8 +156,10 @@ async function handleStashPop() {
|
|
|
151
156
|
logger.raw(infoBox(t('commands.stash.noStashes')));
|
|
152
157
|
return;
|
|
153
158
|
}
|
|
154
|
-
// Show explanation
|
|
155
|
-
|
|
159
|
+
// Show explanation for beginners only
|
|
160
|
+
if (shouldShowExplanation()) {
|
|
161
|
+
logger.raw(infoBox(t('commands.stash.popExplain'), t('commands.stash.whatItDoes')));
|
|
162
|
+
}
|
|
156
163
|
try {
|
|
157
164
|
logger.command('git stash pop');
|
|
158
165
|
await gitService.stashPop();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stash-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/stash-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,QAAQ,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"stash-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/stash-menu.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"undo-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/undo-menu.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"undo-menu.d.ts","sourceRoot":"","sources":["../../../src/ui/menus/undo-menu.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;AAEtF,wBAAsB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAuDlD"}
|
|
@@ -4,6 +4,7 @@ import { promptSelect, promptConfirm, promptCheckbox } from '../components/promp
|
|
|
4
4
|
import { successBox, warningBox, errorBox, infoBox } from '../components/box.js';
|
|
5
5
|
import { gitService } from '../../services/git-service.js';
|
|
6
6
|
import { logger } from '../../utils/logger.js';
|
|
7
|
+
import { shouldShowExplanation, shouldConfirm } from '../../utils/level-helper.js';
|
|
7
8
|
export async function showUndoMenu() {
|
|
8
9
|
const theme = getTheme();
|
|
9
10
|
logger.raw('\n' + theme.title(t('commands.undo.title')) + '\n');
|
|
@@ -58,8 +59,10 @@ export async function showUndoMenu() {
|
|
|
58
59
|
}
|
|
59
60
|
async function handleSoftReset() {
|
|
60
61
|
const theme = getTheme();
|
|
61
|
-
// Show explanation
|
|
62
|
-
|
|
62
|
+
// Show explanation for beginners only
|
|
63
|
+
if (shouldShowExplanation()) {
|
|
64
|
+
logger.raw(infoBox(t('commands.undo.softResetExplain'), t('commands.undo.whatItDoes')));
|
|
65
|
+
}
|
|
63
66
|
// Get last commits for context
|
|
64
67
|
const commits = await gitService.getLog(3);
|
|
65
68
|
if (commits.length === 0) {
|
|
@@ -69,10 +72,13 @@ async function handleSoftReset() {
|
|
|
69
72
|
logger.raw('\n' + theme.textBold(t('commands.undo.lastCommit')) + '\n');
|
|
70
73
|
const lastCommit = commits[0];
|
|
71
74
|
logger.raw(` ${theme.commitHash(lastCommit.hash)} ${lastCommit.message}\n`);
|
|
72
|
-
|
|
73
|
-
if (
|
|
74
|
-
|
|
75
|
-
|
|
75
|
+
// Soft reset is not destructive (files are kept), so use level-based confirmation
|
|
76
|
+
if (shouldConfirm(false)) {
|
|
77
|
+
const confirm = await promptConfirm(t('commands.undo.confirmSoftReset'), false);
|
|
78
|
+
if (!confirm) {
|
|
79
|
+
logger.raw(theme.textMuted(t('prompts.cancel')) + '\n');
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
76
82
|
}
|
|
77
83
|
try {
|
|
78
84
|
logger.command('git reset --soft HEAD~1');
|
|
@@ -123,8 +129,10 @@ async function handleHardReset() {
|
|
|
123
129
|
}
|
|
124
130
|
async function handleUnstage() {
|
|
125
131
|
const theme = getTheme();
|
|
126
|
-
// Show explanation
|
|
127
|
-
|
|
132
|
+
// Show explanation for beginners only
|
|
133
|
+
if (shouldShowExplanation()) {
|
|
134
|
+
logger.raw(infoBox(t('commands.undo.unstageExplain'), t('commands.undo.whatItDoes')));
|
|
135
|
+
}
|
|
128
136
|
const stagedFiles = await gitService.getStagedFiles();
|
|
129
137
|
if (stagedFiles.length === 0) {
|
|
130
138
|
logger.raw(warningBox(t('commands.undo.noStagedFiles')));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"undo-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/undo-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,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"undo-menu.js","sourceRoot":"","sources":["../../../src/ui/menus/undo-menu.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC"}
|
package/dist/utils/index.js
CHANGED
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Level-based helper functions for adaptive UI behavior
|
|
3
|
+
* based on user experience level (beginner, intermediate, expert)
|
|
4
|
+
*/
|
|
5
|
+
import { ExperienceLevel } from '../config/defaults.js';
|
|
6
|
+
/**
|
|
7
|
+
* Get the current experience level from user config
|
|
8
|
+
*/
|
|
9
|
+
export declare function getLevel(): ExperienceLevel;
|
|
10
|
+
/**
|
|
11
|
+
* Check if current level matches the specified level
|
|
12
|
+
*/
|
|
13
|
+
export declare function isLevel(level: ExperienceLevel): boolean;
|
|
14
|
+
/**
|
|
15
|
+
* Determine if confirmation should be shown based on level
|
|
16
|
+
* - Beginner: Always confirm
|
|
17
|
+
* - Intermediate: Always confirm
|
|
18
|
+
* - Expert: Only confirm destructive actions
|
|
19
|
+
*
|
|
20
|
+
* @param isDestructive - Whether the action is destructive (force push, delete, hard reset)
|
|
21
|
+
*/
|
|
22
|
+
export declare function shouldConfirm(isDestructive?: boolean): boolean;
|
|
23
|
+
/**
|
|
24
|
+
* Warning severity categories
|
|
25
|
+
* - critical: Data loss, force push, hard reset, delete branch
|
|
26
|
+
* - warning: Uncommitted changes, behind remote
|
|
27
|
+
* - info: Tips, suggestions, educational content
|
|
28
|
+
*/
|
|
29
|
+
export type WarningCategory = 'critical' | 'warning' | 'info';
|
|
30
|
+
/**
|
|
31
|
+
* Determine if warning should be shown based on level and category
|
|
32
|
+
* - Beginner: Show all warnings
|
|
33
|
+
* - Intermediate: Show critical and warning, skip info
|
|
34
|
+
* - Expert: Only show critical
|
|
35
|
+
*/
|
|
36
|
+
export declare function shouldShowWarning(category: WarningCategory): boolean;
|
|
37
|
+
/**
|
|
38
|
+
* Determine if educational explanations should be shown
|
|
39
|
+
* Only shows for beginner level
|
|
40
|
+
*/
|
|
41
|
+
export declare function shouldShowExplanation(): boolean;
|
|
42
|
+
//# sourceMappingURL=level-helper.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"level-helper.d.ts","sourceRoot":"","sources":["../../src/utils/level-helper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD;;GAEG;AACH,wBAAgB,QAAQ,IAAI,eAAe,CAE1C;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAEvD;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,aAAa,GAAE,OAAe,GAAG,OAAO,CAOrE;AAED;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG,UAAU,GAAG,SAAS,GAAG,MAAM,CAAC;AAE9D;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAUpE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,OAAO,CAE/C"}
|