evm-cli 2.4.0__tar.gz → 2.6.0__tar.gz

{evm_cli-2.4.0 → evm_cli-2.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evm-cli
-Version: 2.4.0
+Version: 2.6.0
 Summary: A command-line tool for managing environment variables
 Author-email: EVM Tool <evm@example.com>
 License: MIT
@@ -42,7 +42,7 @@ Dynamic: license-file
 
 A powerful command-line tool for managing environment variables on macOS and Linux systems.
 
-**Version**: 2.4.0
+**Version**: 2.6.0
 
 ## Features
 
@@ -52,6 +52,7 @@ A powerful command-line tool for managing environment variables on macOS and Lin
 - ✅ **Backup/Restore**: Timestamps and merge support
 - ✅ **Groups**: Namespace-based organization
 - ✅ **Execute**: Run commands with custom environment
+- ✅ **Inject**: Load variables into the current shell via `eval "$(evm inject)"`
 - ✅ **Load to Memory**: Sync variables to system environment
 - ✅ **Secrets**: HKDF+HMAC-CTR encrypted storage (v3) with auto-migration from v1/v2
 - ✅ **Templates**: `{{VAR}}` reference expansion
@@ -61,6 +62,8 @@ A powerful command-line tool for managing environment variables on macOS and Lin
 - ✅ **Schema**: Define and enforce variable formats and constraints
 - ✅ **History**: Operation audit log with JSONL storage
 - ✅ **Shell Completion**: bash, zsh, fish completion script generation
+- ✅ **Shell Integration**: `evm init` auto-installs `evm-load` + completion into your rc on first use
+- ✅ **Self-Upgrade**: `evm upgrade` checks PyPI and pip-installs the latest version
 - ✅ **Interactive Safety**: Confirmation prompts for destructive operations (`--force` to skip)
 - ✅ **JSON Output**: `--json` flag for structured output (agent-friendly, stdout=data, stderr=errors)
 - ✅ **Quiet Mode**: `--quiet` suppresses all human-readable output
@@ -95,13 +98,22 @@ evm/
 │   ├── _completion.py        # Shell completion generators (bash/zsh/fish)
 │   ├── _json.py              # JSON output helpers (agent-friendly)
 │   ├── _crypto.py            # HKDF + HMAC-CTR encryption module
+│   ├── _upgrade.py           # Self-upgrade: PyPI version check + pip install
+│   ├── _typing.py            # Shared typing helpers (Protocol mixins)
 │   ├── formatters.py         # Terminal output formatting
 │   └── exceptions.py         # Custom exception hierarchy (17 classes)
 ├── examples/                 # Example scripts
-├── tests/                    # Test suite (575 tests)
+├── tests/                    # Test suite
 │   ├── test_main.py          # Unit + integration tests
+│   ├── test_inject.py        # `evm inject` + `evm-load` tests
+│   ├── test_shell_integration.py  # `evm init` + auto-install tests
+│   ├── test_upgrade.py       # `evm upgrade` tests
 │   ├── test_io_boundary.py   # _io.py boundary tests
 │   ├── test_cli_boundary.py  # cli.py boundary tests
+│   ├── test_cli_additional.py  # cli.py additional coverage
+│   ├── test_cli_coverage.py  # cli.py coverage gap tests
+│   ├── test_main_entry.py    # `evm` entry-point tests
+│   ├── test_main_module.py   # `python -m evm` entry tests
 │   ├── test_v230_fixes.py    # v2.3.0 code review fix tests
 │   ├── test_coverage_gap.py  # Coverage gap tests (98% target)
 │   ├── test_formatters.py    # Formatter output tests
@@ -320,8 +332,11 @@ evm delete KEY             # Delete a variable
 evm setg GROUP KEY VALUE   # Set in a group
 evm groups                 # List groups
 evm exec -- COMMAND        # Run with env vars
+eval "$(evm inject)"       # Load vars into current shell
 evm backup                 # Create backup
 evm validate               # Check schemas
+evm upgrade                # Upgrade to latest PyPI release
+evm upgrade --check        # Check for updates only
 ```
 
 ## Usage
@@ -403,6 +418,8 @@ evm restore backup.json --merge   # Merge with existing
 
 ### Load to System Memory
 
+> ⚠️ **Scope note**: `evm loadmemory` sets `os.environ` inside the **evm process itself**. When the CLI command exits, those variables are gone — your interactive shell does **not** see them. Use `evm inject` (below) to get variables into the current shell, or `manager.load_to_memory()` from a Python script to set them in your own process.
+
 ```bash
 # Load all variables to memory (with EVM: prefix)
 evm loadmemory
@@ -413,8 +430,72 @@ evm loadmemory --no-prefix
 # Load with filter
 evm loadmemory --prefix DEMO_
 
-# Check in Python
-python -c "import os; print(os.environ.get('EVM:API_KEY'))"
+# Only meaningful when called from a Python script that imports evm:
+#   from evm import EnvironmentManager
+#   EnvironmentManager().load_to_memory()
+```
+
+### Inject to Current Shell
+
+`evm inject` prints shell-sourceable `export` statements to stdout. Wrap it in `eval "$( ... )"` to load variables into your **current** shell session:
+
+```bash
+# Inject all non-grouped variables into the current shell
+eval "$(evm inject)"
+
+# Verify they're now in your shell
+echo "$API_KEY"
+
+# Target a specific shell (auto-detected from $SHELL by default)
+eval "$(evm inject --shell bash)"
+eval "$(evm inject --shell fish)"   # fish uses `set -gx KEY VALUE`
+
+# Inject only a group's variables (the `group:` prefix is stripped)
+eval "$(evm inject --group prod)"
+
+# Add a prefix to every exported key
+eval "$(evm inject --prefix EVM_)"
+
+# Also decrypt and inject secret variables (stored with --secret)
+eval "$(evm inject --include-secrets)"
+
+# Preview what would be injected, without eval-ing it
+evm inject --dry-run
+
+# Structured output for scripts/agents
+evm inject --json
+```
+
+How `inject` decides what to export:
+
+| Variable kind | Default | With flag |
+|---|---|---|
+| Plain (e.g. `API_KEY`) | ✅ exported | — |
+| Grouped (e.g. `dev:DB_URL`) | ⏭️ silently skipped (invalid shell identifier) | `--group dev` strips the prefix and exports |
+| Secret (stored with `--secret`) | ⏭️ skipped (would leak ciphertext) | `--include-secrets` decrypts and exports |
+| Invalid shell identifier | ⏭️ skipped, reported in `--json`/`--dry-run` | — |
+
+### The `evm-load` shortcut
+
+Installing shell completion (see [Shell Completion](#shell-completion)) also defines an `evm-load` shell function that wraps `eval "$(evm inject)"` for you. It correctly handles the `--env-file` global-flag positioning so you don't have to:
+
+```bash
+# After sourcing the completion script (bash/zsh/fish), just:
+evm-load                              # inject from default ~/.evm/env.json
+evm-load --env-file ./project.json    # inject from a project-specific file
+evm-load --group prod                 # inject only the prod group
+evm-load --include-secrets            # also decrypt and inject secrets
+evm-load --prefix EVM_                # namespace all keys to avoid collisions
+
+# Verify
+echo "$API_KEY"
+```
+
+Without completion installed, you can still type the `eval` form by hand, or add the alias yourself:
+
+```bash
+# ~/.zshrc or ~/.bashrc
+alias evm-load='eval "$(evm inject)"'
 ```
 
 ### Execute Commands
@@ -529,6 +610,84 @@ evm history --limit 50
 evm history --clear
 ```
 
+### Self-Upgrade (`evm upgrade`)
+
+Check PyPI for a newer `evm` release and pip-install it in one step. Uses only the standard library — no extra dependencies.
+
+```bash
+# Check whether a newer version is available (no changes made)
+evm upgrade --check
+# exit 0 = up to date, exit 1 = update available (or network error)
+
+# Upgrade to the latest release
+evm upgrade
+#  → Upgraded from 2.5.0 to 2.6.0.
+
+# Preview the pip command without running it
+evm upgrade --dry-run
+
+# Skip the pre-check and run pip directly
+evm upgrade --force
+
+# Structured JSON output (stdout = data, stderr = errors)
+evm upgrade --check --json
+# stdout: {"status": "ok", "data": {"current": "2.5.0", "latest": "2.6.0", "update_available": true}}
+
+evm upgrade --json
+# stdout: {"status": "ok", "data": {"current": "2.5.0", "new_version": "2.6.0", "action": "upgraded", "upgraded": true, "message": "Upgraded from 2.5.0 to 2.6.0."}}
+```
+
+`evm upgrade` calls `pip install --upgrade evm-cli` using the **same Python interpreter** that runs `evm`, so it upgrades the correct installation. If the network is unreachable, `--check` reports `unknown` and exits 1; a plain `evm upgrade` aborts before touching pip.
+
+### Shell Integration (`evm init`)
+
+EVM can install a shell-integration snippet into your rc file (`~/.zshrc`, `~/.bashrc`, `~/.config/fish/config.fish`). The snippet is **one line** that re-evaluates `evm init` on every shell start — so `evm-load`, tab completion, and any future integration stay in sync with the installed `evm` version automatically (no need to re-install after an upgrade).
+
+**Auto-install on first use:** the first time you run any `evm` command, EVM detects your shell from `$SHELL`, appends the integration block to the matching rc file, and prints a notice to stderr. Subsequent commands skip (idempotent). This is the zero-config path — you don't have to do anything.
+
+```bash
+# Just use evm normally — on first run it prints:
+#   Installed evm shell integration to ~/.zshrc
+#   Restart your shell (or source the rc file) to enable `evm-load` and tab completion.
+#   Set EVM_NO_AUTO_INSTALL=1 to skip this.
+
+# After restarting the shell, both `evm-load` and tab completion are available.
+```
+
+**Manual control** (if you prefer explicit, or the auto-install didn't fit your setup):
+
+```bash
+# Explicitly install (same as what auto-install does, but on demand)
+evm init zsh --install        # or bash / fish
+
+# Check whether it's installed
+evm init zsh --check          # exit 0 = installed, 1 = not
+
+# Remove the integration block from your rc file
+evm init zsh --uninstall
+
+# Force re-add (useful if your rc got out of sync)
+evm init zsh --reinstall
+```
+
+**What the rc block looks like** (conda-style markers, easy to grep/remove):
+
+```bash
+# >>> evm shell integration >>>
+# Auto-added by evm. Remove with: evm init zsh --uninstall
+eval "$(evm init zsh)"
+# <<< evm shell integration <<<
+```
+
+**Opt out of auto-install** — if you don't want EVM touching your rc file automatically:
+
+```bash
+export EVM_NO_AUTO_INSTALL=1   # in your rc, or just for one command:
+EVM_NO_AUTO_INSTALL=1 evm get API_KEY
+```
+
+> 💡 The integration block installs both **tab completion** and the **`evm-load`** function (a shortcut for `eval "$(evm inject)"` that handles `--env-file` positioning). See [The `evm-load` shortcut](#the-evm-load-shortcut).
+
 ### Shell Completion
 
 ```bash
@@ -544,6 +703,8 @@ echo 'source ~/.evm-completion.zsh' >> ~/.zshrc
 evm completion fish > ~/.config/fish/completions/evm.fish
 ```
 
+> 💡 Each completion script also installs an **`evm-load`** shell function — a shortcut for `eval "$(evm inject)"` that handles `--env-file` flag positioning for you. See [The `evm-load` shortcut](#the-evm-load-shortcut) above.
+
 ### Interactive Safety
 
 ```bash

{evm_cli-2.4.0 → evm_cli-2.6.0}/README.md

@@ -2,7 +2,7 @@
 
 A powerful command-line tool for managing environment variables on macOS and Linux systems.
 
-**Version**: 2.4.0
+**Version**: 2.6.0
 
 ## Features
 
@@ -12,6 +12,7 @@ A powerful command-line tool for managing environment variables on macOS and Lin
 - ✅ **Backup/Restore**: Timestamps and merge support
 - ✅ **Groups**: Namespace-based organization
 - ✅ **Execute**: Run commands with custom environment
+- ✅ **Inject**: Load variables into the current shell via `eval "$(evm inject)"`
 - ✅ **Load to Memory**: Sync variables to system environment
 - ✅ **Secrets**: HKDF+HMAC-CTR encrypted storage (v3) with auto-migration from v1/v2
 - ✅ **Templates**: `{{VAR}}` reference expansion
@@ -21,6 +22,8 @@ A powerful command-line tool for managing environment variables on macOS and Lin
 - ✅ **Schema**: Define and enforce variable formats and constraints
 - ✅ **History**: Operation audit log with JSONL storage
 - ✅ **Shell Completion**: bash, zsh, fish completion script generation
+- ✅ **Shell Integration**: `evm init` auto-installs `evm-load` + completion into your rc on first use
+- ✅ **Self-Upgrade**: `evm upgrade` checks PyPI and pip-installs the latest version
 - ✅ **Interactive Safety**: Confirmation prompts for destructive operations (`--force` to skip)
 - ✅ **JSON Output**: `--json` flag for structured output (agent-friendly, stdout=data, stderr=errors)
 - ✅ **Quiet Mode**: `--quiet` suppresses all human-readable output
@@ -55,13 +58,22 @@ evm/
 │   ├── _completion.py        # Shell completion generators (bash/zsh/fish)
 │   ├── _json.py              # JSON output helpers (agent-friendly)
 │   ├── _crypto.py            # HKDF + HMAC-CTR encryption module
+│   ├── _upgrade.py           # Self-upgrade: PyPI version check + pip install
+│   ├── _typing.py            # Shared typing helpers (Protocol mixins)
 │   ├── formatters.py         # Terminal output formatting
 │   └── exceptions.py         # Custom exception hierarchy (17 classes)
 ├── examples/                 # Example scripts
-├── tests/                    # Test suite (575 tests)
+├── tests/                    # Test suite
 │   ├── test_main.py          # Unit + integration tests
+│   ├── test_inject.py        # `evm inject` + `evm-load` tests
+│   ├── test_shell_integration.py  # `evm init` + auto-install tests
+│   ├── test_upgrade.py       # `evm upgrade` tests
 │   ├── test_io_boundary.py   # _io.py boundary tests
 │   ├── test_cli_boundary.py  # cli.py boundary tests
+│   ├── test_cli_additional.py  # cli.py additional coverage
+│   ├── test_cli_coverage.py  # cli.py coverage gap tests
+│   ├── test_main_entry.py    # `evm` entry-point tests
+│   ├── test_main_module.py   # `python -m evm` entry tests
 │   ├── test_v230_fixes.py    # v2.3.0 code review fix tests
 │   ├── test_coverage_gap.py  # Coverage gap tests (98% target)
 │   ├── test_formatters.py    # Formatter output tests
@@ -280,8 +292,11 @@ evm delete KEY             # Delete a variable
 evm setg GROUP KEY VALUE   # Set in a group
 evm groups                 # List groups
 evm exec -- COMMAND        # Run with env vars
+eval "$(evm inject)"       # Load vars into current shell
 evm backup                 # Create backup
 evm validate               # Check schemas
+evm upgrade                # Upgrade to latest PyPI release
+evm upgrade --check        # Check for updates only
 ```
 
 ## Usage
@@ -363,6 +378,8 @@ evm restore backup.json --merge   # Merge with existing
 
 ### Load to System Memory
 
+> ⚠️ **Scope note**: `evm loadmemory` sets `os.environ` inside the **evm process itself**. When the CLI command exits, those variables are gone — your interactive shell does **not** see them. Use `evm inject` (below) to get variables into the current shell, or `manager.load_to_memory()` from a Python script to set them in your own process.
+
 ```bash
 # Load all variables to memory (with EVM: prefix)
 evm loadmemory
@@ -373,8 +390,72 @@ evm loadmemory --no-prefix
 # Load with filter
 evm loadmemory --prefix DEMO_
 
-# Check in Python
-python -c "import os; print(os.environ.get('EVM:API_KEY'))"
+# Only meaningful when called from a Python script that imports evm:
+#   from evm import EnvironmentManager
+#   EnvironmentManager().load_to_memory()
+```
+
+### Inject to Current Shell
+
+`evm inject` prints shell-sourceable `export` statements to stdout. Wrap it in `eval "$( ... )"` to load variables into your **current** shell session:
+
+```bash
+# Inject all non-grouped variables into the current shell
+eval "$(evm inject)"
+
+# Verify they're now in your shell
+echo "$API_KEY"
+
+# Target a specific shell (auto-detected from $SHELL by default)
+eval "$(evm inject --shell bash)"
+eval "$(evm inject --shell fish)"   # fish uses `set -gx KEY VALUE`
+
+# Inject only a group's variables (the `group:` prefix is stripped)
+eval "$(evm inject --group prod)"
+
+# Add a prefix to every exported key
+eval "$(evm inject --prefix EVM_)"
+
+# Also decrypt and inject secret variables (stored with --secret)
+eval "$(evm inject --include-secrets)"
+
+# Preview what would be injected, without eval-ing it
+evm inject --dry-run
+
+# Structured output for scripts/agents
+evm inject --json
+```
+
+How `inject` decides what to export:
+
+| Variable kind | Default | With flag |
+|---|---|---|
+| Plain (e.g. `API_KEY`) | ✅ exported | — |
+| Grouped (e.g. `dev:DB_URL`) | ⏭️ silently skipped (invalid shell identifier) | `--group dev` strips the prefix and exports |
+| Secret (stored with `--secret`) | ⏭️ skipped (would leak ciphertext) | `--include-secrets` decrypts and exports |
+| Invalid shell identifier | ⏭️ skipped, reported in `--json`/`--dry-run` | — |
+
+### The `evm-load` shortcut
+
+Installing shell completion (see [Shell Completion](#shell-completion)) also defines an `evm-load` shell function that wraps `eval "$(evm inject)"` for you. It correctly handles the `--env-file` global-flag positioning so you don't have to:
+
+```bash
+# After sourcing the completion script (bash/zsh/fish), just:
+evm-load                              # inject from default ~/.evm/env.json
+evm-load --env-file ./project.json    # inject from a project-specific file
+evm-load --group prod                 # inject only the prod group
+evm-load --include-secrets            # also decrypt and inject secrets
+evm-load --prefix EVM_                # namespace all keys to avoid collisions
+
+# Verify
+echo "$API_KEY"
+```
+
+Without completion installed, you can still type the `eval` form by hand, or add the alias yourself:
+
+```bash
+# ~/.zshrc or ~/.bashrc
+alias evm-load='eval "$(evm inject)"'
 ```
 
 ### Execute Commands
@@ -489,6 +570,84 @@ evm history --limit 50
 evm history --clear
 ```
 
+### Self-Upgrade (`evm upgrade`)
+
+Check PyPI for a newer `evm` release and pip-install it in one step. Uses only the standard library — no extra dependencies.
+
+```bash
+# Check whether a newer version is available (no changes made)
+evm upgrade --check
+# exit 0 = up to date, exit 1 = update available (or network error)
+
+# Upgrade to the latest release
+evm upgrade
+#  → Upgraded from 2.5.0 to 2.6.0.
+
+# Preview the pip command without running it
+evm upgrade --dry-run
+
+# Skip the pre-check and run pip directly
+evm upgrade --force
+
+# Structured JSON output (stdout = data, stderr = errors)
+evm upgrade --check --json
+# stdout: {"status": "ok", "data": {"current": "2.5.0", "latest": "2.6.0", "update_available": true}}
+
+evm upgrade --json
+# stdout: {"status": "ok", "data": {"current": "2.5.0", "new_version": "2.6.0", "action": "upgraded", "upgraded": true, "message": "Upgraded from 2.5.0 to 2.6.0."}}
+```
+
+`evm upgrade` calls `pip install --upgrade evm-cli` using the **same Python interpreter** that runs `evm`, so it upgrades the correct installation. If the network is unreachable, `--check` reports `unknown` and exits 1; a plain `evm upgrade` aborts before touching pip.
+
+### Shell Integration (`evm init`)
+
+EVM can install a shell-integration snippet into your rc file (`~/.zshrc`, `~/.bashrc`, `~/.config/fish/config.fish`). The snippet is **one line** that re-evaluates `evm init` on every shell start — so `evm-load`, tab completion, and any future integration stay in sync with the installed `evm` version automatically (no need to re-install after an upgrade).
+
+**Auto-install on first use:** the first time you run any `evm` command, EVM detects your shell from `$SHELL`, appends the integration block to the matching rc file, and prints a notice to stderr. Subsequent commands skip (idempotent). This is the zero-config path — you don't have to do anything.
+
+```bash
+# Just use evm normally — on first run it prints:
+#   Installed evm shell integration to ~/.zshrc
+#   Restart your shell (or source the rc file) to enable `evm-load` and tab completion.
+#   Set EVM_NO_AUTO_INSTALL=1 to skip this.
+
+# After restarting the shell, both `evm-load` and tab completion are available.
+```
+
+**Manual control** (if you prefer explicit, or the auto-install didn't fit your setup):
+
+```bash
+# Explicitly install (same as what auto-install does, but on demand)
+evm init zsh --install        # or bash / fish
+
+# Check whether it's installed
+evm init zsh --check          # exit 0 = installed, 1 = not
+
+# Remove the integration block from your rc file
+evm init zsh --uninstall
+
+# Force re-add (useful if your rc got out of sync)
+evm init zsh --reinstall
+```
+
+**What the rc block looks like** (conda-style markers, easy to grep/remove):
+
+```bash
+# >>> evm shell integration >>>
+# Auto-added by evm. Remove with: evm init zsh --uninstall
+eval "$(evm init zsh)"
+# <<< evm shell integration <<<
+```
+
+**Opt out of auto-install** — if you don't want EVM touching your rc file automatically:
+
+```bash
+export EVM_NO_AUTO_INSTALL=1   # in your rc, or just for one command:
+EVM_NO_AUTO_INSTALL=1 evm get API_KEY
+```
+
+> 💡 The integration block installs both **tab completion** and the **`evm-load`** function (a shortcut for `eval "$(evm inject)"` that handles `--env-file` positioning). See [The `evm-load` shortcut](#the-evm-load-shortcut).
+
 ### Shell Completion
 
 ```bash
@@ -504,6 +663,8 @@ echo 'source ~/.evm-completion.zsh' >> ~/.zshrc
 evm completion fish > ~/.config/fish/completions/evm.fish
 ```
 
+> 💡 Each completion script also installs an **`evm-load`** shell function — a shortcut for `eval "$(evm inject)"` that handles `--env-file` flag positioning for you. See [The `evm-load` shortcut](#the-evm-load-shortcut) above.
+
 ### Interactive Safety
 
 ```bash

{evm_cli-2.4.0 → evm_cli-2.6.0}/evm/__init__.py

@@ -3,7 +3,7 @@ EVM - Environment Variable Manager
 A command-line tool for managing environment variables.
 """
 
-__version__ = "2.4.0"
+__version__ = "2.6.0"
 __author__ = "EVM Tool"
 
 from .exceptions import (

{evm_cli-2.4.0 → evm_cli-2.6.0}/evm/_completion.py

@@ -7,6 +7,8 @@ M3: 为 get/delete/edit/expand/validate/rename/copy 等命令
 提供动态变量名补全（通过 evm list --json --quiet 获取 key 列表）。
 """
 
+from pathlib import Path
+
 
 def generate_bash_completion(commands: list) -> str:
     """生成 bash 补全脚本（含动态变量名补全）"""
@@ -93,9 +95,33 @@ _evm_completions() {{
     COMPREPLY=( $(compgen -W "${{commands}} ${{global_opts}}" -- "${{cur}}") )
 }}
 complete -F _evm_completions evm
+''' + _evm_load_posix('bash')
+
+
+_EVM_LOAD_POSIX_TEMPLATE = '''# evm-load: inject EVM variables into the current shell
+# Usage: evm-load [--env-file PATH] [--group NAME] [--include-secrets] [--prefix PREFIX]
+evm-load() {
+    local evf=""
+    local -a rest=()
+    while (($#)); do
+        case "$1" in
+            --env-file)    evf="$2"; shift 2 ;;
+            --env-file=*)  evf="${1#--env-file=}"; shift ;;
+            *)             rest+=("$1"); shift ;;
+        esac
+    done
+    local -a pre=()
+    [[ -n "$evf" ]] && pre=(--env-file "$evf")
+    eval "$(evm "${pre[@]}" inject --shell __SHELL__ "${rest[@]}")"
+}
 '''
 
 
+def _evm_load_posix(shell: str) -> str:
+    """Return the evm-load shell function for a POSIX shell (bash/zsh)."""
+    return _EVM_LOAD_POSIX_TEMPLATE.replace('__SHELL__', shell)
+
+
 def generate_zsh_completion(commands: list) -> str:
     """生成 zsh 补全脚本（含动态变量名补全）"""
     return f'''#compdef evm
@@ -169,7 +195,7 @@ _evm() {{
 }}
 
 _evm "$@"
-'''
+''' + _evm_load_posix('zsh')
 
 
 def generate_fish_completion(commands: list) -> str:
@@ -242,6 +268,20 @@ def generate_fish_completion(commands: list) -> str:
     lines.append('# Group name completion')
     for cmd in ['setg', 'getg', 'deleteg', 'listg']:
         lines.append(f"complete -c evm -n '__fish_seen_subcommand_from {cmd}' -a '(__evm_groups)'")
+    lines.append('')
+
+    # evm-load: inject EVM variables into the current shell
+    lines.append('# evm-load: inject EVM variables into the current shell')
+    lines.append('# Usage: evm-load [--env-file PATH] [--group NAME] [--include-secrets] [--prefix PREFIX]')
+    lines.append('function evm-load')
+    lines.append('    argparse --ignore-unknown --name=evm-load \'e/env-file=\' -- $argv')
+    lines.append('    or return')
+    lines.append('    if set -q _flag_env_file')
+    lines.append('        evm --env-file $_flag_env_file inject --shell fish $argv | source')
+    lines.append('    else')
+    lines.append('        evm inject --shell fish $argv | source')
+    lines.append('    end')
+    lines.append('end')
 
     return '\n'.join(lines) + '\n'
 
@@ -251,3 +291,106 @@ SHELL_GENERATORS = {
     'zsh': generate_zsh_completion,
     'fish': generate_fish_completion,
 }
+
+
+# ── Shell 集成（rc 文件自动安装/卸载）──────────────────────
+
+# 标记块（conda 风格）—— rc 文件中可被 grep / 行级删除
+INTEGRATION_MARKER_START = '# >>> evm shell integration >>>'
+INTEGRATION_MARKER_END = '# <<< evm shell integration <<<'
+
+# Shell → rc 文件路径
+SHELL_RC_MAP: dict[str, str] = {
+    'bash': '~/.bashrc',
+    'zsh': '~/.zshrc',
+    'fish': '~/.config/fish/config.fish',
+}
+
+
+def get_rc_path(shell: str):
+    """返回 shell 对应 rc 文件路径（Path），未知 shell 返回 None。"""
+    rc = SHELL_RC_MAP.get(shell)
+    if rc is None:
+        return None
+    return Path(rc).expanduser()
+
+
+def integration_block(shell: str) -> str:
+    """生成要追加到 rc 文件的标记块文本。"""
+    return (
+        f'\n{INTEGRATION_MARKER_START}\n'
+        f'# Auto-added by evm. Remove with: evm init {shell} --uninstall\n'
+        f'eval "$(evm init {shell})"\n'
+        f'{INTEGRATION_MARKER_END}\n'
+    )
+
+
+def is_integration_installed(shell: str) -> bool:
+    """检查该 shell 的 rc 文件是否已含 evm 标记块。"""
+    rc = get_rc_path(shell)
+    if rc is None or not rc.exists():
+        return False
+    try:
+        content = rc.read_text(encoding='utf-8')
+    except OSError:
+        return False
+    return INTEGRATION_MARKER_START in content
+
+
+def install_integration(shell: str) -> tuple[bool, str]:
+    """把集成块追加到 shell 的 rc 文件。
+
+    Returns:
+        (success, message)
+    """
+    rc = get_rc_path(shell)
+    if rc is None:
+        return False, f"Unknown shell: {shell}"
+
+    if is_integration_installed(shell):
+        return True, f"Already installed in {rc}"
+
+    try:
+        rc.parent.mkdir(parents=True, exist_ok=True)
+        with open(rc, 'a', encoding='utf-8') as f:
+            f.write(integration_block(shell))
+        return True, f"Installed evm shell integration to {rc}"
+    except OSError as e:
+        return False, f"Failed to install to {rc}: {e}"
+
+
+def uninstall_integration(shell: str) -> tuple[bool, str]:
+    """从 shell 的 rc 文件移除集成块（行级删除）。"""
+    rc = get_rc_path(shell)
+    if rc is None:
+        return False, f"Unknown shell: {shell}"
+    if not rc.exists():
+        return True, f"Nothing to remove ({rc} does not exist)"
+
+    try:
+        content = rc.read_text(encoding='utf-8')
+        if INTEGRATION_MARKER_START not in content:
+            return True, f"Nothing to remove (marker not found in {rc})"
+
+        # 行级删除：从 start 标记行删到 end 标记行（含两端）
+        lines = content.split('\n')
+        out: list[str] = []
+        i = 0
+        while i < len(lines):
+            if lines[i].strip() == INTEGRATION_MARKER_START:
+                # 跳过到 end 标记行（含）
+                while i < len(lines) and lines[i].strip() != INTEGRATION_MARKER_END:
+                    i += 1
+                i += 1  # 跳过 end 行
+                continue
+            out.append(lines[i])
+            i += 1
+
+        new_content = '\n'.join(out)
+        # 去除因删除可能留下的尾部空行
+        new_content = new_content.rstrip('\n') + '\n' if new_content.strip() else ''
+        rc.write_text(new_content, encoding='utf-8')
+        return True, f"Removed evm shell integration from {rc}"
+    except OSError as e:
+        return False, f"Failed to uninstall from {rc}: {e}"
+