@radkode/neo 1.8.3 → 1.9.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/dist/commands/git/commit/index.d.ts.map +1 -1
- package/dist/commands/git/commit/index.js +9 -2
- package/dist/commands/git/commit/index.js.map +1 -1
- package/dist/commands/git/pull/index.d.ts.map +1 -1
- package/dist/commands/git/pull/index.js +11 -2
- package/dist/commands/git/pull/index.js.map +1 -1
- package/dist/types/schemas.d.ts +1 -0
- package/dist/types/schemas.d.ts.map +1 -1
- package/dist/types/schemas.js +1 -0
- package/dist/types/schemas.js.map +1 -1
- package/dist/utils/git-errors.d.ts +3 -0
- package/dist/utils/git-errors.d.ts.map +1 -1
- package/dist/utils/git-errors.js +57 -16
- package/dist/utils/git-errors.js.map +1 -1
- package/package.json +1 -1
- package/templates/skills/neo/SKILL.md +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/git/commit/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAMtD,OAAO,KAAK,EAAE,gBAAgB,EAAc,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAA+B,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/git/commit/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAMtD,OAAO,KAAK,EAAE,gBAAgB,EAAc,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,KAAK,MAAM,EAA+B,MAAM,wBAAwB,CAAC;AAuLlF,wBAAsB,aAAa,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAkSpF;AAKD,wBAAgB,mBAAmB,IAAI,OAAO,CA8C7C"}
|
|
@@ -41,6 +41,12 @@ function formatCommitMessage(type, scope, message, body, breaking) {
|
|
|
41
41
|
}
|
|
42
42
|
return commitMsg;
|
|
43
43
|
}
|
|
44
|
+
function buildCommitArgs(message, options) {
|
|
45
|
+
const args = ['commit', '-m', message];
|
|
46
|
+
if (options.verify === false)
|
|
47
|
+
args.push('--no-verify');
|
|
48
|
+
return args;
|
|
49
|
+
}
|
|
44
50
|
async function hasStagedChanges() {
|
|
45
51
|
try {
|
|
46
52
|
const { stdout } = await execa('git', ['diff', '--cached', '--name-only']);
|
|
@@ -196,7 +202,7 @@ export async function executeCommit(options) {
|
|
|
196
202
|
const spinner = ui.spinner('Creating commit');
|
|
197
203
|
spinner.start();
|
|
198
204
|
try {
|
|
199
|
-
await execa('git',
|
|
205
|
+
await execa('git', buildCommitArgs(formattedMessage, options));
|
|
200
206
|
spinner.succeed('Commit created successfully!');
|
|
201
207
|
const { stdout: commitHash } = await execa('git', ['rev-parse', '--short', 'HEAD']);
|
|
202
208
|
ui.info(`Commit: ${commitHash.trim()}`);
|
|
@@ -307,7 +313,7 @@ export async function executeCommit(options) {
|
|
|
307
313
|
const spinner = ui.spinner('Creating commit');
|
|
308
314
|
spinner.start();
|
|
309
315
|
try {
|
|
310
|
-
await execa('git',
|
|
316
|
+
await execa('git', buildCommitArgs(formattedMessage, options));
|
|
311
317
|
spinner.succeed('Commit created successfully!');
|
|
312
318
|
const { stdout: commitHash } = await execa('git', ['rev-parse', '--short', 'HEAD']);
|
|
313
319
|
emitJson({
|
|
@@ -348,6 +354,7 @@ export function createCommitCommand() {
|
|
|
348
354
|
.option('--breaking', 'mark as breaking change')
|
|
349
355
|
.option('-a, --all', 'automatically stage all modified files')
|
|
350
356
|
.option('--ai', 'generate commit message using AI')
|
|
357
|
+
.option('-n, --no-verify', 'skip the pre-commit and commit-msg hooks')
|
|
351
358
|
.addHelpText('after', `
|
|
352
359
|
Examples:
|
|
353
360
|
Interactive wizard:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/git/commit/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/git/commit/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/git/pull/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAWtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAA+B,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/git/pull/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAWtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAA+B,MAAM,wBAAwB,CAAC;AAqClF,MAAM,MAAM,WAAW,GAAG;IAAE,SAAS,EAAE,KAAK,CAAA;CAAE,GAAG;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAMrF,wBAAsB,WAAW,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CA4HvF;AAkRD,wBAAgB,iBAAiB,IAAI,OAAO,CA0C3C"}
|
|
@@ -10,7 +10,7 @@ import { ui } from '../../../utils/ui.js';
|
|
|
10
10
|
import { validate } from '../../../utils/validation.js';
|
|
11
11
|
import { gitPullOptionsSchema, deletedBranchActionSchema } from '../../../types/schemas.js';
|
|
12
12
|
import { success, failure, isFailure } from '../../../core/errors/index.js';
|
|
13
|
-
import { GitErrors, isNotGitRepository, isAuthenticationError, isNetworkError, isConflictError, isNonFastForwardError, } from '../../../utils/git-errors.js';
|
|
13
|
+
import { GitErrors, isNotGitRepository, isAuthenticationError, isNetworkError, isConflictError, isUncommittedChangesError, isNonFastForwardError, } from '../../../utils/git-errors.js';
|
|
14
14
|
function isRemoteBranchDeletedError(error) {
|
|
15
15
|
const errorMessage = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
|
|
16
16
|
return (errorMessage.includes('no such ref was fetched') ||
|
|
@@ -97,8 +97,11 @@ export async function executePull(options) {
|
|
|
97
97
|
if (isRemoteBranchDeletedError(error)) {
|
|
98
98
|
return handleDeletedRemoteBranch(branchName);
|
|
99
99
|
}
|
|
100
|
+
if (isUncommittedChangesError(error)) {
|
|
101
|
+
return failure(GitErrors.uncommittedChanges('pull'));
|
|
102
|
+
}
|
|
100
103
|
if (isConflictError(error)) {
|
|
101
|
-
return failure(GitErrors.mergeConflict('pull'));
|
|
104
|
+
return failure(options.rebase ? GitErrors.rebaseConflict('pull') : GitErrors.mergeConflict('pull'));
|
|
102
105
|
}
|
|
103
106
|
if (isAuthenticationError(error)) {
|
|
104
107
|
return failure(GitErrors.authenticationFailed('pull'));
|
|
@@ -141,6 +144,9 @@ async function handleDivergedPull(branchName, options) {
|
|
|
141
144
|
}
|
|
142
145
|
catch (error) {
|
|
143
146
|
rebaseSpinner.stop();
|
|
147
|
+
if (isUncommittedChangesError(error)) {
|
|
148
|
+
return failure(GitErrors.uncommittedChanges('pull'));
|
|
149
|
+
}
|
|
144
150
|
if (isConflictError(error)) {
|
|
145
151
|
return failure(GitErrors.rebaseConflict('pull'));
|
|
146
152
|
}
|
|
@@ -173,6 +179,9 @@ async function handleDivergedPull(branchName, options) {
|
|
|
173
179
|
catch (error) {
|
|
174
180
|
fetchSpinner.stop();
|
|
175
181
|
mergeSpinner.stop();
|
|
182
|
+
if (isUncommittedChangesError(error)) {
|
|
183
|
+
return failure(GitErrors.uncommittedChanges('pull'));
|
|
184
|
+
}
|
|
176
185
|
if (isConflictError(error)) {
|
|
177
186
|
return failure(GitErrors.mergeConflict('pull'));
|
|
178
187
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/git/pull/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/git/pull/index.ts"],"names":[],"mappings":"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"}
|
package/dist/types/schemas.d.ts
CHANGED
|
@@ -80,6 +80,7 @@ export declare const gitCommitOptionsSchema: z.ZodObject<{
|
|
|
80
80
|
breaking: z.ZodOptional<z.ZodBoolean>;
|
|
81
81
|
all: z.ZodOptional<z.ZodBoolean>;
|
|
82
82
|
ai: z.ZodOptional<z.ZodBoolean>;
|
|
83
|
+
verify: z.ZodOptional<z.ZodBoolean>;
|
|
83
84
|
}, z.core.$strip>;
|
|
84
85
|
export declare const deletedBranchActionSchema: z.ZodEnum<{
|
|
85
86
|
switch_main_delete: "switch_main_delete";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/types/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,eAAO,MAAM,iBAAiB;;;;;iBAK5B,CAAC;AAKH,eAAO,MAAM,iBAAiB;;;;;;;;iBAI5B,CAAC;AAKH,eAAO,MAAM,oBAAoB;;;;;;;;;iBAK/B,CAAC;AAKH,eAAO,MAAM,oBAAoB;;;;;;;iBAG/B,CAAC;AAKH,eAAO,MAAM,sBAAsB;;;;;;;iBAGjC,CAAC;AAKH,eAAO,MAAM,YAAY,yGAYf,CAAC;AAEX,eAAO,MAAM,gBAAgB;;;;;;;;;;;;EAE3B,CAAC;AAMH,eAAO,MAAM,iBAAiB,4BAIjB,CAAC;AAMd,eAAO,MAAM,mBAAmB,aAG2B,CAAC;AAK5D,eAAO,MAAM,sBAAsB
|
|
1
|
+
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/types/schemas.ts"],"names":[],"mappings":"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"}
|
package/dist/types/schemas.js
CHANGED
|
@@ -57,6 +57,7 @@ export const gitCommitOptionsSchema = baseOptionsSchema.extend({
|
|
|
57
57
|
breaking: z.boolean().optional(),
|
|
58
58
|
all: z.boolean().optional(),
|
|
59
59
|
ai: z.boolean().optional(),
|
|
60
|
+
verify: z.boolean().optional(),
|
|
60
61
|
});
|
|
61
62
|
export const deletedBranchActionSchema = z.enum(['switch_main_delete', 'switch_main_keep', 'set_upstream', 'cancel'], {
|
|
62
63
|
message: 'Must be one of: switch_main_delete, switch_main_keep, set_upstream, cancel',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../src/types/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC/B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC7B,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAC;AAKH,MAAM,CAAC,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,MAAM,CAAC;IACxD,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC7B,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACnC,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAC9B,CAAC,CAAC;AAKH,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,MAAM,CAAC;IAC3D,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC9B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;CAC7C,CAAC,CAAC;AAKH,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,MAAM,CAAC;IAC3D,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC9B,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAKH,MAAM,CAAC,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,MAAM,CAAC;IAC7D,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC9B,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAC9B,CAAC,CAAC;AAKH,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM;IACN,KAAK;IACL,MAAM;IACN,OAAO;IACP,UAAU;IACV,MAAM;IACN,MAAM;IACN,OAAO;IACP,IAAI;IACJ,OAAO;IACP,QAAQ;CACA,CAAC;AAEX,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE;IACnD,OAAO,EAAE,wBAAwB,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;CAC3D,CAAC,CAAC;AAMH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC;KAC/B,MAAM,EAAE;KACR,GAAG,CAAC,CAAC,EAAE,uBAAuB,CAAC;KAC/B,KAAK,CAAC,mBAAmB,EAAE,uDAAuD,CAAC;KACnF,QAAQ,EAAE,CAAC;AAMd,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC;KACjC,MAAM,EAAE;KACR,GAAG,CAAC,CAAC,EAAE,gCAAgC,CAAC;KACxC,GAAG,CAAC,GAAG,EAAE,8CAA8C,CAAC,CAAC;AAK5D,MAAM,CAAC,MAAM,sBAAsB,GAAG,iBAAiB,CAAC,MAAM,CAAC;IAC7D,IAAI,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IACjC,KAAK,EAAE,iBAAiB;IACxB,OAAO,EAAE,mBAAmB,CAAC,QAAQ,EAAE;IACvC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAChC,GAAG,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC3B,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../src/types/schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export declare enum GitErrorCode {
|
|
|
6
6
|
NETWORK_ERROR = "GIT_NETWORK_ERROR",
|
|
7
7
|
MERGE_CONFLICT = "GIT_MERGE_CONFLICT",
|
|
8
8
|
REBASE_CONFLICT = "GIT_REBASE_CONFLICT",
|
|
9
|
+
UNCOMMITTED_CHANGES = "GIT_UNCOMMITTED_CHANGES",
|
|
9
10
|
NON_FAST_FORWARD = "GIT_NON_FAST_FORWARD",
|
|
10
11
|
NOTHING_TO_COMMIT = "GIT_NOTHING_TO_COMMIT",
|
|
11
12
|
NO_STAGED_CHANGES = "GIT_NO_STAGED_CHANGES",
|
|
@@ -43,6 +44,7 @@ export declare function isAuthenticationError(error: unknown): boolean;
|
|
|
43
44
|
export declare function isNoUpstreamError(error: unknown): boolean;
|
|
44
45
|
export declare function isNetworkError(error: unknown): boolean;
|
|
45
46
|
export declare function isConflictError(error: unknown): boolean;
|
|
47
|
+
export declare function isUncommittedChangesError(error: unknown): boolean;
|
|
46
48
|
export declare function isNonFastForwardError(error: unknown): boolean;
|
|
47
49
|
export declare function isStashNotFoundError(error: unknown): boolean;
|
|
48
50
|
export declare function isStashApplyConflictError(error: unknown): boolean;
|
|
@@ -54,6 +56,7 @@ export declare const GitErrors: {
|
|
|
54
56
|
networkError(commandName: string): GitError;
|
|
55
57
|
mergeConflict(commandName: string): GitError;
|
|
56
58
|
rebaseConflict(commandName: string): GitError;
|
|
59
|
+
uncommittedChanges(commandName: string): GitError;
|
|
57
60
|
nonFastForward(commandName: string): GitError;
|
|
58
61
|
nothingToCommit(commandName: string): GitError;
|
|
59
62
|
noStagedChanges(commandName: string): GitError;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-errors.d.ts","sourceRoot":"","sources":["../../src/utils/git-errors.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EACR,aAAa,EACb,aAAa,EACb,KAAK,MAAM,EAEZ,MAAM,wBAAwB,CAAC;AAKhC,oBAAY,YAAY;IACtB,gBAAgB,yBAAyB;IACzC,WAAW,oBAAoB;IAC/B,qBAAqB,8BAA8B;IACnD,aAAa,sBAAsB;IACnC,cAAc,uBAAuB;IACrC,eAAe,wBAAwB;IACvC,gBAAgB,yBAAyB;IACzC,iBAAiB,0BAA0B;IAC3C,iBAAiB,0BAA0B;IAC3C,qBAAqB,8BAA8B;IACnD,eAAe,wBAAwB;IACvC,oBAAoB,6BAA6B;IACjD,sBAAsB,+BAA+B;IACrD,kBAAkB,2BAA2B;IAC7C,uBAAuB,gCAAgC;IACvD,2BAA2B,oCAAoC;IAC/D,OAAO,sBAAsB;CAC9B;AAKD,qBAAa,QAAS,SAAQ,QAAQ;aAOlB,YAAY,EAAE,YAAY;aAC1B,WAAW,EAAE,MAAM;IAPrC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,wBAAwB;IACzC,QAAQ,CAAC,QAAQ,yBAAyB;gBAGxC,OAAO,EAAE,MAAM,EACC,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,MAAM,EACnC,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAClC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;QACvB,aAAa,CAAC,EAAE,KAAK,CAAC;KACvB;CAKJ;AAeD,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;
|
|
1
|
+
{"version":3,"file":"git-errors.d.ts","sourceRoot":"","sources":["../../src/utils/git-errors.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/git-errors.js
CHANGED
|
@@ -7,6 +7,7 @@ export var GitErrorCode;
|
|
|
7
7
|
GitErrorCode["NETWORK_ERROR"] = "GIT_NETWORK_ERROR";
|
|
8
8
|
GitErrorCode["MERGE_CONFLICT"] = "GIT_MERGE_CONFLICT";
|
|
9
9
|
GitErrorCode["REBASE_CONFLICT"] = "GIT_REBASE_CONFLICT";
|
|
10
|
+
GitErrorCode["UNCOMMITTED_CHANGES"] = "GIT_UNCOMMITTED_CHANGES";
|
|
10
11
|
GitErrorCode["NON_FAST_FORWARD"] = "GIT_NON_FAST_FORWARD";
|
|
11
12
|
GitErrorCode["NOTHING_TO_COMMIT"] = "GIT_NOTHING_TO_COMMIT";
|
|
12
13
|
GitErrorCode["NO_STAGED_CHANGES"] = "GIT_NO_STAGED_CHANGES";
|
|
@@ -61,18 +62,39 @@ const GIT_ERROR_PATTERNS = [
|
|
|
61
62
|
getSuggestions: () => ['Check your internet connection'],
|
|
62
63
|
},
|
|
63
64
|
{
|
|
64
|
-
code: GitErrorCode.
|
|
65
|
-
patterns: [
|
|
66
|
-
|
|
65
|
+
code: GitErrorCode.UNCOMMITTED_CHANGES,
|
|
66
|
+
patterns: [
|
|
67
|
+
'cannot pull with rebase',
|
|
68
|
+
'please commit or stash them',
|
|
69
|
+
'your local changes to the following files would be overwritten',
|
|
70
|
+
'untracked working tree files would be overwritten',
|
|
71
|
+
'you have unstaged changes',
|
|
72
|
+
'cannot rebase: your index contains uncommitted changes',
|
|
73
|
+
],
|
|
74
|
+
message: 'You have uncommitted changes.',
|
|
67
75
|
getSuggestions: () => [
|
|
68
|
-
'
|
|
76
|
+
'Stash them: git stash push -u',
|
|
77
|
+
'Or commit them: neo git commit',
|
|
78
|
+
'Then retry the pull',
|
|
79
|
+
],
|
|
80
|
+
},
|
|
81
|
+
{
|
|
82
|
+
code: GitErrorCode.STASH_APPLY_CONFLICT,
|
|
83
|
+
patterns: ['could not apply stash', 'stash entry is kept', 'needs merge'],
|
|
84
|
+
message: 'Conflicts detected when applying stash!',
|
|
85
|
+
getSuggestions: () => [
|
|
86
|
+
'Resolve conflicts manually in your editor',
|
|
69
87
|
'Stage resolved files: git add <files>',
|
|
70
|
-
'
|
|
88
|
+
'The stash was not dropped - you can retry after resolving',
|
|
71
89
|
],
|
|
72
90
|
},
|
|
73
91
|
{
|
|
74
92
|
code: GitErrorCode.REBASE_CONFLICT,
|
|
75
|
-
patterns: [
|
|
93
|
+
patterns: [
|
|
94
|
+
'could not apply',
|
|
95
|
+
'resolve all conflicts manually',
|
|
96
|
+
'after resolving the conflicts',
|
|
97
|
+
],
|
|
76
98
|
message: 'Rebase hit conflicts.',
|
|
77
99
|
getSuggestions: () => [
|
|
78
100
|
'Fix conflicts in your editor',
|
|
@@ -81,6 +103,23 @@ const GIT_ERROR_PATTERNS = [
|
|
|
81
103
|
'Or abort the rebase: git rebase --abort',
|
|
82
104
|
],
|
|
83
105
|
},
|
|
106
|
+
{
|
|
107
|
+
code: GitErrorCode.MERGE_CONFLICT,
|
|
108
|
+
patterns: [
|
|
109
|
+
'merge conflict',
|
|
110
|
+
'automatic merge failed',
|
|
111
|
+
'fix conflicts',
|
|
112
|
+
'conflict (',
|
|
113
|
+
'unmerged files',
|
|
114
|
+
'unresolved conflict',
|
|
115
|
+
],
|
|
116
|
+
message: 'Merge conflicts detected!',
|
|
117
|
+
getSuggestions: () => [
|
|
118
|
+
'Fix conflicts in your editor',
|
|
119
|
+
'Stage resolved files: git add <files>',
|
|
120
|
+
'Commit the merge: git commit',
|
|
121
|
+
],
|
|
122
|
+
},
|
|
84
123
|
{
|
|
85
124
|
code: GitErrorCode.NON_FAST_FORWARD,
|
|
86
125
|
patterns: [
|
|
@@ -134,16 +173,6 @@ const GIT_ERROR_PATTERNS = [
|
|
|
134
173
|
'The stash may have been dropped or applied already',
|
|
135
174
|
],
|
|
136
175
|
},
|
|
137
|
-
{
|
|
138
|
-
code: GitErrorCode.STASH_APPLY_CONFLICT,
|
|
139
|
-
patterns: ['conflict', 'could not apply stash', 'needs merge'],
|
|
140
|
-
message: 'Conflicts detected when applying stash!',
|
|
141
|
-
getSuggestions: () => [
|
|
142
|
-
'Resolve conflicts manually in your editor',
|
|
143
|
-
'Stage resolved files: git add <files>',
|
|
144
|
-
'The stash was not dropped - you can retry after resolving',
|
|
145
|
-
],
|
|
146
|
-
},
|
|
147
176
|
{
|
|
148
177
|
code: GitErrorCode.STASH_NOTHING_TO_STASH,
|
|
149
178
|
patterns: ['no local changes to save', 'no changes added to commit but untracked'],
|
|
@@ -231,6 +260,9 @@ export function isConflictError(error) {
|
|
|
231
260
|
return (isGitError(error, GitErrorCode.MERGE_CONFLICT) ||
|
|
232
261
|
isGitError(error, GitErrorCode.REBASE_CONFLICT));
|
|
233
262
|
}
|
|
263
|
+
export function isUncommittedChangesError(error) {
|
|
264
|
+
return isGitError(error, GitErrorCode.UNCOMMITTED_CHANGES);
|
|
265
|
+
}
|
|
234
266
|
export function isNonFastForwardError(error) {
|
|
235
267
|
return isGitError(error, GitErrorCode.NON_FAST_FORWARD);
|
|
236
268
|
}
|
|
@@ -286,6 +318,15 @@ export const GitErrors = {
|
|
|
286
318
|
],
|
|
287
319
|
});
|
|
288
320
|
},
|
|
321
|
+
uncommittedChanges(commandName) {
|
|
322
|
+
return new GitError('You have uncommitted changes.', GitErrorCode.UNCOMMITTED_CHANGES, commandName, {
|
|
323
|
+
suggestions: [
|
|
324
|
+
'Stash them: git stash push -u',
|
|
325
|
+
'Or commit them: neo git commit',
|
|
326
|
+
'Then retry the pull',
|
|
327
|
+
],
|
|
328
|
+
});
|
|
329
|
+
},
|
|
289
330
|
nonFastForward(commandName) {
|
|
290
331
|
return new GitError('Push was rejected because the remote has new commits.', GitErrorCode.NON_FAST_FORWARD, commandName, {
|
|
291
332
|
suggestions: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-errors.js","sourceRoot":"","sources":["../../src/utils/git-errors.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"git-errors.js","sourceRoot":"","sources":["../../src/utils/git-errors.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -60,7 +60,8 @@ Exit codes: `0` success, `1` failure, `2` non-interactive prompt required (the J
|
|
|
60
60
|
|
|
61
61
|
## Anti-patterns
|
|
62
62
|
|
|
63
|
-
- Don't `git push` to bypass neo's main-branch confirmation. If you need to push to main, use
|
|
63
|
+
- Don't `git push` to bypass neo's main-branch confirmation. If you need to push to main, use `neo git push --force-main`. Not `--force`: that is not a neo flag, so it passes straight through to git as a real force-push.
|
|
64
64
|
- Don't open PRs with `gh pr create` when `neo work ship` is the right call. Ship handles verify + changeset + push + PR in one step.
|
|
65
65
|
- Don't skip changesets. `neo work ship` enforces them; if a change doesn't affect a published package, create an empty changeset (`---\n---`).
|
|
66
66
|
- Don't re-derive the command tree from memory. `neo schema --json` is authoritative and version-correct.
|
|
67
|
+
- Don't quietly fall back to raw `git`/`gh` when neo is installed but misbehaving. The bullets above cover neo being absent; this one covers it being wrong. A rejected valid input, a guardrail that misfires, a missing command or flag, a stale example: reaching for the fallback is the finding. Say it out loud, file it (in DailyDeck if you have it: `create-task`, `intake: "filed"`, `repo: "radkode/neo"`; a GitHub issue on radkode/neo otherwise), and then work around it.
|