easy-command 2.0.5 → 2.0.7

package/README.md

@@ -91,11 +91,11 @@ bash install.sh -y --no-chsh
 # Remove only the configuration block managed by easy-command
 bash install.sh --uninstall
 
-# Enable optional fuzzy search and Git aliases
-bash install.sh -y --with-fzf --with-git-aliases
+# Enable optional fuzzy search
+bash install.sh -y --with-fzf
 ```
 
-`zoxide` is installed by default. It enables `z <keyword>` directory jumping and `z add <directory>` (or `z a <directory>`) for manually recording a directory. Use `--without-zoxide` to disable it. `fzf` adds fuzzy history and file searching. Git aliases use the non-conflicting `ec-` prefix, such as `git ec-status`; existing aliases are never overwritten.
+`zoxide` is installed by default. It enables `z <keyword>` directory jumping and `z add <directory>` (or `z a <directory>`) for manually recording a directory. Directories are recorded only through `z add`, `z a`, `ec add`, or `ec a`; normal jumps never add a directory automatically. Use `--without-zoxide` to disable it. `fzf` adds fuzzy history and file searching. Git aliases are added by default, including `git st`, `git br`, `git sw`, `git ci`, `git cam`, `git lg`, `git la`, `git lb`, and `git ec-status`; existing aliases are never overwritten. Use `--without-git-aliases` to skip or remove aliases managed by easy-command.
 
 For a unified interface, use `ec <keyword>` to jump, `ec add <directory>` (or `ec a <directory>`) to record a directory, `ec list` (or `ec l`) to view entries, and `ec del <directory>` (or `ec remove <directory>`) to remove one. `ec doctor`, `ec repair`, `ec update`, `ec install`, `ec uninstall`, and `ec --dry-run` run the matching easy-command maintenance operation. `z` remains available for zoxide compatibility.
 
@@ -131,13 +131,13 @@ bash install.sh -y
 For production, pin a release tag instead of running `main` directly:
 
 ```bash
-npx easy-command@2.0.5 -y
+npx easy-command@2.0.7 -y
 ```
 
 Or, without npm:
 
 ```bash
-curl -fsSL https://raw.githubusercontent.com/UnionSchool/easy-command/v2.0.5/install.sh | bash -s -- -y
+curl -fsSL https://raw.githubusercontent.com/UnionSchool/easy-command/v2.0.7/install.sh | bash -s -- -y
 ```
 
 ## License

package/README_CN.md

@@ -91,11 +91,11 @@ bash install.sh -y --no-chsh
 # 仅删除 easy-command 管理的 .zshrc 配置区块
 bash install.sh --uninstall
 
-# 启用可选的模糊搜索和 Git 快捷操作
-bash install.sh -y --with-fzf --with-git-aliases
+# 启用可选的模糊搜索
+bash install.sh -y --with-fzf
 ```
 
-默认安装 `zoxide`，可使用 `z <关键词>` 跳转目录，也支持 `z add <目录>` 或 `z a <目录>` 手动记录目录；使用 `--without-zoxide` 可关闭。`fzf` 提供历史命令和文件的模糊搜索；Git 快捷操作使用 `ec-` 前缀，例如 `git ec-status`，不会覆盖已有别名。
+默认安装 `zoxide`，可使用 `z <关键词>` 跳转目录，也支持 `z add <目录>` 或 `z a <目录>` 手动记录目录；目录仅会通过 `z add`、`z a`、`ec add` 或 `ec a` 显式记录，普通跳转不会自动添加目录。使用 `--without-zoxide` 可关闭。`fzf` 提供历史命令和文件的模糊搜索；默认添加 Git 快捷操作，包括 `git st`、`git br`、`git sw`、`git ci`、`git cam`、`git lg`、`git la`、`git lb` 和 `git ec-status` 等，不会覆盖已有同名别名。使用 `--without-git-aliases` 可跳过或移除项目管理的快捷方式。
 
 统一入口使用 `ec`：`ec <关键词>` 跳转目录，`ec add <目录>` 或 `ec a <目录>` 记录目录，`ec list` 或 `ec l` 查看记录，`ec del <目录>` 或 `ec remove <目录>` 删除记录；`ec doctor`、`ec repair`、`ec update`、`ec install`、`ec uninstall` 和 `ec --dry-run` 执行对应的 easy-command 维护操作。为兼容 zoxide，原有 `z` 命令仍可使用。
 
@@ -131,13 +131,13 @@ bash install.sh -y
 生产环境建议固定到发布标签，而不是直接使用 `main`：
 
 ```bash
-npx easy-command@2.0.5 -y
+npx easy-command@2.0.7 -y
 ```
 
 或者不使用 npm：
 
 ```bash
-curl -fsSL https://raw.githubusercontent.com/UnionSchool/easy-command/v2.0.5/install.sh | bash -s -- -y
+curl -fsSL https://raw.githubusercontent.com/UnionSchool/easy-command/v2.0.7/install.sh | bash -s -- -y
 ```
 
 ## 许可

package/install.sh

@@ -2,7 +2,7 @@
 
 set -Eeuo pipefail
 
-readonly VERSION='2.0.5'
+readonly VERSION='2.0.7'
 readonly BEGIN_MARKER='# >>> easy-command zsh >>>'
 readonly END_MARKER='# <<< easy-command zsh <<<'
 readonly BASE_DIR_NAME='.easy-command'
@@ -13,7 +13,7 @@ CHANGE_LOGIN_SHELL=true
 DRY_RUN=false
 ENABLE_ZOXIDE=true
 ENABLE_FZF='auto'
-ENABLE_GIT_ALIASES='auto'
+ENABLE_GIT_ALIASES=true
 GLOBAL_INSTALL=false
 TARGET_USER="${SUDO_USER:-${USER}}"
 TARGET_HOME=''
@@ -45,7 +45,7 @@ Options:
   --without-zoxide    Do not install or enable zoxide.
   --with-fzf          Enable optional fzf history and file searching.
   --without-fzf       Disable fzf in the managed configuration.
-  --with-git-aliases  Add non-conflicting global Git aliases prefixed with ec-.
+  --with-git-aliases  Add non-conflicting global Git aliases (default).
   --without-git-aliases
                     Remove global Git aliases managed by easy-command.
   --uninstall         Remove only the easy-command managed .zshrc block.
@@ -315,15 +315,22 @@ EOF
 
 # easy-command: zoxide
 if command -v zoxide >/dev/null 2>&1; then
-    eval "$(zoxide init zsh)"
+    # Paths are recorded only through `ec add` / `ec a`; never implicitly after cd.
+    eval "$(zoxide init zsh --no-cmd --hook none)"
 
-    # Keep zoxide's normal jump behavior and add a short command for recording paths.
+    function __easy_command_jump() {
+        local target
+        target="$(command zoxide query --exclude "$PWD" -- "$@")" || return 1
+        builtin cd -- "$target"
+    }
+
+    # Keep z for zoxide compatibility, but record paths only when explicitly requested.
     function z() {
         if [[ "$1" == 'add' || "$1" == 'a' ]]; then
             shift
             command zoxide add "$@"
         else
-            __zoxide_z "$@"
+            __easy_command_jump "$@"
         fi
     }
 
@@ -366,7 +373,7 @@ if command -v zoxide >/dev/null 2>&1; then
                     '       ec --dry-run'
                 ;;
             *)
-                __zoxide_z "$@"
+                __easy_command_jump "$@"
                 ;;
         esac
     }
@@ -397,9 +404,29 @@ EOF
 
 configure_git_aliases() {
     local enabled
-    enabled="$(resolve_option "$ENABLE_GIT_ALIASES" 'git-aliases')"
+    enabled="$ENABLE_GIT_ALIASES"
 
     local aliases=(
+        'st=status'
+        'br=branch'
+        'bc=branch'
+        'sw=switch'
+        'cd=switch'
+        'ch=checkout'
+        'ck=checkout'
+        'ci=commit'
+        'ca=commit -a'
+        'cam=commit -a -m'
+        'co=commit'
+        'rb=rebase'
+        'rs=restore'
+        'rt=remote'
+        'mg=merge'
+        'rh=reset HEAD'
+        'last=log -1'
+        "lg=log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
+        'la=log --pretty=oneline --abbrev-commit'
+        'lb=log --graph --pretty=oneline --abbrev-commit'
         'ec-status=status --short --branch'
         'ec-log=log --oneline --graph --decorate -12'
         'ec-last=log -1 --stat'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-command",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "Configure a polished Zsh terminal with one command.",
   "license": "MIT",
   "bin": {