@camaradesuk/git-worktree-tools 1.5.0 → 1.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 +82 -11
- package/dist/cli/cleanpr.js +35 -4
- package/dist/cli/cleanpr.js.map +1 -1
- package/dist/cli/cleanpr.test.js +254 -0
- package/dist/cli/cleanpr.test.js.map +1 -1
- package/dist/cli/lswt.js +54 -6
- package/dist/cli/lswt.js.map +1 -1
- package/dist/cli/lswt.test.js +207 -0
- package/dist/cli/lswt.test.js.map +1 -1
- package/dist/cli/newpr.js +87 -65
- package/dist/cli/newpr.js.map +1 -1
- package/dist/cli/newpr.test.js +2 -1
- package/dist/cli/newpr.test.js.map +1 -1
- package/dist/cli/wt/clean.d.ts +16 -0
- package/dist/cli/wt/clean.d.ts.map +1 -0
- package/dist/cli/wt/clean.js +64 -0
- package/dist/cli/wt/clean.js.map +1 -0
- package/dist/cli/wt/completion.d.ts +12 -0
- package/dist/cli/wt/completion.d.ts.map +1 -0
- package/dist/cli/wt/completion.js +246 -0
- package/dist/cli/wt/completion.js.map +1 -0
- package/dist/cli/wt/completion.test.d.ts +5 -0
- package/dist/cli/wt/completion.test.d.ts.map +1 -0
- package/dist/cli/wt/completion.test.js +173 -0
- package/dist/cli/wt/completion.test.js.map +1 -0
- package/dist/cli/wt/config.d.ts +13 -0
- package/dist/cli/wt/config.d.ts.map +1 -0
- package/dist/cli/wt/config.js +40 -0
- package/dist/cli/wt/config.js.map +1 -0
- package/dist/cli/wt/entry.test.d.ts +8 -0
- package/dist/cli/wt/entry.test.d.ts.map +1 -0
- package/dist/cli/wt/entry.test.js +198 -0
- package/dist/cli/wt/entry.test.js.map +1 -0
- package/dist/cli/wt/link.d.ts +13 -0
- package/dist/cli/wt/link.d.ts.map +1 -0
- package/dist/cli/wt/link.js +88 -0
- package/dist/cli/wt/link.js.map +1 -0
- package/dist/cli/wt/list.d.ts +16 -0
- package/dist/cli/wt/list.d.ts.map +1 -0
- package/dist/cli/wt/list.js +65 -0
- package/dist/cli/wt/list.js.map +1 -0
- package/dist/cli/wt/new.d.ts +18 -0
- package/dist/cli/wt/new.d.ts.map +1 -0
- package/dist/cli/wt/new.js +78 -0
- package/dist/cli/wt/new.js.map +1 -0
- package/dist/cli/wt/run-command.d.ts +31 -0
- package/dist/cli/wt/run-command.d.ts.map +1 -0
- package/dist/cli/wt/run-command.js +49 -0
- package/dist/cli/wt/run-command.js.map +1 -0
- package/dist/cli/wt/run-command.test.d.ts +5 -0
- package/dist/cli/wt/run-command.test.d.ts.map +1 -0
- package/dist/cli/wt/run-command.test.js +88 -0
- package/dist/cli/wt/run-command.test.js.map +1 -0
- package/dist/cli/wt/state.d.ts +13 -0
- package/dist/cli/wt/state.d.ts.map +1 -0
- package/dist/cli/wt/state.js +38 -0
- package/dist/cli/wt/state.js.map +1 -0
- package/dist/cli/wt/wt.test.d.ts +8 -0
- package/dist/cli/wt/wt.test.d.ts.map +1 -0
- package/dist/cli/wt/wt.test.js +378 -0
- package/dist/cli/wt/wt.test.js.map +1 -0
- package/dist/cli/wt.d.ts +25 -0
- package/dist/cli/wt.d.ts.map +1 -0
- package/dist/cli/wt.js +74 -0
- package/dist/cli/wt.js.map +1 -0
- package/dist/cli/wtconfig.js +4 -4
- package/dist/cli/wtconfig.js.map +1 -1
- package/dist/cli/wtlink.js +66 -9
- package/dist/cli/wtlink.js.map +1 -1
- package/dist/cli/wtlink.test.js +101 -0
- package/dist/cli/wtlink.test.js.map +1 -1
- package/dist/e2e/cli.e2e.test.js +97 -1
- package/dist/e2e/cli.e2e.test.js.map +1 -1
- package/dist/e2e/lswt/lswt.e2e.test.js +33 -0
- package/dist/e2e/lswt/lswt.e2e.test.js.map +1 -1
- package/dist/e2e/wtlink/wtlink.e2e.test.js +52 -0
- package/dist/e2e/wtlink/wtlink.e2e.test.js.map +1 -1
- package/dist/lib/json-output.d.ts +11 -1
- package/dist/lib/json-output.d.ts.map +1 -1
- package/dist/lib/json-output.js +42 -1
- package/dist/lib/json-output.js.map +1 -1
- package/dist/lib/json-output.test.js +2 -0
- package/dist/lib/json-output.test.js.map +1 -1
- package/dist/lib/lswt/formatters.d.ts +1 -0
- package/dist/lib/lswt/formatters.d.ts.map +1 -1
- package/dist/lib/lswt/formatters.js +6 -1
- package/dist/lib/lswt/formatters.js.map +1 -1
- package/dist/lib/lswt/formatters.test.js +2 -2
- package/dist/lib/lswt/formatters.test.js.map +1 -1
- package/dist/lib/lswt/fuzzy-search.d.ts +27 -0
- package/dist/lib/lswt/fuzzy-search.d.ts.map +1 -0
- package/dist/lib/lswt/fuzzy-search.js +130 -0
- package/dist/lib/lswt/fuzzy-search.js.map +1 -0
- package/dist/lib/lswt/fuzzy-search.test.d.ts +5 -0
- package/dist/lib/lswt/fuzzy-search.test.d.ts.map +1 -0
- package/dist/lib/lswt/fuzzy-search.test.js +207 -0
- package/dist/lib/lswt/fuzzy-search.test.js.map +1 -0
- package/dist/lib/lswt/index.d.ts +1 -0
- package/dist/lib/lswt/index.d.ts.map +1 -1
- package/dist/lib/lswt/index.js +2 -0
- package/dist/lib/lswt/index.js.map +1 -1
- package/dist/lib/lswt/interactive.d.ts +8 -0
- package/dist/lib/lswt/interactive.d.ts.map +1 -1
- package/dist/lib/lswt/interactive.js +169 -20
- package/dist/lib/lswt/interactive.js.map +1 -1
- package/dist/lib/newpr/action-deps.test.d.ts +5 -0
- package/dist/lib/newpr/action-deps.test.d.ts.map +1 -0
- package/dist/lib/newpr/action-deps.test.js +111 -0
- package/dist/lib/newpr/action-deps.test.js.map +1 -0
- package/dist/lib/newpr/args.d.ts.map +1 -1
- package/dist/lib/newpr/args.js +6 -2
- package/dist/lib/newpr/args.js.map +1 -1
- package/dist/lib/newpr/args.test.js +209 -1
- package/dist/lib/newpr/args.test.js.map +1 -1
- package/dist/lib/prompts.d.ts +4 -0
- package/dist/lib/prompts.d.ts.map +1 -1
- package/dist/lib/prompts.js +178 -1
- package/dist/lib/prompts.js.map +1 -1
- package/dist/lib/prompts.test.js +279 -0
- package/dist/lib/prompts.test.js.map +1 -1
- package/dist/lib/wtlink/link-configs.test.js +282 -2
- package/dist/lib/wtlink/link-configs.test.js.map +1 -1
- package/dist/lib/wtlink/main-menu.js +1 -0
- package/dist/lib/wtlink/main-menu.js.map +1 -1
- package/dist/lib/wtlink/main-menu.test.d.ts +5 -0
- package/dist/lib/wtlink/main-menu.test.d.ts.map +1 -0
- package/dist/lib/wtlink/main-menu.test.js +124 -0
- package/dist/lib/wtlink/main-menu.test.js.map +1 -0
- package/dist/lib/wtlink/manage-manifest.d.ts +5 -0
- package/dist/lib/wtlink/manage-manifest.d.ts.map +1 -1
- package/dist/lib/wtlink/manage-manifest.js +65 -2
- package/dist/lib/wtlink/manage-manifest.js.map +1 -1
- package/dist/lib/wtlink/manage-manifest.test.js +144 -2
- package/dist/lib/wtlink/manage-manifest.test.js.map +1 -1
- package/package.json +2 -1
package/dist/cli/newpr.js
CHANGED
|
@@ -13,7 +13,7 @@ import { promptChoiceIndex } from '../lib/prompts.js';
|
|
|
13
13
|
import { loadConfig, generateBranchName, generateWorktreePath, } from '../lib/config.js';
|
|
14
14
|
import { analyzeGitState, detectScenario } from '../lib/state-detection.js';
|
|
15
15
|
import { parseArgs, getHelpText, getScenarioContext, isPrWorktreeScenario, isExistingBranchAction, executeStateAction, getBranchPoint, getScenarioMessageLevel, createHookRunner, createActionDeps, } from '../lib/newpr/index.js';
|
|
16
|
-
import { createSuccessResult, createErrorResult, formatJsonResult, ErrorCode, } from '../lib/json-output.js';
|
|
16
|
+
import { createSuccessResult, createErrorResult, formatJsonResult, ErrorCode, getErrorCodeFromError, getErrorSuggestion, } from '../lib/json-output.js';
|
|
17
17
|
/**
|
|
18
18
|
* Debug logging - enabled with DEBUG=newpr or DEBUG=*
|
|
19
19
|
*/
|
|
@@ -40,6 +40,22 @@ function debug(message, data) {
|
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
|
+
/**
|
|
44
|
+
* Progress logging - suppressed in JSON mode for clean output
|
|
45
|
+
*/
|
|
46
|
+
function progress(options, ...args) {
|
|
47
|
+
if (!options.json) {
|
|
48
|
+
console.log(...args);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Progress error logging - suppressed in JSON mode
|
|
53
|
+
*/
|
|
54
|
+
function progressError(options, ...args) {
|
|
55
|
+
if (!options.json) {
|
|
56
|
+
console.error(...args);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
43
59
|
/**
|
|
44
60
|
* Check prerequisites
|
|
45
61
|
*/
|
|
@@ -215,12 +231,12 @@ async function handleScenario(state, baseBranch, options) {
|
|
|
215
231
|
/**
|
|
216
232
|
* Setup worktree (symlinks, wtlink, deps)
|
|
217
233
|
*/
|
|
218
|
-
async function setupWorktree(worktreePath, config,
|
|
234
|
+
async function setupWorktree(worktreePath, config, options) {
|
|
219
235
|
const repoRoot = git.getRepoRoot();
|
|
220
236
|
const parentDir = path.dirname(repoRoot);
|
|
221
237
|
// Create symlinks for shared repos
|
|
222
238
|
if (config.sharedRepos.length > 0) {
|
|
223
|
-
|
|
239
|
+
progress(options, colors.info('Creating symlinks for shared repositories...'));
|
|
224
240
|
for (const repo of config.sharedRepos) {
|
|
225
241
|
const target = path.join(parentDir, repo);
|
|
226
242
|
const link = path.join(worktreePath, repo);
|
|
@@ -228,18 +244,18 @@ async function setupWorktree(worktreePath, config, _options) {
|
|
|
228
244
|
if (!fs.existsSync(link)) {
|
|
229
245
|
try {
|
|
230
246
|
fs.symlinkSync(target, link, 'dir');
|
|
231
|
-
|
|
247
|
+
progress(options, colors.success(`Linked ${repo}`));
|
|
232
248
|
}
|
|
233
249
|
catch (error) {
|
|
234
|
-
|
|
250
|
+
progress(options, colors.warning(`Failed to link ${repo}: ${error}`));
|
|
235
251
|
}
|
|
236
252
|
}
|
|
237
253
|
else {
|
|
238
|
-
|
|
254
|
+
progress(options, colors.warning(`${repo} already exists in worktree`));
|
|
239
255
|
}
|
|
240
256
|
}
|
|
241
257
|
else {
|
|
242
|
-
|
|
258
|
+
progress(options, colors.warning(`${repo} not found at ${target}`));
|
|
243
259
|
}
|
|
244
260
|
}
|
|
245
261
|
}
|
|
@@ -270,35 +286,35 @@ function printSummary(prNumber, branchName, worktreePath, prUrl, options, extra)
|
|
|
270
286
|
console.log(` Worktree: ${worktreePath}`);
|
|
271
287
|
console.log(` PR URL: ${prUrl}`);
|
|
272
288
|
console.log();
|
|
273
|
-
console.log(' Next steps:');
|
|
274
|
-
console.log(` cd ${worktreePath}`);
|
|
289
|
+
console.log(colors.dim(' Next steps:'));
|
|
290
|
+
console.log(colors.dim(` cd ${worktreePath}`));
|
|
291
|
+
console.log(colors.dim(` gh pr view ${prNumber} --web # Open PR in browser`));
|
|
292
|
+
console.log(colors.dim(` wtlink link # Link config files from main worktree`));
|
|
275
293
|
console.log();
|
|
276
294
|
}
|
|
277
295
|
/**
|
|
278
296
|
* Mode: Setup worktree for existing PR
|
|
279
297
|
*/
|
|
280
298
|
async function modeExistingPr(prNumber, options) {
|
|
281
|
-
|
|
299
|
+
progress(options, colors.info(`Setting up worktree for existing PR #${prNumber}...`));
|
|
282
300
|
const repoRoot = git.getRepoRoot();
|
|
283
301
|
const repoName = git.getRepoName(repoRoot);
|
|
284
302
|
const config = loadConfig(repoRoot);
|
|
285
303
|
const pr = github.getPr(prNumber);
|
|
286
304
|
if (!pr) {
|
|
287
|
-
|
|
288
|
-
process.exit(1);
|
|
305
|
+
exitWithError(`Could not find PR #${prNumber}`, ErrorCode.PR_NOT_FOUND, options.json);
|
|
289
306
|
}
|
|
290
307
|
if (pr.state !== 'OPEN') {
|
|
291
|
-
|
|
308
|
+
progress(options, colors.warning(`PR #${prNumber} is ${pr.state}`));
|
|
292
309
|
}
|
|
293
|
-
|
|
310
|
+
progress(options, colors.info(`PR branch: ${pr.headBranch}`));
|
|
294
311
|
const worktreePath = generateWorktreePath(config, repoRoot, repoName, prNumber);
|
|
295
312
|
if (fs.existsSync(worktreePath)) {
|
|
296
|
-
|
|
297
|
-
process.exit(1);
|
|
313
|
+
exitWithError(`Worktree already exists: ${worktreePath}`, ErrorCode.WORKTREE_EXISTS, options.json);
|
|
298
314
|
}
|
|
299
|
-
|
|
315
|
+
progress(options, colors.info('Fetching branch from origin...'));
|
|
300
316
|
git.fetch('origin');
|
|
301
|
-
|
|
317
|
+
progress(options, colors.info(`Creating worktree at ${worktreePath}...`));
|
|
302
318
|
try {
|
|
303
319
|
git.addWorktree(worktreePath, pr.headBranch, {
|
|
304
320
|
createBranch: true,
|
|
@@ -308,9 +324,7 @@ async function modeExistingPr(prNumber, options) {
|
|
|
308
324
|
catch {
|
|
309
325
|
git.addWorktree(worktreePath, pr.headBranch);
|
|
310
326
|
}
|
|
311
|
-
|
|
312
|
-
console.log(colors.success(`Created worktree: ${worktreePath}`));
|
|
313
|
-
}
|
|
327
|
+
progress(options, colors.success(`Created worktree: ${worktreePath}`));
|
|
314
328
|
await setupWorktree(worktreePath, config, options);
|
|
315
329
|
printSummary(prNumber, pr.headBranch, worktreePath, pr.url, options, { draft: pr.isDraft });
|
|
316
330
|
}
|
|
@@ -318,29 +332,28 @@ async function modeExistingPr(prNumber, options) {
|
|
|
318
332
|
* Mode: Create PR for existing branch
|
|
319
333
|
*/
|
|
320
334
|
async function modeExistingBranch(branchName, options) {
|
|
321
|
-
|
|
335
|
+
progress(options, colors.info(`Creating PR for existing branch: ${branchName}...`));
|
|
322
336
|
const repoRoot = git.getRepoRoot();
|
|
323
337
|
const repoName = git.getRepoName(repoRoot);
|
|
324
338
|
const config = loadConfig(repoRoot);
|
|
325
|
-
|
|
339
|
+
progress(options, colors.info('Fetching latest from origin...'));
|
|
326
340
|
git.fetch('origin');
|
|
327
341
|
if (!git.remoteBranchExists(branchName)) {
|
|
328
342
|
if (git.branchExists(branchName)) {
|
|
329
|
-
|
|
343
|
+
progress(options, colors.info('Branch exists locally, pushing to origin...'));
|
|
330
344
|
git.push({ setUpstream: true, remote: 'origin', branch: branchName });
|
|
331
345
|
}
|
|
332
346
|
else {
|
|
333
|
-
|
|
334
|
-
process.exit(1);
|
|
347
|
+
exitWithError(`Branch '${branchName}' does not exist locally or on remote`, ErrorCode.BRANCH_NOT_FOUND, options.json);
|
|
335
348
|
}
|
|
336
349
|
}
|
|
337
350
|
const existingPr = github.getPrByBranch(branchName);
|
|
338
351
|
if (existingPr) {
|
|
339
|
-
|
|
352
|
+
progress(options, colors.info(`PR #${existingPr.number} already exists for branch ${branchName}`));
|
|
340
353
|
await modeExistingPr(existingPr.number, options);
|
|
341
354
|
return;
|
|
342
355
|
}
|
|
343
|
-
|
|
356
|
+
progress(options, colors.info('Creating pull request...'));
|
|
344
357
|
const title = branchName
|
|
345
358
|
.replace(/^(feat|fix|chore)\//, '')
|
|
346
359
|
.replace(/-/g, ' ')
|
|
@@ -365,9 +378,9 @@ PR created from existing branch: \`${branchName}\`
|
|
|
365
378
|
head: branchName,
|
|
366
379
|
draft: options.draft,
|
|
367
380
|
});
|
|
368
|
-
|
|
381
|
+
progress(options, colors.success(`Created PR #${pr.number}: ${pr.url}`));
|
|
369
382
|
const worktreePath = generateWorktreePath(config, repoRoot, repoName, pr.number);
|
|
370
|
-
|
|
383
|
+
progress(options, colors.info(`Creating worktree at ${worktreePath}...`));
|
|
371
384
|
try {
|
|
372
385
|
git.addWorktree(worktreePath, branchName, {
|
|
373
386
|
createBranch: true,
|
|
@@ -377,9 +390,7 @@ PR created from existing branch: \`${branchName}\`
|
|
|
377
390
|
catch {
|
|
378
391
|
git.addWorktree(worktreePath, branchName);
|
|
379
392
|
}
|
|
380
|
-
|
|
381
|
-
console.log(colors.success(`Created worktree: ${worktreePath}`));
|
|
382
|
-
}
|
|
393
|
+
progress(options, colors.success(`Created worktree: ${worktreePath}`));
|
|
383
394
|
await setupWorktree(worktreePath, config, options);
|
|
384
395
|
printSummary(pr.number, branchName, worktreePath, pr.url, options);
|
|
385
396
|
}
|
|
@@ -406,12 +417,12 @@ async function modeNewFeature(description, options) {
|
|
|
406
417
|
if (!(await hookRunner.runHook('pre-analyze'))) {
|
|
407
418
|
exitWithError('Aborted by pre-analyze hook.', ErrorCode.HOOK_FAILED, options.json);
|
|
408
419
|
}
|
|
409
|
-
|
|
420
|
+
progress(options, colors.info('Fetching latest from origin...'));
|
|
410
421
|
try {
|
|
411
422
|
git.fetch('origin');
|
|
412
423
|
}
|
|
413
424
|
catch {
|
|
414
|
-
|
|
425
|
+
progress(options, colors.warning('Could not fetch from origin (network unavailable?)'));
|
|
415
426
|
}
|
|
416
427
|
const state = analyzeGitState(options.baseBranch);
|
|
417
428
|
const scenario = detectScenario(state);
|
|
@@ -458,28 +469,27 @@ async function modeNewFeature(description, options) {
|
|
|
458
469
|
if (isExistingBranchAction(action)) {
|
|
459
470
|
const currentBranch = state.currentBranch;
|
|
460
471
|
if (!currentBranch) {
|
|
461
|
-
|
|
462
|
-
process.exit(1);
|
|
472
|
+
exitWithError('Cannot determine current branch', ErrorCode.DETACHED_HEAD, options.json);
|
|
463
473
|
}
|
|
464
474
|
const deps = createActionDeps(repoRoot);
|
|
465
475
|
executeStateAction(action, description, currentBranch, deps, repoRoot);
|
|
466
476
|
if (!git.remoteBranchExists(currentBranch)) {
|
|
467
|
-
|
|
477
|
+
progress(options, colors.info('Pushing branch to origin...'));
|
|
468
478
|
git.push({ setUpstream: true, remote: 'origin', branch: currentBranch });
|
|
469
479
|
}
|
|
470
480
|
await modeExistingBranch(currentBranch, options);
|
|
471
481
|
return;
|
|
472
482
|
}
|
|
473
|
-
|
|
483
|
+
progress(options, colors.info(`Creating feature branch: ${branchName}`));
|
|
474
484
|
if (git.remoteBranchExists(branchName)) {
|
|
475
|
-
|
|
485
|
+
progress(options, colors.warning(`Branch ${branchName} already exists on remote`));
|
|
476
486
|
const existingPr = github.getPrByBranch(branchName);
|
|
477
487
|
if (existingPr) {
|
|
478
|
-
|
|
488
|
+
progress(options, colors.info(`PR #${existingPr.number} already exists, setting up worktree...`));
|
|
479
489
|
await modeExistingPr(existingPr.number, options);
|
|
480
490
|
}
|
|
481
491
|
else {
|
|
482
|
-
|
|
492
|
+
progress(options, colors.info('No PR exists, creating one...'));
|
|
483
493
|
await modeExistingBranch(branchName, options);
|
|
484
494
|
}
|
|
485
495
|
return;
|
|
@@ -500,13 +510,12 @@ async function modeNewFeature(description, options) {
|
|
|
500
510
|
unstagedFilesAfter: git.getUnstagedFiles(),
|
|
501
511
|
});
|
|
502
512
|
if (!actionResult.success) {
|
|
503
|
-
|
|
504
|
-
process.exit(1);
|
|
513
|
+
exitWithError(`Action failed: ${actionResult.message}`, ErrorCode.OPERATION_FAILED, options.json);
|
|
505
514
|
}
|
|
506
515
|
// Stash unstaged changes if needed
|
|
507
516
|
let unstagedStashRef = null;
|
|
508
517
|
if (action.stashUnstaged) {
|
|
509
|
-
|
|
518
|
+
progress(options, colors.info('Stashing unstaged changes (will move to worktree)...'));
|
|
510
519
|
unstagedStashRef = git.stash({
|
|
511
520
|
keepIndex: true,
|
|
512
521
|
message: 'newpr: unstaged changes for worktree',
|
|
@@ -518,7 +527,7 @@ async function modeNewFeature(description, options) {
|
|
|
518
527
|
if (!(await hookRunner.runHook('pre-branch'))) {
|
|
519
528
|
exitWithError('Aborted by pre-branch hook.', ErrorCode.HOOK_FAILED, options.json);
|
|
520
529
|
}
|
|
521
|
-
|
|
530
|
+
progress(options, colors.info(`Creating branch from ${branchFrom}...`));
|
|
522
531
|
debug('Before checkout', {
|
|
523
532
|
branchFrom,
|
|
524
533
|
branchName,
|
|
@@ -533,11 +542,11 @@ async function modeNewFeature(description, options) {
|
|
|
533
542
|
// the staged files in the index - no data is lost. Provide a helpful message.
|
|
534
543
|
const errorMessage = checkoutError instanceof Error ? checkoutError.message : String(checkoutError);
|
|
535
544
|
if (errorMessage.includes('overwritten') || errorMessage.includes('conflict')) {
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
545
|
+
progressError(options, colors.error('Checkout failed due to conflicting changes.'));
|
|
546
|
+
progressError(options, colors.info('Your staged changes are preserved. To resolve this, either:'));
|
|
547
|
+
progressError(options, colors.info(' 1. Commit your changes first, then run newpr again'));
|
|
548
|
+
progressError(options, colors.info(' 2. Stash your changes: git stash push'));
|
|
549
|
+
progressError(options, colors.info(' 3. Use a different branch point (e.g., HEAD instead of origin/main)'));
|
|
541
550
|
}
|
|
542
551
|
throw checkoutError;
|
|
543
552
|
}
|
|
@@ -556,7 +565,7 @@ async function modeNewFeature(description, options) {
|
|
|
556
565
|
if (!(await hookRunner.runHook('pre-commit'))) {
|
|
557
566
|
exitWithError('Aborted by pre-commit hook.', ErrorCode.HOOK_FAILED, options.json);
|
|
558
567
|
}
|
|
559
|
-
|
|
568
|
+
progress(options, colors.info('Committing staged changes...'));
|
|
560
569
|
git.commit({ message: `feat: ${description}\n\n🤖 Created with newpr` });
|
|
561
570
|
debug('Committed staged changes');
|
|
562
571
|
// Run post-commit hook
|
|
@@ -567,7 +576,7 @@ async function modeNewFeature(description, options) {
|
|
|
567
576
|
if (!(await hookRunner.runHook('pre-commit'))) {
|
|
568
577
|
exitWithError('Aborted by pre-commit hook.', ErrorCode.HOOK_FAILED, options.json);
|
|
569
578
|
}
|
|
570
|
-
|
|
579
|
+
progress(options, colors.info('Creating initial commit (required for PR creation)...'));
|
|
571
580
|
git.commit({
|
|
572
581
|
message: `chore: initialize ${branchName}\n\nBranch created for: ${description}\n\n🤖 Created with newpr`,
|
|
573
582
|
allowEmpty: true,
|
|
@@ -580,7 +589,7 @@ async function modeNewFeature(description, options) {
|
|
|
580
589
|
if (!(await hookRunner.runHook('pre-push'))) {
|
|
581
590
|
exitWithError('Aborted by pre-push hook.', ErrorCode.HOOK_FAILED, options.json);
|
|
582
591
|
}
|
|
583
|
-
|
|
592
|
+
progress(options, colors.info('Pushing branch to origin...'));
|
|
584
593
|
git.push({ setUpstream: true, remote: 'origin', branch: branchName });
|
|
585
594
|
// Run post-push hook
|
|
586
595
|
await hookRunner.runHook('post-push');
|
|
@@ -589,7 +598,7 @@ async function modeNewFeature(description, options) {
|
|
|
589
598
|
if (!(await hookRunner.runHook('pre-pr'))) {
|
|
590
599
|
exitWithError('Aborted by pre-pr hook.', ErrorCode.HOOK_FAILED, options.json);
|
|
591
600
|
}
|
|
592
|
-
|
|
601
|
+
progress(options, colors.info('Creating pull request...'));
|
|
593
602
|
const pr = github.createPr({
|
|
594
603
|
title: description,
|
|
595
604
|
body: `## Summary
|
|
@@ -610,7 +619,7 @@ ${description}
|
|
|
610
619
|
head: branchName,
|
|
611
620
|
draft: options.draft,
|
|
612
621
|
});
|
|
613
|
-
|
|
622
|
+
progress(options, colors.success(`Created PR #${pr.number}: ${pr.url}`));
|
|
614
623
|
// Update context with PR info
|
|
615
624
|
hookRunner.updateContext({
|
|
616
625
|
prNumber: pr.number,
|
|
@@ -625,19 +634,19 @@ ${description}
|
|
|
625
634
|
if (!(await hookRunner.runHook('pre-worktree'))) {
|
|
626
635
|
exitWithError('Aborted by pre-worktree hook.', ErrorCode.HOOK_FAILED, options.json);
|
|
627
636
|
}
|
|
628
|
-
|
|
637
|
+
progress(options, colors.info(`Creating worktree at ${worktreePath}...`));
|
|
629
638
|
git.addWorktree(worktreePath, branchName);
|
|
630
|
-
|
|
639
|
+
progress(options, colors.success(`Created worktree: ${worktreePath}`));
|
|
631
640
|
if (unstagedStashRef) {
|
|
632
|
-
|
|
641
|
+
progress(options, colors.info('Moving unstaged changes to worktree...'));
|
|
633
642
|
try {
|
|
634
643
|
git.stashApply(unstagedStashRef, worktreePath);
|
|
635
|
-
|
|
644
|
+
progress(options, colors.success('Unstaged changes applied to worktree'));
|
|
636
645
|
git.stashDrop(unstagedStashRef);
|
|
637
646
|
}
|
|
638
647
|
catch {
|
|
639
|
-
|
|
640
|
-
|
|
648
|
+
progress(options, colors.warning('Failed to apply unstaged changes to worktree.'));
|
|
649
|
+
progress(options, colors.warning("Run 'git stash pop' in main worktree to recover them."));
|
|
641
650
|
}
|
|
642
651
|
}
|
|
643
652
|
await setupWorktree(worktreePath, config, options);
|
|
@@ -652,12 +661,12 @@ ${description}
|
|
|
652
661
|
// Run cleanup hook
|
|
653
662
|
await hookRunner.runCleanup(error instanceof Error ? error : undefined);
|
|
654
663
|
if (actionResult.stashRef) {
|
|
655
|
-
|
|
664
|
+
progress(options, colors.info('Restoring stashed changes...'));
|
|
656
665
|
try {
|
|
657
666
|
git.stashPop(actionResult.stashRef);
|
|
658
667
|
}
|
|
659
668
|
catch {
|
|
660
|
-
|
|
669
|
+
progress(options, colors.warning("Failed to restore stash. Run 'git stash pop' manually."));
|
|
661
670
|
}
|
|
662
671
|
}
|
|
663
672
|
throw error;
|
|
@@ -728,6 +737,19 @@ main().catch((error) => {
|
|
|
728
737
|
exitWithError(error.message, error.code, useJson);
|
|
729
738
|
}
|
|
730
739
|
const message = error instanceof Error ? error.message : String(error);
|
|
731
|
-
|
|
740
|
+
const code = getErrorCodeFromError(error);
|
|
741
|
+
const suggestion = getErrorSuggestion(code);
|
|
742
|
+
if (useJson) {
|
|
743
|
+
exitWithError(message, code, useJson);
|
|
744
|
+
}
|
|
745
|
+
else {
|
|
746
|
+
// Show friendly error with suggestion for non-JSON mode
|
|
747
|
+
console.error(colors.error(`Error: ${message}`));
|
|
748
|
+
if (suggestion) {
|
|
749
|
+
console.error('');
|
|
750
|
+
console.error(colors.dim(suggestion));
|
|
751
|
+
}
|
|
752
|
+
process.exit(1);
|
|
753
|
+
}
|
|
732
754
|
});
|
|
733
755
|
//# sourceMappingURL=newpr.js.map
|
package/dist/cli/newpr.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"newpr.js","sourceRoot":"","sources":["../../src/cli/newpr.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"newpr.js","sourceRoot":"","sources":["../../src/cli/newpr.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/newpr.test.js
CHANGED
|
@@ -705,7 +705,8 @@ describe('cli/newpr', () => {
|
|
|
705
705
|
vi.mocked(loadConfig).mockReturnValue(defaultConfig);
|
|
706
706
|
vi.mocked(github.getPr).mockReturnValue(null);
|
|
707
707
|
await runCli(['--pr', '999', '--json']);
|
|
708
|
-
|
|
708
|
+
// JSON mode outputs to console.log, not console.error
|
|
709
|
+
expect(mockConsoleLog).toHaveBeenCalledWith(expect.stringContaining('Could not find PR'));
|
|
709
710
|
expect(mockProcessExit).toHaveBeenCalledWith(1);
|
|
710
711
|
});
|
|
711
712
|
});
|