merge(pr): pull request #1 from darwincereska

feat(help): added new cli parser and help menu

CHECKLIST.md

@@ -91,9 +91,9 @@
 # Utilities and Polish
 
 - [x] Add colored output for better UX
-- [ ] Implement proper error handling messages
-- [ ] Add input validation for all commands
-- [ ] Create help system (`notevc --help`)
+- [x] Implement proper error handling messages
+- [x] Add input validation for all commands
+- [x] Create help system (`notevc --help`)
 - [x] Add version information (`notevc --version`)
 - [ ] Implement configuration file support
 

build.gradle.kts

@@ -4,13 +4,13 @@ plugins {
     kotlin("jvm") version "2.2.21"
     kotlin("plugin.serialization") version "2.2.21"
     application
-    id("com.github.gmazzo.buildconfig") version "4.1.2"
+    id("com.github.gmazzo.buildconfig") version "5.7.1"
     id("com.gradleup.shadow") version "9.2.2"
     id("org.graalvm.buildtools.native") version "0.10.4"
 }
 
 group = "org.notevc"
-version = "1.0.6"
+version = "1.0.7"
 
 buildConfig {
     buildConfigField("String", "VERSION", "\"${project.version}\"")
@@ -26,6 +26,7 @@ dependencies {
     val junitVersion = "5.10.0"
     implementation(kotlin("stdlib"))
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
+    implementation("org.kargs:kargs:1.0.4")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
@@ -50,16 +51,14 @@ graalvmNative {
 
             buildArgs.addAll(listOf(
                 "--no-fallback",
-                "-H:+ReportExceptionStackTraces",
                 "-H:+UnlockExperimentalVMOptions",
                 "--initialize-at-build-time=kotlin",
                 "--initialize-at-build-time=kotlinx",
-                "--initialize-at-build-time=io.notevc",
-                "-H:IncludeResources=.*\\.json",
-                "-H:IncludeResources=.*\\.properties",
+                "--initialize-at-build-time=org.notevc",
+                // "-H:IncludeResources=.*\\.json",
+                // "-H:IncludeResources=.*\\.properties",
                 "-Ob",  // Optimize for size
-                "--gc=serial",  // Use smaller GC (if you don't need G1)
-                "--strict-image-heap"
+                "--gc=epsilon",  // Serial or epsilon
             ))
         }
     }
@@ -80,3 +79,4 @@ tasks.jar {
 tasks.startScripts {
     dependsOn(tasks.shadowJar)
 }
+

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,248 @@
+#!/bin/sh
+
+#
+# Copyright © 2015 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,93 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

src/main/kotlin/org/notevc/NoteVC.kt

@@ -3,103 +3,28 @@ package org.notevc
 import org.notevc.core.Repository
 import org.notevc.commands.*
 import org.notevc.utils.ColorUtils
+import org.kargs.*
 
 fun main(args: Array<String>) {
-    // Parse global flags first (like --no-color)
-    val filteredArgs = args.filter { arg ->
-        when (arg) {
-            "--no-color" -> {
-                ColorUtils.disableColors()
-                false  // Remove this arg from the list
-            }
-            else -> true  // Keep this arg
-        }
-    }.toTypedArray()
+    // Create argument parser
+    val parser = Parser("notevc", ParserConfig(programVersion = Repository.VERSION))
 
-    // Args logic
-    when (filteredArgs.firstOrNull()) {
-        "init", "i" -> {
-            val initCommand = InitCommand()
-            val result = initCommand.execute(filteredArgs.getOrNull(1))
+    // Register subcommands
+    parser.subcommands(
+        StatusCommand(),
+        InitCommand(),
+        CommitCommand(),
+        LogCommand(),
+        DiffCommand(),
+        ShowCommand(),
+        RestoreCommand()
+    )
 
-            result.fold(
-                onSuccess = { message -> println(message) },
-                onFailure = { error -> println("${ColorUtils.error("Error:")} ${error.message}") }
-            )
-        }
-
-        "log" -> {
-            val logArgs = filteredArgs.drop(1)
-            val logCommand = LogCommand()
-            val result = logCommand.execute(logArgs)
-
-            result.fold(
-                onSuccess = { output -> println(output) },
-                onFailure = { error -> println("${ColorUtils.error("Error:")} ${error.message}") }
-            )
-        }
-
-        "commit" -> {
-            val commitArgs = filteredArgs.drop(1)
-            val commitCommand = CommitCommand()
-            val result = commitCommand.execute(commitArgs)
-
-            result.fold(
-                onSuccess = { output -> println(output) },
-                onFailure = { error -> println("${ColorUtils.error("Error:")} ${error.message}") }
-            )
-        }
-
-        "status", "st" -> {
-            val statusCommand = StatusCommand()
-            val result = statusCommand.execute()
-
-            result.fold(
-                onSuccess = { output -> println(output) },
-                onFailure = { error -> println("${ColorUtils.error("Error:")} ${error.message}") }
-            )
-        }
-
-        "version", "--version", "-v" -> {
-            println("notevc version ${Repository.VERSION}")
-        }
-
-        "restore" -> {
-            val restoreArgs = filteredArgs.drop(1)
-            val restoreCommand = RestoreCommand()
-            val result = restoreCommand.execute(restoreArgs)
-
-            result.fold(
-                onSuccess = { output -> println(output) },
-                onFailure = { error -> println("${ColorUtils.error("Error:")} ${error.message}") }
-            )
-        }
-
-        "diff" -> {
-            val diffArgs = filteredArgs.drop(1)
-            val diffCommand = DiffCommand()
-            val result = diffCommand.execute(diffArgs)
-
-            result.fold(
-                onSuccess = { output -> println(output) },
-                onFailure = { error -> println("${ColorUtils.error("Error:")} ${error.message}") }
-            )
-        }
-
-        "show" -> {
-            val showArgs = filteredArgs.drop(1)
-            val showCommand = ShowCommand()
-            val result = showCommand.execute(showArgs)
-
-            result.fold(
-                onSuccess = { output -> println(output) },
-                onFailure = { error -> println("${ColorUtils.error("Error:")} ${error.message}") }
-            )
-        }
-        
-        else -> {
-            println("Usage: notevc [--no-color] init|commit|status|log|restore|diff|show|version")
-            println("For more info, visit: ${ColorUtils.bold("https://notevc.org")}")
-        }
+    // Parse arguments
+    try {
+        parser.parse(args)
+    } catch (e: Exception) {
+        kotlin.system.exitProcess(1)
     }
 }
+

src/main/kotlin/org/notevc/commands/CommitCommand.kt

@@ -9,49 +9,28 @@ import java.nio.file.Files
 import java.time.Instant
 import org.notevc.utils.ColorUtils
 import kotlin.io.path.*
+import org.kargs.Subcommand
+import org.kargs.ArgType
+import org.kargs.Option
+import org.kargs.Argument
 
-class CommitCommand {
+class CommitCommand : Subcommand("commit", description = "Create a commit of changed files") {
+    val targetFile by Option(ArgType.readableFile(), longName = "file", shortName = "f", description = "Commit only a specific file")
+    val message by Argument(ArgType.String, name = "message", description = "Message for commit", required = true)
 
-    fun execute(args: List<String>): Result<String> {
-        return try {
-            val (targetFile, message) = parseArgs(args)
+    override fun execute() {
+        val result: Result<String> = runCatching {
+            val repo = Repository.find() ?: throw Exception("Not in a notevc repository. Run `notevc init` first.")
 
-            if (message.isBlank()) {
-                return Result.failure(Exception("Commit message cannot be empty"))
-            }
-            
-            val repo = Repository.find()
-                ?: return Result.failure(Exception("Not in a notevc repository. Run 'notevc init' first."))
-            
-            val commitResult = if (targetFile != null) {
-                createSingleFileCommit(repo, targetFile, message)
+            if (targetFile != null) {
+                createSingleFileCommit(repo, targetFile.toString(), message!!)
             } else {
-                createChangedFilesCommit(repo, message)
+                createChangedFilesCommit(repo, message!!)
             }
-            
-            Result.success(commitResult)
-        } catch (e: Exception) {
-            Result.failure(e)
-        }
-    }
-    
-    private fun parseArgs(args: List<String>): Pair<String?, String> {
-        if (args.isEmpty()) {
-            return null to ""
         }
 
-        // Check for --file flag
-        val fileIndex = args.indexOf("--file")
-        if (fileIndex != -1 && fileIndex + 1 < args.size) {
-            val targetFile = args[fileIndex + 1]
-            val messageArgs = args.filterIndexed { index, _ -> 
-                index != fileIndex && index != fileIndex + 1 
-            }
-            return targetFile to messageArgs.joinToString(" ")
-        }
-        
-        // No --file flag, all args are the message
-        return null to args.joinToString(" ")
+        result.onSuccess { message -> println(message) }
+        result.onFailure { error -> println("${ColorUtils.error("Error:")} ${error.message}") }
     }
     
     private fun createSingleFileCommit(repo: Repository, targetFile: String, message: String): String {
@@ -66,7 +45,7 @@ class CommitCommand {
             throw Exception("File not found: $targetFile")
         }
         
-        if (!targetFile.endsWith(".md")) {
+        if (!targetFile.toString().endsWith(".md")) {
             throw Exception("Only markdown files (.md) are supported")
         }
         

src/main/kotlin/org/notevc/commands/DiffCommand.kt

@@ -6,80 +6,54 @@ import kotlinx.serialization.json.Json
 import java.nio.file.Files
 import java.time.Instant
 import kotlin.io.path.*
+import org.kargs.*
 
-class DiffCommand {
+class DiffCommand : Subcommand("diff", description = "Show differences between commits or working directory") {
+    val commitHash1 by Argument(ArgType.String, name = "commit1", description = "First commit", required = false)
+    val commitHash2 by Argument(ArgType.String, name = "commit2", description = "Second commit", required = false)
+    val targetFile by Option(ArgType.readableFile(), longName = "file", shortName = "f", description = "Show diff for specific file only") 
+    val blockHash by Option(ArgType.String, longName = "block", shortName = "b", description = "Compare specific block only")
 
-    fun execute(args: List<String>): Result<String> {
-        return try {
-            val options = parseArgs(args)
+    override fun execute() {
+        val result: Result<String> = runCatching {
+            val repo = Repository.find() ?: throw Exception("Not in a notevc repository. Run `notevc init` first.")
 
-            val repo = Repository.find()
-                ?: return Result.failure(Exception("Not in a notevc repository. Run 'notevc init' first."))
-
-            val result = when {
-                options.blockHash != null -> {
-                    // Compare specific block
-                    compareSpecificBlock(repo, options.commitHash1, options.blockHash, options.targetFile)
+            when {
+                blockHash != null && commitHash1 != null -> {
+                    // Compare specific block to commit
+                    if (targetFile == null) {
+                        throw Exception("--file is required when using --block option")
+                    }
+                    compareSpecificBlock(repo, commitHash1, blockHash!!, targetFile!!.toString())
                 }
-                options.commitHash1 != null && options.commitHash2 != null -> {
+
+                blockHash != null -> {
+                    // Compare specific block in working directory
+                    if (targetFile == null) {
+                        throw Exception("--file is required when using --block option")
+                    }
+                    compareSpecificBlock(repo, null, blockHash!!, targetFile!!.toString())
+                }
+
+                commitHash1 != null && commitHash2 != null -> {
                     // Compare two commits
-                    compareCommits(repo, options.commitHash1, options.commitHash2, options.targetFile)
+                    compareCommits(repo, commitHash1!!, commitHash2!!, targetFile?.toString())
                 }
-                options.commitHash1 != null -> {
+
+                commitHash1 != null -> {
                     // Compare working directory to a commit
-                    compareWorkingDirectoryToCommit(repo, options.commitHash1, options.targetFile)
+                    compareWorkingDirectoryToCommit(repo, commitHash1!!, targetFile?.toString())
                 }
+
                 else -> {
                     // Show changes in working directory (not committed)
-                    showWorkingDirectoryChanges(repo, options.targetFile)
+                    showWorkingDirectoryChanges(repo, targetFile?.toString())
                 }
             }
-
-            Result.success(result)
-        } catch (e: Exception) {
-            Result.failure(e)
-        }
-    }
-
-    private fun parseArgs(args: List<String>): DiffOptions {
-        var commitHash1: String? = null
-        var commitHash2: String? = null
-        var targetFile: String? = null
-        var blockHash: String? = null
-
-        var i = 0
-        while (i < args.size) {
-            when {
-                args[i].startsWith("--file=") -> {
-                    targetFile = args[i].substring(7)
-                    i++
-                }
-                args[i] == "--file" && i + 1 < args.size -> {
-                    targetFile = args[i + 1]
-                    i += 2
-                }
-                args[i] == "--block" || args[i] == "-b" -> {
-                    if (i + 1 < args.size && !args[i + 1].startsWith("-")) {
-                        blockHash = args[i + 1]
-                        i += 2
-                    } else {
-                        i++
-                    }
-                }
-                !args[i].startsWith("-") -> {
-                    // This is a commit hash
-                    if (commitHash1 == null) {
-                        commitHash1 = args[i]
-                    } else if (commitHash2 == null) {
-                        commitHash2 = args[i]
-                    }
-                    i++
-                }
-                else -> i++
-            }
         }
 
-        return DiffOptions(commitHash1, commitHash2, targetFile, blockHash)
+        result.onSuccess { message -> println(message) }
+        result.onFailure { error -> println("${ColorUtils.error("Error:")} ${error.message}") }
     }
 
     private fun compareSpecificBlock(repo: Repository, commitHash: String?, blockHash: String, targetFile: String?): String {

src/main/kotlin/org/notevc/commands/InitCommand.kt

@@ -3,26 +3,29 @@ package org.notevc.commands
 import org.notevc.core.Repository
 import java.nio.file.Path
 import org.notevc.utils.ColorUtils
+import org.kargs.Subcommand
+import org.kargs.Argument
+import org.kargs.ArgType
 
-class InitCommand {
-    fun execute(path: String?): Result<String> {
-        return try {
+class InitCommand : Subcommand("init", description = "Initialize a repository", aliases = listOf("i")) {
+    val path by Argument(ArgType.existingDirectory(), "path", description = "Initialize in a specified directory", required = false)
+
+    override fun execute() {
+        val result: Result<String> = runCatching {
             val repo = if (path != null) {
-                Repository.at(path).getOrElse { return Result.failure(it) }
+                Repository.at(path!!.toString()).getOrElse { throw Exception(it) }
             } else Repository.current()
 
             repo.init().fold(
                 onSuccess = {
                     val absolutePath = repo.path.toAbsolutePath().toString()
-                    Result.success("${ColorUtils.success("Initialized notevc repository")} in ${ColorUtils.filename(repo.path.toAbsolutePath().toString())}")
+                    "Initialized notevc repository in ${ColorUtils.filename(absolutePath)}"
                 },
-                onFailure = {
-                    error -> Result.failure(error)
-                }
+                onFailure = { error -> throw Exception(error) }
             )
         }
-        catch (e: Exception) {
-            Result.failure(e)
-        }
+
+        result.onSuccess { message -> println(message) }
+        result.onFailure { error -> println("${ColorUtils.error("Error:")} ${error.message}") }
     }
 }

src/main/kotlin/org/notevc/commands/LogCommand.kt

@@ -8,67 +8,26 @@ import org.notevc.utils.ColorUtils
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import kotlin.io.path.*
+import org.kargs.*
 
-class LogCommand {
+class LogCommand : Subcommand("log", description = "Show commit history with details") {
+    val maxCount by Option(ArgType.intRange(1, 100), longName = "max-count", shortName = "n", description = "Limit the number of commits shown")
+    val since by Option(ArgType.String, longName = "since", shortName = "s", description = "Show commits since specified time (e.g. 1h, 2d, 1w)")
+    val oneline by Flag(longName = "oneline", "o", description = "Show compact one-line format")
+    val file by OptionalOption(longName = "file", shortName = "f", description = "Show specific file and block details for each commit")
 
-    fun execute(args: List<String>): Result<String> {
-        return try {
-            val repo = Repository.find()
-                ?: return Result.failure(Exception("Not in a notevc repository. Run 'notevc init' first."))
+    override fun execute() {
+        val result: Result<String> = runCatching {
+            val repo = Repository.find() ?: throw Exception("Not in a notevc repository. Run `notevc init` first.")
 
-            val options = parseArgs(args)
-            val logOutput = generateLog(repo, options)
+            val targetFile: String? = if (file == "true") null else file
 
-            Result.success(logOutput)
-        } catch (e: Exception) {
-            Result.failure(e)
-        }
-    }
-    
-    private fun parseArgs(args: List<String>): LogOptions {
-        var maxCount: Int? = null
-        var since: String? = null
-        var oneline = false
-        var showFiles = false
-        var targetFile: String? = null
-        
-        var i = 0
-        while (i < args.size) {
-            when (args[i]) {
-                "--max-count", "-n" -> {
-                    if (i + 1 < args.size && !args[i + 1].startsWith("-")) {
-                        maxCount = args[i + 1].toIntOrNull()
-                        i += 2
-                    } else {
-                        i++
-                    }
-                }
-                "--since" -> {
-                    if (i + 1 < args.size && !args[i + 1].startsWith("-")) {
-                        since = args[i + 1]
-                        i += 2
-                    } else {
-                        i++
-                    }
-                }
-                "--oneline" -> {
-                    oneline = true
-                    i++
-                }
-                "--file", "-f" -> {
-                    showFiles = true
-                    if (i + 1 < args.size && !args[i + 1].startsWith("-")) {
-                        targetFile = args[i + 1]
-                        i += 2
-                    } else {
-                        i++
-                    }
-                }
-                else -> i++
-            }
+            val options = LogOptions(maxCount, since, oneline ?: false, file == "true" || targetFile != null, targetFile)
+            generateLog(repo, options)
         }
 
-        return LogOptions(maxCount, since, oneline, showFiles, targetFile)
+        result.onSuccess { message -> println(message) }
+        result.onFailure { error -> println("${ColorUtils.error("Error:")} ${error.message}") }
     }
 
     private fun generateLog(repo: Repository, options: LogOptions): String {

src/main/kotlin/org/notevc/commands/RestoreCommand.kt

@@ -6,67 +6,36 @@ import kotlinx.serialization.json.Json
 import java.nio.file.Files
 import java.time.Instant
 import kotlin.io.path.*
+import org.kargs.*
 
-class RestoreCommand {
+class RestoreCommand : Subcommand("restore", description = "Restore files or blocks from a specific commit") {
+    val blockHash by Option(ArgType.String, longName = "block", shortName = "b", description = "Restore specific block only")
+    val commitHash by Argument(ArgType.String, name = "commit-hash", description = "Commit to restore from", required = true)
+    val targetFile by Argument(ArgType.writableFile(), name = "file", description = "Specific file to restore to", required = false)
 
-    fun execute(args: List<String>): Result<String> {
-        return try {
-            val options = parseArgs(args)
+    override fun execute() {
+        val result: Result<String> = runCatching {
+            val options = RestoreOptions(commitHash!!, blockHash, targetFile?.toString())
 
-            if (options.commitHash.isBlank()) {
-                return Result.failure(Exception("Commit hash is required"))
-            }
+            val repo = Repository.find() ?: throw Exception("Not in a notevc repository. Run `notevc init` first.")
 
-            val repo = Repository.find()
-            ?: return Result.failure(Exception("Not in a notevc repository. Run 'notevc init' first."))
-
-            val result = when {
+            when {
                 options.blockHash != null && options.targetFile != null -> {
-                    restoreSpecificBlock(repo, options.commitHash, options.blockHash, options.targetFile)
+                    restoreSpecificBlock(repo, options.blockHash, options.blockHash, options.targetFile)
                 }
+
                 options.targetFile != null -> {
                     restoreSpecificFile(repo, options.commitHash, options.targetFile)
                 }
+
                 else -> {
                     restoreEntireRepository(repo, options.commitHash)
                 }
             }
-
-            Result.success(result)
-        } catch (e: Exception) {
-            Result.failure(e)
-        }
-    }
-
-    private fun parseArgs(args: List<String>): RestoreOptions {
-        if (args.isEmpty()) {
-            return RestoreOptions("", null, null)
         }
 
-        val commitHash = args[0]
-        var blockHash: String? = null
-        var targetFile: String? = null
-
-        var i = 1
-        while (i < args.size) {
-            when (args[i]) {
-                "--block", "-b" -> {
-                    if (i + 1 < args.size) {
-                        blockHash = args[i + 1]
-                        i += 2
-                    } else {
-                        i++
-                    }
-                }
-                else -> {
-                    // Assume it's the target file
-                    targetFile = args[i]
-                    i++
-                }
-            }
-        }
-
-        return RestoreOptions(commitHash, blockHash, targetFile)
+        result.onSuccess { message -> println(message) }
+        result.onFailure { error -> println("${ColorUtils.error("Error:")} ${error.message}") }
     }
 
     private fun restoreSpecificBlock(repo: Repository, commitHash: String, blockHash: String, targetFile: String): String {

src/main/kotlin/org/notevc/commands/ShowCommand.kt

@@ -8,66 +8,29 @@ import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import kotlin.io.path.*
+import org.kargs.*
 
-class ShowCommand {
+class ShowCommand : Subcommand("show", description = "Show detailed information about a specific commit", aliases = listOf("sh")) {
+    val commitHash by Argument(ArgType.String, "commit-hash", description = "Commit to show", required = true)
+    val targetFile by Option(ArgType.readableFile(), longName = "file", shortName = "f", description = "Show changes only for specific file")
+    val blockHash by Option(ArgType.String, longName = "block", shortName = "b", description = "Show specific block content")
+    val showContent by Flag(longName = "content", shortName = "c", description = "Show full file content at commit")
 
-    fun execute(args: List<String>): Result<String> {
-        return try {
-            if (args.isEmpty()) {
-                return Result.failure(Exception("Commit hash is required. Usage: notevc show <commit-hash> [--file <file>] [--block <block>] [--content]"))
-            }
+    override fun execute() {
+        val result: Result<String> = runCatching {
+            val repo = Repository.find() ?: throw Exception("Not in a notevc repository. Run `notevc init` first.")
 
-            val options = parseArgs(args)
+            val options = ShowOptions(commitHash!!, targetFile?.toString(), blockHash, showContent ?: false)
 
-            val repo = Repository.find()
-                ?: return Result.failure(Exception("Not in a notevc repository. Run 'notevc init' first."))
-
-            val result = when {
+            when {
                 options.blockHash != null -> showBlock(repo, options)
                 options.showContent -> showFileContent(repo, options)
                 else -> showCommit(repo, options.commitHash, options.targetFile)
             }
-
-            Result.success(result)
-        } catch (e: Exception) {
-            Result.failure(e)
-        }
-    }
-
-    private fun parseArgs(args: List<String>): ShowOptions {
-        val commitHash = args[0]
-        var targetFile: String? = null
-        var blockHash: String? = null
-        var showContent = false
-
-        var i = 1
-        while (i < args.size) {
-            when {
-                args[i] == "--file" && i + 1 < args.size && !args[i + 1].startsWith("-") -> {
-                    targetFile = args[i + 1]
-                    i += 2
-                }
-                args[i].startsWith("--file=") -> {
-                    targetFile = args[i].substring(7)
-                    i++
-                }
-                args[i] == "--block" || args[i] == "-b" -> {
-                    if (i + 1 < args.size && !args[i + 1].startsWith("-")) {
-                        blockHash = args[i + 1]
-                        i += 2
-                    } else {
-                        i++
-                    }
-                }
-                args[i] == "--content" || args[i] == "-c" -> {
-                    showContent = true
-                    i++
-                }
-                else -> i++
-            }
         }
 
-        return ShowOptions(commitHash, targetFile, blockHash, showContent)
+        result.onSuccess { message -> println(message) }
+        result.onFailure { error -> println("${ColorUtils.error("Error:")} ${error.message}") }
     }
 
     private fun showCommit(repo: Repository, commitHash: String, targetFile: String?): String {

src/main/kotlin/org/notevc/commands/StatusCommand.kt

@@ -5,21 +5,23 @@ import org.notevc.utils.FileUtils
 import org.notevc.utils.ColorUtils
 import org.notevc.core.Repository.Companion.NOTEVC_DIR
 import java.time.Instant
+import org.kargs.Subcommand
 
-class StatusCommand {
-    fun execute(): Result<String> {
-        return try {
-            val repo = Repository.find()
-                ?: return Result.failure(Exception("Not in notevc repository. Run `notevc init` first."))
+class StatusCommand : Subcommand("status", description = "Show status of tracked files", aliases = listOf("st")) {
+    override fun execute() {
+        val result: Result<String> = runCatching {
+            try {
+                val repo = Repository.find() ?: throw Exception("Note in notevc repository. Run `notevc init` first.")
 
-            val status = getRepositoryStatus(repo)
-            val output = formatStatusOutput(status)
-
-            Result.success(output)
-        }
-        catch (e: Exception) {
-            Result.failure(e)
+                val status = getRepositoryStatus(repo)
+                formatStatusOutput(status)
+            } catch (e: Exception) {
+                throw e
+            }
         }
+
+        result.onSuccess { output -> println(output) }
+        result.onFailure { error -> println("${ColorUtils.error("Error:")} ${error.message}") }
     }
 
     private fun getRepositoryStatus(repo: Repository): RepositoryStatus {