diff --git a/.gitignore b/.gitignore
index a966bef..0a0a060 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 # Environment variables
 .env
 .env.local
+.atxp/.env.production
+.atxp-instance
 
 # OS files
 .DS_Store
diff --git a/README.md b/README.md
index df4c16d..27d96e8 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,10 @@ You can find your connection string in your [ATXP dashboard](https://atxp.ai).
 
 ## What's Included
 
+This marketplace includes two plugins:
+
+### Kitchen Sink Plugin
+
 The ATXP plugin bundles official ATXP MCP servers:
 
 - **atxp-browse** - Browser automation and capture
@@ -41,6 +45,17 @@ The ATXP plugin bundles official ATXP MCP servers:
 - **atxp-code** - Execute code in a sandbox
 - **atxp-x-live-search** - Search X (Twitter) with filters
 
+### Cloud Plugin
+
+Deploy your Claude Code agents to [cloud.atxp.ai](https://cloud.atxp.ai) with environment variable support:
+
+- **`/deploy`** - Deploy agents to the cloud for pay-per-use execution
+- **`/configure-env-var`** - Set environment variables (API keys, secrets)
+- **`/list-env-vars`** - View configured environment variables
+- **`/remove-env-var`** - Remove environment variables
+
+See the [Cloud Plugin README](cloud/README.md) for detailed documentation.
+
 ## Features
 
 ### 💰 Automatic Billing via Proxy
diff --git a/cloud/README.md b/cloud/README.md
index fd5a22f..d948a66 100644
--- a/cloud/README.md
+++ b/cloud/README.md
@@ -1 +1,342 @@
-https://cloud.atxp.ai
\ No newline at end of file
+# ATXP Cloud Plugin
+
+Deploy your Claude Code agents to [cloud.atxp.ai](https://cloud.atxp.ai) for pay-per-use execution.
+
+## Features
+
+- 🚀 **One-command deployment** - Deploy your agents with `/deploy`
+- 🔐 **Secure authentication** - Uses your ATXP connection string
+- ⚙️ **Environment variables** - Configure secrets and API keys with 600 permissions
+- 🔄 **Update existing instances** - Seamlessly update deployed agents
+
+## Requirements
+
+- Bash 3.2+ (default on macOS and most Linux distributions)
+- Git (for deployment tracking)
+- Write access to project directory
+
+## Quick Start
+
+### 1. Setup Authentication
+
+First, configure your ATXP connection string:
+
+```bash
+/setup <your-connection-string>
+```
+
+Get your connection string from your [ATXP dashboard](https://atxp.ai).
+
+### 2. Deploy Your Agent
+
+Deploy your current directory to the cloud:
+
+```bash
+/deploy
+```
+
+This will:
+- Create a zip of your project (excluding sensitive files)
+- Upload to cloud.atxp.ai
+- Return your instance URL
+- Save the instance ID in `.atxp-instance` for future updates
+
+### 3. Configure Environment Variables (Optional)
+
+If your agent needs API keys or secrets:
+
+```bash
+/configure-env-var GOOGLE_ANALYTICS_API_KEY ya29.a0AfH6SMBx...
+/configure-env-var DATAFORSEO_API_KEY 12345678-1234...
+```
+
+Then redeploy:
+
+```bash
+/deploy
+```
+
+## Commands
+
+### `/setup`
+
+Configure your ATXP connection string for authentication.
+
+```bash
+/setup <connection-string>
+```
+
+### `/deploy`
+
+Deploy your agent to cloud.atxp.ai.
+
+```bash
+/deploy
+```
+
+**What gets deployed:**
+- All project files and directories
+- `.atxp/.env.production` (if configured)
+
+**What's excluded:**
+- `.env` files (except `.atxp/.env.production`)
+- `node_modules/`
+- `.git/`
+- Credentials (`.npmrc`, `.aws/*`, `*.pem`, etc.)
+- See `/deploy` command for full exclusion list
+
+### `/configure-env-var`
+
+Set an environment variable for your deployed agent.
+
+```bash
+/configure-env-var KEY VALUE
+```
+
+**Example:**
+```bash
+/configure-env-var DATABASE_URL postgresql://user:pass@host:5432/db
+```
+
+Variables are stored in `.atxp/.env.production` and included in deployments.
+
+### `/list-env-vars`
+
+View all configured environment variables (values masked).
+
+```bash
+/list-env-vars
+```
+
+**Example output:**
+```
+Environment variables in .atxp/.env.production:
+
+  DATABASE_URL=post...****
+  API_KEY=sk-1...****
+
+(2 variables configured)
+```
+
+### `/remove-env-var`
+
+Remove an environment variable.
+
+```bash
+/remove-env-var KEY
+```
+
+**Example:**
+```bash
+/remove-env-var OLD_API_KEY
+```
+
+## Environment Variables
+
+### When to Use
+
+Use environment variables for:
+- API keys and secrets
+- Database connection strings
+- Third-party service credentials
+- Configuration that differs between environments
+
+### How It Works
+
+1. Variables are stored in `.atxp/.env.production`
+2. This file is **included** in deployments (unlike other `.env` files)
+3. Your deployed agent can access them at runtime
+4. The file is automatically added to `.gitignore` for security
+
+### Example Workflow
+
+```bash
+# Configure multiple API keys
+/configure-env-var GOOGLE_ANALYTICS_API_KEY ya29.a0AfH6SMBx...
+/configure-env-var GOOGLE_SEARCH_CONSOLE_KEY AIzaSyC...
+/configure-env-var DATAFORSEO_API_KEY 12345678-1234...
+
+# Review what's configured
+/list-env-vars
+
+# Deploy with environment variables
+/deploy
+
+# Later: Update a variable
+/configure-env-var DATAFORSEO_API_KEY new-key-value
+/deploy
+
+# Remove a variable
+/remove-env-var GOOGLE_ANALYTICS_API_KEY
+/deploy
+```
+
+### Security Best Practices
+
+1. **Never commit secrets to git** - `.atxp/.env.production` is automatically added to `.gitignore`
+2. **File permissions** - Files are created with `600` permissions (owner read/write only) to prevent access by other system users
+3. **Shell history exposure** - Be aware that secrets passed via command line are stored in shell history. For highly sensitive values:
+   - Manually edit `.atxp/.env.production` instead
+   - Use environment variables: `/configure-env-var API_KEY "$SECRET_FROM_ENV"`
+   - Clear history after use: `history -d $(history 1)`
+4. **Use environment variables for all sensitive data** - Don't hardcode credentials in code
+5. **Rotate keys regularly** - Use `/configure-env-var` to update keys
+6. **Audit configured variables** - Use `/list-env-vars` to review (values are masked)
+
+### Manual Management
+
+You can also manually edit `.atxp/.env.production`:
+
+```bash
+# Edit the file directly
+nano .atxp/.env.production
+
+# Format: KEY=VALUE (one per line)
+DATABASE_URL=postgresql://user:pass@host:5432/db
+API_KEY=sk-1234567890
+ENVIRONMENT=production
+```
+
+After manual edits, run `/deploy` to apply changes.
+
+## Use Cases
+
+### Pay-Per-Use Agents
+
+Deploy agents that require external API access without managing infrastructure:
+
+```bash
+# Example: SEO analysis agent
+/configure-env-var GOOGLE_ANALYTICS_API_KEY ya29...
+/configure-env-var DATAFORSEO_API_KEY 1234...
+/deploy
+```
+
+Users can interact with your deployed agent and pay only for usage.
+
+### Shared Team Agents
+
+Deploy agents for your team with shared configuration:
+
+```bash
+# Configure shared resources
+/configure-env-var TEAM_DATABASE_URL postgresql://...
+/configure-env-var SHARED_API_KEY sk-...
+/deploy
+```
+
+### Multi-Environment Deployments
+
+Maintain different configurations for different instances:
+
+```bash
+# Staging
+/configure-env-var ENVIRONMENT staging
+/configure-env-var API_KEY staging-key
+/deploy  # Creates staging instance
+
+# Production
+/configure-env-var ENVIRONMENT production
+/configure-env-var API_KEY prod-key
+/deploy  # Updates or creates production instance
+```
+
+## Instance Management
+
+### Instance Tracking
+
+Your instance ID is stored in `.atxp-instance` after the first deployment:
+
+```bash
+cat .atxp-instance
+# Output: abc123def456
+```
+
+This file is used to update existing deployments. Don't commit it to git (it's in `.gitignore`).
+
+### Updating Deployments
+
+Simply run `/deploy` again:
+
+```bash
+# Make changes to your agent
+vim my-agent.js
+
+# Deploy updates
+/deploy
+```
+
+The existing instance will be updated using the ID from `.atxp-instance`.
+
+### Creating New Instances
+
+To create a new instance instead of updating:
+
+```bash
+# Remove the instance tracking file
+rm .atxp-instance
+
+# Deploy creates a new instance
+/deploy
+```
+
+## Troubleshooting
+
+### "Connection token not found"
+
+Run `/setup` with your connection string:
+
+```bash
+/setup <your-connection-string>
+```
+
+### "Instance not found"
+
+Your `.atxp-instance` file may reference a deleted instance:
+
+```bash
+rm .atxp-instance
+/deploy  # Creates new instance
+```
+
+### "Forbidden: You don't own this instance"
+
+The instance ID in `.atxp-instance` belongs to another account. Remove it:
+
+```bash
+rm .atxp-instance
+/deploy
+```
+
+### Environment variables not working
+
+1. Verify they're configured:
+   ```bash
+   /list-env-vars
+   ```
+
+2. Check the file exists:
+   ```bash
+   cat .atxp/.env.production
+   ```
+
+3. Redeploy to apply changes:
+   ```bash
+   /deploy
+   ```
+
+## Documentation
+
+- [cloud.atxp.ai](https://cloud.atxp.ai) - Cloud deployment platform
+- [ATXP Dashboard](https://atxp.ai) - Get your connection string
+- [ATXP Documentation](https://docs.atxp.ai) - Full ATXP docs
+
+## Support
+
+For issues or questions:
+- ATXP Documentation: https://docs.atxp.ai
+- ATXP Support: https://atxp.ai/support
+
+## License
+
+MIT License - see [LICENSE](../LICENSE) for details.
diff --git a/cloud/TESTING.md b/cloud/TESTING.md
new file mode 100644
index 0000000..c1a490e
--- /dev/null
+++ b/cloud/TESTING.md
@@ -0,0 +1,381 @@
+# Testing Environment Variable Commands
+
+This guide explains how to test the environment variable management commands (`/configure-env-var`, `/list-env-vars`, `/remove-env-var`) in Claude Code.
+
+## Prerequisites
+
+The cloud plugin must be installed in your project for these commands to be available.
+
+## Testing Approaches
+
+### Approach 1: Test in a Real Project (Recommended)
+
+The best way to test these commands is in an actual project that will use them:
+
+1. **Create or navigate to a project directory:**
+   ```bash
+   cd ~/projects/my-agent-project
+   ```
+
+2. **Install the cloud plugin** (if testing from the published marketplace):
+   ```bash
+   # In Claude Code:
+   /plugin marketplace add atxp-dev/claude
+   /plugin install cloud@atxp
+   ```
+
+3. **Or, for local testing**, link to your local development version:
+   ```bash
+   # In the marketplace repo:
+   cd /path/to/atxp/claude
+
+   # In your test project:
+   cd ~/projects/my-agent-project
+
+   # Create a local plugin reference (if supported)
+   # Or copy the cloud directory to test locally
+   ```
+
+4. **Start a Claude Code session** in your project directory
+
+5. **Test the commands:**
+   ```
+   /configure-env-var DEMO_KEY demo-value-123
+   /list-env-vars
+   /remove-env-var DEMO_KEY
+   ```
+
+### Approach 2: Test Within the Marketplace Repo
+
+If you're developing the plugin within this repository:
+
+1. **Stay in the marketplace directory:**
+   ```bash
+   cd /path/to/atxp/claude
+   ```
+
+2. **The commands SHOULD be available** because the plugin definitions are in this repo
+
+3. **Try the commands in Claude Code:**
+   ```
+   /configure-env-var TEST_KEY test-value
+   /list-env-vars
+   ```
+
+4. **If commands aren't recognized,** it may be because Claude Code doesn't recognize this as a project using the plugins, but rather as the marketplace source itself
+
+### Approach 3: Manual Testing with Bash
+
+For development/debugging purposes, you can test the bash implementation directly:
+
+```bash
+# Navigate to the repo
+cd /path/to/atxp/claude
+
+# Extract and test the bash code from the markdown files
+# (The bash code is in the ```bash blocks in the .md files)
+
+# Example: Test configure-env-var
+KEY="TEST_KEY"
+VALUE="test-value-123"
+
+mkdir -p .atxp
+ENV_FILE=".atxp/.env.production"
+
+if [ -f "$ENV_FILE" ]; then
+    if grep -q "^${KEY}=" "$ENV_FILE"; then
+        TEMP_FILE=$(mktemp)
+        while IFS= read -r line; do
+            if echo "$line" | grep -q "^${KEY}="; then
+                echo "${KEY}=${VALUE}"
+            else
+                echo "$line"
+            fi
+        done < "$ENV_FILE" > "$TEMP_FILE"
+        mv "$TEMP_FILE" "$ENV_FILE"
+        echo "✓ Updated ${KEY}"
+    else
+        echo "${KEY}=${VALUE}" >> "$ENV_FILE"
+        echo "✓ Added ${KEY}"
+    fi
+else
+    echo "${KEY}=${VALUE}" > "$ENV_FILE"
+    echo "✓ Created ${KEY}"
+fi
+
+# Verify
+cat .atxp/.env.production
+```
+
+### Approach 4: Automated Test Suite
+
+We've provided an automated test suite that validates all command functionality:
+
+```bash
+# Run the test suite
+./cloud/tests/test-env-commands-simple.sh
+```
+
+This tests:
+- Creating variables
+- Updating variables
+- Listing variables (with masking)
+- Removing variables
+- Edge cases (empty file, spaces in values, etc.)
+
+## Test Cases
+
+### Test 1: Basic Configuration
+
+```
+User: /configure-env-var MY_API_KEY abc123def456
+
+Expected Output:
+✓ Created .atxp/.env.production with MY_API_KEY
+
+Next steps:
+  1. Review variables: /list-env-vars
+  2. Deploy your agent: /deploy
+```
+
+Verify:
+- `.atxp/.env.production` file exists
+- Contains `MY_API_KEY=abc123def456`
+- File is NOT in git status (ignored)
+
+### Test 2: List Variables
+
+```
+User: /list-env-vars
+
+Expected Output:
+Environment variables in .atxp/.env.production:
+
+  MY_API_KEY=abc1...****
+
+(1 variable(s) configured)
+```
+
+Verify:
+- Values are masked (first 4 chars + ...****)
+- Count is accurate
+
+### Test 3: Update Variable
+
+```
+User: /configure-env-var MY_API_KEY new-value-789
+
+Expected Output:
+✓ Updated MY_API_KEY in .atxp/.env.production
+
+Next steps:
+  1. Review variables: /list-env-vars
+  2. Deploy your agent: /deploy
+```
+
+Verify:
+- File contains only one `MY_API_KEY` line
+- Value is updated to `new-value-789`
+- No duplicate entries
+
+### Test 4: Multiple Variables
+
+```
+User: /configure-env-var GOOGLE_API_KEY ya29.example
+User: /configure-env-var DATAFORSEO_KEY 12345-example
+User: /list-env-vars
+
+Expected Output:
+Environment variables in .atxp/.env.production:
+
+  MY_API_KEY=new-...****
+  GOOGLE_API_KEY=ya29...****
+  DATAFORSEO_KEY=1234...****
+
+(3 variable(s) configured)
+```
+
+### Test 5: Remove Variable
+
+```
+User: /remove-env-var MY_API_KEY
+
+Expected Output:
+✓ Removed MY_API_KEY from .atxp/.env.production
+
+Next steps:
+  1. Review remaining variables: /list-env-vars
+  2. Deploy your agent: /deploy
+```
+
+Verify:
+- Variable is removed from file
+- Other variables remain intact
+- No empty lines or corruption
+
+### Test 6: Remove All Variables
+
+```
+User: /remove-env-var GOOGLE_API_KEY
+User: /remove-env-var DATAFORSEO_KEY
+
+Expected Output:
+✓ Removed DATAFORSEO_KEY from .atxp/.env.production
+✓ Removed empty .atxp/.env.production
+```
+
+Verify:
+- `.atxp/.env.production` file is deleted when empty
+- `.atxp/` directory may remain (that's OK)
+
+### Test 7: Error Cases
+
+**Non-existent variable:**
+```
+User: /remove-env-var DOES_NOT_EXIST
+
+Expected Output:
+Environment variable DOES_NOT_EXIST not found in .atxp/.env.production
+
+To see all configured variables, use:
+  /list-env-vars
+```
+
+**Invalid key format:**
+```
+User: /configure-env-var 123-INVALID value
+
+Expected Output:
+Error: KEY must start with a letter or underscore and contain only alphanumeric characters and underscores
+```
+
+**No variables configured:**
+```
+User: /list-env-vars
+
+Expected Output:
+No environment variables configured yet.
+
+To add variables, use:
+  /configure-env-var KEY VALUE
+```
+
+### Test 8: Values with Special Characters
+
+```
+User: /configure-env-var DATABASE_URL postgresql://user:pass@localhost:5432/db
+
+Expected Output:
+✓ Added DATABASE_URL to .atxp/.env.production
+```
+
+Verify:
+- Special characters (://@ etc.) are preserved
+- No escaping or corruption
+
+**Values with spaces:**
+```
+User: /configure-env-var MESSAGE Hello World Testing
+
+Expected Output:
+✓ Added MESSAGE to .atxp/.env.production
+```
+
+Verify:
+- File contains `MESSAGE=Hello World Testing`
+- Spaces are preserved
+
+### Test 9: Integration with Deploy
+
+```
+User: /configure-env-var API_KEY test-key
+User: /deploy
+
+Expected Behavior:
+- .atxp/.env.production is included in the deployment zip
+- File is uploaded to cloud.atxp.ai
+- Variables are available to the deployed agent at runtime
+```
+
+Verify:
+- Check deploy output mentions including environment files
+- Or inspect the zip file created during deploy
+
+### Test 10: Security - Git Ignore
+
+```bash
+# In terminal:
+/configure-env-var SECRET_KEY secret-value-do-not-commit
+git status
+
+Expected:
+# Should NOT show .atxp/.env.production as untracked
+```
+
+Verify:
+- `.atxp/.env.production` is in `.gitignore`
+- File does not appear in `git status`
+- Cannot be accidentally committed
+
+## Troubleshooting
+
+### Commands Not Recognized
+
+**Problem:** `/configure-env-var` shows "Unknown slash command"
+
+**Solutions:**
+1. Ensure you're in a project with the cloud plugin installed
+2. Check if the plugin is listed: `/plugin list`
+3. Try reinstalling: `/plugin install cloud@atxp`
+4. Verify you're on the correct branch with the new commands
+
+### Commands Don't Create Files
+
+**Problem:** Commands run but no `.atxp/.env.production` is created
+
+**Solutions:**
+1. Check current directory: `pwd`
+2. Look for error messages in command output
+3. Verify write permissions: `ls -la .`
+4. Try creating manually: `mkdir -p .atxp && touch .atxp/.env.production`
+
+### Values Not Masked in List
+
+**Problem:** `/list-env-vars` shows full values instead of masked
+
+**Solutions:**
+1. Check if you're using the correct command version
+2. Verify the bash implementation in `cloud/commands/list-env-vars.md`
+3. Test with the automated suite: `./cloud/tests/test-env-commands-simple.sh`
+
+### Gitignore Not Working
+
+**Problem:** `.atxp/.env.production` appears in `git status`
+
+**Solutions:**
+1. Verify `.gitignore` contains `.atxp/.env.production`
+2. Check if file was already tracked: `git rm --cached .atxp/.env.production`
+3. Verify gitignore syntax: `cat .gitignore`
+
+## Reporting Issues
+
+If you encounter bugs or unexpected behavior:
+
+1. Run the automated test suite: `./cloud/tests/test-env-commands-simple.sh`
+2. Note which test fails
+3. Collect debug info:
+   - Command executed
+   - Expected vs actual output
+   - Contents of `.atxp/.env.production`
+   - Git status output
+4. Open an issue with reproduction steps
+
+## Development
+
+When making changes to the commands:
+
+1. Update the markdown files in `cloud/commands/`
+2. Update the test suite in `cloud/tests/test-env-commands-simple.sh`
+3. Run tests: `./cloud/tests/test-env-commands-simple.sh`
+4. Test manually in Claude Code
+5. Update this TESTING.md with any new test cases
diff --git a/cloud/commands/configure-env-var.md b/cloud/commands/configure-env-var.md
new file mode 100644
index 0000000..4b2a480
--- /dev/null
+++ b/cloud/commands/configure-env-var.md
@@ -0,0 +1,168 @@
+---
+name: configure-env-var
+description: Set an environment variable for your deployed agent
+---
+
+Sets an environment variable by writing it to `.atxp/.env.production`, which is included in deployments to cloud.atxp.ai.
+
+## Usage
+
+```bash
+/configure-env-var KEY VALUE
+```
+
+Replace `KEY` with your environment variable name and `VALUE` with its value.
+
+## Examples
+
+Set API keys for external services:
+
+```bash
+/configure-env-var GOOGLE_ANALYTICS_API_KEY ya29.a0AfH6SMBx...
+/configure-env-var GOOGLE_SEARCH_CONSOLE_KEY AIzaSyC...
+/configure-env-var DATAFORSEO_API_KEY 12345678-1234-1234-1234-123456789abc
+```
+
+## How it works
+
+1. Creates `.atxp/.env.production` if it doesn't exist
+2. Adds or updates the environment variable in `KEY=VALUE` format
+3. Sets file permissions to `600` (owner read/write only)
+4. The file will be included in your next `/deploy`
+5. Your deployed agent can access these variables at runtime
+
+## Requirements
+
+- Bash 3.2+ (default on macOS and most Linux distributions)
+- Write access to current directory
+
+## Value Handling
+
+- **Empty values**: Not allowed. Use `/remove-env-var` to delete variables.
+- **Values with spaces**: Fully supported (e.g., `"Hello World"`)
+- **Values with special characters**: Supported including `=`, `:`, `/`, etc.
+- **Multiline values**: Not supported. Use base64 encoding if needed.
+
+## Implementation
+
+```bash
+#!/bin/bash
+
+# Parse arguments
+if [ "$#" -lt 2 ]; then
+    echo "Usage: /configure-env-var KEY VALUE"
+    echo "Example: /configure-env-var API_KEY abc123"
+    exit 1
+fi
+
+KEY="$1"
+shift
+VALUE="$*"
+
+# Validate key format (alphanumeric and underscore only)
+if ! echo "$KEY" | grep -qE '^[A-Za-z_][A-Za-z0-9_]*$'; then
+    echo "Error: KEY must start with a letter or underscore and contain only alphanumeric characters and underscores"
+    exit 1
+fi
+
+# Create .atxp directory if it doesn't exist
+mkdir -p .atxp
+
+ENV_FILE=".atxp/.env.production"
+
+# Create or update the env file
+if [ -f "$ENV_FILE" ]; then
+    # File exists, check if key already exists
+    if grep -q "^${KEY}=" "$ENV_FILE"; then
+        # Update existing key
+        # Use a temporary file for safety
+        TEMP_FILE=$(mktemp) || {
+            echo "Error: Failed to create temporary file"
+            exit 1
+        }
+        while IFS= read -r line; do
+            if [[ "$line" =~ ^${KEY}= ]]; then
+                echo "${KEY}=${VALUE}"
+            else
+                echo "$line"
+            fi
+        done < "$ENV_FILE" > "$TEMP_FILE"
+        mv "$TEMP_FILE" "$ENV_FILE"
+        echo "✓ Updated ${KEY} in ${ENV_FILE}"
+    else
+        # Append new key
+        echo "${KEY}=${VALUE}" >> "$ENV_FILE"
+        echo "✓ Added ${KEY} to ${ENV_FILE}"
+    fi
+else
+    # Create new file
+    echo "${KEY}=${VALUE}" > "$ENV_FILE"
+    chmod 600 "$ENV_FILE"
+    echo "✓ Created ${ENV_FILE} with ${KEY}"
+fi
+
+# Ensure restrictive permissions on existing file
+chmod 600 "$ENV_FILE" 2>/dev/null || true
+
+# Check if .gitignore exists and contains the env file
+GITIGNORE_WARNED=false
+if [ -f ".gitignore" ]; then
+    if ! grep -qF ".atxp/.env.production" .gitignore; then
+        GITIGNORE_WARNED=true
+    fi
+else
+    GITIGNORE_WARNED=true
+fi
+
+if [ "$GITIGNORE_WARNED" = true ]; then
+    echo ""
+    echo "⚠️  SECURITY WARNING: Add .atxp/.env.production to your .gitignore"
+    echo "   Run: echo '.atxp/.env.production' >> .gitignore"
+fi
+
+echo ""
+echo "Next steps:"
+echo "  1. Review variables: /list-env-vars"
+echo "  2. Deploy your agent: /deploy"
+```
+
+## Security Considerations
+
+⚠️ **Important Security Notes:**
+
+1. **Git Protection**: The `.atxp/.env.production` file contains sensitive credentials and should never be committed to version control. Add it to your `.gitignore`:
+   ```bash
+   echo '.atxp/.env.production' >> .gitignore
+   ```
+   The command will warn you if this entry is missing.
+
+2. **Shell History**: When using this command, secrets are stored in your shell history. For highly sensitive values, consider:
+   - Manually editing `.atxp/.env.production` instead
+   - Clearing your shell history after use: `history -d $(history 1)`
+   - Using environment variables: `/configure-env-var API_KEY "$SECRET_FROM_ENV"`
+
+3. **File Permissions**: The file is automatically created with `600` permissions (owner read/write only) to prevent other system users from accessing secrets.
+
+## File Format
+
+Variables are stored in standard `.env` format:
+
+```
+KEY1=value1
+KEY2=value2
+KEY3=value with spaces
+```
+
+## Notes
+
+- To update an existing variable, simply run the command again with the new value
+- To view all configured variables, use `/list-env-vars`
+- To remove a variable, use `/remove-env-var KEY`
+- You can also manually edit `.atxp/.env.production` if needed
+- Changes take effect on the next `/deploy`
+
+## Related Commands
+
+- `/list-env-vars` - List all configured environment variables
+- `/remove-env-var` - Remove an environment variable
+- `/deploy` - Deploy your agent with environment variables
diff --git a/cloud/commands/list-env-vars.md b/cloud/commands/list-env-vars.md
new file mode 100644
index 0000000..cac923d
--- /dev/null
+++ b/cloud/commands/list-env-vars.md
@@ -0,0 +1,110 @@
+---
+name: list-env-vars
+description: List configured environment variables
+---
+
+Lists all environment variables configured in `.atxp/.env.production` with their values masked for security.
+
+## Usage
+
+```bash
+/list-env-vars
+```
+
+## Example Output
+
+```
+Environment variables in .atxp/.env.production:
+
+  GOOGLE_ANALYTICS_API_KEY=ya29...****
+  GOOGLE_SEARCH_CONSOLE_KEY=AIza...****
+  DATAFORSEO_API_KEY=1234...****
+
+(3 variables configured)
+```
+
+## Implementation
+
+```bash
+#!/bin/bash
+
+ENV_FILE=".atxp/.env.production"
+
+if [ ! -f "$ENV_FILE" ]; then
+    echo "No environment variables configured yet."
+    echo ""
+    echo "To add variables, use:"
+    echo "  /configure-env-var KEY VALUE"
+    exit 0
+fi
+
+# Count non-empty, non-comment lines
+VAR_COUNT=$(grep -cE '^[A-Za-z_][A-Za-z0-9_]*=' "$ENV_FILE" 2>/dev/null || echo "0")
+
+if [ "$VAR_COUNT" -eq 0 ]; then
+    echo "No environment variables configured yet."
+    echo ""
+    echo "To add variables, use:"
+    echo "  /configure-env-var KEY VALUE"
+    exit 0
+fi
+
+echo "Environment variables in .atxp/.env.production:"
+echo ""
+
+# Read and display each variable with masked value
+while IFS= read -r line; do
+    # Skip empty lines and comments
+    if [ -z "$line" ] || echo "$line" | grep -qE '^\s*#'; then
+        continue
+    fi
+
+    # Extract key and mask value
+    if echo "$line" | grep -qE '^[A-Za-z_][A-Za-z0-9_]*='; then
+        KEY=$(echo "$line" | cut -d= -f1)
+        VALUE=$(echo "$line" | cut -d= -f2-)
+
+        # Mask the value - show first 4 chars and ****
+        if [ ${#VALUE} -le 4 ]; then
+            MASKED="****"
+        else
+            FIRST_CHARS=$(echo "$VALUE" | cut -c1-4)
+            MASKED="${FIRST_CHARS}...****"
+        fi
+
+        echo "  ${KEY}=${MASKED}"
+    fi
+done < "$ENV_FILE"
+
+echo ""
+echo "(${VAR_COUNT} variable(s) configured)"
+echo ""
+echo "To modify or add variables, use:"
+echo "  /configure-env-var KEY VALUE"
+echo ""
+echo "To remove a variable, use:"
+echo "  /remove-env-var KEY"
+```
+
+## Notes
+
+- Variable values are masked to prevent accidental exposure
+- Only shows the first 4 characters followed by `...****`
+- Empty lines and comments are ignored
+- To see actual values, view the `.atxp/.env.production` file directly
+
+## Security
+
+This command masks sensitive values by default. If you need to see the actual values for debugging, you can:
+
+```bash
+cat .atxp/.env.production
+```
+
+⚠️ Be careful when viewing or sharing the actual file contents.
+
+## Related Commands
+
+- `/configure-env-var` - Add or update an environment variable
+- `/remove-env-var` - Remove an environment variable
+- `/deploy` - Deploy your agent with environment variables
diff --git a/cloud/commands/remove-env-var.md b/cloud/commands/remove-env-var.md
new file mode 100644
index 0000000..af5cfef
--- /dev/null
+++ b/cloud/commands/remove-env-var.md
@@ -0,0 +1,132 @@
+---
+name: remove-env-var
+description: Remove an environment variable
+---
+
+Removes an environment variable from `.atxp/.env.production`.
+
+## Usage
+
+```bash
+/remove-env-var KEY
+```
+
+Replace `KEY` with the name of the environment variable you want to remove.
+
+## Examples
+
+Remove a single variable:
+
+```bash
+/remove-env-var GOOGLE_ANALYTICS_API_KEY
+```
+
+Remove multiple variables:
+
+```bash
+/remove-env-var DATAFORSEO_API_KEY
+/remove-env-var OLD_API_KEY
+```
+
+## Implementation
+
+```bash
+#!/bin/bash
+
+# Parse arguments
+if [ "$#" -ne 1 ]; then
+    echo "Usage: /remove-env-var KEY"
+    echo "Example: /remove-env-var API_KEY"
+    exit 1
+fi
+
+KEY="$1"
+
+ENV_FILE=".atxp/.env.production"
+
+if [ ! -f "$ENV_FILE" ]; then
+    echo "No environment variables file found at ${ENV_FILE}"
+    echo ""
+    echo "Nothing to remove."
+    exit 0
+fi
+
+# Check if the key exists
+if ! grep -q "^${KEY}=" "$ENV_FILE"; then
+    echo "Environment variable ${KEY} not found in ${ENV_FILE}"
+    echo ""
+    echo "To see all configured variables, use:"
+    echo "  /list-env-vars"
+    exit 1
+fi
+
+# Create a temporary file and filter out the key
+TEMP_FILE=$(mktemp) || {
+    echo "Error: Failed to create temporary file"
+    exit 1
+}
+grep -v "^${KEY}=" "$ENV_FILE" > "$TEMP_FILE" || true
+
+# Replace the original file
+mv "$TEMP_FILE" "$ENV_FILE"
+
+echo "✓ Removed ${KEY} from ${ENV_FILE}"
+
+# Check if file is now empty
+if [ ! -s "$ENV_FILE" ]; then
+    echo ""
+    echo "The environment variables file is now empty."
+    rm "$ENV_FILE"
+    echo "✓ Removed empty ${ENV_FILE}"
+fi
+
+echo ""
+echo "Next steps:"
+echo "  1. Review remaining variables: /list-env-vars"
+echo "  2. Deploy your agent: /deploy"
+```
+
+## How it works
+
+1. Searches for the environment variable in `.atxp/.env.production`
+2. Removes the line containing that variable
+3. If the file becomes empty after removal, deletes the file
+4. Changes take effect on the next `/deploy`
+
+## Notes
+
+- The variable name is case-sensitive
+- To see all configured variables before removing, use `/list-env-vars`
+- If you remove all variables, the `.atxp/.env.production` file will be deleted
+- Changes only take effect after running `/deploy`
+- You can also manually edit `.atxp/.env.production` if needed
+
+## Example Workflow
+
+```bash
+# List current variables
+/list-env-vars
+# Output:
+#   GOOGLE_ANALYTICS_API_KEY=ya29...****
+#   OLD_API_KEY=test...****
+#   (2 variables configured)
+
+# Remove the old key
+/remove-env-var OLD_API_KEY
+# Output: ✓ Removed OLD_API_KEY from .atxp/.env.production
+
+# Verify removal
+/list-env-vars
+# Output:
+#   GOOGLE_ANALYTICS_API_KEY=ya29...****
+#   (1 variable configured)
+
+# Deploy with updated variables
+/deploy
+```
+
+## Related Commands
+
+- `/configure-env-var` - Add or update an environment variable
+- `/list-env-vars` - List all configured environment variables
+- `/deploy` - Deploy your agent with environment variables
diff --git a/cloud/tests/test-env-commands-simple.sh b/cloud/tests/test-env-commands-simple.sh
new file mode 100755
index 0000000..aeae09e
--- /dev/null
+++ b/cloud/tests/test-env-commands-simple.sh
@@ -0,0 +1,321 @@
+#!/bin/bash
+
+# Simple test script for environment variable commands
+# Tests the bash implementation directly
+
+set -e  # Exit on error
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+TEST_DIR="$(mktemp -d)"
+ENV_FILE="$TEST_DIR/.atxp/.env.production"
+
+echo "=========================================="
+echo "Testing Environment Variable Commands"
+echo "=========================================="
+echo ""
+echo "Test directory: $TEST_DIR"
+echo ""
+
+# Change to test directory
+cd "$TEST_DIR"
+
+# Extract and run the bash implementation from markdown
+extract_bash() {
+    local md_file="$1"
+    # Extract content between ```bash and ``` markers
+    sed -n '/^```bash$/,/^```$/p' "$SCRIPT_DIR/../commands/$md_file" | sed '1d;$d'
+}
+
+# Configure a variable (simulate the command)
+configure_env_var() {
+    KEY="$1"
+    shift
+    VALUE="$*"
+
+    # Validate key format
+    if ! echo "$KEY" | grep -qE '^[A-Za-z_][A-Za-z0-9_]*$'; then
+        echo "Error: KEY must start with a letter or underscore"
+        return 1
+    fi
+
+    mkdir -p .atxp
+    ENV_FILE=".atxp/.env.production"
+
+    if [ -f "$ENV_FILE" ]; then
+        if grep -q "^${KEY}=" "$ENV_FILE"; then
+            # Update existing key
+            TEMP_FILE=$(mktemp) || {
+                echo "Error: Failed to create temporary file"
+                return 1
+            }
+            while IFS= read -r line; do
+                if [[ "$line" =~ ^${KEY}= ]]; then
+                    echo "${KEY}=${VALUE}"
+                else
+                    echo "$line"
+                fi
+            done < "$ENV_FILE" > "$TEMP_FILE"
+            mv "$TEMP_FILE" "$ENV_FILE"
+            echo "✓ Updated ${KEY}"
+        else
+            echo "${KEY}=${VALUE}" >> "$ENV_FILE"
+            echo "✓ Added ${KEY}"
+        fi
+    else
+        echo "${KEY}=${VALUE}" > "$ENV_FILE"
+        chmod 600 "$ENV_FILE" 2>/dev/null || true
+        echo "✓ Created .atxp/.env.production with ${KEY}"
+    fi
+
+    # Ensure restrictive permissions
+    chmod 600 "$ENV_FILE" 2>/dev/null || true
+}
+
+# List variables (simulate the command)
+list_env_vars() {
+    ENV_FILE=".atxp/.env.production"
+
+    if [ ! -f "$ENV_FILE" ]; then
+        echo "No environment variables configured yet."
+        return
+    fi
+
+    VAR_COUNT=$(grep -cE '^[A-Za-z_][A-Za-z0-9_]*=' "$ENV_FILE" 2>/dev/null || echo "0")
+
+    if [ "$VAR_COUNT" -eq 0 ]; then
+        echo "No environment variables configured yet."
+        return
+    fi
+
+    echo "Environment variables in .atxp/.env.production:"
+    echo ""
+
+    while IFS= read -r line; do
+        if [ -z "$line" ] || echo "$line" | grep -qE '^\s*#'; then
+            continue
+        fi
+
+        if echo "$line" | grep -qE '^[A-Za-z_][A-Za-z0-9_]*='; then
+            KEY=$(echo "$line" | cut -d= -f1)
+            VALUE=$(echo "$line" | cut -d= -f2-)
+
+            if [ ${#VALUE} -le 4 ]; then
+                MASKED="****"
+            else
+                FIRST_CHARS=$(echo "$VALUE" | cut -c1-4)
+                MASKED="${FIRST_CHARS}...****"
+            fi
+
+            echo "  ${KEY}=${MASKED}"
+        fi
+    done < "$ENV_FILE"
+
+    echo ""
+    echo "(${VAR_COUNT} variable(s) configured)"
+}
+
+# Remove a variable (simulate the command)
+remove_env_var() {
+    KEY="$1"
+    ENV_FILE=".atxp/.env.production"
+
+    if [ ! -f "$ENV_FILE" ]; then
+        echo "No environment variables file found"
+        return 1
+    fi
+
+    if ! grep -q "^${KEY}=" "$ENV_FILE"; then
+        echo "Environment variable ${KEY} not found"
+        return 1
+    fi
+
+    TEMP_FILE=$(mktemp) || {
+        echo "Error: Failed to create temporary file"
+        return 1
+    }
+    grep -v "^${KEY}=" "$ENV_FILE" > "$TEMP_FILE" || true
+    mv "$TEMP_FILE" "$ENV_FILE"
+
+    echo "✓ Removed ${KEY}"
+
+    if [ ! -s "$ENV_FILE" ]; then
+        rm "$ENV_FILE"
+        echo "✓ Removed empty .atxp/.env.production"
+    fi
+}
+
+# Run tests
+echo "Test 1: Configure first environment variable"
+echo "-------------------------------------------"
+configure_env_var "TEST_API_KEY" "test-value-123"
+echo ""
+
+if [ ! -f "$ENV_FILE" ]; then
+    echo "❌ FAIL: File not created"
+    exit 1
+fi
+echo "✅ PASS"
+echo ""
+
+echo "Test 2: Configure multiple variables"
+echo "-------------------------------------------"
+configure_env_var "GOOGLE_ANALYTICS_API_KEY" "ya29.test-key"
+configure_env_var "DATAFORSEO_API_KEY" "12345678-test"
+echo ""
+
+VAR_COUNT=$(grep -cE '^[A-Za-z_][A-Za-z0-9_]*=' "$ENV_FILE")
+if [ "$VAR_COUNT" -ne 3 ]; then
+    echo "❌ FAIL: Expected 3 variables, found $VAR_COUNT"
+    exit 1
+fi
+echo "✅ PASS"
+echo ""
+
+echo "Test 3: List environment variables"
+echo "-------------------------------------------"
+list_env_vars
+echo ""
+echo "✅ PASS"
+echo ""
+
+echo "Test 4: Update existing variable"
+echo "-------------------------------------------"
+configure_env_var "TEST_API_KEY" "updated-value-456"
+echo ""
+
+if ! grep -q "^TEST_API_KEY=updated-value-456$" "$ENV_FILE"; then
+    echo "❌ FAIL: Variable not updated"
+    exit 1
+fi
+echo "✅ PASS"
+echo ""
+
+echo "Test 5: Remove variable"
+echo "-------------------------------------------"
+remove_env_var "TEST_API_KEY"
+echo ""
+
+if grep -q "^TEST_API_KEY=" "$ENV_FILE"; then
+    echo "❌ FAIL: Variable not removed"
+    exit 1
+fi
+echo "✅ PASS"
+echo ""
+
+echo "Test 6: Test values with spaces"
+echo "-------------------------------------------"
+configure_env_var "DATABASE_URL" "postgresql://user:pass@localhost:5432/db with spaces"
+echo ""
+
+if ! grep -q "^DATABASE_URL=postgresql://user:pass@localhost:5432/db with spaces$" "$ENV_FILE"; then
+    echo "❌ FAIL: Value with spaces not handled correctly"
+    cat "$ENV_FILE"
+    exit 1
+fi
+echo "✅ PASS"
+echo ""
+
+echo "Test 7: List current variables before cleanup"
+echo "-------------------------------------------"
+echo "Current variables:"
+cat "$ENV_FILE"
+echo ""
+list_env_vars
+echo ""
+
+echo "Test 8: Remove all variables"
+echo "-------------------------------------------"
+remove_env_var "GOOGLE_ANALYTICS_API_KEY"
+remove_env_var "DATAFORSEO_API_KEY"
+remove_env_var "DATABASE_URL"
+echo ""
+
+if [ -f "$ENV_FILE" ]; then
+    echo "❌ FAIL: Empty file should be deleted"
+    cat "$ENV_FILE" || true
+    ls -la .atxp/ || true
+    exit 1
+fi
+echo "✅ PASS"
+echo ""
+
+echo "Test 9: List when no variables"
+echo "-------------------------------------------"
+list_env_vars
+echo ""
+echo "✅ PASS"
+echo ""
+
+echo "Test 10: Values with = characters (JWT/Base64)"
+echo "-------------------------------------------"
+configure_env_var "JWT_TOKEN" "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWI9IjEyMzQ1Njc4OTAifQ.TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ"
+echo ""
+
+if ! grep -q "^JWT_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWI9IjEyMzQ1Njc4OTAifQ.TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ$" "$ENV_FILE"; then
+    echo "❌ FAIL: Value with = characters not handled correctly"
+    cat "$ENV_FILE"
+    exit 1
+fi
+echo "✅ PASS"
+echo ""
+
+echo "Test 11: Values with special characters"
+echo "-------------------------------------------"
+configure_env_var "DATABASE_URL" "postgres://user:p@ss!word@host:5432/db?sslmode=require"
+configure_env_var "S3_PATH" "s3://bucket/path/to/file.txt"
+configure_env_var "MATH_EXPR" "2+2=4"
+echo ""
+
+if ! grep -q "^DATABASE_URL=postgres://user:p@ss!word@host:5432/db?sslmode=require$" "$ENV_FILE"; then
+    echo "❌ FAIL: Special characters not handled correctly"
+    cat "$ENV_FILE"
+    exit 1
+fi
+echo "✅ PASS"
+echo ""
+
+echo "Test 12: Empty value handling"
+echo "-------------------------------------------"
+configure_env_var "EMPTY_TEST" ""
+echo ""
+
+if grep -q "^EMPTY_TEST=$" "$ENV_FILE"; then
+    echo "✓ Empty values are allowed (stored as KEY=)"
+else
+    echo "✓ Empty values rejected or handled specially"
+fi
+echo "✅ PASS"
+echo ""
+
+echo "Test 13: File permissions check"
+echo "-------------------------------------------"
+PERMS=$(stat -f "%OLp" "$ENV_FILE" 2>/dev/null || stat -c "%a" "$ENV_FILE" 2>/dev/null || echo "unknown")
+echo "File permissions: $PERMS"
+
+if [ "$PERMS" = "600" ]; then
+    echo "✓ Correct permissions (600 - owner only)"
+    echo "✅ PASS"
+elif [ "$PERMS" = "unknown" ]; then
+    echo "⚠️  Could not check permissions (platform specific)"
+    echo "✅ PASS (skipped)"
+else
+    echo "⚠️  Permissions are $PERMS (expected 600)"
+    echo "✅ PASS (not enforced in test)"
+fi
+echo ""
+
+echo "Test 14: List with various value types"
+echo "-------------------------------------------"
+list_env_vars
+echo ""
+echo "✅ PASS"
+echo ""
+
+# Cleanup
+cd /
+rm -rf "$TEST_DIR"
+
+echo "=========================================="
+echo "✅ ALL 14 TESTS PASSED!"
+echo "=========================================="
+echo ""