@radkode/neo 1.9.0 → 1.9.2

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.
Files changed (38) hide show
  1. package/README.md +18 -0
  2. package/bin/cli.js +5 -1
  3. package/dist/cli.d.ts.map +1 -1
  4. package/dist/cli.js +19 -3
  5. package/dist/cli.js.map +1 -1
  6. package/dist/commands/git/commit/index.js +4 -4
  7. package/dist/commands/git/commit/index.js.map +1 -1
  8. package/dist/commands/git/pull/index.d.ts.map +1 -1
  9. package/dist/commands/git/pull/index.js +33 -37
  10. package/dist/commands/git/pull/index.js.map +1 -1
  11. package/dist/commands/verify/index.d.ts +6 -3
  12. package/dist/commands/verify/index.d.ts.map +1 -1
  13. package/dist/commands/verify/index.js +75 -18
  14. package/dist/commands/verify/index.js.map +1 -1
  15. package/dist/commands/work/finish/index.d.ts.map +1 -1
  16. package/dist/commands/work/finish/index.js +90 -74
  17. package/dist/commands/work/finish/index.js.map +1 -1
  18. package/dist/commands/work/index.js +1 -1
  19. package/dist/commands/work/ship/index.d.ts.map +1 -1
  20. package/dist/commands/work/ship/index.js +7 -1
  21. package/dist/commands/work/ship/index.js.map +1 -1
  22. package/dist/commands/work/start/index.d.ts.map +1 -1
  23. package/dist/commands/work/start/index.js +31 -6
  24. package/dist/commands/work/start/index.js.map +1 -1
  25. package/dist/types/index.d.ts +0 -1
  26. package/dist/types/index.d.ts.map +1 -1
  27. package/dist/types/schemas.d.ts +0 -1
  28. package/dist/types/schemas.d.ts.map +1 -1
  29. package/dist/types/schemas.js +0 -1
  30. package/dist/types/schemas.js.map +1 -1
  31. package/dist/utils/git-errors.d.ts +6 -6
  32. package/dist/utils/git-errors.d.ts.map +1 -1
  33. package/dist/utils/git-errors.js +107 -40
  34. package/dist/utils/git-errors.js.map +1 -1
  35. package/dist/utils/output.d.ts.map +1 -1
  36. package/dist/utils/output.js +20 -1
  37. package/dist/utils/output.js.map +1 -1
  38. package/package.json +3 -3
package/README.md CHANGED
@@ -85,6 +85,24 @@ neo git commit --ai # Draft a message from the staged diff (Anthropic API)
85
85
 
86
86
  The AI path uses `claude-haiku-4-5` by default and caches the system prompt. Set your key with `neo config set ai.apiKey` or `ANTHROPIC_API_KEY`.
87
87
 
88
+ ### `neo verify`
89
+
90
+ Runs the `build`, `test`, `lint`, and `typecheck` package scripts that the repository defines. A repository can select one shared verification gate in `package.json`:
91
+
92
+ ```json
93
+ {
94
+ "scripts": {
95
+ "build:restricted": "next build --webpack",
96
+ "verify:neo": "pnpm run build:restricted && pnpm run quality:check"
97
+ },
98
+ "neo": {
99
+ "verify": "verify:neo"
100
+ }
101
+ }
102
+ ```
103
+
104
+ Neo invokes the configured value as a package script. Use an umbrella script when verification needs multiple commands or environment-specific options. `neo verify --only build,test` overrides the repository setting for one run, and `--skip` filters the selected scripts.
105
+
88
106
  ### `neo config`
89
107
 
90
108
  Key-value configuration with secure secrets storage and profiles.
package/bin/cli.js CHANGED
@@ -1,2 +1,6 @@
1
1
  #!/usr/bin/env node
2
- import('../dist/cli.js');
2
+ import { fileURLToPath } from 'node:url';
3
+
4
+ const cliUrl = new URL('../dist/cli.js', import.meta.url);
5
+ process.argv[1] = fileURLToPath(cliUrl);
6
+ await import(cliUrl.href);
package/dist/cli.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAYtD,wBAAsB,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAuGlD"}
1
+ {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAYtD,wBAAsB,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAuGlD"}
package/dist/cli.js CHANGED
@@ -1,3 +1,5 @@
1
+ import { realpathSync } from 'node:fs';
2
+ import { fileURLToPath } from 'node:url';
1
3
  import { Command } from '@commander-js/extra-typings';
2
4
  import chalk from 'chalk';
3
5
  import { displayBanner } from './utils/banner.js';
@@ -91,7 +93,21 @@ Learn more:
91
93
  registerCommands(program);
92
94
  return program;
93
95
  }
94
- if (import.meta.url === `file://${process.argv[1]}` || process.argv[1]?.endsWith('cli.js')) {
96
+ function isMainModule() {
97
+ const entryPath = process.argv[1];
98
+ const modulePath = fileURLToPath(import.meta.url);
99
+ if (entryPath === modulePath)
100
+ return true;
101
+ if (entryPath === undefined)
102
+ return false;
103
+ try {
104
+ return realpathSync(entryPath) === realpathSync(modulePath);
105
+ }
106
+ catch {
107
+ return false;
108
+ }
109
+ }
110
+ if (isMainModule()) {
95
111
  process.on('SIGINT', () => {
96
112
  process.exit(130);
97
113
  });
@@ -99,13 +115,13 @@ if (import.meta.url === `file://${process.argv[1]}` || process.argv[1]?.endsWith
99
115
  process.exit(143);
100
116
  });
101
117
  createCLI()
102
- .then((program) => {
118
+ .then(async (program) => {
103
119
  if (process.argv.length <= 2) {
104
120
  program.help();
105
121
  }
106
122
  program.exitOverride();
107
123
  try {
108
- program.parse();
124
+ await program.parseAsync();
109
125
  }
110
126
  catch (err) {
111
127
  if (err && typeof err === 'object' && 'code' in err) {
package/dist/cli.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpF,OAAO,WAAW,MAAM,iBAAiB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,SAAS;IAC7B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAE9B,OAAO;SACJ,IAAI,CAAC,KAAK,CAAC;SACX,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC;SACpC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;SAC5B,MAAM,CAAC,eAAe,EAAE,wBAAwB,CAAC;SACjD,MAAM,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;SACpD,MAAM,CAAC,YAAY,EAAE,wBAAwB,CAAC;SAC9C,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC;SACpC,MAAM,CAAC,QAAQ,EAAE,2EAA2E,CAAC;SAC7F,MAAM,CAAC,WAAW,EAAE,8CAA8C,CAAC;SACnE,MAAM,CAAC,mBAAmB,EAAE,kDAAkD,CAAC;SAC/E,MAAM,CAAC,aAAa,EAAE,kDAAkD,CAAC;SACzE,WAAW,CACV,OAAO,EACP;;;;;;;;;;;;;;;;;CAiBL,CACI;SACA,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE;QACtD,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;QAChC,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;QAKzC,MAAM,SAAS,GAOX,EAAE,CAAC;QACP,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI;YAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC;QACjD,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI;YAAE,SAAS,CAAC,GAAG,GAAG,IAAI,CAAC;QAC/C,IAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,IAAI;YAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC;QACrE,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI;YAAE,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC;QACnD,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI;YAAE,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;QACvD,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK;YAAE,SAAS,CAAC,KAAK,GAAG,KAAK,CAAC;QACrD,MAAM,GAAG,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAC3C,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAEvB,MAAM,eAAe,GACnB,WAAW,KAAK,SAAS;YACzB,WAAW,KAAK,MAAM;YACtB,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;YAClC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAI9B,MAAM,sBAAsB,GAAG,WAAW,KAAK,QAAQ,IAAI,WAAW,KAAK,aAAa,CAAC;QAEzF,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAChB,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACxB,MAAM,CAAC,KAAK,CAAC,sBAAsB,WAAW,EAAE,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YACf,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,cAAc,GAClB,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI,IAAI,sBAAsB,CAAC;QAC1F,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,IAAI,CAAC,cAAc,EAAE,CAAC;YACjE,IAAI,UAAU,GAAe,MAAM,CAAC;YACpC,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;gBAC1C,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC;YACzC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,CAAC,gDAAgD,KAAK,EAAE,CAAC,CAAC;YACxE,CAAC;YAED,aAAa,CAAC,UAAU,CAAC,CAAC;QAC5B,CAAC;QAED,IAAI,CAAC,eAAe,IAAI,CAAC,cAAc,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;YAC/D,MAAM,0BAA0B,EAAE,CAAC;QACrC,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAE1B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,UAAU,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC3F,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACxB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QACzB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,SAAS,EAAE;SACR,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;QAChB,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,CAAC;QAED,OAAO,CAAC,YAAY,EAAE,CAAC;QAEvB,IAAI,CAAC;YACH,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,IAAI,GAAG,EAAE,CAAC;gBACpD,IAAI,GAAG,CAAC,IAAI,KAAK,yBAAyB,IAAI,GAAG,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;oBAC5E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;gBAED,IAAI,GAAG,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;oBACrC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;gBAED,IAAI,GAAG,CAAC,IAAI,KAAK,2BAA2B,IAAI,GAAG,CAAC,IAAI,KAAK,0BAA0B,EAAE,CAAC;oBACxF,OAAO,CAAC,KAAK,CACX,KAAK,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAC7F,CAAC;oBACF,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAC;oBACvF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;YACH,CAAC;YAED,MAAM,KAAK,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YAClE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,MAAM,KAAK,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAClE,MAAM,CAAC,KAAK,CAAC,8BAA8B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
@@ -127,11 +127,11 @@ export async function executeCommit(options) {
127
127
  try {
128
128
  await execa('git', ['rev-parse', '--git-dir']);
129
129
  if (options.all) {
130
- const spinner = ui.spinner('Staging modified files');
130
+ const spinner = ui.spinner('Staging all changes');
131
131
  spinner.start();
132
132
  try {
133
- await execa('git', ['add', '-u']);
134
- spinner.succeed('Staged all modified files');
133
+ await execa('git', ['add', '--all']);
134
+ spinner.succeed('Staged all changes');
135
135
  }
136
136
  catch (error) {
137
137
  spinner.fail('Failed to stage files');
@@ -352,7 +352,7 @@ export function createCommitCommand() {
352
352
  .option('-m, --message <message>', 'commit message description')
353
353
  .option('-b, --body <body>', 'commit body (optional)')
354
354
  .option('--breaking', 'mark as breaking change')
355
- .option('-a, --all', 'automatically stage all modified files')
355
+ .option('-a, --all', 'automatically stage all changes, including untracked files')
356
356
  .option('--ai', 'generate commit message using AI')
357
357
  .option('-n, --no-verify', 'skip the pre-commit and commit-msg hooks')
358
358
  .addHelpText('after', `
@@ -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;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"}
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,CA0HvF;AA8QD,wBAAgB,iBAAiB,IAAI,OAAO,CA0C3C"}
@@ -48,8 +48,9 @@ export async function executePull(options) {
48
48
  return success({ cancelled: false });
49
49
  }
50
50
  logger.debug('Attempting normal pull...');
51
+ const pullArgs = options.rebase === false ? ['pull', '--no-rebase'] : ['pull'];
51
52
  try {
52
- const { stdout } = await execa('git', ['pull'], {
53
+ const { stdout } = await execa('git', pullArgs, {
53
54
  encoding: 'utf8',
54
55
  stdio: 'pipe',
55
56
  });
@@ -60,31 +61,25 @@ export async function executePull(options) {
60
61
  return success({ cancelled: false });
61
62
  }
62
63
  catch (error) {
63
- if (isNonFastForwardError(error)) {
64
- spinner.stop();
65
- return handleDivergedPull(branchName, options);
66
- }
67
64
  if (isMultipleBranchesError(error)) {
68
- logger.debug(`Multiple branches error, retrying with explicit branch: ${branchName}`);
69
- spinner.text = `Pulling from origin/${branchName}...`;
70
- try {
71
- const { stdout } = await execa('git', ['pull', 'origin', branchName], {
72
- encoding: 'utf8',
73
- stdio: 'pipe',
74
- });
75
- spinner.succeed('Successfully pulled from remote!');
76
- if (stdout.trim()) {
77
- ui.muted(stdout);
78
- }
79
- return success({ cancelled: false });
65
+ if (options.rebase !== false) {
66
+ throw error;
80
67
  }
81
- catch (retryError) {
82
- if (isNonFastForwardError(retryError)) {
83
- spinner.stop();
84
- return handleDivergedPull(branchName, options);
85
- }
86
- throw retryError;
68
+ logger.debug('Multiple upstream branches configured, retrying with merge');
69
+ spinner.text = 'Merging configured upstream branches...';
70
+ const { stdout } = await execa('git', ['pull', '--no-rebase', '--no-ff'], {
71
+ encoding: 'utf8',
72
+ stdio: 'pipe',
73
+ });
74
+ spinner.succeed('Successfully merged configured upstream branches!');
75
+ if (stdout.trim()) {
76
+ ui.muted(stdout);
87
77
  }
78
+ return success({ cancelled: false });
79
+ }
80
+ if (isNonFastForwardError(error)) {
81
+ spinner.stop();
82
+ return handleDivergedPull(options);
88
83
  }
89
84
  throw error;
90
85
  }
@@ -92,30 +87,32 @@ export async function executePull(options) {
92
87
  catch (error) {
93
88
  spinner.stop();
94
89
  if (isNotGitRepository(error)) {
95
- return failure(GitErrors.notARepository('pull'));
90
+ return failure(GitErrors.notARepository('pull', error));
96
91
  }
97
92
  if (isRemoteBranchDeletedError(error)) {
98
93
  return handleDeletedRemoteBranch(branchName);
99
94
  }
100
95
  if (isUncommittedChangesError(error)) {
101
- return failure(GitErrors.uncommittedChanges('pull'));
96
+ return failure(GitErrors.uncommittedChanges('pull', error));
102
97
  }
103
98
  if (isConflictError(error)) {
104
- return failure(options.rebase ? GitErrors.rebaseConflict('pull') : GitErrors.mergeConflict('pull'));
99
+ return failure(options.rebase
100
+ ? GitErrors.rebaseConflict('pull', error)
101
+ : GitErrors.mergeConflict('pull', error));
105
102
  }
106
103
  if (isAuthenticationError(error)) {
107
- return failure(GitErrors.authenticationFailed('pull'));
104
+ return failure(GitErrors.authenticationFailed('pull', error));
108
105
  }
109
106
  if (isNetworkError(error)) {
110
- return failure(GitErrors.networkError('pull'));
107
+ return failure(GitErrors.networkError('pull', error));
111
108
  }
112
109
  return failure(GitErrors.unknown('pull', error));
113
110
  }
114
111
  }
115
- async function handleDivergedPull(branchName, options) {
112
+ async function handleDivergedPull(options) {
116
113
  ui.error('Local and remote branches have diverged.');
117
114
  ui.warn('Choose how to reconcile the branches.');
118
- const defaultStrategy = options.noRebase ? 'merge' : 'rebase';
115
+ const defaultStrategy = options.rebase === false ? 'merge' : 'rebase';
119
116
  const strategy = await promptSelect({
120
117
  choices: [
121
118
  { label: 'Cancel (do nothing)', value: 'cancel' },
@@ -145,10 +142,10 @@ async function handleDivergedPull(branchName, options) {
145
142
  catch (error) {
146
143
  rebaseSpinner.stop();
147
144
  if (isUncommittedChangesError(error)) {
148
- return failure(GitErrors.uncommittedChanges('pull'));
145
+ return failure(GitErrors.uncommittedChanges('pull', error));
149
146
  }
150
147
  if (isConflictError(error)) {
151
- return failure(GitErrors.rebaseConflict('pull'));
148
+ return failure(GitErrors.rebaseConflict('pull', error));
152
149
  }
153
150
  return failure(GitErrors.unknown('pull', error));
154
151
  }
@@ -156,16 +153,15 @@ async function handleDivergedPull(branchName, options) {
156
153
  if (strategy === 'merge') {
157
154
  const fetchSpinner = ui.spinner('Fetching latest changes');
158
155
  const mergeSpinner = ui.spinner('Merging remote into current branch');
159
- const remoteRef = branchName || 'HEAD';
160
156
  try {
161
157
  fetchSpinner.start();
162
- await execa('git', ['fetch', 'origin', remoteRef], {
158
+ await execa('git', ['fetch'], {
163
159
  encoding: 'utf8',
164
160
  stdio: 'pipe',
165
161
  });
166
162
  fetchSpinner.succeed('Fetched remote updates');
167
163
  mergeSpinner.start();
168
- const { stdout } = await execa('git', ['merge', '--no-ff', `origin/${remoteRef}`], {
164
+ const { stdout } = await execa('git', ['merge', '--no-ff', '@{upstream}'], {
169
165
  encoding: 'utf8',
170
166
  stdio: 'pipe',
171
167
  });
@@ -180,10 +176,10 @@ async function handleDivergedPull(branchName, options) {
180
176
  fetchSpinner.stop();
181
177
  mergeSpinner.stop();
182
178
  if (isUncommittedChangesError(error)) {
183
- return failure(GitErrors.uncommittedChanges('pull'));
179
+ return failure(GitErrors.uncommittedChanges('pull', error));
184
180
  }
185
181
  if (isConflictError(error)) {
186
- return failure(GitErrors.mergeConflict('pull'));
182
+ return failure(GitErrors.mergeConflict('pull', error));
187
183
  }
188
184
  return failure(GitErrors.unknown('pull', error));
189
185
  }
@@ -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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"}
@@ -1,17 +1,20 @@
1
1
  import { Command } from '@commander-js/extra-typings';
2
- type PackageManager = 'pnpm' | 'npm' | 'yarn' | 'bun';
2
+ declare const PACKAGE_MANAGERS: readonly ["pnpm", "npm", "yarn", "bun"];
3
+ type PackageManager = (typeof PACKAGE_MANAGERS)[number];
3
4
  interface VerifyOptions {
4
5
  pm?: string;
5
6
  only?: string;
6
7
  skip?: string;
7
8
  }
8
- interface ScriptResult {
9
+ export interface ScriptResult {
9
10
  script: string;
10
11
  status: 'passed' | 'failed' | 'skipped';
11
12
  durationMs: number;
12
13
  exitCode?: number;
14
+ stdoutTail?: string;
15
+ stderrTail?: string;
13
16
  }
14
- interface VerifyResult {
17
+ export interface VerifyResult {
15
18
  packageManager: PackageManager;
16
19
  results: ScriptResult[];
17
20
  ok: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/verify/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAQtD,KAAK,cAAc,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,CAAC;AAatD,UAAU,aAAa;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,UAAU,YAAY;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,YAAY;IACpB,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,EAAE,EAAE,OAAO,CAAC;IACZ,eAAe,EAAE,MAAM,CAAC;CACzB;AAgED,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAqD9F;AAED,wBAAgB,mBAAmB,IAAI,OAAO,CA+D7C"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/verify/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAQtD,QAAA,MAAM,gBAAgB,yCAA0C,CAAC;AACjE,KAAK,cAAc,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;AAcxD,UAAU,aAAa;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,EAAE,EAAE,OAAO,CAAC;IACZ,eAAe,EAAE,MAAM,CAAC;CACzB;AAwHD,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CA6D9F;AAED,wBAAgB,mBAAmB,IAAI,OAAO,CAiE7C"}
@@ -5,6 +5,7 @@ import { join } from 'node:path';
5
5
  import { ui } from '../../utils/ui.js';
6
6
  import { emitJson } from '../../utils/output.js';
7
7
  import { runAction } from '../../utils/run-action.js';
8
+ const PACKAGE_MANAGERS = ['pnpm', 'npm', 'yarn', 'bun'];
8
9
  const LOCKFILES = [
9
10
  { file: 'pnpm-lock.yaml', pm: 'pnpm' },
10
11
  { file: 'yarn.lock', pm: 'yarn' },
@@ -13,6 +14,8 @@ const LOCKFILES = [
13
14
  { file: 'package-lock.json', pm: 'npm' },
14
15
  ];
15
16
  const DEFAULT_SCRIPTS = ['build', 'test', 'lint', 'typecheck'];
17
+ const OUTPUT_TAIL_LINES = 20;
18
+ const OUTPUT_TAIL_CHARS = 8_000;
16
19
  async function pathExists(p) {
17
20
  try {
18
21
  await access(p);
@@ -33,14 +36,24 @@ async function detectPackageManager(cwd) {
33
36
  }
34
37
  return found[0];
35
38
  }
36
- async function readScripts(cwd) {
39
+ function parsePackageManager(value) {
40
+ const packageManager = PACKAGE_MANAGERS.find((candidate) => candidate === value);
41
+ if (!packageManager) {
42
+ throw new Error(`Unsupported package manager "${value}". Expected one of: ${PACKAGE_MANAGERS.join(', ')}.`);
43
+ }
44
+ return packageManager;
45
+ }
46
+ async function readPackageManifest(cwd) {
37
47
  const pkgPath = join(cwd, 'package.json');
38
48
  if (!(await pathExists(pkgPath))) {
39
49
  throw new Error('No package.json in current directory.');
40
50
  }
41
51
  const raw = await readFile(pkgPath, 'utf-8');
42
52
  const pkg = JSON.parse(raw);
43
- return pkg.scripts ?? {};
53
+ return {
54
+ scripts: pkg.scripts ?? {},
55
+ verifyScript: pkg.neo?.verify,
56
+ };
44
57
  }
45
58
  function parseFilter(value) {
46
59
  if (!value)
@@ -50,26 +63,61 @@ function parseFilter(value) {
50
63
  .map((s) => s.trim())
51
64
  .filter(Boolean);
52
65
  }
53
- function pickScripts(scripts, only, skip) {
54
- const base = only ?? DEFAULT_SCRIPTS;
66
+ function selectScripts(scripts, verifyScript, only, skip) {
67
+ let base;
68
+ if (only !== null) {
69
+ const missing = only.find((script) => !Object.hasOwn(scripts, script));
70
+ if (missing) {
71
+ throw new Error(`Requested verification script "${missing}" is not defined in package.json.`);
72
+ }
73
+ base = only;
74
+ }
75
+ else if (verifyScript !== undefined) {
76
+ if (typeof verifyScript !== 'string' || verifyScript.trim() === '') {
77
+ throw new Error('package.json#neo.verify must be a non-empty script name.');
78
+ }
79
+ const configured = verifyScript.trim();
80
+ if (!Object.hasOwn(scripts, configured)) {
81
+ throw new Error(`Configured verification script "${configured}" is not defined in package.json.`);
82
+ }
83
+ base = [configured];
84
+ }
85
+ else {
86
+ base = DEFAULT_SCRIPTS;
87
+ }
88
+ const optionLike = base.find((script) => script.startsWith('-'));
89
+ if (optionLike) {
90
+ throw new Error(`Verification script names cannot start with "-": ${optionLike}.`);
91
+ }
55
92
  const skipSet = new Set(skip ?? []);
56
- return base.filter((s) => s in scripts && !skipSet.has(s));
93
+ return base.filter((script) => Object.hasOwn(scripts, script) && !skipSet.has(script));
57
94
  }
58
95
  function pmArgs(pm, script) {
59
96
  if (pm === 'npm')
60
97
  return ['run', script];
61
98
  return ['run', script];
62
99
  }
100
+ function outputTail(value) {
101
+ if (typeof value !== 'string')
102
+ return undefined;
103
+ const trimmed = value.trim();
104
+ if (!trimmed)
105
+ return undefined;
106
+ const lines = trimmed.split('\n').slice(-OUTPUT_TAIL_LINES).join('\n');
107
+ return lines.slice(-OUTPUT_TAIL_CHARS);
108
+ }
63
109
  export async function executeVerify(cwd, options) {
64
110
  const only = parseFilter(options.only);
65
111
  const skip = parseFilter(options.skip);
66
- const pm = options.pm
67
- ? options.pm
68
- : await detectPackageManager(cwd);
69
- const scripts = await readScripts(cwd);
70
- const toRun = pickScripts(scripts, only, skip);
112
+ const pm = options.pm ? parsePackageManager(options.pm) : await detectPackageManager(cwd);
113
+ const manifest = await readPackageManifest(cwd);
114
+ const toRun = selectScripts(manifest.scripts, manifest.verifyScript, only, skip);
71
115
  if (toRun.length === 0) {
72
- throw new Error(`No matching scripts found in package.json. Looked for: ${(only ?? DEFAULT_SCRIPTS).join(', ')}.`);
116
+ const requested = only ??
117
+ (typeof manifest.verifyScript === 'string'
118
+ ? [manifest.verifyScript.trim()]
119
+ : DEFAULT_SCRIPTS);
120
+ throw new Error(`No matching scripts found in package.json. Looked for: ${requested.join(', ')}.`);
73
121
  }
74
122
  const results = [];
75
123
  const startedAt = Date.now();
@@ -92,12 +140,19 @@ export async function executeVerify(cwd, options) {
92
140
  ? error.exitCode
93
141
  : 1;
94
142
  scriptSpinner.fail(`${script} failed (${Math.round(durationMs / 100) / 10}s)`);
95
- const stderr = error.stderr ?? '';
96
- const stdout = error.stdout ?? '';
97
- const tail = (stderr || stdout).trim().split('\n').slice(-20).join('\n');
98
- if (tail)
99
- ui.muted(tail);
100
- results.push({ script, status: 'failed', durationMs, exitCode });
143
+ const stderrTail = outputTail(error.stderr);
144
+ const stdoutTail = outputTail(error.stdout);
145
+ const visibleTail = stderrTail ?? stdoutTail;
146
+ if (visibleTail)
147
+ ui.muted(visibleTail);
148
+ results.push({
149
+ script,
150
+ status: 'failed',
151
+ durationMs,
152
+ exitCode,
153
+ ...(stdoutTail !== undefined ? { stdoutTail } : {}),
154
+ ...(stderrTail !== undefined ? { stderrTail } : {}),
155
+ });
101
156
  }
102
157
  }
103
158
  const totalDurationMs = Date.now() - startedAt;
@@ -107,7 +162,7 @@ export async function executeVerify(cwd, options) {
107
162
  export function createVerifyCommand() {
108
163
  const command = new Command('verify');
109
164
  command
110
- .description('Run build, test, lint, and typecheck scripts and summarize results')
165
+ .description('Run repository verification scripts and summarize results')
111
166
  .option('--pm <name>', 'force a specific package manager (pnpm|npm|yarn|bun)')
112
167
  .option('--only <scripts>', 'comma-separated subset to run (e.g. build,test)')
113
168
  .option('--skip <scripts>', 'comma-separated scripts to skip')
@@ -116,6 +171,8 @@ Examples:
116
171
  Run every verify step the repo defines:
117
172
  $ neo verify
118
173
 
174
+ package.json can set neo.verify to one repository verification script.
175
+
119
176
  Just build and test:
120
177
  $ neo verify --only build,test
121
178