geeto 0.4.3 → 0.6.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/README.md +1 -1
- package/lib/api/copilot.d.ts +3 -3
- package/lib/api/copilot.js +3 -3
- package/lib/cli/input.d.ts +21 -18
- package/lib/cli/input.d.ts.map +1 -1
- package/lib/cli/input.js +174 -372
- package/lib/cli/input.js.map +1 -1
- package/lib/cli/menu.d.ts.map +1 -1
- package/lib/cli/menu.js +83 -4
- package/lib/cli/menu.js.map +1 -1
- package/lib/core/copilot-setup.d.ts +2 -2
- package/lib/core/copilot-setup.d.ts.map +1 -1
- package/lib/core/copilot-setup.js +16 -19
- package/lib/core/copilot-setup.js.map +1 -1
- package/lib/core/setup.d.ts +1 -1
- package/lib/core/setup.js +1 -1
- package/lib/index.js +203 -3
- package/lib/index.js.map +1 -1
- package/lib/utils/branch-naming.d.ts.map +1 -1
- package/lib/utils/branch-naming.js +17 -7
- package/lib/utils/branch-naming.js.map +1 -1
- package/lib/utils/dry-run.d.ts +21 -0
- package/lib/utils/dry-run.d.ts.map +1 -0
- package/lib/utils/dry-run.js +102 -0
- package/lib/utils/dry-run.js.map +1 -0
- package/lib/utils/exec.d.ts.map +1 -1
- package/lib/utils/exec.js +13 -0
- package/lib/utils/exec.js.map +1 -1
- package/lib/utils/git-ai.d.ts.map +1 -1
- package/lib/utils/git-ai.js +40 -21
- package/lib/utils/git-ai.js.map +1 -1
- package/lib/utils/git-errors.d.ts.map +1 -1
- package/lib/utils/git-errors.js +15 -2
- package/lib/utils/git-errors.js.map +1 -1
- package/lib/utils/menu-builders.js +1 -1
- package/lib/utils/menu-builders.js.map +1 -1
- package/lib/utils/scramble.d.ts +117 -0
- package/lib/utils/scramble.d.ts.map +1 -0
- package/lib/utils/scramble.js +317 -0
- package/lib/utils/scramble.js.map +1 -0
- package/lib/version.d.ts +1 -1
- package/lib/version.js +1 -1
- package/lib/workflows/abort.d.ts +9 -0
- package/lib/workflows/abort.d.ts.map +1 -0
- package/lib/workflows/abort.js +158 -0
- package/lib/workflows/abort.js.map +1 -0
- package/lib/workflows/ai-provider.js +1 -1
- package/lib/workflows/ai-provider.js.map +1 -1
- package/lib/workflows/alias.d.ts +6 -0
- package/lib/workflows/alias.d.ts.map +1 -0
- package/lib/workflows/alias.js +420 -0
- package/lib/workflows/alias.js.map +1 -0
- package/lib/workflows/amend.d.ts.map +1 -1
- package/lib/workflows/amend.js +9 -4
- package/lib/workflows/amend.js.map +1 -1
- package/lib/workflows/branch-helpers.js +2 -2
- package/lib/workflows/branch-helpers.js.map +1 -1
- package/lib/workflows/branch-utils.d.ts.map +1 -1
- package/lib/workflows/branch-utils.js +4 -3
- package/lib/workflows/branch-utils.js.map +1 -1
- package/lib/workflows/branch.d.ts.map +1 -1
- package/lib/workflows/branch.js +7 -4
- package/lib/workflows/branch.js.map +1 -1
- package/lib/workflows/cleanup.js +3 -3
- package/lib/workflows/cleanup.js.map +1 -1
- package/lib/workflows/commit.d.ts.map +1 -1
- package/lib/workflows/commit.js +58 -6
- package/lib/workflows/commit.js.map +1 -1
- package/lib/workflows/dry-run.d.ts +5 -0
- package/lib/workflows/dry-run.d.ts.map +1 -0
- package/lib/workflows/dry-run.js +127 -0
- package/lib/workflows/dry-run.js.map +1 -0
- package/lib/workflows/fetch.d.ts +9 -0
- package/lib/workflows/fetch.d.ts.map +1 -0
- package/lib/workflows/fetch.js +118 -0
- package/lib/workflows/fetch.js.map +1 -0
- package/lib/workflows/issue.d.ts.map +1 -1
- package/lib/workflows/issue.js +317 -72
- package/lib/workflows/issue.js.map +1 -1
- package/lib/workflows/main-steps.d.ts.map +1 -1
- package/lib/workflows/main-steps.js +144 -99
- package/lib/workflows/main-steps.js.map +1 -1
- package/lib/workflows/main.d.ts.map +1 -1
- package/lib/workflows/main.js +14 -6
- package/lib/workflows/main.js.map +1 -1
- package/lib/workflows/pr.d.ts.map +1 -1
- package/lib/workflows/pr.js +307 -39
- package/lib/workflows/pr.js.map +1 -1
- package/lib/workflows/prune.d.ts +9 -0
- package/lib/workflows/prune.d.ts.map +1 -0
- package/lib/workflows/prune.js +116 -0
- package/lib/workflows/prune.js.map +1 -0
- package/lib/workflows/pull.d.ts +9 -0
- package/lib/workflows/pull.d.ts.map +1 -0
- package/lib/workflows/pull.js +281 -0
- package/lib/workflows/pull.js.map +1 -0
- package/lib/workflows/release.d.ts.map +1 -1
- package/lib/workflows/release.js +50 -38
- package/lib/workflows/release.js.map +1 -1
- package/lib/workflows/repo-settings.js +2 -2
- package/lib/workflows/repo-settings.js.map +1 -1
- package/lib/workflows/revert.d.ts +9 -0
- package/lib/workflows/revert.d.ts.map +1 -0
- package/lib/workflows/revert.js +77 -0
- package/lib/workflows/revert.js.map +1 -0
- package/lib/workflows/reword.d.ts +9 -0
- package/lib/workflows/reword.d.ts.map +1 -0
- package/lib/workflows/reword.js +722 -0
- package/lib/workflows/reword.js.map +1 -0
- package/lib/workflows/settings.js +1 -1
- package/lib/workflows/settings.js.map +1 -1
- package/lib/workflows/status.d.ts +9 -0
- package/lib/workflows/status.d.ts.map +1 -0
- package/lib/workflows/status.js +164 -0
- package/lib/workflows/status.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,420 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shell alias management workflow
|
|
3
|
+
* Installs/removes short aliases for geeto commands in shell config.
|
|
4
|
+
*/
|
|
5
|
+
import { execSync } from 'node:child_process';
|
|
6
|
+
import fs from 'node:fs';
|
|
7
|
+
import os from 'node:os';
|
|
8
|
+
import path from 'node:path';
|
|
9
|
+
import { confirm } from '../cli/input.js';
|
|
10
|
+
import { multiSelect } from '../cli/menu.js';
|
|
11
|
+
import { colors } from '../utils/colors.js';
|
|
12
|
+
import { isDryRun, logDryRun } from '../utils/dry-run.js';
|
|
13
|
+
import { log } from '../utils/logging.js';
|
|
14
|
+
import { isWindows } from '../utils/platform.js';
|
|
15
|
+
const ALIASES = [
|
|
16
|
+
{ alias: 'gsa', command: 'geeto -sa', desc: 'Stage all' },
|
|
17
|
+
{ alias: 'gco', command: 'geeto -c', desc: 'Commit' },
|
|
18
|
+
{ alias: 'gps', command: 'geeto -p', desc: 'Push' },
|
|
19
|
+
{ alias: 'gpl', command: 'geeto -pl', desc: 'Pull' },
|
|
20
|
+
{ alias: 'gsw', command: 'geeto -sw', desc: 'Switch branch' },
|
|
21
|
+
{ alias: 'gcl', command: 'geeto -cl', desc: 'Cleanup branches' },
|
|
22
|
+
{ alias: 'gpr', command: 'geeto -pr', desc: 'Create PR' },
|
|
23
|
+
{ alias: 'gis', command: 'geeto -i', desc: 'Create Issue' },
|
|
24
|
+
{ alias: 'glg', command: 'geeto -lg', desc: 'Log / history' },
|
|
25
|
+
{ alias: 'gsh', command: 'geeto -sh', desc: 'Stash' },
|
|
26
|
+
{ alias: 'gam', command: 'geeto -am', desc: 'Amend commit' },
|
|
27
|
+
{ alias: 'gun', command: 'geeto -u', desc: 'Undo' },
|
|
28
|
+
{ alias: 'grv', command: 'geeto -rv', desc: 'Revert commit' },
|
|
29
|
+
{ alias: 'gtg', command: 'geeto -t', desc: 'Tag / release' },
|
|
30
|
+
{ alias: 'gft', command: 'geeto -ft', desc: 'Fetch' },
|
|
31
|
+
{ alias: 'gst', command: 'geeto -st', desc: 'Status' },
|
|
32
|
+
{ alias: 'gcm', command: 'geeto -cmp', desc: 'Compare branches' },
|
|
33
|
+
{ alias: 'gcp', command: 'geeto -cp', desc: 'Cherry-pick' },
|
|
34
|
+
{ alias: 'gdr', command: 'geeto -dr', desc: 'Dry-run' },
|
|
35
|
+
{ alias: 'gtr', command: 'geeto -tr', desc: 'Trello' },
|
|
36
|
+
{ alias: 'grw', command: 'geeto -rw', desc: 'Reword commits' },
|
|
37
|
+
{ alias: 'gal', command: 'geeto -al', desc: 'Manage aliases' },
|
|
38
|
+
];
|
|
39
|
+
const MARKER_START = '# >>> geeto aliases >>>';
|
|
40
|
+
const MARKER_END = '# <<< geeto aliases <<<';
|
|
41
|
+
// ── System binary check ────────────────────────────────────────────
|
|
42
|
+
/**
|
|
43
|
+
* Check if a name is already a system binary / builtin.
|
|
44
|
+
* Returns the path if found, empty string otherwise.
|
|
45
|
+
*/
|
|
46
|
+
const systemBinaryPath = (name) => {
|
|
47
|
+
try {
|
|
48
|
+
if (isWindows()) {
|
|
49
|
+
const out = execSync(`where ${name} 2>NUL`, {
|
|
50
|
+
encoding: 'utf8',
|
|
51
|
+
stdio: ['pipe', 'pipe', 'pipe'],
|
|
52
|
+
}).trim();
|
|
53
|
+
return out.split('\n')[0] ?? '';
|
|
54
|
+
}
|
|
55
|
+
const out = execSync(`command -v ${name} 2>/dev/null`, {
|
|
56
|
+
encoding: 'utf8',
|
|
57
|
+
stdio: ['pipe', 'pipe', 'pipe'],
|
|
58
|
+
}).trim();
|
|
59
|
+
return out;
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
return '';
|
|
63
|
+
}
|
|
64
|
+
};
|
|
65
|
+
/**
|
|
66
|
+
* Generate alternative alias names when the preferred one conflicts.
|
|
67
|
+
* Tries: ge-prefix (gpr→gepr), gto-prefix (gpr→gtopr), alias+o (gpr→gpro).
|
|
68
|
+
* Returns the first non-conflicting alternative, or empty string.
|
|
69
|
+
*/
|
|
70
|
+
const suggestAlternative = (alias) => {
|
|
71
|
+
// Extract the suffix after 'g' (e.g. 'pr' from 'gpr')
|
|
72
|
+
const suffix = alias.startsWith('g') ? alias.slice(1) : alias;
|
|
73
|
+
const candidates = [
|
|
74
|
+
`ge${suffix}`, // gpr → gepr
|
|
75
|
+
`gto${suffix}`, // gpr → gtopr
|
|
76
|
+
`${alias}o`, // gpr → gpro
|
|
77
|
+
`gee${suffix}`, // gpr → geepr
|
|
78
|
+
];
|
|
79
|
+
for (const candidate of candidates) {
|
|
80
|
+
if (!systemBinaryPath(candidate)) {
|
|
81
|
+
return candidate;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
return '';
|
|
85
|
+
};
|
|
86
|
+
const detectShell = () => {
|
|
87
|
+
if (isWindows()) {
|
|
88
|
+
// PowerShell profile
|
|
89
|
+
const psProfile = path.join(os.homedir(), 'Documents', 'PowerShell', 'Microsoft.PowerShell_profile.ps1');
|
|
90
|
+
return { type: 'powershell', rcFile: psProfile };
|
|
91
|
+
}
|
|
92
|
+
const shell = process.env.SHELL ?? '';
|
|
93
|
+
const home = os.homedir();
|
|
94
|
+
if (shell.includes('zsh')) {
|
|
95
|
+
return { type: 'zsh', rcFile: path.join(home, '.zshrc') };
|
|
96
|
+
}
|
|
97
|
+
if (shell.includes('bash')) {
|
|
98
|
+
// Prefer .bashrc, fallback to .bash_profile on macOS
|
|
99
|
+
const bashrc = path.join(home, '.bashrc');
|
|
100
|
+
if (fs.existsSync(bashrc))
|
|
101
|
+
return { type: 'bash', rcFile: bashrc };
|
|
102
|
+
return { type: 'bash', rcFile: path.join(home, '.bash_profile') };
|
|
103
|
+
}
|
|
104
|
+
if (shell.includes('fish')) {
|
|
105
|
+
return {
|
|
106
|
+
type: 'fish',
|
|
107
|
+
rcFile: path.join(home, '.config', 'fish', 'config.fish'),
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
// Fallback: check if common rc files exist
|
|
111
|
+
const zshrc = path.join(home, '.zshrc');
|
|
112
|
+
if (fs.existsSync(zshrc))
|
|
113
|
+
return { type: 'zsh', rcFile: zshrc };
|
|
114
|
+
const bashrc = path.join(home, '.bashrc');
|
|
115
|
+
if (fs.existsSync(bashrc))
|
|
116
|
+
return { type: 'bash', rcFile: bashrc };
|
|
117
|
+
return { type: 'unknown', rcFile: '' };
|
|
118
|
+
};
|
|
119
|
+
// ── Alias formatting ───────────────────────────────────────────────
|
|
120
|
+
const formatAliasLine = (entry, shellType) => {
|
|
121
|
+
if (shellType === 'fish') {
|
|
122
|
+
return `alias ${entry.alias} '${entry.command}'`;
|
|
123
|
+
}
|
|
124
|
+
if (shellType === 'powershell') {
|
|
125
|
+
// PowerShell needs a function wrapper for commands with args
|
|
126
|
+
return `function ${entry.alias} { ${entry.command} @args }`;
|
|
127
|
+
}
|
|
128
|
+
// bash / zsh
|
|
129
|
+
return `alias ${entry.alias}='${entry.command}'`;
|
|
130
|
+
};
|
|
131
|
+
const buildAliasBlock = (entries, shellType) => {
|
|
132
|
+
const comment = shellType === 'powershell' ? '#' : '#';
|
|
133
|
+
const lines = [MARKER_START, `${comment} Auto-generated by geeto — do not edit manually`];
|
|
134
|
+
for (const entry of entries) {
|
|
135
|
+
lines.push(formatAliasLine(entry, shellType));
|
|
136
|
+
}
|
|
137
|
+
lines.push(MARKER_END);
|
|
138
|
+
return lines.join('\n');
|
|
139
|
+
};
|
|
140
|
+
// ── RC file manipulation ───────────────────────────────────────────
|
|
141
|
+
const readRcFile = (filePath) => {
|
|
142
|
+
try {
|
|
143
|
+
return fs.readFileSync(filePath, 'utf8');
|
|
144
|
+
}
|
|
145
|
+
catch {
|
|
146
|
+
return '';
|
|
147
|
+
}
|
|
148
|
+
};
|
|
149
|
+
const getExistingAliases = (content) => {
|
|
150
|
+
const startIdx = content.indexOf(MARKER_START);
|
|
151
|
+
const endIdx = content.indexOf(MARKER_END);
|
|
152
|
+
if (startIdx === -1 || endIdx === -1)
|
|
153
|
+
return [];
|
|
154
|
+
const block = content.slice(startIdx, endIdx);
|
|
155
|
+
const aliases = [];
|
|
156
|
+
for (const line of block.split('\n')) {
|
|
157
|
+
// Match alias foo='...' or alias foo '...' or function foo { ... }
|
|
158
|
+
const match = line.match(/^(?:alias\s+(\w+)|function\s+(\w+))/);
|
|
159
|
+
if (match) {
|
|
160
|
+
aliases.push(match[1] ?? match[2] ?? '');
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
return aliases.filter(Boolean);
|
|
164
|
+
};
|
|
165
|
+
/**
|
|
166
|
+
* Scan entire RC file for ALL alias definitions (outside our block too).
|
|
167
|
+
* Returns a map: alias name → resolved command.
|
|
168
|
+
*/
|
|
169
|
+
const scanAllAliases = (content, shellType) => {
|
|
170
|
+
const result = new Map();
|
|
171
|
+
// Remove our geeto block so we don't double-count
|
|
172
|
+
let cleaned = content;
|
|
173
|
+
const sIdx = content.indexOf(MARKER_START);
|
|
174
|
+
const eIdx = content.indexOf(MARKER_END);
|
|
175
|
+
if (sIdx !== -1 && eIdx !== -1) {
|
|
176
|
+
cleaned = content.slice(0, sIdx) + content.slice(eIdx + MARKER_END.length);
|
|
177
|
+
}
|
|
178
|
+
for (const line of cleaned.split('\n')) {
|
|
179
|
+
const trimmed = line.trim();
|
|
180
|
+
if (trimmed.startsWith('#'))
|
|
181
|
+
continue;
|
|
182
|
+
if (shellType === 'powershell') {
|
|
183
|
+
// function foo { some-command @args }
|
|
184
|
+
const m = trimmed.match(/^function\s+(\w+)\s*\{(.+)\}/);
|
|
185
|
+
if (m?.[1] && m[2])
|
|
186
|
+
result.set(m[1], m[2].trim());
|
|
187
|
+
continue;
|
|
188
|
+
}
|
|
189
|
+
// alias foo='bar' or alias foo="bar" or alias foo bar (fish)
|
|
190
|
+
const m = trimmed.match(/^alias\s+(\w+)='([^']*)'/) ??
|
|
191
|
+
trimmed.match(/^alias\s+(\w+)="([^"]*)"/) ??
|
|
192
|
+
trimmed.match(/^alias\s+(\w+)\s+'([^']*)'/) ??
|
|
193
|
+
trimmed.match(/^alias\s+(\w+)=(\S+)/);
|
|
194
|
+
if (m?.[1] && m[2]) {
|
|
195
|
+
result.set(m[1], m[2]);
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
return result;
|
|
199
|
+
};
|
|
200
|
+
const writeAliasBlock = (filePath, block) => {
|
|
201
|
+
const dirPath = path.dirname(filePath);
|
|
202
|
+
if (!fs.existsSync(dirPath)) {
|
|
203
|
+
fs.mkdirSync(dirPath, { recursive: true });
|
|
204
|
+
}
|
|
205
|
+
let content = readRcFile(filePath);
|
|
206
|
+
// Replace existing block or append
|
|
207
|
+
const startIdx = content.indexOf(MARKER_START);
|
|
208
|
+
const endIdx = content.indexOf(MARKER_END);
|
|
209
|
+
if (startIdx !== -1 && endIdx !== -1) {
|
|
210
|
+
const before = content.slice(0, startIdx);
|
|
211
|
+
const after = content.slice(endIdx + MARKER_END.length);
|
|
212
|
+
content = before + block + after;
|
|
213
|
+
}
|
|
214
|
+
else {
|
|
215
|
+
// Append with spacing
|
|
216
|
+
if (content.length > 0 && !content.endsWith('\n')) {
|
|
217
|
+
content += '\n';
|
|
218
|
+
}
|
|
219
|
+
content += `\n${block}\n`;
|
|
220
|
+
}
|
|
221
|
+
fs.writeFileSync(filePath, content, 'utf8');
|
|
222
|
+
};
|
|
223
|
+
const removeAliasBlock = (filePath) => {
|
|
224
|
+
const content = readRcFile(filePath);
|
|
225
|
+
const startIdx = content.indexOf(MARKER_START);
|
|
226
|
+
const endIdx = content.indexOf(MARKER_END);
|
|
227
|
+
if (startIdx === -1 || endIdx === -1)
|
|
228
|
+
return false;
|
|
229
|
+
const before = content.slice(0, Math.max(0, startIdx - 1));
|
|
230
|
+
const after = content.slice(endIdx + MARKER_END.length);
|
|
231
|
+
const cleaned = before + after;
|
|
232
|
+
fs.writeFileSync(filePath, cleaned, 'utf8');
|
|
233
|
+
return true;
|
|
234
|
+
};
|
|
235
|
+
// ── Main handler ───────────────────────────────────────────────────
|
|
236
|
+
export const handleAlias = async () => {
|
|
237
|
+
log.banner();
|
|
238
|
+
log.step(`${colors.cyan}Shell Aliases${colors.reset}\n`);
|
|
239
|
+
// Detect shell
|
|
240
|
+
const shell = detectShell();
|
|
241
|
+
if (shell.type === 'unknown' || !shell.rcFile) {
|
|
242
|
+
log.error('Could not detect shell. Supported: zsh, bash, fish, PowerShell.');
|
|
243
|
+
return;
|
|
244
|
+
}
|
|
245
|
+
console.log(` ${colors.gray}Shell: ${shell.type} • RC: ${shell.rcFile}${colors.reset}`);
|
|
246
|
+
// Check which aliases are already installed (from geeto block)
|
|
247
|
+
const existingContent = readRcFile(shell.rcFile);
|
|
248
|
+
const existingAliases = getExistingAliases(existingContent);
|
|
249
|
+
// Scan ALL aliases in rc file (outside geeto block)
|
|
250
|
+
const rcAliases = scanAllAliases(existingContent, shell.type);
|
|
251
|
+
// Also build reverse map: command → alias name(s) for value conflict check
|
|
252
|
+
const commandToAlias = new Map();
|
|
253
|
+
for (const [name, cmd] of rcAliases) {
|
|
254
|
+
commandToAlias.set(cmd, name);
|
|
255
|
+
}
|
|
256
|
+
if (existingAliases.length > 0) {
|
|
257
|
+
console.log(` ${colors.yellow}${existingAliases.length} geeto alias(es) already installed${colors.reset}`);
|
|
258
|
+
}
|
|
259
|
+
if (rcAliases.size > 0) {
|
|
260
|
+
console.log(` ${colors.gray}${rcAliases.size} total alias(es) in RC file${colors.reset}`);
|
|
261
|
+
}
|
|
262
|
+
console.log('');
|
|
263
|
+
// Check system binary conflicts
|
|
264
|
+
const conflicts = new Map();
|
|
265
|
+
for (const entry of ALIASES) {
|
|
266
|
+
const bin = systemBinaryPath(entry.alias);
|
|
267
|
+
if (bin) {
|
|
268
|
+
conflicts.set(entry.alias, bin);
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
// Compute column widths for alignment
|
|
272
|
+
const maxAlias = Math.max(...ALIASES.map((a) => a.alias.length));
|
|
273
|
+
const maxCmd = Math.max(...ALIASES.map((a) => a.command.length));
|
|
274
|
+
const maxDesc = Math.max(...ALIASES.map((a) => a.desc.length));
|
|
275
|
+
// Build options for multi-select
|
|
276
|
+
const options = ALIASES.map((entry) => {
|
|
277
|
+
const conflict = conflicts.get(entry.alias);
|
|
278
|
+
const installed = existingAliases.includes(entry.alias);
|
|
279
|
+
const existingCmd = rcAliases.get(entry.alias);
|
|
280
|
+
const existingName = commandToAlias.get(entry.command);
|
|
281
|
+
const aliasCol = entry.alias.padEnd(maxAlias);
|
|
282
|
+
const cmdCol = entry.command.padEnd(maxCmd);
|
|
283
|
+
const descCol = entry.desc.padEnd(maxDesc);
|
|
284
|
+
let label = `${aliasCol} → ${cmdCol} ${colors.gray}${descCol}${colors.reset}`;
|
|
285
|
+
if (conflict) {
|
|
286
|
+
const alt = suggestAlternative(entry.alias);
|
|
287
|
+
label += ` ${colors.red}⚠ bin: ${conflict}${colors.reset}`;
|
|
288
|
+
if (alt) {
|
|
289
|
+
label += ` ${colors.cyan}→ try: ${alt}${colors.reset}`;
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
if (existingCmd && !installed) {
|
|
293
|
+
label += ` ${colors.yellow}⚠ exists: ${entry.alias}='${existingCmd}'${colors.reset}`;
|
|
294
|
+
}
|
|
295
|
+
if (existingName && existingName !== entry.alias) {
|
|
296
|
+
label += ` ${colors.blue}≈ same as: ${existingName}${colors.reset}`;
|
|
297
|
+
}
|
|
298
|
+
if (installed) {
|
|
299
|
+
label += ` ${colors.green}✓ installed${colors.reset}`;
|
|
300
|
+
}
|
|
301
|
+
return { label, value: entry.alias };
|
|
302
|
+
});
|
|
303
|
+
const selected = await multiSelect('Select aliases to install:', options);
|
|
304
|
+
if (selected.length === 0) {
|
|
305
|
+
// Check if user wants to remove existing aliases
|
|
306
|
+
if (existingAliases.length > 0) {
|
|
307
|
+
console.log('');
|
|
308
|
+
const remove = confirm('Remove all geeto aliases?', false);
|
|
309
|
+
if (remove) {
|
|
310
|
+
if (isDryRun()) {
|
|
311
|
+
logDryRun(`Remove geeto alias block from ${shell.rcFile}`);
|
|
312
|
+
return;
|
|
313
|
+
}
|
|
314
|
+
const removed = removeAliasBlock(shell.rcFile);
|
|
315
|
+
if (removed) {
|
|
316
|
+
log.success('All geeto aliases removed.');
|
|
317
|
+
console.log(` ${colors.gray}Run: source ${shell.rcFile}${colors.reset}`);
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
else {
|
|
321
|
+
log.info('No changes made.');
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
else {
|
|
325
|
+
log.info('No aliases selected.');
|
|
326
|
+
}
|
|
327
|
+
return;
|
|
328
|
+
}
|
|
329
|
+
// Filter out conflicting aliases with warning
|
|
330
|
+
const safeEntries = [];
|
|
331
|
+
const skippedConflicts = [];
|
|
332
|
+
for (const alias of selected) {
|
|
333
|
+
const entry = ALIASES.find((a) => a.alias === alias);
|
|
334
|
+
if (!entry)
|
|
335
|
+
continue;
|
|
336
|
+
if (conflicts.has(alias)) {
|
|
337
|
+
skippedConflicts.push(entry);
|
|
338
|
+
}
|
|
339
|
+
else {
|
|
340
|
+
safeEntries.push(entry);
|
|
341
|
+
}
|
|
342
|
+
}
|
|
343
|
+
// Warn about conflicts and offer alternatives
|
|
344
|
+
if (skippedConflicts.length > 0) {
|
|
345
|
+
console.log('');
|
|
346
|
+
log.warn('The following aliases conflict with system binaries:');
|
|
347
|
+
for (const entry of skippedConflicts) {
|
|
348
|
+
const bin = conflicts.get(entry.alias) ?? '';
|
|
349
|
+
const alt = suggestAlternative(entry.alias);
|
|
350
|
+
let line = ` ${colors.red}✗${colors.reset} ${entry.alias} → ${bin}`;
|
|
351
|
+
if (alt)
|
|
352
|
+
line += ` ${colors.cyan}(suggested: ${alt})${colors.reset}`;
|
|
353
|
+
console.log(line);
|
|
354
|
+
}
|
|
355
|
+
console.log('');
|
|
356
|
+
// Auto-use alternatives for conflicting aliases
|
|
357
|
+
const hasAlternatives = skippedConflicts.some((e) => suggestAlternative(e.alias) !== '');
|
|
358
|
+
if (hasAlternatives) {
|
|
359
|
+
const useAlts = confirm('Use suggested alternatives instead?');
|
|
360
|
+
if (useAlts) {
|
|
361
|
+
for (const entry of skippedConflicts) {
|
|
362
|
+
const alt = suggestAlternative(entry.alias);
|
|
363
|
+
if (alt) {
|
|
364
|
+
safeEntries.push({ ...entry, alias: alt });
|
|
365
|
+
}
|
|
366
|
+
}
|
|
367
|
+
}
|
|
368
|
+
else {
|
|
369
|
+
const force = confirm('Install conflicting aliases anyway?', false);
|
|
370
|
+
if (force) {
|
|
371
|
+
safeEntries.push(...skippedConflicts);
|
|
372
|
+
}
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
else {
|
|
376
|
+
const force = confirm('Install conflicting aliases anyway?', false);
|
|
377
|
+
if (force) {
|
|
378
|
+
safeEntries.push(...skippedConflicts);
|
|
379
|
+
}
|
|
380
|
+
}
|
|
381
|
+
}
|
|
382
|
+
if (safeEntries.length === 0) {
|
|
383
|
+
log.info('No aliases to install.');
|
|
384
|
+
return;
|
|
385
|
+
}
|
|
386
|
+
// Preview
|
|
387
|
+
console.log('');
|
|
388
|
+
console.log(` ${colors.bright}Installing ${safeEntries.length} alias(es):${colors.reset}`);
|
|
389
|
+
for (const entry of safeEntries) {
|
|
390
|
+
console.log(` ${colors.green}+${colors.reset} ${colors.cyan}${entry.alias}${colors.reset} → ${entry.command}`);
|
|
391
|
+
}
|
|
392
|
+
console.log('');
|
|
393
|
+
// Dry-run: show what would happen and exit
|
|
394
|
+
if (isDryRun()) {
|
|
395
|
+
logDryRun(`Write ${safeEntries.length} alias(es) to ${shell.rcFile}`);
|
|
396
|
+
for (const entry of safeEntries) {
|
|
397
|
+
console.log(` ${colors.green}+${colors.reset} ${colors.cyan}${entry.alias}${colors.reset} → ${entry.command}`);
|
|
398
|
+
}
|
|
399
|
+
return;
|
|
400
|
+
}
|
|
401
|
+
const doInstall = confirm('Write to ' + shell.rcFile + '?');
|
|
402
|
+
if (!doInstall) {
|
|
403
|
+
log.info('Cancelled.');
|
|
404
|
+
return;
|
|
405
|
+
}
|
|
406
|
+
// Write
|
|
407
|
+
const block = buildAliasBlock(safeEntries, shell.type);
|
|
408
|
+
writeAliasBlock(shell.rcFile, block);
|
|
409
|
+
log.success(`${safeEntries.length} alias(es) installed!`);
|
|
410
|
+
if (shell.type === 'fish') {
|
|
411
|
+
console.log(` ${colors.gray}Run: source ${shell.rcFile}${colors.reset}`);
|
|
412
|
+
}
|
|
413
|
+
else if (shell.type === 'powershell') {
|
|
414
|
+
console.log(` ${colors.gray}Run: . $PROFILE${colors.reset}`);
|
|
415
|
+
}
|
|
416
|
+
else {
|
|
417
|
+
console.log(` ${colors.gray}Run: source ${shell.rcFile}${colors.reset}`);
|
|
418
|
+
}
|
|
419
|
+
};
|
|
420
|
+
//# sourceMappingURL=alias.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"alias.js","sourceRoot":"","sources":["../../src/workflows/alias.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amend.d.ts","sourceRoot":"","sources":["../../src/workflows/amend.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"amend.d.ts","sourceRoot":"","sources":["../../src/workflows/amend.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA2EH;;GAEG;AACH,eAAO,MAAM,WAAW,QAAa,OAAO,CAAC,IAAI,CA2LhD,CAAA"}
|
package/lib/workflows/amend.js
CHANGED
|
@@ -5,9 +5,10 @@
|
|
|
5
5
|
import { askQuestion, confirm } from '../cli/input.js';
|
|
6
6
|
import { multiSelect, select } from '../cli/menu.js';
|
|
7
7
|
import { colors } from '../utils/colors.js';
|
|
8
|
-
import { exec, execSilent } from '../utils/exec.js';
|
|
8
|
+
import { exec, execAsync, execSilent } from '../utils/exec.js';
|
|
9
9
|
import { getCurrentBranch } from '../utils/git.js';
|
|
10
10
|
import { log } from '../utils/logging.js';
|
|
11
|
+
import { ScrambleProgress } from '../utils/scramble.js';
|
|
11
12
|
/**
|
|
12
13
|
* Get last commit info
|
|
13
14
|
*/
|
|
@@ -219,10 +220,14 @@ export const handleAmend = async () => {
|
|
|
219
220
|
console.log('');
|
|
220
221
|
const forcePush = confirm('Force push to update remote?');
|
|
221
222
|
if (forcePush) {
|
|
222
|
-
const pushSpinner =
|
|
223
|
-
pushSpinner.start(
|
|
223
|
+
const pushSpinner = new ScrambleProgress();
|
|
224
|
+
pushSpinner.start([
|
|
225
|
+
'preparing force push...',
|
|
226
|
+
'pushing to remote...',
|
|
227
|
+
'confirming remote state...',
|
|
228
|
+
]);
|
|
224
229
|
try {
|
|
225
|
-
|
|
230
|
+
await execAsync(`git push --force-with-lease origin ${current}`, true);
|
|
226
231
|
pushSpinner.succeed('Force pushed!');
|
|
227
232
|
}
|
|
228
233
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amend.js","sourceRoot":"","sources":["../../src/workflows/amend.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"amend.js","sourceRoot":"","sources":["../../src/workflows/amend.ts"],"names":[],"mappings":"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"}
|
|
@@ -114,7 +114,7 @@ export async function handleTrelloCase(state, branchConfig, separator, defaultPr
|
|
|
114
114
|
log.warn('No AI provider configured yet.');
|
|
115
115
|
const providerChoice = await select('Choose AI provider:', [
|
|
116
116
|
{ label: 'Gemini', value: 'gemini' },
|
|
117
|
-
{ label: 'GitHub
|
|
117
|
+
{ label: 'GitHub (Recommended)', value: 'copilot' },
|
|
118
118
|
{ label: 'OpenRouter', value: 'openrouter' },
|
|
119
119
|
{ label: 'Back to naming strategy', value: 'back' },
|
|
120
120
|
]);
|
|
@@ -289,7 +289,7 @@ export async function handleTrelloCase(state, branchConfig, separator, defaultPr
|
|
|
289
289
|
// let user pick another provider and optionally pick a model
|
|
290
290
|
const prov = await select('Choose AI provider:', [
|
|
291
291
|
{ label: 'Gemini', value: 'gemini' },
|
|
292
|
-
{ label: 'GitHub
|
|
292
|
+
{ label: 'GitHub (Recommended)', value: 'copilot' },
|
|
293
293
|
{ label: 'OpenRouter', value: 'openrouter' },
|
|
294
294
|
{ label: 'Back to suggested branch selection', value: 'cancel-prov' },
|
|
295
295
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branch-helpers.js","sourceRoot":"","sources":["../../src/workflows/branch-helpers.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACpE,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,iCAAiC,GAClC,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,eAAe,EACf,wBAAwB,GACzB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,EACL,8BAA8B,EAC9B,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,oBAAoB,GACrB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAS7C,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,KAAiB,EACjB,YAAyC,EACzC,SAAoB,EACpB,aAAqB;IAErB,oEAAoE;IACpE,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,EAAE,CAAA;QAC7B,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;QACjD,MAAM,EAAE,4BAA4B,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAA;QAChF,MAAM,YAAY,GAAG,4BAA4B,EAAE,CAAA;QACnD,OAAO,CAAC,IAAI,EAAE,CAAA;QACd,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,GAAG,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAA;YAC7C,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;QAC9D,CAAC;QACD,GAAG,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAA;IAC/C,CAAC;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,EAAE,CAAA;IAC7B,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;IAE7C,MAAM,WAAW,GAAG,MAAM,gBAAgB,EAAE,CAAA;IAC5C,OAAO,CAAC,IAAI,EAAE,CAAA;IACd,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,GAAG,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAA;QAC1C,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;IAC9D,CAAC;IAED,iBAAiB;IACjB,MAAM,cAAc,GAAG,YAAY,EAAE,cAAoC,CAAA;IACzE,MAAM,WAAW,GAAG;QAClB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5B,KAAK,EAAE,IAAI,CAAC,EAAE,KAAK,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE;YAC/E,KAAK,EAAE,IAAI,CAAC,EAAE;SACf,CAAC,CAAC;QACH,EAAE,KAAK,EAAE,uBAAuB,EAAE,KAAK,EAAE,KAAK,EAAE;QAChD,EAAE,KAAK,EAAE,qBAAqB,EAAE,KAAK,EAAE,WAAW,EAAE;KACrD,CAAA;IAED,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAA;IACvE,IAAI,cAAc,KAAK,WAAW,EAAE,CAAC;QACnC,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;IAC9D,CAAC;IAED,IAAI,cAAc,KAAK,KAAK,EAAE,CAAC;QAC7B,MAAM,eAAe,GAAG,uBAAuB,EAAE,CAAA;QACjD,wBAAwB,CAAC;YACvB,SAAS;YACT,kBAAkB,EAAE,eAAe,EAAE,kBAAkB;YACvD,cAAc,EAAE,cAAc;SAC/B,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAA;IAC1E,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,EAAE,CAAA;IACjC,WAAW,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,YAAY,CAAC,CAAA;IACxD,WAAW,CAAC,IAAI,EAAE,CAAA;IAElB,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,GAAG,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAA;QAC3C,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;IAC9D,CAAC;IAED,4BAA4B;IAC5B,MAAM,aAAa,GAAG;QACpB,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACvC,MAAM,aAAa,GAAG,iCAAiC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;YAC7F,OAAO;gBACL,KAAK,EAAE,GAAG,aAAa,GAAG,aAAa,EAAE;gBACzC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;aAChE,CAAA;QACH,CAAC,CAAC;QACF,EAAE,KAAK,EAAE,qBAAqB,EAAE,KAAK,EAAE,WAAW,EAAE;KACrD,CAAA;IAED,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAA;IACvE,IAAI,YAAY,KAAK,WAAW,EAAE,CAAC;QACjC,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;IAC9D,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAkC,CAAA;IAC1E,MAAM,YAAY,GAAG,QAAQ,CAAC,EAAE,CAAA;IAChC,GAAG,CAAC,OAAO,CAAC,yBAAyB,YAAY,EAAE,CAAC,CAAA;IAEpD,yCAAyC;IACzC,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,yBAAyB,EAAE;QAC3D,EAAE,KAAK,EAAE,yBAAyB,EAAE,KAAK,EAAE,YAAY,EAAE;QACzD,EAAE,KAAK,EAAE,iCAAiC,EAAE,KAAK,EAAE,UAAU,EAAE;QAC/D,EAAE,KAAK,EAAE,2CAA2C,EAAE,KAAK,EAAE,aAAa,EAAE;QAC5E,EAAE,KAAK,EAAE,wBAAwB,EAAE,KAAK,EAAE,MAAM,EAAE;KACnD,CAAC,CAAA;IAEF,IAAI,YAAY,KAAK,MAAM,EAAE,CAAC;QAC5B,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;IAC9D,CAAC;IAED,IAAI,YAAY,KAAK,YAAY,EAAE,CAAC;QAClC,MAAM,YAAY,GAAG,iCAAiC,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC,CAAA;QAC9F,MAAM,aAAa,GAAG,GAAG,aAAa,GAAG,YAAY,EAAE,CAAA;QACvD,GAAG,CAAC,OAAO,CAAC,gBAAgB,MAAM,CAAC,IAAI,GAAG,aAAa,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QACzE,IAAI,MAAM,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;YAC3D,KAAK,CAAC,aAAa,GAAG,aAAa,CAAA;YACnC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc,CAAA;YAChC,SAAS,CAAC,KAAK,CAAC,CAAA;YAChB,OAAO;gBACL,aAAa;gBACb,sBAAsB,EAAE,YAAY;gBACpC,kBAAkB,EAAE,IAAI;gBACxB,eAAe,EAAE,IAAI;aACtB,CAAA;QACH,CAAC;QAED,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;IAC9D,CAAC;IAED,kGAAkG;IAClG,MAAM,wBAAwB,GAAG,YAAY,KAAK,aAAa,CAAA;IAE/D,0CAA0C;IAC1C,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACtB,GAAG,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAA;QAC1C,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,qBAAqB,EAAE;YACzD,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE;YACpC,EAAE,KAAK,EAAE,8BAA8B,EAAE,KAAK,EAAE,SAAS,EAAE;YAC3D,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE;YAC5C,EAAE,KAAK,EAAE,yBAAyB,EAAE,KAAK,EAAE,MAAM,EAAE;SACpD,CAAC,CAAA;QAEF,IAAI,cAAc,KAAK,MAAM,EAAE,CAAC;YAC9B,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;QAC9D,CAAC;QAED,MAAM,cAAc,GAAG,cAAqD,CAAA;QAE5E,kDAAkD;QAClD,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAC9C,cAAc,EACd,eAAe,EACf,4BAA4B,CAC7B,CAAA;QAED,IAAI,CAAC,WAAW,IAAI,WAAW,KAAK,MAAM,EAAE,CAAC;YAC3C,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;QAC9D,CAAC;QAED,4CAA4C;QAC5C,KAAK,CAAC,UAAU,GAAG,cAAc,CAAA;QACjC,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,KAAK,CAAC,YAAY,GAAG,WAA2B,CAAA;QAClD,CAAC;aAAM,IAAI,cAAc,KAAK,YAAY,EAAE,CAAC;YAC3C,KAAK,CAAC,eAAe,GAAG,WAA8B,CAAA;QACxD,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,WAAW,GAAG,WAA0B,CAAA;QAChD,CAAC;QACD,SAAS,CAAC,KAAK,CAAC,CAAA;QAChB,GAAG,CAAC,OAAO,CAAC,sBAAsB,sBAAsB,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;IAC7E,CAAC;IAED,IAAI,UAAU,GAAG,EAAE,CAAA;IACnB,IAAI,QAAQ,GAAkB,IAAI,CAAA;IAClC,IAAI,cAAc,GAAG,KAAK,CAAA;IAE1B,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,UAAU,GAAG,KAAK,CAAC,UAAiD,CAAA;QAC1E,IAAI,UAAwD,CAAA;QAC5D,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,UAAU,GAAG,KAAK,CAAC,YAA4B,CAAA;QACjD,CAAC;aAAM,IAAI,UAAU,KAAK,YAAY,EAAE,CAAC;YACvC,UAAU,GAAG,KAAK,CAAC,eAAkC,CAAA;QACvD,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,oBAAoB,CAAgB,CAAA;QACzE,CAAC;QAED,IAAI,KAAyB,CAAA;QAC7B,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,KAAK,GAAG,KAAK,CAAC,YAAiC,CAAA;QACjD,CAAC;aAAM,IAAI,UAAU,KAAK,YAAY,EAAE,CAAC;YACvC,KAAK,GAAG,KAAK,CAAC,eAAoC,CAAA;QACpD,CAAC;aAAM,CAAC;YACN,KAAK,GAAI,KAAK,CAAC,WAAiC,IAAI,oBAAoB,CAAA;QAC1E,CAAC;QACD,MAAM,YAAY,GAAG,mBAAmB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;QAC3D,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,EAAE,CAAA;QAE7B,IAAI,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAA;QAEnC,4CAA4C;QAC5C,IAAI,wBAAwB,IAAI,CAAC,cAAc,EAAE,CAAC;YAChD,OAAO,CAAC,KAAK,CACX,gCAAgC,sBAAsB,CAAC,UAAU,CAAC,GAChE,YAAY,CAAC,CAAC,CAAC,KAAK,YAAY,GAAG,CAAC,CAAC,CAAC,EACxC,KAAK,CACN,CAAA;YAED,MAAM,eAAe,GAAG,MAAM,8BAA8B,CAC1D,UAAU,EACV,iDAAiD,QAAQ,CAAC,KAAK,GAAG,EAClE,EAAE,EACF,KAAK,CAAC,YAAY,EAClB,KAAK,CAAC,eAAe,EACrB,KAAK,CAAC,WAAW,CAClB,CAAA;YAED,iEAAiE;YACjE,OAAO,CAAC,IAAI,EAAE,CAAA;YAEd,IACE,eAAe;gBACf,CAAC,oBAAoB,CAAC,eAAe,CAAC;gBACtC,CAAC,qBAAqB,CAAC,eAAe,CAAC,EACvC,CAAC;gBACD,cAAc,GAAG,eAAe,CAAA;gBAChC,GAAG,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,IAAI,GAAG,cAAc,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;YACxE,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,eAAe,IAAI,eAAe,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;oBACrE,GAAG,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAA;gBAC3D,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAA;gBACtD,CAAC;YACH,CAAC;QACH,CAAC;QAED,qCAAqC;QACrC,OAAO,CAAC,KAAK,CACX,sCAAsC,sBAAsB,CAAC,UAAU,CAAC,GACtE,YAAY,CAAC,CAAC,CAAC,KAAK,YAAY,GAAG,CAAC,CAAC,CAAC,EACxC,KAAK,CACN,CAAA;QAED,IAAI,cAAc,EAAE,CAAC;YACnB,gDAAgD;YAChD,cAAc,GAAG,KAAK,CAAA;YACtB,OAAO,CAAC,IAAI,EAAE,CAAA;QAChB,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,MAAM,8BAA8B,CAC7C,UAAU,EACV,cAAc,EACd,UAAU,EACV,KAAK,CAAC,YAAY,EAClB,KAAK,CAAC,eAAe,EACrB,KAAK,CAAC,WAAW,CAClB,CAAA;YACD,OAAO,CAAC,IAAI,EAAE,CAAA;QAChB,CAAC;QAED,IAAI,CAAC,QAAQ,IAAI,oBAAoB,CAAC,QAAQ,CAAC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnF,QAAQ,GAAG,MAAM,qBAAqB,CACpC,QAAQ,EACR,UAAU,EACV,UAAU,EACV,QAAQ,CAAC,KAAK,EACd,UAAU,EACV,KAAK,CAAC,aAAa,EACnB,CAAC,QAA6C,EAAE,aAAsB,EAAE,EAAE;gBACxE,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAA;gBAC3B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;oBAC3B,KAAK,CAAC,YAAY,GAAG,aAA6B,CAAA;gBACpD,CAAC;qBAAM,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;oBACrC,KAAK,CAAC,eAAe,GAAG,aAAgC,CAAA;gBAC1D,CAAC;gBACD,SAAS,CAAC,KAAK,CAAC,CAAA;YAClB,CAAC,CACF,CAAA;QACH,CAAC;QAED,IAAI,aAAa,GAAG,EAAE,CAAA;QAEtB,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACtB,aAAa,GAAG,kBAAkB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;QACzD,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,GAAG,QAAQ;iBACjB,UAAU,CAAC,gBAAgB,EAAE,SAAS,CAAC;iBACvC,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC;iBAC/B,WAAW,EAAE,CAAA;YAEhB,IAAI,WAAW,GAAG,GAAG,CAAA;YACrB,OAAO,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC;gBAAE,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;YAC3F,OAAO,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAAE,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;YAE7F,aAAa,GAAG,GAAG,aAAa,GAAG,YAAY,GAAG,SAAS,GAAG,WAAW,EAAE,CAAA;YAC3E,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAA;YAC5D,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC1B,GAAG,CAAC,EAAE,CAAC,cAAc,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,GAAG,aAAa,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;gBAClF,GAAG,CAAC,IAAI,CACN,2FAA2F,CAC5F,CAAA;YACH,CAAC;QACH,CAAC;QAED,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAA;QAE5D,IAAI,YAAoB,CAAA;QACxB,IAAI,oBAAoB,EAAE,CAAC;YACzB,YAAY,GAAG,MAAM,MAAM,CACzB,+GAA+G,EAC/G;gBACE;oBACE,KAAK,EAAE,kBAAkB,sBAAsB,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,QAAQ;oBAChG,KAAK,EAAE,UAAU;iBAClB;gBACD,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,cAAc,EAAE;gBAChD,EAAE,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAE,iBAAiB,EAAE;gBACzD,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,EAAE;gBACzC,EAAE,KAAK,EAAE,wBAAwB,EAAE,KAAK,EAAE,MAAM,EAAE;aACnD,CACF,CAAA;QACH,CAAC;aAAM,CAAC;YACN,YAAY,GAAG,MAAM,MAAM,CAAC,0BAA0B,EAAE;gBACtD,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE;gBACzC,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE;gBAC5C,EAAE,KAAK,EAAE,4BAA4B,EAAE,KAAK,EAAE,SAAS,EAAE;gBACzD,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,cAAc,EAAE;gBAChD,EAAE,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAE,iBAAiB,EAAE;gBACzD,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,EAAE;gBACzC,EAAE,KAAK,EAAE,wBAAwB,EAAE,KAAK,EAAE,MAAM,EAAE;aACnD,CAAC,CAAA;QACJ,CAAC;QAED,QAAQ,YAAY,EAAE,CAAC;YACrB,KAAK,QAAQ,CAAC,CAAC,CAAC;gBACd,2BAA2B;gBAC3B,IAAI,MAAM,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC3D,KAAK,CAAC,aAAa,GAAG,aAAa,CAAA;oBACnC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc,CAAA;oBAChC,SAAS,CAAC,KAAK,CAAC,CAAA;oBAChB,OAAO;wBACL,aAAa;wBACb,sBAAsB,EAAE,UAAU;wBAClC,kBAAkB,EAAE,IAAI;wBACxB,eAAe,EAAE,IAAI;qBACtB,CAAA;gBACH,CAAC;gBACD,mCAAmC;gBACnC,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;YAC9D,CAAC;YACD,KAAK,UAAU,CAAC,CAAC,CAAC;gBAChB,wDAAwD;gBACxD,UAAU,GAAG,EAAE,CAAA;gBACf,MAAK;YACP,CAAC;YACD,KAAK,YAAY,CAAC,CAAC,CAAC;gBAClB,UAAU,GAAG,EAAE,CAAA;gBACf,MAAK;YACP,CAAC;YACD,KAAK,iBAAiB,CAAC,CAAC,CAAC;gBACvB,6DAA6D;gBAC7D,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,qBAAqB,EAAE;oBAC/C,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE;oBACpC,EAAE,KAAK,EAAE,8BAA8B,EAAE,KAAK,EAAE,SAAS,EAAE;oBAC3D,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE;oBAC5C,EAAE,KAAK,EAAE,oCAAoC,EAAE,KAAK,EAAE,aAAa,EAAE;iBACtE,CAAC,CAAA;gBACF,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;oBAC3B,8DAA8D;oBAC9D,cAAc,GAAG,IAAI,CAAA;oBACrB,SAAQ;gBACV,CAAC;gBACD,KAAK,CAAC,UAAU,GAAG,IAA2C,CAAA;gBAE9D,GAAG,CAAC,IAAI,CAAC,yBAAyB,sBAAsB,CAAC,KAAK,CAAC,UAAU,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAA;gBACzF,MAAM,MAAM,GAAG,MAAM,sBAAsB,CACzC,KAAK,CAAC,UAAiD,EACvD,eAAe,EACf,oCAAoC,CACrC,CAAA;gBACD,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,cAAc,GAAG,IAAI,CAAA;oBACrB,SAAQ;gBACV,CAAC;gBACD,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;oBACtB,cAAc,GAAG,IAAI,CAAA;oBACrB,SAAQ;gBACV,CAAC;gBAED,QAAQ,IAAI,EAAE,CAAC;oBACb,KAAK,SAAS,CAAC,CAAC,CAAC;wBACf,KAAK,CAAC,YAAY,GAAG,MAAiC,CAAA;wBACtD,MAAK;oBACP,CAAC;oBACD,KAAK,YAAY,CAAC,CAAC,CAAC;wBAClB,KAAK,CAAC,eAAe,GAAG,MAAoC,CAAA;wBAC5D,MAAK;oBACP,CAAC;oBACD,KAAK,QAAQ,CAAC,CAAC,CAAC;wBACd,KAAK,CAAC,WAAW,GAAG,MAAgC,CAAA;wBACpD,MAAK;oBACP,CAAC;oBACD,OAAO,CAAC,CAAC,CAAC;wBACR,MAAK;oBACP,CAAC;gBACH,CAAC;gBACD,SAAS,CAAC,KAAK,CAAC,CAAA;gBAChB,UAAU,GAAG,EAAE,CAAA;gBACf,MAAK;YACP,CAAC;YACD,KAAK,cAAc,CAAC,CAAC,CAAC;gBACpB,2CAA2C;gBAC3C,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,IAAI,QAAQ,CAAA;gBAChD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC9B,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAA;oBAC7C,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,gBAAgB,EAAE,CAAA;oBAC3C,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC;wBACvD,CAAC,CAAC,MAAM;wBACR,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE,KAAK,EAAE,oCAAoC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;oBAC/E,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,uBAAuB,EAAE,UAAU,CAAC,CAAA;oBAChE,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;wBACtB,cAAc,GAAG,IAAI,CAAA;wBACrB,SAAQ;oBACV,CAAC;oBACD,KAAK,CAAC,YAAY,GAAG,MAAiC,CAAA;gBACxD,CAAC;qBAAM,IAAI,WAAW,KAAK,YAAY,EAAE,CAAC;oBACxC,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAA;oBAC/C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,mBAAmB,EAAE,CAAA;oBAC7C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC;wBACtD,CAAC,CAAC,MAAM;wBACR,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE,KAAK,EAAE,oCAAoC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;oBAC/E,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAA;oBAClE,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;wBACtB,cAAc,GAAG,IAAI,CAAA;wBACrB,SAAQ;oBACV,CAAC;oBACD,KAAK,CAAC,eAAe,GAAG,MAAoC,CAAA;gBAC9D,CAAC;qBAAM,CAAC;oBACN,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAA;oBAC3C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;oBACzC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC;wBACtD,CAAC,CAAC,MAAM;wBACR,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE,KAAK,EAAE,oCAAoC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;oBAC/E,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAA;oBAC9D,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;wBACtB,cAAc,GAAG,IAAI,CAAA;wBACrB,SAAQ;oBACV,CAAC;oBACD,KAAK,CAAC,WAAW,GAAG,MAAgC,CAAA;gBACtD,CAAC;gBACD,SAAS,CAAC,KAAK,CAAC,CAAA;gBAChB,UAAU,GAAG,EAAE,CAAA;gBACf,MAAK;YACP,CAAC;YACD,KAAK,SAAS,CAAC,CAAC,CAAC;gBACf,UAAU,GAAG,WAAW,CACtB,qEAAqE,CACtE,CAAA;gBACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;gBACf,MAAK;YACP,CAAC;YACD,KAAK,MAAM,CAAC,CAAC,CAAC;gBACZ,MAAM,MAAM,GAAG,WAAW,CAAC,gBAAgB,aAAa,KAAK,CAAC,CAAA;gBAC9D,aAAa,GAAG,MAAM,IAAI,aAAa,CAAA;gBACvC,IAAI,MAAM,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC3D,KAAK,CAAC,aAAa,GAAG,aAAa,CAAA;oBACnC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc,CAAA;oBAChC,SAAS,CAAC,KAAK,CAAC,CAAA;oBAChB,OAAO;wBACL,aAAa;wBACb,sBAAsB,EAAE,UAAU;wBAClC,kBAAkB,EAAE,IAAI;wBACxB,eAAe,EAAE,IAAI;qBACtB,CAAA;gBACH,CAAC;gBACD,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;YAC9D,CAAC;YACD,KAAK,MAAM,CAAC,CAAC,CAAC;gBACZ,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;YAC9D,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"branch-helpers.js","sourceRoot":"","sources":["../../src/workflows/branch-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branch-utils.d.ts","sourceRoot":"","sources":["../../src/workflows/branch-utils.ts"],"names":[],"mappings":"AAWA;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAc5D;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,GAAU,MAAM,MAAM,EAAE,eAAe,MAAM,KAAG,OAAO,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"branch-utils.d.ts","sourceRoot":"","sources":["../../src/workflows/branch-utils.ts"],"names":[],"mappings":"AAWA;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAc5D;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,GAAU,MAAM,MAAM,EAAE,eAAe,MAAM,KAAG,OAAO,CAAC,OAAO,CAyCvF,CAAA"}
|
|
@@ -49,13 +49,14 @@ export const createBranch = async (name, currentBranch) => {
|
|
|
49
49
|
log.error('Proposed branch name looks like an AI error message; please regenerate or choose a different model/provider');
|
|
50
50
|
return false;
|
|
51
51
|
}
|
|
52
|
-
log.
|
|
52
|
+
const spinner = log.spinner();
|
|
53
|
+
spinner.start(`Creating branch: ${name}`);
|
|
53
54
|
const result = await safeCheckout(name, { create: true });
|
|
54
55
|
if (!result.success) {
|
|
55
|
-
|
|
56
|
+
spinner.fail(`Failed to create branch: ${result.error}`);
|
|
56
57
|
return false;
|
|
57
58
|
}
|
|
58
|
-
|
|
59
|
+
spinner.succeed(`Branch created: ${colors.cyan}${colors.bright}${name}${colors.reset}`);
|
|
59
60
|
return true;
|
|
60
61
|
};
|
|
61
62
|
//# sourceMappingURL=branch-utils.js.map
|