@radkode/neo 1.1.2 → 1.2.0

package/dist/commands/git/commit/index.js

@@ -7,6 +7,10 @@ import { gitCommitOptionsSchema } from '../../../types/schemas.js';
 import { success, failure, isFailure } from '../../../core/errors/index.js';
 import { GitErrors, isNotGitRepository } from '../../../utils/git-errors.js';
 import { generateCommitMessage, isAICommitAvailable, AIErrors } from '../../../services/ai/index.js';
+import { getRuntimeContext } from '../../../utils/runtime-context.js';
+import { NonInteractiveError } from '../../../utils/prompt.js';
+import { emitJson, emitError } from '../../../utils/output.js';
+import { runAction } from '../../../utils/run-action.js';
 const COMMIT_TYPE_DESCRIPTIONS = {
     feat: 'A new feature',
     fix: 'A bug fix',
@@ -134,7 +138,7 @@ export async function executeCommit(options) {
         if (stagedFiles.length > 10) {
             ui.muted(`... and ${stagedFiles.length - 10} more files`);
         }
-        console.log('');
+        ui.newline();
         let commitType;
         let commitScope;
         let commitMessage;
@@ -152,25 +156,31 @@ export async function executeCommit(options) {
                 if (!aiResponse) {
                     return failure(GitErrors.unknown('commit', new Error('No AI response')));
                 }
-                console.log('');
+                ui.newline();
                 ui.section('AI-Generated Commit');
                 const previewMessage = formatCommitMessage(aiResponse.type, aiResponse.scope, aiResponse.message, aiResponse.body, aiResponse.breaking);
                 ui.code(previewMessage);
-                console.log('');
-                const { selectedAction } = await inquirer.prompt([
-                    {
-                        type: 'list',
-                        name: 'selectedAction',
-                        message: 'What would you like to do?',
-                        choices: [
-                            { name: 'Commit with this message', value: 'commit' },
-                            { name: 'Edit in wizard', value: 'edit' },
-                            { name: 'Regenerate', value: 'regenerate' },
-                            { name: 'Cancel', value: 'cancel' },
-                        ],
-                    },
-                ]);
-                action = selectedAction;
+                ui.newline();
+                const runtimeCtx = getRuntimeContext();
+                if (runtimeCtx.yes || runtimeCtx.nonInteractive) {
+                    action = 'commit';
+                }
+                else {
+                    const { selectedAction } = await inquirer.prompt([
+                        {
+                            type: 'list',
+                            name: 'selectedAction',
+                            message: 'What would you like to do?',
+                            choices: [
+                                { name: 'Commit with this message', value: 'commit' },
+                                { name: 'Edit in wizard', value: 'edit' },
+                                { name: 'Regenerate', value: 'regenerate' },
+                                { name: 'Cancel', value: 'cancel' },
+                            ],
+                        },
+                    ]);
+                    action = selectedAction;
+                }
             }
             if (action === 'cancel') {
                 ui.warn('Commit cancelled');
@@ -208,7 +218,13 @@ export async function executeCommit(options) {
                 };
             }
         }
+        const runtimeCtx = getRuntimeContext();
         const quickMode = options.type !== undefined && options.message !== undefined;
+        if (!quickMode && (runtimeCtx.yes || runtimeCtx.nonInteractive)) {
+            if (!options.type || !options.message) {
+                throw new NonInteractiveError('git commit requires --type and --message in non-interactive mode', '--type <type> --message <msg>');
+            }
+        }
         if (quickMode) {
             commitType = options.type;
             commitScope = options.scope;
@@ -279,19 +295,19 @@ export async function executeCommit(options) {
             isBreaking = answers.breaking;
         }
         const formattedMessage = formatCommitMessage(commitType, commitScope, commitMessage, commitBody, isBreaking);
-        console.log('');
+        ui.newline();
         ui.section('Commit Preview');
         ui.keyValue([
             ['Type', commitType],
             ['Scope', commitScope || '(none)'],
             ['Breaking', isBreaking ? 'Yes' : 'No'],
         ]);
-        console.log('');
+        ui.newline();
         ui.highlight('Full commit message:');
-        console.log('');
+        ui.newline();
         ui.muted(formattedMessage);
-        console.log('');
-        if (!quickMode) {
+        ui.newline();
+        if (!quickMode && !runtimeCtx.yes && !runtimeCtx.nonInteractive) {
             const { confirm } = await inquirer.prompt([
                 {
                     type: 'confirm',
@@ -311,7 +327,16 @@ export async function executeCommit(options) {
             await execa('git', ['commit', '-m', formattedMessage]);
             spinner.succeed('Commit created successfully!');
             const { stdout: commitHash } = await execa('git', ['rev-parse', '--short', 'HEAD']);
-            ui.info(`Commit: ${commitHash.trim()}`);
+            emitJson({
+                ok: true,
+                command: 'git.commit',
+                commit: commitHash.trim(),
+                type: commitType,
+                scope: commitScope ?? null,
+                message: commitMessage,
+                breaking: isBreaking,
+                files: stagedFiles,
+            }, { text: () => ui.info(`Commit: ${commitHash.trim()}`) });
             return success(undefined);
         }
         catch (error) {
@@ -340,7 +365,21 @@ export function createCommitCommand() {
         .option('--breaking', 'mark as breaking change')
         .option('-a, --all', 'automatically stage all modified files')
         .option('--ai', 'generate commit message using AI')
-        .action(async (options) => {
+        .addHelpText('after', `
+Examples:
+  Interactive wizard:
+    $ neo git commit
+
+  Quick commit (no prompts):
+    $ neo git commit --type fix --message "handle null token"
+
+  AI-drafted commit, auto-accept (agent-friendly):
+    $ neo git commit --ai --yes
+
+  Machine-readable output:
+    $ neo git commit --ai --yes --json
+`)
+        .action(runAction(async (options) => {
         let validatedOptions;
         try {
             validatedOptions = validate(gitCommitOptionsSchema, options, 'git commit options');
@@ -353,17 +392,10 @@ export function createCommitCommand() {
         }
         const result = await executeCommit(validatedOptions);
         if (isFailure(result)) {
-            ui.error(result.error.message);
-            if (result.error.suggestions && result.error.suggestions.length > 0) {
-                ui.warn('Suggestions:');
-                ui.list(result.error.suggestions);
-            }
-            if (result.error.context?.['error']) {
-                ui.muted(String(result.error.context['error']));
-            }
+            emitError(result.error);
             process.exit(1);
         }
-    });
+    }));
     return command;
 }
 //# sourceMappingURL=index.js.map

package/dist/commands/git/commit/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/git/commit/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/git/commit/index.ts"],"names":[],"mappings":"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"}

package/dist/commands/git/pull/index.d.ts

@@ -1,6 +1,12 @@
 import { Command } from '@commander-js/extra-typings';
 import type { GitPullOptions } from '../../../types/schemas.js';
 import { type Result } from '../../../core/errors/index.js';
-export declare function executePull(options: GitPullOptions): Promise<Result<void>>;
+export type PullOutcome = {
+    cancelled: false;
+} | {
+    cancelled: true;
+    reason: string;
+};
+export declare function executePull(options: GitPullOptions): Promise<Result<PullOutcome>>;
 export declare function createPullCommand(): Command;
 //# sourceMappingURL=index.d.ts.map

package/dist/commands/git/pull/index.d.ts.map

@@ -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;AAQtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAA+B,MAAM,wBAAwB,CAAC;AA8BlF,wBAAsB,WAAW,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAqHhF;AA4QD,wBAAgB,iBAAiB,IAAI,OAAO,CAmC3C"}
+{"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;AA+BlF,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,CAqHvF;AAyQD,wBAAgB,iBAAiB,IAAI,OAAO,CA6C3C"}

package/dist/commands/git/pull/index.js

@@ -2,7 +2,10 @@ import { Command } from '@commander-js/extra-typings';
 import { execa } from 'execa';
 import inquirer from 'inquirer';
 import { logger } from '../../../utils/logger.js';
-import { promptSelect } from '../../../utils/prompt.js';
+import { promptSelect, NonInteractiveError } from '../../../utils/prompt.js';
+import { getRuntimeContext } from '../../../utils/runtime-context.js';
+import { emitJson, emitError } from '../../../utils/output.js';
+import { runAction } from '../../../utils/run-action.js';
 import { ui } from '../../../utils/ui.js';
 import { validate, isValidationError } from '../../../utils/validation.js';
 import { gitPullOptionsSchema, deletedBranchActionSchema } from '../../../types/schemas.js';
@@ -41,7 +44,7 @@ export async function executePull(options) {
             if (stdout.trim()) {
                 ui.muted(stdout);
             }
-            return success(undefined);
+            return success({ cancelled: false });
         }
         logger.debug('Attempting normal pull...');
         try {
@@ -53,7 +56,7 @@ export async function executePull(options) {
             if (stdout.trim()) {
                 ui.muted(stdout);
             }
-            return success(undefined);
+            return success({ cancelled: false });
         }
         catch (error) {
             if (isNonFastForwardError(error)) {
@@ -72,7 +75,7 @@ export async function executePull(options) {
                     if (stdout.trim()) {
                         ui.muted(stdout);
                     }
-                    return success(undefined);
+                    return success({ cancelled: false });
                 }
                 catch (retryError) {
                     if (isNonFastForwardError(retryError)) {
@@ -111,21 +114,14 @@ async function handleDivergedPull(branchName, options) {
     const defaultStrategy = options.noRebase ? 'merge' : 'rebase';
     const strategy = await promptSelect({
         choices: [
-            {
-                label: 'Cancel (do nothing)',
-                value: 'cancel',
-            },
-            {
-                label: 'Merge remote into current branch (--no-ff)',
-                value: 'merge',
-            },
-            {
-                label: 'Rebase onto remote (recommended)',
-                value: 'rebase',
-            },
+            { label: 'Cancel (do nothing)', value: 'cancel' },
+            { label: 'Merge remote into current branch (--no-ff)', value: 'merge' },
+            { label: 'Rebase onto remote (recommended)', value: 'rebase' },
         ],
         defaultValue: defaultStrategy,
         message: 'Branches have diverged. Choose a pull strategy:',
+        flag: '--rebase or --no-rebase',
+        safeDefaultForNonInteractive: true,
     });
     if (strategy === 'rebase') {
         const rebaseSpinner = ui.spinner('Pulling with rebase');
@@ -140,7 +136,7 @@ async function handleDivergedPull(branchName, options) {
             if (stdout.trim()) {
                 ui.muted(stdout);
             }
-            return success(undefined);
+            return success({ cancelled: false });
         }
         catch (error) {
             rebaseSpinner.stop();
@@ -171,7 +167,7 @@ async function handleDivergedPull(branchName, options) {
             if (stdout.trim()) {
                 ui.muted(stdout);
             }
-            return success(undefined);
+            return success({ cancelled: false });
         }
         catch (error) {
             fetchSpinner.stop();
@@ -183,33 +179,22 @@ async function handleDivergedPull(branchName, options) {
         }
     }
     ui.info('Pull cancelled. No changes were applied.');
-    return failure(GitErrors.unknown('pull'));
+    return success({ cancelled: true, reason: 'user-cancelled-diverged' });
 }
 async function handleDeletedRemoteBranch(branchName) {
     ui.error('Remote branch no longer exists!');
     ui.warn(`Your local branch "${branchName}" is tracking a remote branch that has been deleted`);
-    console.log('');
+    ui.newline();
     const validatedAction = deletedBranchActionSchema.parse(await promptSelect({
         choices: [
-            {
-                label: 'Switch to main and delete this branch (recommended)',
-                value: 'switch_main_delete',
-            },
-            {
-                label: 'Switch to main and keep this branch',
-                value: 'switch_main_keep',
-            },
-            {
-                label: `Set a new upstream for "${branchName}"`,
-                value: 'set_upstream',
-            },
-            {
-                label: 'Cancel (no changes)',
-                value: 'cancel',
-            },
+            { label: 'Switch to main and delete this branch (recommended)', value: 'switch_main_delete' },
+            { label: 'Switch to main and keep this branch', value: 'switch_main_keep' },
+            { label: `Set a new upstream for "${branchName}"`, value: 'set_upstream' },
+            { label: 'Cancel (no changes)', value: 'cancel' },
         ],
         defaultValue: 'switch_main_delete',
         message: 'How would you like to resolve this?',
+        flag: '(no flag yet — remote branch deletion requires interactive resolution)',
     }));
     switch (validatedAction) {
         case 'switch_main_delete':
@@ -220,7 +205,7 @@ async function handleDeletedRemoteBranch(branchName) {
             return setNewUpstream(branchName);
         case 'cancel':
             ui.muted('Operation cancelled. No changes were made.');
-            return success(undefined);
+            return success({ cancelled: true, reason: 'user-cancelled-deleted-remote' });
     }
 }
 async function switchToMainAndDelete(branchName) {
@@ -238,14 +223,22 @@ async function switchToMainAndDelete(branchName) {
             const errorMessage = error instanceof Error ? error.message : String(error);
             if (errorMessage.includes('not fully merged')) {
                 ui.warn(`Branch "${branchName}" has unmerged changes`);
-                const { forceDelete } = await inquirer.prompt([
-                    {
-                        type: 'confirm',
-                        name: 'forceDelete',
-                        message: 'Force delete anyway? (This will lose any uncommitted changes)',
-                        default: false,
-                    },
-                ]);
+                const rtCtx = getRuntimeContext();
+                let forceDelete;
+                if (rtCtx.nonInteractive || rtCtx.yes) {
+                    throw new NonInteractiveError('Branch has unmerged changes; force-delete requires explicit confirmation');
+                }
+                else {
+                    const answer = await inquirer.prompt([
+                        {
+                            type: 'confirm',
+                            name: 'forceDelete',
+                            message: 'Force delete anyway? (This will lose any uncommitted changes)',
+                            default: false,
+                        },
+                    ]);
+                    forceDelete = Boolean(answer.forceDelete);
+                }
                 if (forceDelete) {
                     await execa('git', ['branch', '-D', branchName]);
                     ui.success(`Force deleted branch "${branchName}"`);
@@ -260,7 +253,7 @@ async function switchToMainAndDelete(branchName) {
                 throw error;
             }
         }
-        return success(undefined);
+        return success({ cancelled: false });
     }
     catch (error) {
         return failure(GitErrors.unknown('pull', error));
@@ -275,7 +268,7 @@ async function switchToMain(branchName) {
         ui.success(`Pulled latest changes on ${mainBranch}`);
         ui.info(`Branch "${branchName}" was preserved`);
         ui.muted(`You can switch back with: git checkout ${branchName}`);
-        return success(undefined);
+        return success({ cancelled: false });
     }
     catch (error) {
         return failure(GitErrors.unknown('pull', error));
@@ -286,7 +279,7 @@ async function setNewUpstream(branchName) {
         await execa('git', ['branch', '--set-upstream-to', `origin/${branchName}`, branchName]);
         ui.success(`Set upstream for "${branchName}" to origin/${branchName}`);
         ui.info('You can now try pulling again');
-        return success(undefined);
+        return success({ cancelled: true, reason: 'upstream-set-only' });
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -324,7 +317,18 @@ export function createPullCommand() {
         .description('Pull changes from remote repository with automatic rebase fallback')
         .option('--rebase', 'force rebase strategy')
         .option('--no-rebase', 'prevent automatic rebase fallback')
-        .action(async (options) => {
+        .addHelpText('after', `
+Examples:
+  Normal pull (auto-rebases on divergence):
+    $ neo git pull
+
+  Force rebase:
+    $ neo git pull --rebase
+
+  Agent-friendly (structured output, auto-handles divergence):
+    $ neo git pull --yes --json
+`)
+        .action(runAction(async (options) => {
         let validatedOptions;
         try {
             validatedOptions = validate(gitPullOptionsSchema, options, 'git pull options');
@@ -337,17 +341,15 @@ export function createPullCommand() {
         }
         const result = await executePull(validatedOptions);
         if (isFailure(result)) {
-            ui.error(result.error.message);
-            if (result.error.suggestions && result.error.suggestions.length > 0) {
-                ui.warn('Suggestions:');
-                ui.list(result.error.suggestions);
-            }
-            if (result.error.context?.['error']) {
-                ui.muted(String(result.error.context['error']));
-            }
+            emitError(result.error);
             process.exit(1);
         }
-    });
+        if (result.data.cancelled) {
+            emitJson({ ok: false, command: 'git.pull', cancelled: true, reason: result.data.reason });
+            return;
+        }
+        emitJson({ ok: true, command: 'git.pull' });
+    }));
     return command;
 }
 //# sourceMappingURL=index.js.map

package/dist/commands/git/pull/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/git/pull/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/git/pull/index.ts"],"names":[],"mappings":"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"}

package/dist/commands/git/push/index.d.ts

@@ -5,6 +5,8 @@ interface PushOptions {
     passthrough: string[];
     remote?: string | undefined;
     branch?: string | undefined;
+    forceMain?: boolean | undefined;
+    onReject?: 'pull-rebase' | 'force' | 'cancel' | undefined;
 }
 export declare function executePush(options: PushOptions): Promise<Result<void>>;
 export declare function createPushCommand(): Command;

package/dist/commands/git/push/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/git/push/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAMtD,OAAO,EAAE,KAAK,MAAM,EAA+B,MAAM,wBAAwB,CAAC;AAUlF,UAAU,WAAW;IACnB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B;AAMD,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAiJ7E;AAiFD,wBAAgB,iBAAiB,IAAI,OAAO,CA0D3C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/git/push/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAStD,OAAO,EAAE,KAAK,MAAM,EAA+B,MAAM,wBAAwB,CAAC;AAUlF,UAAU,WAAW;IACnB,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAEhC,QAAQ,CAAC,EAAE,aAAa,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC;CAC3D;AAMD,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAiK7E;AAiFD,wBAAgB,iBAAiB,IAAI,OAAO,CA4E3C"}