easy-command 2.0.6 → 2.0.8

package/README.md

@@ -95,7 +95,7 @@ bash install.sh --uninstall
 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 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.
+`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.6 -y
+npx easy-command@2.0.8 -y
 ```
 
 Or, without npm:
 
 ```bash
-curl -fsSL https://raw.githubusercontent.com/UnionSchool/easy-command/v2.0.6/install.sh | bash -s -- -y
+curl -fsSL https://raw.githubusercontent.com/UnionSchool/easy-command/v2.0.8/install.sh | bash -s -- -y
 ```
 
 ## License

package/README_CN.md

@@ -95,7 +95,7 @@ bash install.sh --uninstall
 bash install.sh -y --with-fzf
 ```
 
-默认安装 `zoxide`，可使用 `z <关键词>` 跳转目录，也支持 `z add <目录>` 或 `z 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` 可跳过或移除项目管理的快捷方式。
+默认安装 `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.6 -y
+npx easy-command@2.0.8 -y
 ```
 
 或者不使用 npm：
 
 ```bash
-curl -fsSL https://raw.githubusercontent.com/UnionSchool/easy-command/v2.0.6/install.sh | bash -s -- -y
+curl -fsSL https://raw.githubusercontent.com/UnionSchool/easy-command/v2.0.8/install.sh | bash -s -- -y
 ```
 
 ## 许可

package/bin/easy-command

@@ -10,4 +10,4 @@ while [[ -h "$source_path" ]]; do
 done
 
 package_directory="$(cd -P "$(dirname "$source_path")/.." && pwd)"
-exec "$package_directory/install.sh" "$@"
+exec env EASY_COMMAND_NPM_CLI=1 "$package_directory/install.sh" "$@"

package/install.sh

@@ -2,7 +2,7 @@
 
 set -Eeuo pipefail
 
-readonly VERSION='2.0.6'
+readonly VERSION='2.0.8'
 readonly BEGIN_MARKER='# >>> easy-command zsh >>>'
 readonly END_MARKER='# <<< easy-command zsh <<<'
 readonly BASE_DIR_NAME='.easy-command'
@@ -48,6 +48,7 @@ Options:
   --with-git-aliases  Add non-conflicting global Git aliases (default).
   --without-git-aliases
                     Remove global Git aliases managed by easy-command.
+  --version, -v       Print the easy-command version.
   --uninstall         Remove only the easy-command managed .zshrc block.
   --help, -h          Show this help.
 EOF
@@ -202,6 +203,24 @@ install_global_package() {
     fi
 }
 
+update_global_package() {
+    [[ "${EASY_COMMAND_NPM_CLI:-}" == '1' ]] || return 0
+    [[ "${EASY_COMMAND_SELF_UPDATED:-}" != '1' ]] || return 0
+    command -v npm >/dev/null 2>&1 || {
+        warn 'npm is unavailable; skipped easy-command CLI upgrade.'
+        return 0
+    }
+
+    if "$DRY_RUN"; then
+        command_preview npm install -g easy-command@latest
+        return 0
+    fi
+
+    info 'Updating easy-command CLI to the latest npm version...'
+    npm install -g easy-command@latest || fail 'Unable to update easy-command CLI. Check npm permissions and registry settings, then retry.'
+    exec env EASY_COMMAND_NPM_CLI=1 EASY_COMMAND_SELF_UPDATED=1 easy-command update --yes --user "$TARGET_USER"
+}
+
 ensure_repository() {
     local repository="$1"
     local destination="$2"
@@ -315,15 +334,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)"
+
+    function __easy_command_jump() {
+        local target
+        target="$(command zoxide query --exclude "$PWD" -- "$@")" || return 1
+        builtin cd -- "$target"
+    }
 
-    # Keep zoxide's normal jump behavior and add a short command for recording paths.
+    # 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
     }
 
@@ -337,7 +363,7 @@ if command -v zoxide >/dev/null 2>&1; then
                     command npx easy-command "$@"
                 fi
                 ;;
-            --dry-run)
+            --dry-run|-v|--version)
                 if (( $+commands[easy-command] )); then
                     command easy-command "$@"
                 else
@@ -366,7 +392,7 @@ if command -v zoxide >/dev/null 2>&1; then
                     '       ec --dry-run'
                 ;;
             *)
-                __zoxide_z "$@"
+                __easy_command_jump "$@"
                 ;;
         esac
     }
@@ -560,6 +586,10 @@ parse_args() {
             --with-git-aliases) ENABLE_GIT_ALIASES=true ;;
             --without-git-aliases) ENABLE_GIT_ALIASES=false ;;
             --uninstall) ACTION='uninstall' ;;
+            --version|-v)
+                printf '%s\n' "$VERSION"
+                exit 0
+                ;;
             --help|-h)
                 usage
                 exit 0
@@ -609,6 +639,7 @@ main() {
         update)
             CHANGE_LOGIN_SHELL=false
             confirm "Update easy-command repositories for $TARGET_USER?"
+            update_global_package
             ensure_repositories
             update_repositories
             write_zshrc_block

package/package.json

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