@radkode/neo 0.16.0 → 1.0.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Jacek Radko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,306 +1,125 @@
-```
-  ███╗   ██╗███████╗ ██████╗     ██████╗██╗     ██╗
-  ████╗  ██║██╔════╝██╔═══██╗   ██╔════╝██║     ██║
-  ██╔██╗ ██║█████╗  ██║   ██║   ██║     ██║     ██║
-  ██║╚██╗██║██╔══╝  ██║   ██║   ██║     ██║     ██║
-  ██║ ╚████║███████╗╚██████╔╝   ╚██████╗███████╗██║
-  ╚═╝  ╚═══╝╚══════╝ ╚═════╝     ╚═════╝╚══════╝╚═╝
-```
-
 <div align="center">
 
-### Modern CLI toolkit with intelligent git workflows and configuration management
+# Neo CLI
+
+**An opinionated CLI that wraps common commands to smooth out paper cuts and speed up your workflow.**
 
 [![npm version](https://img.shields.io/npm/v/@radkode/neo.svg)](https://www.npmjs.com/package/@radkode/neo)
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 [![TypeScript](https://img.shields.io/badge/TypeScript-Ready-blue.svg)](https://www.typescriptlang.org/)
 [![CI](https://github.com/radkode/neo/workflows/CI/badge.svg)](https://github.com/radkode/neo/actions)
 
-Intelligent git operations • Configuration management • Self-updating
-
 </div>
 
 ---
 
-## Features
+## Why Neo?
+
+Daily CLI workflows have friction. Neo wraps familiar commands with sensible defaults and guardrails:
 
-✨ **Smart Git Operations** - Enhanced git commands with safety confirmations  
-⚙️ **Configuration Management** - Simple key-value configuration storage  
-🛡️ **Branch Protection** - Interactive confirmation for main branch pushes  
-🔄 **Self-Updating** - Built-in update command with smart package manager detection  
-🎨 **Beautiful UI** - Colorful output with progress indicators and banners  
-📦 **Semantic Versioning** - Automated releases with changesets  
-🚀 **TypeScript First** - Built with full TypeScript support and type safety
+| Friction | Neo's Solution |
+|----------|----------------|
+| Accidentally pushing to `main` | Interactive confirmation before main branch pushes |
+| Forgetting to pull before pushing | `neo git push` pulls first, then pushes |
+| Typing `git stash && git pull && git stash pop` | `neo git pull` handles it automatically |
+| Managing scattered config files | Unified `neo config` with secure secrets storage |
 
-## Installation
+Neo doesn't replace your tools—it wraps them with opinions that prevent mistakes and save keystrokes.
+
+## Install
 
 ```bash
-# Install globally
 npm install -g @radkode/neo
-# or with pnpm
+# or
 pnpm add -g @radkode/neo
 ```
 
 ## Quick Start
 
 ```bash
-# Display help and available commands
-neo --help
-
-# Initialize Neo CLI configuration
-neo init
-
-# Check for updates
-neo update --check-only
-
-# Configure a setting
-neo config set editor.default "code"
-
-# Smart git push with main branch protection
-neo git push
-
-# View current configuration
-neo config list
+neo --help          # See all commands
+neo git push        # Smart push with main branch protection
+neo git pull        # Auto-stash, pull, pop
+neo config list     # View your configuration
 ```
 
-## Demo
+## Commands
 
-### Smart Git Push Protection
+### `neo git push`
 
-When attempting to push to the main branch, Neo intelligently prompts for confirmation:
+Pulls before pushing. Prompts for confirmation on `main`.
 
 ```bash
-$ neo git push
-
-⚡ NEO CLI
-  Radkode's Lightning-Fast CLI Framework
-
-⚠️  You are about to push directly to the main branch.
-This is generally not recommended as it bypasses code review processes.
-✔ Are you sure you want to continue? » No
-
-✅ Push cancelled. Here's how to push your changes safely:
-  1. Create a feature branch: git checkout -b feature/your-feature-name
-  2. Push to your branch: git push -u origin feature/your-feature-name
-  3. Create a pull request to merge into main
-
-This protects the main branch from accidental changes.
+neo git push              # Safe push (confirms on main)
+neo git push --force      # Force push
+neo git push --tags       # Include tags
 ```
 
-### Beautiful Configuration Management
-
-```bash
-$ neo config set theme.primary "#00ff88"
-✨ Configuration saved: theme.primary = "#00ff88"
+### `neo git pull`
 
-$ neo config list
-📝 Your Configuration:
-
-  🎨 theme.primary     "#00ff88"
-  💻 editor.default   "code"
-  🚀 workflow.auto    true
-```
-
-## Commands
-
-### `init`
-
-Install and configure Neo CLI globally.
+Stashes uncommitted changes, pulls, and restores your work.
 
 ```bash
-neo init
+neo git pull              # Auto-stash and pull
+neo git pull --rebase     # Pull with rebase
 ```
 
-Options:
-
-- `--force` - Force reconfiguration if already initialized
-- `--skip-install` - Skip global installation (configuration only)
-
-### `config`
+### `neo git stash`
 
-Manage configuration values with simple key-value storage.
+Simplified stash management.
 
 ```bash
-# Set a configuration value
-neo config set api.key "your-api-key"
-
-# Get a configuration value
-neo config get api.key
-
-# List all configuration values
-neo config list
+neo git stash             # Stash changes
+neo git stash pop         # Pop latest stash
+neo git stash list        # List stashes
 ```
 
-Subcommands:
-
-- `config get <key>` - Get a configuration value
-- `config set <key> <value>` - Set a configuration value
-- `config list` - List all configuration values
-
-### `git`
-
-Enhanced git operations with safety features.
+### `neo config`
 
-#### `git push`
-
-Smart git push with main branch protection.
+Key-value configuration with secure secrets storage.
 
 ```bash
-# Regular push (prompts for confirmation on main branch)
-neo git push
-
-# Force push (use with caution)
-neo git push --force
-
-# Dry run to see what would be pushed
-neo git push --dry-run
-
-# Push and set upstream branch
-neo git push --set-upstream origin feature-branch
-
-# Push with tags
-neo git push --tags
+neo config set key value  # Set a value
+neo config get key        # Get a value
+neo config list           # List all values
 ```
 
-Options:
+### `neo update`
 
-- `-f, --force` - Force push (overwrites remote)
-- `-u, --set-upstream <branch>` - Set upstream branch
-- `--dry-run` - Show what would be pushed without actually pushing
-- `--tags` - Push tags along with commits
-
-**Safety Features:**
-
-- ⚠️ Interactive confirmation when pushing to main branch
-- 📝 Helpful guidance for safer alternatives
-- ✅ Graceful cancellation (exits with success code)
-- 🎯 Encourages best practices while allowing flexibility
-
-### `update`
-
-Update Neo CLI to the latest version from npm.
+Self-update with your detected package manager.
 
 ```bash
-# Update to the latest version (with confirmation)
-neo update
-
-# Check for updates without installing
-neo update --check-only
-
-# Force update/reinstall even if on latest version
-neo update --force
+neo update                # Update to latest
+neo update --check-only   # Check for updates
 ```
 
-Options:
-
-- `--check-only` - Only check for updates without installing
-- `--force` - Force update even if already on latest version
-
-**Features:**
-
-- 🔍 Automatic version checking against npm registry
-- 📦 Smart package manager detection (npm, pnpm, yarn)
-- ✨ Interactive confirmation before updating
-- 🎯 Helpful error messages for permission issues
-- ⚡ Progress indicators with real-time status
-
 ## Global Options
 
-- `-v, --verbose` - Enable verbose logging
-- `-c, --config <path>` - Path to config file
-- `--no-color` - Disable colored output
-- `--no-banner` - Hide banner
-- `-h, --help` - Display help
-- `-V, --version` - Display version
+```
+-v, --verbose     Verbose output
+--no-color        Disable colors
+--no-banner       Hide banner
+-h, --help        Show help
+-V, --version     Show version
+```
 
 ## Development
 
-### Setup
-
 ```bash
 git clone https://github.com/radkode/neo.git
 cd neo
 pnpm install
-```
-
-### Build
-
-```bash
 pnpm run build
-```
-
-### Test
-
-```bash
 pnpm test
-pnpm run test:watch
-pnpm run test:coverage
-```
 
-### Local Development
-
-```bash
-# Link for local testing
+# Local testing
 pnpm run link-local
-
-# Test the CLI
 neo --help
-
-# Unlink when done
 pnpm run unlink-local
 ```
 
-### Versioning & Releases
-
-This project uses [Changesets](https://github.com/changesets/changesets) for version management and publishing.
-
-#### Creating a Changeset
-
-When you make changes that should be released, create a changeset:
-
-```bash
-# Create a new changeset
-pnpm changeset
-```
-
-This will:
-
-1. Prompt you to select which packages to version (this project has one)
-2. Ask for the type of change (patch, minor, major)
-3. Request a description of the changes
-4. Generate a changeset file in `.changeset/`
-
-#### Release Workflow
-
-```bash
-# Check current changeset status
-pnpm changeset:status
-
-# Consume changesets and update version
-pnpm version-packages
-
-# Publish to npm (after tests pass)
-pnpm release
-```
-
-#### Change Types
-
-- **patch**: Bug fixes, small improvements (0.1.0 → 0.1.1)
-- **minor**: New features, enhancements (0.1.0 → 0.2.0)
-- **major**: Breaking changes (0.1.0 → 1.0.0)
-
-#### CI Integration
-
-The changeset workflow integrates with:
-
-- GitHub releases and changelogs
-- Automated version bumping
-- NPM publishing pipeline
+See [CONTRIBUTING.md](CONTRIBUTING.md) for more details.
 
 ## License
 
-MIT © Jacek Radko
-
----
-
-Built with ⚡ by [Radkode](https://github.com/jacekradko)
+[MIT](LICENSE) © Jacek Radko

package/dist/cli.d.ts

@@ -1,3 +1,3 @@
 import { Command } from '@commander-js/extra-typings';
-export declare function createCLI(): Command;
+export declare function createCLI(): Promise<Command>;
 //# sourceMappingURL=cli.d.ts.map

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAWtD,wBAAgB,SAAS,IAAI,OAAO,CAkEnC"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAgBtD,wBAAsB,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAkJlD"}

package/dist/cli.js

@@ -6,8 +6,11 @@ import { registerCommands } from './commands/index.js';
 import { configManager } from './utils/config.js';
 import { notifyIfCliUpdateAvailable } from './utils/update-check.js';
 import { Colors } from './utils/ui-types.js';
+import { pluginRegistry, commandRegistry } from './core/plugins/index.js';
+import { success } from './core/errors/index.js';
 import packageJson from '../package.json' with { type: 'json' };
-export function createCLI() {
+let pluginsLoaded = false;
+export async function createCLI() {
     const program = new Command();
     program
         .name('neo')
@@ -47,36 +50,122 @@ export function createCLI() {
         if (!isHelpOrVersion) {
             await notifyIfCliUpdateAvailable();
         }
+        if (pluginsLoaded) {
+            await pluginRegistry.executeBeforeCommand(commandName, opts);
+        }
+    })
+        .hook('postAction', async (_thisCommand, actionCommand) => {
+        const commandName = actionCommand.name();
+        if (pluginsLoaded) {
+            await pluginRegistry.executeAfterCommand(commandName, success(undefined));
+        }
     });
     registerCommands(program);
-    return program;
-}
-if (import.meta.url === `file://${process.argv[1]}` || process.argv[1]?.endsWith('cli.js')) {
-    const program = createCLI();
-    if (process.argv.length <= 2) {
-        program.help();
-    }
-    program.exitOverride();
     try {
-        program.parse();
-    }
-    catch (err) {
-        if (err && typeof err === 'object' && 'code' in err) {
-            if (err.code === 'commander.helpDisplayed' || err.code === 'commander.help') {
-                process.exit(0);
+        const config = await configManager.read();
+        const pluginsEnabled = config.plugins?.enabled !== false;
+        if (pluginsEnabled) {
+            const disabledPlugins = config.plugins?.disabled ?? [];
+            await pluginRegistry.loadPlugins(disabledPlugins);
+            pluginsLoaded = true;
+            for (const command of commandRegistry.getAll()) {
+                const cmd = new Command(command.name);
+                cmd.description(command.description);
+                if (command.options) {
+                    for (const opt of command.options) {
+                        if (opt.required) {
+                            cmd.requiredOption(opt.flags, opt.description, opt.defaultValue);
+                        }
+                        else {
+                            cmd.option(opt.flags, opt.description, opt.defaultValue);
+                        }
+                    }
+                }
+                if (command.arguments) {
+                    for (const arg of command.arguments) {
+                        if (arg.required) {
+                            cmd.argument(`<${arg.name}>`, arg.description);
+                        }
+                        else {
+                            cmd.argument(`[${arg.name}]`, arg.description);
+                        }
+                    }
+                }
+                cmd.action(async (...args) => {
+                    const opts = args[args.length - 2];
+                    const cmdArgs = args.slice(0, -2);
+                    if (command.validate && !command.validate(opts)) {
+                        logger.error(`Invalid options for command "${command.name}"`);
+                        process.exit(1);
+                    }
+                    const result = await command.execute(opts, cmdArgs);
+                    if (!result.success) {
+                        logger.error(result.error.message);
+                        process.exit(1);
+                    }
+                });
+                program.addCommand(cmd);
+                logger.debug(`Registered plugin command: ${command.name}`);
             }
-            if (err.code === 'commander.version') {
-                process.exit(0);
+            if (pluginRegistry.size > 0) {
+                logger.debug(`Loaded ${pluginRegistry.size} plugin(s)`);
             }
-            if (err.code === 'commander.missingArgument' || err.code === 'commander.unknownCommand') {
-                console.error(`\n${chalk.hex(Colors.error)('Error:')} ${err instanceof Error ? err.message : String(err)}`);
-                console.log(`\nRun ${chalk.hex(Colors.primary)('neo --help')} for usage information.`);
-                process.exit(1);
+        }
+    }
+    catch (error) {
+        logger.debug(`Plugin loading failed: ${error}`);
+    }
+    return program;
+}
+async function cleanup(code) {
+    if (pluginsLoaded) {
+        await pluginRegistry.executeOnExit(code);
+        await pluginRegistry.disposeAll();
+    }
+}
+if (import.meta.url === `file://${process.argv[1]}` || process.argv[1]?.endsWith('cli.js')) {
+    process.on('beforeExit', async (code) => {
+        await cleanup(code);
+    });
+    process.on('SIGINT', async () => {
+        await cleanup(130);
+        process.exit(130);
+    });
+    process.on('SIGTERM', async () => {
+        await cleanup(143);
+        process.exit(143);
+    });
+    createCLI()
+        .then((program) => {
+        if (process.argv.length <= 2) {
+            program.help();
+        }
+        program.exitOverride();
+        try {
+            program.parse();
+        }
+        catch (err) {
+            if (err && typeof err === 'object' && 'code' in err) {
+                if (err.code === 'commander.helpDisplayed' || err.code === 'commander.help') {
+                    process.exit(0);
+                }
+                if (err.code === 'commander.version') {
+                    process.exit(0);
+                }
+                if (err.code === 'commander.missingArgument' || err.code === 'commander.unknownCommand') {
+                    console.error(`\n${chalk.hex(Colors.error)('Error:')} ${err instanceof Error ? err.message : String(err)}`);
+                    console.log(`\nRun ${chalk.hex(Colors.primary)('neo --help')} for usage information.`);
+                    process.exit(1);
+                }
             }
+            const errorMessage = err instanceof Error ? err.message : String(err);
+            logger.error(errorMessage);
+            process.exit(1);
         }
-        const errorMessage = err instanceof Error ? err.message : String(err);
-        logger.error(errorMessage);
+    })
+        .catch((err) => {
+        logger.error(`CLI initialization failed: ${err}`);
         process.exit(1);
-    }
+    });
 }
 //# sourceMappingURL=cli.js.map

package/dist/cli.js.map

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

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;AAQtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAA+B,MAAM,wBAAwB,CAAC;AAclF,wBAAsB,WAAW,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CA4JhF;AA4ED,wBAAgB,iBAAiB,IAAI,OAAO,CAqC3C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/git/push/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;AAclF,wBAAsB,WAAW,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAiKhF;AAkFD,wBAAgB,iBAAiB,IAAI,OAAO,CA8C3C"}

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

@@ -40,8 +40,12 @@ export async function executePush(options) {
             ui.step('Proceeding with push to main branch');
         }
         spinner.start();
+        const remoteName = options.remote || 'origin';
+        const targetBranch = options.branch || branchName;
         logger.debug(`Force push: ${options.force || false}`);
-        logger.debug(`Set upstream: ${options.setUpstream || 'none'}`);
+        logger.debug(`Set upstream: ${options.setUpstream || false}`);
+        logger.debug(`Remote: ${remoteName}`);
+        logger.debug(`Target branch: ${targetBranch}`);
         logger.debug(`Dry run: ${options.dryRun || false}`);
         logger.debug(`Push tags: ${options.tags || false}`);
         if (options.dryRun) {
@@ -75,11 +79,9 @@ export async function executePush(options) {
             pushArgs.push('--tags');
         }
         if (options.setUpstream) {
-            pushArgs.push('-u', 'origin', options.setUpstream);
-        }
-        else {
-            pushArgs.push('origin', branchName);
+            pushArgs.push('-u');
         }
+        pushArgs.push(remoteName, targetBranch);
         logger.debug(`Executing: git ${pushArgs.join(' ')}`);
         const pushResult = await execa('git', pushArgs, {
             stdio: 'pipe',
@@ -90,7 +92,7 @@ export async function executePush(options) {
             ui.muted(pushResult.stdout);
         }
         if (options.setUpstream) {
-            ui.info(`Set upstream branch: ${options.setUpstream}`);
+            ui.info(`Set upstream branch: ${remoteName}/${targetBranch}`);
         }
         return success(undefined);
     }
@@ -155,7 +157,9 @@ async function handlePullRebase(branchName, pushArgs, options) {
             ui.muted(retryResult.stdout);
         }
         if (options.setUpstream) {
-            ui.info(`Set upstream branch: ${options.setUpstream}`);
+            const remoteName = pushArgs[pushArgs.length - 2];
+            const targetBranch = pushArgs[pushArgs.length - 1];
+            ui.info(`Set upstream branch: ${remoteName}/${targetBranch}`);
         }
         return success(undefined);
     }
@@ -183,7 +187,9 @@ async function handleForcePush(pushArgs, options) {
             ui.muted(forceResult.stdout);
         }
         if (options.setUpstream) {
-            ui.info(`Set upstream branch: ${options.setUpstream}`);
+            const remoteName = pushArgs[pushArgs.length - 2];
+            const targetBranch = pushArgs[pushArgs.length - 1];
+            ui.info(`Set upstream branch: ${remoteName}/${targetBranch}`);
         }
         return success(undefined);
     }
@@ -196,14 +202,21 @@ export function createPushCommand() {
     const command = new Command('push');
     command
         .description('Push changes to remote repository')
+        .argument('[remote]', 'remote name (default: origin)')
+        .argument('[branch]', 'branch name (default: current branch)')
         .option('-f, --force', 'force push (overwrites remote)')
-        .option('-u, --set-upstream <branch>', 'set upstream branch')
+        .option('-u, --set-upstream', 'set upstream tracking reference')
         .option('--dry-run', 'show what would be pushed without actually pushing')
         .option('--tags', 'push tags along with commits')
-        .action(async (options) => {
+        .action(async (remote, branch, options) => {
+        const mergedOptions = {
+            ...options,
+            remote,
+            branch,
+        };
         let validatedOptions;
         try {
-            validatedOptions = validate(gitPushOptionsSchema, options, 'git push options');
+            validatedOptions = validate(gitPushOptionsSchema, mergedOptions, 'git push options');
         }
         catch (error) {
             if (isValidationError(error)) {