git-smart-flow 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +33 -0
- package/LICENSE +21 -0
- package/README.md +130 -0
- package/bin/git-smart-flow.js +2 -0
- package/bin/gsf.js +2 -0
- package/bin/gsfc.js +3 -0
- package/bin/gsfm.js +3 -0
- package/bin/gsfp.js +3 -0
- package/bin/gsfpr.js +3 -0
- package/dist/cli.d.ts +2 -0
- package/dist/cli.js +214 -0
- package/dist/cli.js.map +1 -0
- package/dist/commands/aliases.d.ts +2 -0
- package/dist/commands/aliases.js +37 -0
- package/dist/commands/aliases.js.map +1 -0
- package/dist/commands/branch.d.ts +2 -0
- package/dist/commands/branch.js +414 -0
- package/dist/commands/branch.js.map +1 -0
- package/dist/commands/commit-message.d.ts +7 -0
- package/dist/commands/commit-message.js +95 -0
- package/dist/commands/commit-message.js.map +1 -0
- package/dist/commands/commit.d.ts +3 -0
- package/dist/commands/commit.js +597 -0
- package/dist/commands/commit.js.map +1 -0
- package/dist/commands/config.d.ts +2 -0
- package/dist/commands/config.js +88 -0
- package/dist/commands/config.js.map +1 -0
- package/dist/commands/doctor.d.ts +2 -0
- package/dist/commands/doctor.js +246 -0
- package/dist/commands/doctor.js.map +1 -0
- package/dist/commands/info.d.ts +2 -0
- package/dist/commands/info.js +155 -0
- package/dist/commands/info.js.map +1 -0
- package/dist/commands/install-hooks.d.ts +2 -0
- package/dist/commands/install-hooks.js +66 -0
- package/dist/commands/install-hooks.js.map +1 -0
- package/dist/commands/log.d.ts +2 -0
- package/dist/commands/log.js +101 -0
- package/dist/commands/log.js.map +1 -0
- package/dist/commands/menu.d.ts +2 -0
- package/dist/commands/menu.js +297 -0
- package/dist/commands/menu.js.map +1 -0
- package/dist/commands/merge.d.ts +6 -0
- package/dist/commands/merge.js +128 -0
- package/dist/commands/merge.js.map +1 -0
- package/dist/commands/pr.d.ts +2 -0
- package/dist/commands/pr.js +731 -0
- package/dist/commands/pr.js.map +1 -0
- package/dist/commands/push.d.ts +7 -0
- package/dist/commands/push.js +225 -0
- package/dist/commands/push.js.map +1 -0
- package/dist/commands/reflog.d.ts +2 -0
- package/dist/commands/reflog.js +162 -0
- package/dist/commands/reflog.js.map +1 -0
- package/dist/commands/repo-init.d.ts +2 -0
- package/dist/commands/repo-init.js +466 -0
- package/dist/commands/repo-init.js.map +1 -0
- package/dist/commands/revert.d.ts +7 -0
- package/dist/commands/revert.js +694 -0
- package/dist/commands/revert.js.map +1 -0
- package/dist/commands/setup.d.ts +2 -0
- package/dist/commands/setup.js +86 -0
- package/dist/commands/setup.js.map +1 -0
- package/dist/commands/stash.d.ts +2 -0
- package/dist/commands/stash.js +130 -0
- package/dist/commands/stash.js.map +1 -0
- package/dist/commands/sync.d.ts +2 -0
- package/dist/commands/sync.js +335 -0
- package/dist/commands/sync.js.map +1 -0
- package/dist/commands/tag.d.ts +2 -0
- package/dist/commands/tag.js +163 -0
- package/dist/commands/tag.js.map +1 -0
- package/dist/commands/validate.d.ts +2 -0
- package/dist/commands/validate.js +203 -0
- package/dist/commands/validate.js.map +1 -0
- package/dist/config/config.d.ts +10 -0
- package/dist/config/config.js +126 -0
- package/dist/config/config.js.map +1 -0
- package/dist/git/ai-context-builder.d.ts +11 -0
- package/dist/git/ai-context-builder.js +112 -0
- package/dist/git/ai-context-builder.js.map +1 -0
- package/dist/git/convention-detector.d.ts +3 -0
- package/dist/git/convention-detector.js +211 -0
- package/dist/git/convention-detector.js.map +1 -0
- package/dist/git/ensure-repo.d.ts +7 -0
- package/dist/git/ensure-repo.js +141 -0
- package/dist/git/ensure-repo.js.map +1 -0
- package/dist/git/gitignore.d.ts +8 -0
- package/dist/git/gitignore.js +261 -0
- package/dist/git/gitignore.js.map +1 -0
- package/dist/git/remote-setup.d.ts +2 -0
- package/dist/git/remote-setup.js +129 -0
- package/dist/git/remote-setup.js.map +1 -0
- package/dist/git/repo.d.ts +73 -0
- package/dist/git/repo.js +308 -0
- package/dist/git/repo.js.map +1 -0
- package/dist/git/validate.d.ts +36 -0
- package/dist/git/validate.js +113 -0
- package/dist/git/validate.js.map +1 -0
- package/dist/providers/base.provider.d.ts +10 -0
- package/dist/providers/base.provider.js +40 -0
- package/dist/providers/base.provider.js.map +1 -0
- package/dist/providers/claude.provider.d.ts +14 -0
- package/dist/providers/claude.provider.js +85 -0
- package/dist/providers/claude.provider.js.map +1 -0
- package/dist/providers/copilot.provider.d.ts +12 -0
- package/dist/providers/copilot.provider.js +88 -0
- package/dist/providers/copilot.provider.js.map +1 -0
- package/dist/providers/heuristic.provider.d.ts +9 -0
- package/dist/providers/heuristic.provider.js +163 -0
- package/dist/providers/heuristic.provider.js.map +1 -0
- package/dist/providers/ollama.provider.d.ts +14 -0
- package/dist/providers/ollama.provider.js +83 -0
- package/dist/providers/ollama.provider.js.map +1 -0
- package/dist/providers/openai.provider.d.ts +14 -0
- package/dist/providers/openai.provider.js +84 -0
- package/dist/providers/openai.provider.js.map +1 -0
- package/dist/providers/provider.factory.d.ts +5 -0
- package/dist/providers/provider.factory.js +51 -0
- package/dist/providers/provider.factory.js.map +1 -0
- package/dist/security/scanner.d.ts +13 -0
- package/dist/security/scanner.js +138 -0
- package/dist/security/scanner.js.map +1 -0
- package/dist/types/index.d.ts +146 -0
- package/dist/types/index.js +2 -0
- package/dist/types/index.js.map +1 -0
- package/dist/ux/components/BranchTree.d.ts +8 -0
- package/dist/ux/components/BranchTree.js +57 -0
- package/dist/ux/components/BranchTree.js.map +1 -0
- package/dist/ux/components/CommitProposal.d.ts +13 -0
- package/dist/ux/components/CommitProposal.js +127 -0
- package/dist/ux/components/CommitProposal.js.map +1 -0
- package/dist/ux/components/DiagnosticReport.d.ts +18 -0
- package/dist/ux/components/DiagnosticReport.js +19 -0
- package/dist/ux/components/DiagnosticReport.js.map +1 -0
- package/dist/ux/components/ErrorBox.d.ts +7 -0
- package/dist/ux/components/ErrorBox.js +9 -0
- package/dist/ux/components/ErrorBox.js.map +1 -0
- package/dist/ux/components/FileSelector.d.ts +14 -0
- package/dist/ux/components/FileSelector.js +87 -0
- package/dist/ux/components/FileSelector.js.map +1 -0
- package/dist/ux/components/Logo.d.ts +6 -0
- package/dist/ux/components/Logo.js +21 -0
- package/dist/ux/components/Logo.js.map +1 -0
- package/dist/ux/components/RepoContext.d.ts +8 -0
- package/dist/ux/components/RepoContext.js +17 -0
- package/dist/ux/components/RepoContext.js.map +1 -0
- package/dist/ux/components/SecurityAlert.d.ts +9 -0
- package/dist/ux/components/SecurityAlert.js +16 -0
- package/dist/ux/components/SecurityAlert.js.map +1 -0
- package/dist/ux/components/StatusDashboard.d.ts +14 -0
- package/dist/ux/components/StatusDashboard.js +36 -0
- package/dist/ux/components/StatusDashboard.js.map +1 -0
- package/dist/ux/components/SuccessBox.d.ts +7 -0
- package/dist/ux/components/SuccessBox.js +9 -0
- package/dist/ux/components/SuccessBox.js.map +1 -0
- package/dist/ux/components/ValidationReport.d.ts +16 -0
- package/dist/ux/components/ValidationReport.js +19 -0
- package/dist/ux/components/ValidationReport.js.map +1 -0
- package/dist/ux/components/WarningBox.d.ts +7 -0
- package/dist/ux/components/WarningBox.js +9 -0
- package/dist/ux/components/WarningBox.js.map +1 -0
- package/dist/ux/display.d.ts +21 -0
- package/dist/ux/display.js +96 -0
- package/dist/ux/display.js.map +1 -0
- package/dist/ux/hooks/useActivation.d.ts +8 -0
- package/dist/ux/hooks/useActivation.js +16 -0
- package/dist/ux/hooks/useActivation.js.map +1 -0
- package/dist/ux/hooks/useSpinner.d.ts +2 -0
- package/dist/ux/hooks/useSpinner.js +13 -0
- package/dist/ux/hooks/useSpinner.js.map +1 -0
- package/dist/ux/menu.d.ts +7 -0
- package/dist/ux/menu.js +56 -0
- package/dist/ux/menu.js.map +1 -0
- package/dist/ux/prompt.d.ts +7 -0
- package/dist/ux/prompt.js +361 -0
- package/dist/ux/prompt.js.map +1 -0
- package/dist/ux/renderer.d.ts +9 -0
- package/dist/ux/renderer.js +45 -0
- package/dist/ux/renderer.js.map +1 -0
- package/dist/ux/spinner.d.ts +6 -0
- package/dist/ux/spinner.js +42 -0
- package/dist/ux/spinner.js.map +1 -0
- package/dist/ux/statusbar.d.ts +2 -0
- package/dist/ux/statusbar.js +44 -0
- package/dist/ux/statusbar.js.map +1 -0
- package/dist/ux/theme.d.ts +37 -0
- package/dist/ux/theme.js +55 -0
- package/dist/ux/theme.js.map +1 -0
- package/package.json +125 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"revert.js","sourceRoot":"","sources":["../../src/commands/revert.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
import { readFileSync } from 'fs';
|
|
2
|
+
import { fileURLToPath } from 'url';
|
|
3
|
+
import { dirname, join } from 'path';
|
|
4
|
+
import { saveGlobalConfig, DEFAULT_CONFIG } from '../config/config.js';
|
|
5
|
+
import { detectAvailableProviders } from '../providers/provider.factory.js';
|
|
6
|
+
import { blank, divider, header, info, keyValue, section, success, warning, } from '../ux/display.js';
|
|
7
|
+
import { inputPrompt, passwordPrompt, selectPrompt } from '../ux/prompt.js';
|
|
8
|
+
import { startSpinner, succeedSpinner } from '../ux/spinner.js';
|
|
9
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
10
|
+
const __dirname = dirname(__filename);
|
|
11
|
+
const PROVIDER_LABELS = {
|
|
12
|
+
heuristic: 'None — heuristic only (always works, no AI)',
|
|
13
|
+
ollama: 'Ollama local (free, private, no internet required)',
|
|
14
|
+
copilot: 'GitHub Copilot CLI',
|
|
15
|
+
openai: 'OpenAI API (requires API key)',
|
|
16
|
+
claude: 'Claude API — Anthropic (requires API key)',
|
|
17
|
+
};
|
|
18
|
+
export async function runSetup() {
|
|
19
|
+
const pkg = JSON.parse(readFileSync(join(__dirname, '../../package.json'), 'utf-8'));
|
|
20
|
+
header('Interactive Setup Wizard', pkg.version);
|
|
21
|
+
// Prerequisites
|
|
22
|
+
section('Prerequisites');
|
|
23
|
+
const nodeOk = parseInt(process.version.slice(1), 10) >= 18;
|
|
24
|
+
if (nodeOk) {
|
|
25
|
+
success(`Node.js ${process.version}`);
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
warning(`Node.js ${process.version} — requires >= 18`);
|
|
29
|
+
}
|
|
30
|
+
success('Git: checking...');
|
|
31
|
+
blank();
|
|
32
|
+
// Detect available AI providers
|
|
33
|
+
startSpinner('Detecting available AI providers...');
|
|
34
|
+
const available = await detectAvailableProviders();
|
|
35
|
+
succeedSpinner();
|
|
36
|
+
section('Detected Providers');
|
|
37
|
+
for (const p of ['heuristic', 'ollama', 'copilot', 'openai', 'claude']) {
|
|
38
|
+
const label = available.includes(p) ? '✔' : '○';
|
|
39
|
+
console.log(` ${label} ${p}`);
|
|
40
|
+
}
|
|
41
|
+
blank();
|
|
42
|
+
const config = { ...DEFAULT_CONFIG };
|
|
43
|
+
// Language
|
|
44
|
+
section('Language');
|
|
45
|
+
const lang = await selectPrompt('Default language for commits and PR descriptions:', [
|
|
46
|
+
'en (English)',
|
|
47
|
+
'es (Spanish)',
|
|
48
|
+
'fr (French)',
|
|
49
|
+
'de (German)',
|
|
50
|
+
'pt (Portuguese)',
|
|
51
|
+
]);
|
|
52
|
+
const langCode = lang.split(' ')[0];
|
|
53
|
+
config.language.commit = langCode;
|
|
54
|
+
config.language.prTitle = langCode;
|
|
55
|
+
config.language.prBody = langCode;
|
|
56
|
+
// AI Provider
|
|
57
|
+
section('AI Provider');
|
|
58
|
+
const providerChoices = ['heuristic', 'ollama', 'copilot', 'openai', 'claude'].map((p) => {
|
|
59
|
+
const avail = available.includes(p) ? ' [available]' : '';
|
|
60
|
+
return `${p}${avail} — ${PROVIDER_LABELS[p]}`;
|
|
61
|
+
});
|
|
62
|
+
const providerChoice = await selectPrompt('Which AI provider do you want to use?', providerChoices);
|
|
63
|
+
const chosenProvider = providerChoice.split(' ')[0];
|
|
64
|
+
config.ai.provider = chosenProvider;
|
|
65
|
+
if (chosenProvider === 'openai') {
|
|
66
|
+
config.ai.apiKey = await passwordPrompt('OpenAI API Key');
|
|
67
|
+
}
|
|
68
|
+
else if (chosenProvider === 'claude') {
|
|
69
|
+
config.ai.apiKey = await passwordPrompt('Anthropic API Key');
|
|
70
|
+
}
|
|
71
|
+
else if (chosenProvider === 'ollama') {
|
|
72
|
+
const model = await inputPrompt('Ollama model', 'llama3.2');
|
|
73
|
+
config.ai.ollamaModel = model;
|
|
74
|
+
}
|
|
75
|
+
// Save config
|
|
76
|
+
saveGlobalConfig(config);
|
|
77
|
+
blank();
|
|
78
|
+
section('Setup Complete');
|
|
79
|
+
keyValue('Language', config.language.commit);
|
|
80
|
+
keyValue('AI Provider', config.ai.provider);
|
|
81
|
+
blank();
|
|
82
|
+
success('Configuration saved to ~/.git-smart-flow/config.json');
|
|
83
|
+
info('Run "git-smart-flow menu" or just "gsf" to open the main menu.');
|
|
84
|
+
divider();
|
|
85
|
+
}
|
|
86
|
+
//# sourceMappingURL=setup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
import { spawnSync } from 'child_process';
|
|
2
|
+
import { getConfig } from '../config/config.js';
|
|
3
|
+
import { ensureGitRepo } from '../git/ensure-repo.js';
|
|
4
|
+
import { hasUncommittedChanges, stashList, stashApplyRef, stashPopRef, stashDropRef, } from '../git/repo.js';
|
|
5
|
+
import { blank, error, info, keyValue, section, success, warning } from '../ux/display.js';
|
|
6
|
+
import { confirmPrompt, inputPrompt, selectPrompt } from '../ux/prompt.js';
|
|
7
|
+
export async function runStash() {
|
|
8
|
+
const cwd = process.cwd();
|
|
9
|
+
if (!(await ensureGitRepo(cwd)))
|
|
10
|
+
return;
|
|
11
|
+
const _config = getConfig();
|
|
12
|
+
let running = true;
|
|
13
|
+
while (running) {
|
|
14
|
+
const entries = stashList(cwd);
|
|
15
|
+
section('Gestión de Stash');
|
|
16
|
+
if (entries.length > 0) {
|
|
17
|
+
info(`${entries.length} stash(es) guardados`);
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
info('No hay stashes guardados');
|
|
21
|
+
}
|
|
22
|
+
blank();
|
|
23
|
+
const menuOptions = [
|
|
24
|
+
'💾 Guardar cambios en stash',
|
|
25
|
+
...(entries.length > 0
|
|
26
|
+
? [
|
|
27
|
+
'↩️ Recuperar último stash',
|
|
28
|
+
'🔍 Ver y recuperar stash específico',
|
|
29
|
+
'🗑️ Eliminar stash',
|
|
30
|
+
'📋 Ver lista de stashes',
|
|
31
|
+
]
|
|
32
|
+
: []),
|
|
33
|
+
'← Salir',
|
|
34
|
+
];
|
|
35
|
+
const choice = await selectPrompt('¿Qué quieres hacer?', menuOptions);
|
|
36
|
+
if (choice.includes('Guardar')) {
|
|
37
|
+
if (!hasUncommittedChanges(cwd)) {
|
|
38
|
+
warning('No hay cambios para guardar en stash.');
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
const msg = await inputPrompt('Mensaje del stash (opcional, Enter para omitir)');
|
|
42
|
+
const args = msg.trim() ? ['stash', 'push', '-u', '-m', msg.trim()] : ['stash', 'push', '-u'];
|
|
43
|
+
const r = spawnSync('git', args, { cwd, encoding: 'utf-8', stdio: 'pipe' });
|
|
44
|
+
if (r.status === 0) {
|
|
45
|
+
success('Cambios guardados en stash.');
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
error('Error al guardar en stash: ' + (r.stderr ?? ''));
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
else if (choice.includes('último stash')) {
|
|
52
|
+
const latest = entries[0];
|
|
53
|
+
if (!latest) {
|
|
54
|
+
warning('No hay stashes.');
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
57
|
+
const confirmed = await confirmPrompt(`¿Recuperar "${latest.message}"?`);
|
|
58
|
+
if (!confirmed)
|
|
59
|
+
continue;
|
|
60
|
+
const r = spawnSync('git', ['stash', 'pop'], { cwd, encoding: 'utf-8', stdio: 'pipe' });
|
|
61
|
+
if (r.status === 0) {
|
|
62
|
+
success('Stash recuperado.');
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
error('Error al recuperar stash. Puede haber conflictos.');
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
else if (choice.includes('específico')) {
|
|
69
|
+
if (entries.length === 0) {
|
|
70
|
+
info('No hay stashes.');
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
const stashOptions = entries.map((e) => `${e.ref} [${e.ago}] ${e.message}`);
|
|
74
|
+
const picked = await selectPrompt('Selecciona el stash:', stashOptions);
|
|
75
|
+
const selectedEntry = entries[stashOptions.indexOf(picked)];
|
|
76
|
+
if (!selectedEntry)
|
|
77
|
+
continue;
|
|
78
|
+
const action = await selectPrompt('¿Qué hacer con este stash?', [
|
|
79
|
+
'Aplicar (mantener en lista)',
|
|
80
|
+
'Pop (aplicar y eliminar de lista)',
|
|
81
|
+
'← Volver',
|
|
82
|
+
]);
|
|
83
|
+
if (action.startsWith('Aplicar')) {
|
|
84
|
+
stashApplyRef(selectedEntry.ref, cwd);
|
|
85
|
+
success('Stash aplicado.');
|
|
86
|
+
}
|
|
87
|
+
else if (action.startsWith('Pop')) {
|
|
88
|
+
stashPopRef(selectedEntry.ref, cwd);
|
|
89
|
+
success('Stash aplicado y eliminado.');
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
else if (choice.includes('Eliminar')) {
|
|
93
|
+
if (entries.length === 0) {
|
|
94
|
+
info('No hay stashes.');
|
|
95
|
+
continue;
|
|
96
|
+
}
|
|
97
|
+
const stashOptions = [
|
|
98
|
+
...entries.map((e) => `${e.ref} [${e.ago}] ${e.message}`),
|
|
99
|
+
'← Cancelar',
|
|
100
|
+
];
|
|
101
|
+
const picked = await selectPrompt('¿Cuál stash eliminar?', stashOptions);
|
|
102
|
+
if (picked.includes('Cancelar'))
|
|
103
|
+
continue;
|
|
104
|
+
const selectedEntry = entries[stashOptions.indexOf(picked)];
|
|
105
|
+
if (!selectedEntry)
|
|
106
|
+
continue;
|
|
107
|
+
const confirmed = await confirmPrompt(`¿Eliminar "${selectedEntry.message}"?`, false);
|
|
108
|
+
if (!confirmed)
|
|
109
|
+
continue;
|
|
110
|
+
stashDropRef(selectedEntry.ref, cwd);
|
|
111
|
+
success('Stash eliminado.');
|
|
112
|
+
}
|
|
113
|
+
else if (choice.includes('lista')) {
|
|
114
|
+
section('Stashes guardados');
|
|
115
|
+
if (entries.length === 0) {
|
|
116
|
+
info('No hay stashes.');
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
entries.forEach((e) => {
|
|
120
|
+
keyValue(e.ref, `${e.message} [${e.ago}]`);
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
blank();
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
running = false;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
//# sourceMappingURL=stash.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stash.js","sourceRoot":"","sources":["../../src/commands/stash.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,335 @@
|
|
|
1
|
+
import { execSync, spawnSync } from 'child_process';
|
|
2
|
+
import { ensureGitRepo } from '../git/ensure-repo.js';
|
|
3
|
+
import { validateRemoteName } from '../git/validate.js';
|
|
4
|
+
import { fetchRemote, getAheadBehindCount, getCurrentBranch, getLastCommit, getLastFetchTime, getUpstream, hasMergeConflicts, listRemotes, } from '../git/repo.js';
|
|
5
|
+
import { getConfig } from '../config/config.js';
|
|
6
|
+
import { blank, error, info, keyValue, section, success, warning } from '../ux/display.js';
|
|
7
|
+
import { confirmPrompt, selectPrompt } from '../ux/prompt.js';
|
|
8
|
+
import { failSpinner, startSpinner, succeedSpinner } from '../ux/spinner.js';
|
|
9
|
+
async function resolveRemote(cwd) {
|
|
10
|
+
const remotes = listRemotes(cwd);
|
|
11
|
+
if (remotes.length <= 1)
|
|
12
|
+
return remotes[0] ?? 'origin';
|
|
13
|
+
return selectPrompt('¿Qué remoto usar?', remotes);
|
|
14
|
+
}
|
|
15
|
+
function relativeTime(d) {
|
|
16
|
+
const s = Math.floor((Date.now() - d.getTime()) / 1000);
|
|
17
|
+
if (s < 60)
|
|
18
|
+
return `${s}s ago`;
|
|
19
|
+
if (s < 3600)
|
|
20
|
+
return `${Math.floor(s / 60)}m ago`;
|
|
21
|
+
if (s < 86400)
|
|
22
|
+
return `${Math.floor(s / 3600)}h ago`;
|
|
23
|
+
return `${Math.floor(s / 86400)}d ago`;
|
|
24
|
+
}
|
|
25
|
+
function git(args, cwd) {
|
|
26
|
+
const r = spawnSync('git', args, { cwd, encoding: 'utf-8' });
|
|
27
|
+
return { ok: r.status === 0, out: (r.stdout ?? '').trim(), err: (r.stderr ?? '').trim() };
|
|
28
|
+
}
|
|
29
|
+
function getIncomingCommits(upstream, cwd) {
|
|
30
|
+
const r = git(['log', `HEAD..${upstream}`, '--oneline'], cwd);
|
|
31
|
+
return r.out.split('\n').filter(Boolean);
|
|
32
|
+
}
|
|
33
|
+
function getOutgoingCommits(upstream, cwd) {
|
|
34
|
+
const r = git(['log', `${upstream}..HEAD`, '--oneline'], cwd);
|
|
35
|
+
return r.out.split('\n').filter(Boolean);
|
|
36
|
+
}
|
|
37
|
+
// ── Main command ───────────────────────────────────────────────────────────
|
|
38
|
+
export async function runSync() {
|
|
39
|
+
const cwd = process.cwd();
|
|
40
|
+
if (!(await ensureGitRepo(cwd)))
|
|
41
|
+
return;
|
|
42
|
+
const remote = await resolveRemote(cwd);
|
|
43
|
+
const config = getConfig();
|
|
44
|
+
const syncCommitsShown = config.ui?.syncCommitsShown ?? 5;
|
|
45
|
+
const autoFetch = config.git.autoFetch;
|
|
46
|
+
if (autoFetch !== false) {
|
|
47
|
+
const thresholdMinutes = config.git.autoFetchIntervalMinutes ?? 5;
|
|
48
|
+
const lastFetch = getLastFetchTime(cwd);
|
|
49
|
+
if (!lastFetch || (Date.now() - lastFetch.getTime()) / 60000 >= thresholdMinutes) {
|
|
50
|
+
spawnSync('git', ['fetch', '--quiet', '--prune', remote], {
|
|
51
|
+
cwd,
|
|
52
|
+
stdio: 'pipe',
|
|
53
|
+
timeout: 10000,
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
const upstream = getUpstream(cwd);
|
|
58
|
+
if (!upstream) {
|
|
59
|
+
section('Sync with Remote');
|
|
60
|
+
warning('No upstream branch configured for this branch.');
|
|
61
|
+
blank();
|
|
62
|
+
info('Set one with:');
|
|
63
|
+
console.log(' git branch --set-upstream-to=origin/<branch>');
|
|
64
|
+
console.log(' gsf repo-init → option "Set up remote repository"');
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
section('Sync with Remote');
|
|
68
|
+
const branch = getCurrentBranch(cwd);
|
|
69
|
+
const lastFetch = getLastFetchTime(cwd);
|
|
70
|
+
keyValue('Branch', branch);
|
|
71
|
+
keyValue('Upstream', upstream);
|
|
72
|
+
if (lastFetch)
|
|
73
|
+
keyValue('Last fetch', relativeTime(lastFetch));
|
|
74
|
+
blank();
|
|
75
|
+
// ── Fetch ────────────────────────────────────────────────────────────────
|
|
76
|
+
startSpinner('Fetching from remote...');
|
|
77
|
+
const fetchResult = remote === 'origin'
|
|
78
|
+
? fetchRemote(cwd)
|
|
79
|
+
: (() => {
|
|
80
|
+
const r = spawnSync('git', ['fetch', remote], { cwd, encoding: 'utf-8', timeout: 15000 });
|
|
81
|
+
return { ok: r.status === 0, output: ((r.stdout ?? '') + (r.stderr ?? '')).trim() };
|
|
82
|
+
})();
|
|
83
|
+
if (fetchResult.ok) {
|
|
84
|
+
succeedSpinner('Fetch complete');
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
failSpinner('Fetch failed');
|
|
88
|
+
if (fetchResult.output)
|
|
89
|
+
console.log(' ' + fetchResult.output);
|
|
90
|
+
const proceed = await confirmPrompt('Continue with cached remote state?', true);
|
|
91
|
+
if (!proceed)
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
blank();
|
|
95
|
+
// ── Show sync status ─────────────────────────────────────────────────────
|
|
96
|
+
const { ahead, behind } = getAheadBehindCount(upstream, cwd);
|
|
97
|
+
const hasConflicts = hasMergeConflicts(cwd);
|
|
98
|
+
section('Sync Status');
|
|
99
|
+
if (ahead === 0 && behind === 0) {
|
|
100
|
+
success(`Fully in sync with ${upstream}`);
|
|
101
|
+
blank();
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
if (ahead > 0) {
|
|
105
|
+
const commits = getOutgoingCommits(upstream, cwd);
|
|
106
|
+
warning(`${ahead} local commit(s) not yet pushed to ${upstream}:`);
|
|
107
|
+
commits.slice(0, syncCommitsShown).forEach((c) => console.log(` ↑ ${c}`));
|
|
108
|
+
if (commits.length > syncCommitsShown)
|
|
109
|
+
info(` ... and ${commits.length - syncCommitsShown} more`);
|
|
110
|
+
blank();
|
|
111
|
+
}
|
|
112
|
+
if (behind > 0) {
|
|
113
|
+
const commits = getIncomingCommits(upstream, cwd);
|
|
114
|
+
info(`${behind} new commit(s) on ${upstream} not yet in local branch:`);
|
|
115
|
+
commits.slice(0, syncCommitsShown).forEach((c) => console.log(` ↓ ${c}`));
|
|
116
|
+
if (commits.length > syncCommitsShown)
|
|
117
|
+
info(` ... and ${commits.length - syncCommitsShown} more`);
|
|
118
|
+
blank();
|
|
119
|
+
}
|
|
120
|
+
if (hasConflicts) {
|
|
121
|
+
warning('Active merge conflicts detected — resolve them before syncing.');
|
|
122
|
+
await guideConflictResolution(cwd);
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
// ── Choose action ────────────────────────────────────────────────────────
|
|
126
|
+
const options = [];
|
|
127
|
+
if (behind > 0 && ahead === 0) {
|
|
128
|
+
options.push('Pull (fast-forward) — bring in remote commits');
|
|
129
|
+
options.push('Pull (rebase) — bring in remote commits, reapply mine on top [clean history]');
|
|
130
|
+
options.push('Actualizar rama del PR (gh pr update-branch)');
|
|
131
|
+
}
|
|
132
|
+
else if (behind > 0 && ahead > 0) {
|
|
133
|
+
options.push('Pull (merge) — merge remote commits, keep both histories');
|
|
134
|
+
options.push('Pull (rebase) — reapply my commits on top of remote [clean history]');
|
|
135
|
+
options.push('Push first, then pull — only if remote allows force push');
|
|
136
|
+
options.push('Actualizar rama del PR (gh pr update-branch)');
|
|
137
|
+
}
|
|
138
|
+
else if (behind === 0 && ahead > 0) {
|
|
139
|
+
options.push('Push my commits to remote');
|
|
140
|
+
}
|
|
141
|
+
options.push('View details only — do nothing');
|
|
142
|
+
options.push('Cancel');
|
|
143
|
+
const choice = await selectPrompt('What do you want to do?', options);
|
|
144
|
+
blank();
|
|
145
|
+
if (choice.startsWith('Pull (fast-forward)')) {
|
|
146
|
+
await doPull(cwd, upstream, 'ff-only');
|
|
147
|
+
}
|
|
148
|
+
else if (choice.startsWith('Pull (merge)')) {
|
|
149
|
+
await doPull(cwd, upstream, 'merge');
|
|
150
|
+
}
|
|
151
|
+
else if (choice.startsWith('Pull (rebase)')) {
|
|
152
|
+
await doPull(cwd, upstream, 'rebase');
|
|
153
|
+
}
|
|
154
|
+
else if (choice.startsWith('Push my commits')) {
|
|
155
|
+
doPush(cwd, ahead, upstream);
|
|
156
|
+
}
|
|
157
|
+
else if (choice.startsWith('Push first')) {
|
|
158
|
+
warning('This requires a force push and can overwrite remote commits.');
|
|
159
|
+
const confirm = await confirmPrompt('Force push first?', false);
|
|
160
|
+
if (confirm) {
|
|
161
|
+
try {
|
|
162
|
+
execSync('git push --force-with-lease', { cwd, stdio: 'inherit' });
|
|
163
|
+
success('Pushed.');
|
|
164
|
+
}
|
|
165
|
+
catch {
|
|
166
|
+
error('Push failed.');
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
else if (choice.startsWith('Actualizar rama del PR')) {
|
|
171
|
+
await runPRUpdateBranch(cwd);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
// ── PR Update Branch ──────────────────────────────────────────────────────
|
|
175
|
+
async function runPRUpdateBranch(cwd) {
|
|
176
|
+
const ghResult = spawnSync('gh', ['auth', 'status'], { encoding: 'utf-8', stdio: 'pipe' });
|
|
177
|
+
if (ghResult.status !== 0) {
|
|
178
|
+
error('Esta opción requiere GitHub CLI (gh) autenticado.');
|
|
179
|
+
info(' Instala: https://cli.github.com | Luego: gh auth login');
|
|
180
|
+
return;
|
|
181
|
+
}
|
|
182
|
+
const prResult = spawnSync('gh', ['pr', 'view', '--json', 'number,title,baseRefName'], {
|
|
183
|
+
cwd,
|
|
184
|
+
encoding: 'utf-8',
|
|
185
|
+
stdio: 'pipe',
|
|
186
|
+
});
|
|
187
|
+
if (prResult.status !== 0) {
|
|
188
|
+
warning('No se encontró un PR abierto para esta rama.');
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
191
|
+
let prData;
|
|
192
|
+
try {
|
|
193
|
+
prData = JSON.parse(prResult.stdout);
|
|
194
|
+
}
|
|
195
|
+
catch {
|
|
196
|
+
error('Error al obtener información del PR.');
|
|
197
|
+
return;
|
|
198
|
+
}
|
|
199
|
+
keyValue('PR', `#${prData.number} ${prData.title}`);
|
|
200
|
+
keyValue('Base', prData.baseRefName);
|
|
201
|
+
blank();
|
|
202
|
+
const strategy = await selectPrompt('¿Cómo actualizar la rama del PR?', [
|
|
203
|
+
'Merge (merge de la base en esta rama)',
|
|
204
|
+
'Rebase (rebase sobre la base)',
|
|
205
|
+
'← Cancelar',
|
|
206
|
+
]);
|
|
207
|
+
if (strategy.includes('Cancelar'))
|
|
208
|
+
return;
|
|
209
|
+
const rebaseFlag = strategy.startsWith('Rebase') ? ['--rebase'] : [];
|
|
210
|
+
startSpinner('Actualizando rama del PR...');
|
|
211
|
+
const updateResult = spawnSync('gh', ['pr', 'update-branch', String(prData.number), ...rebaseFlag], { cwd, encoding: 'utf-8', stdio: 'pipe' });
|
|
212
|
+
if (updateResult.status === 0) {
|
|
213
|
+
succeedSpinner('Rama del PR actualizada. Ejecuta "gsf sync" de nuevo para obtener los cambios.');
|
|
214
|
+
}
|
|
215
|
+
else {
|
|
216
|
+
failSpinner('Error al actualizar: ' + (updateResult.stderr ?? ''));
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
// ── Pull ──────────────────────────────────────────────────────────────────
|
|
220
|
+
async function doPull(cwd, upstream, mode) {
|
|
221
|
+
const upstreamParts = upstream.split('/');
|
|
222
|
+
const remote = upstreamParts[0] ?? '';
|
|
223
|
+
const remoteBranch = upstreamParts.slice(1).join('/');
|
|
224
|
+
const remoteCheck = validateRemoteName(remote);
|
|
225
|
+
if (!remoteCheck.valid) {
|
|
226
|
+
error(`Invalid remote name "${remote}": ${remoteCheck.reason}`);
|
|
227
|
+
return;
|
|
228
|
+
}
|
|
229
|
+
const pullArgs = ['pull', remote, remoteBranch];
|
|
230
|
+
if (mode === 'ff-only')
|
|
231
|
+
pullArgs.push('--ff-only');
|
|
232
|
+
if (mode === 'rebase')
|
|
233
|
+
pullArgs.push('--rebase');
|
|
234
|
+
startSpinner(`Pulling (${mode})...`);
|
|
235
|
+
const r = git(pullArgs, cwd);
|
|
236
|
+
if (r.ok) {
|
|
237
|
+
succeedSpinner('Pull complete.');
|
|
238
|
+
blank();
|
|
239
|
+
const last = getLastCommit(cwd);
|
|
240
|
+
if (last)
|
|
241
|
+
success(`Now at: ${last.shortSha} "${last.message}"`);
|
|
242
|
+
return;
|
|
243
|
+
}
|
|
244
|
+
failSpinner('Pull failed.');
|
|
245
|
+
blank();
|
|
246
|
+
if (r.err.includes('conflict') || hasMergeConflicts(cwd)) {
|
|
247
|
+
warning('Merge conflicts occurred during pull.');
|
|
248
|
+
await guideConflictResolution(cwd);
|
|
249
|
+
}
|
|
250
|
+
else if (r.err.includes('non-fast-forward') || r.err.includes('diverged')) {
|
|
251
|
+
warning('Branches have diverged — fast-forward not possible.');
|
|
252
|
+
info('Try "Pull (rebase)" to reapply your commits on top of the remote.');
|
|
253
|
+
}
|
|
254
|
+
else {
|
|
255
|
+
error(r.err || r.out);
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
// ── Push ──────────────────────────────────────────────────────────────────
|
|
259
|
+
function doPush(cwd, ahead, upstream) {
|
|
260
|
+
info(`Pushing ${ahead} commit(s) to ${upstream}...`);
|
|
261
|
+
try {
|
|
262
|
+
execSync('git push', { cwd, stdio: 'inherit' });
|
|
263
|
+
success('Push complete.');
|
|
264
|
+
}
|
|
265
|
+
catch {
|
|
266
|
+
error('Push failed. The remote may have new commits — run sync again to pull first.');
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
// ── Conflict resolution guide ─────────────────────────────────────────────
|
|
270
|
+
async function guideConflictResolution(cwd) {
|
|
271
|
+
section('Conflict Resolution Guide');
|
|
272
|
+
// Show which files have conflicts
|
|
273
|
+
const r = git(['diff', '--name-only', '--diff-filter=U'], cwd);
|
|
274
|
+
const conflictFiles = r.out.split('\n').filter(Boolean);
|
|
275
|
+
if (conflictFiles.length > 0) {
|
|
276
|
+
warning(`${conflictFiles.length} file(s) with conflicts:`);
|
|
277
|
+
conflictFiles.forEach((f) => console.log(` ✖ ${f}`));
|
|
278
|
+
}
|
|
279
|
+
blank();
|
|
280
|
+
console.log(' Conflict markers look like this inside the files:');
|
|
281
|
+
console.log('');
|
|
282
|
+
console.log(' <<<<<<< HEAD ← your changes');
|
|
283
|
+
console.log(' your code here');
|
|
284
|
+
console.log(' =======');
|
|
285
|
+
console.log(' incoming code here');
|
|
286
|
+
console.log(' >>>>>>> origin/main ← remote changes');
|
|
287
|
+
console.log('');
|
|
288
|
+
info('Edit each file, remove the markers, keep what you want.');
|
|
289
|
+
blank();
|
|
290
|
+
const choice = await selectPrompt('How do you want to resolve?', [
|
|
291
|
+
'I will edit the files manually — show me what to do next',
|
|
292
|
+
'Abort the merge — go back to pre-merge state',
|
|
293
|
+
'Accept all INCOMING changes (theirs)',
|
|
294
|
+
'Accept all LOCAL changes (mine)',
|
|
295
|
+
]);
|
|
296
|
+
if (choice.startsWith('Abort')) {
|
|
297
|
+
const r = git(['merge', '--abort'], cwd);
|
|
298
|
+
if (!r.ok)
|
|
299
|
+
git(['rebase', '--abort'], cwd); // might be a rebase
|
|
300
|
+
success('Merge/rebase aborted. Branch restored to pre-merge state.');
|
|
301
|
+
return;
|
|
302
|
+
}
|
|
303
|
+
if (choice.startsWith('Accept all INCOMING')) {
|
|
304
|
+
for (const f of conflictFiles) {
|
|
305
|
+
git(['checkout', '--theirs', '--', f], cwd);
|
|
306
|
+
git(['add', f], cwd);
|
|
307
|
+
}
|
|
308
|
+
success('All conflicts resolved with incoming (remote) changes.');
|
|
309
|
+
info('Review the files, then run "gsf commit" to complete the merge.');
|
|
310
|
+
return;
|
|
311
|
+
}
|
|
312
|
+
if (choice.startsWith('Accept all LOCAL')) {
|
|
313
|
+
for (const f of conflictFiles) {
|
|
314
|
+
git(['checkout', '--ours', '--', f], cwd);
|
|
315
|
+
git(['add', f], cwd);
|
|
316
|
+
}
|
|
317
|
+
success('All conflicts resolved with local changes.');
|
|
318
|
+
info('Review the files, then run "gsf commit" to complete the merge.');
|
|
319
|
+
return;
|
|
320
|
+
}
|
|
321
|
+
// Manual resolution instructions
|
|
322
|
+
blank();
|
|
323
|
+
info('Steps:');
|
|
324
|
+
console.log(' 1. Open each conflicted file in your editor');
|
|
325
|
+
console.log(' 2. Find and resolve all <<<<<<< / ======= / >>>>>>> markers');
|
|
326
|
+
console.log(' 3. Save the file');
|
|
327
|
+
console.log(' 4. Run "gsf commit" — it will detect the merge and suggest a message');
|
|
328
|
+
blank();
|
|
329
|
+
info('To check remaining conflicts at any time:');
|
|
330
|
+
console.log(' git diff --name-only --diff-filter=U');
|
|
331
|
+
blank();
|
|
332
|
+
info('To abort and start over:');
|
|
333
|
+
console.log(' git merge --abort (or git rebase --abort)');
|
|
334
|
+
}
|
|
335
|
+
//# sourceMappingURL=sync.js.map
|