diff --git a/.env.example b/.env.example
index e86f598..a5224dd 100644
--- a/.env.example
+++ b/.env.example
@@ -1,25 +1,31 @@
-# ElevenLabs API Key
-# Get your API key from: https://elevenlabs.io/app/settings/api-keys
+# ElevenLabs API Keys for E2E Testing
+# Get your API keys from: https://elevenlabs.io/app/settings/api-keys
 
-# ⚠️  CRITICAL: Use a DEDICATED EMPTY TEST ACCOUNT
-# 
+# ⚠️  CRITICAL: Use DEDICATED EMPTY TEST ACCOUNTS
+#
 # DO NOT use your production account or any account with deployed agents!
 # E2E tests will create, modify, and DELETE agents during testing.
 # Any existing agents in the workspace could be PERMANENTLY LOST.
 #
-# To set up a test account:
-# 1. Create a new ElevenLabs account at https://elevenlabs.io
-# 2. Generate an API key for that account
-# 3. Use that key below
-# 4. Keep this account empty - only for automated testing
+# To set up test accounts:
+# 1. Create TWO separate new ElevenLabs accounts at https://elevenlabs.io
+# 2. Generate an API key for each account
+# 3. Add the keys below
+# 4. Keep these accounts empty - only for automated testing
 
+# Primary test API key (required for all e2e tests)
 ELEVENLABS_API_KEY=your_test_account_api_key_here
 
+# Secondary test API key (optional - only needed for multi-environment e2e tests)
+# Multi-environment tests verify the CLI can handle multiple environments (prod, staging, dev, etc.)
+# If not provided, multi-environment tests will be skipped
+ELEVENLABS_TEST_API_KEY=your_second_test_account_api_key_here
+
 # For local development and testing:
 # 1. Copy this file to .env (DO NOT COMMIT .env)
 #    cp .env.example .env
-# 2. Add your TEST account API key to .env
-# 3. Verify the test account is empty
+# 2. Add your TEST account API keys to .env
+# 3. Verify both test accounts are empty
 # 4. Run tests: npm run test:e2e
 
 # Note: The .env file is gitignored and will not be committed
diff --git a/README.md b/README.md
index ba730b8..4d4a2dc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # ElevenLabs CLI - Agents as Code
 
-![hero](./assets/hero.png)
+![hero](./assets/Cover.png)
 
 # ElevenLabs CLI
 
@@ -39,7 +39,7 @@ npx @elevenlabs/cli init
 Login with your ElevenLabs API key (stored securely across all platforms):
 
 ```bash
-elevenlabs login
+elevenlabs auth login
 ```
 
 Or set environment variable:
@@ -53,7 +53,7 @@ export ELEVENLABS_API_KEY="your_api_key_here"
 ### Check Status
 
 ```bash
-elevenlabs whoami
+elevenlabs auth whoami
 ```
 
 ### Set Residency Location
@@ -62,19 +62,19 @@ Configure the API residency for isolated regions:
 
 ```bash
 # Set to EU residency (uses api.eu.elevenlabs.io)
-elevenlabs residency eu-residency
+elevenlabs auth residency eu-residency
 
 # Set to India residency (uses api.in.elevenlabs.io)
-elevenlabs residency in-residency
+elevenlabs auth residency in-residency
 
 # Set to US/Global (uses api.elevenlabs.io or api.us.elevenlabs.io)
-elevenlabs residency global  # or 'us'
+elevenlabs auth residency global  # or 'us'
 ```
 
 ### Logout
 
 ```bash
-elevenlabs logout
+elevenlabs auth logout
 ```
 
 ### Multi-Environment Management
@@ -85,13 +85,13 @@ The ElevenLabs CLI supports managing agents, tools, and tests across multiple is
 
 ```bash
 # Login to production
-elevenlabs login --env prod
+elevenlabs auth login --env prod
 
 # Login to staging
-elevenlabs login --env staging
+elevenlabs auth login --env staging
 
 # Login to development
-elevenlabs login --env dev
+elevenlabs auth login --env dev
 ```
 
 Each environment stores its API key securely and independently.
@@ -99,14 +99,14 @@ Each environment stores its API key securely and independently.
 #### Check All Environments
 
 ```bash
-elevenlabs whoami
+elevenlabs auth whoami
 # Shows all configured environments and their authentication status
 ```
 
 #### Logout from Specific Environment
 
 ```bash
-elevenlabs logout --env dev
+elevenlabs auth logout --env dev
 ```
 
 #### Environment Field in Configurations
@@ -136,21 +136,21 @@ When `env` is not specified, it defaults to `prod`.
 
 ```bash
 # 1. Initialize project
-elevenlabs init
+elevenlabs agents init
 
 # Or override existing configuration
-elevenlabs init --override
+elevenlabs agents init --override
 
 # 2. Login with API key (defaults to 'prod' environment)
-elevenlabs login
+elevenlabs auth login
 
 # 3. Create agent with template
-elevenlabs add "Support Bot" --template customer-service
+elevenlabs agents add "Support Bot" --template customer-service
 
 # 4. Edit configuration (agent_configs/support_bot.json)
 
 # 5. Sync to ElevenLabs
-elevenlabs push
+elevenlabs agents push
 ```
 
 > **Note**: This example uses the default 'prod' environment. For multi-environment workflows, see [Multi-Environment Management](#multi-environment-management) and [Multi-Environment Workflows](#multi-environment-workflows).
@@ -171,15 +171,15 @@ your_project/
 
 ### Initialize Project
 
-The `elevenlabs init` command sets up the project structure for managing ElevenLabs agents:
+The `elevenlabs agents init` command sets up the project structure for managing ElevenLabs agents:
 
 ```bash
-elevenlabs init                    # Initialize in current directory
-elevenlabs init ./my-project       # Initialize in specific directory
-elevenlabs init --override         # Override existing files and recreate from scratch
+elevenlabs agents init                    # Initialize in current directory
+elevenlabs agents init ./my-project       # Initialize in specific directory
+elevenlabs agents init --override         # Override existing files and recreate from scratch
 ```
 
-**Default behavior**: When you run `elevenlabs init`, it will:
+**Default behavior**: When you run `elevenlabs agents init`, it will:
 - Create missing files and directories
 - Skip existing files (shown as "skipped" in output)
 - Preserve your existing configuration
@@ -199,72 +199,72 @@ Use `--override` when:
 ```bash
 
 # Authentication
-elevenlabs login
-elevenlabs logout
-elevenlabs whoami
+elevenlabs auth login
+elevenlabs auth logout
+elevenlabs auth whoami
 
 # Create agent
-elevenlabs add "Agent Name" [--template customer-service] [--env prod]
+elevenlabs agents add "Agent Name" [--template customer-service] [--env prod]
 
 # Create webhook tool
-elevenlabs add-webhook-tool "Tool Name" [--config-path path] [--env prod]
+elevenlabs tools add-webhook "Tool Name" [--config-path path] [--env prod]
 
 # Create client tool
-elevenlabs add-client-tool "Tool Name" [--config-path path] [--env prod]
+elevenlabs tools add-client "Tool Name" [--config-path path] [--env prod]
 
 # Push changes (operates on all environments by default)
-elevenlabs push [--agent "Agent Name"] [--env prod] [--dry-run]
+elevenlabs agents push [--agent "Agent Name"] [--env prod] [--dry-run]
 
 # Sync tools (operates on all environments by default)
-elevenlabs push-tools [--tool "Tool Name"] [--env prod] [--dry-run]
+elevenlabs tools push [--tool "Tool Name"] [--env prod] [--dry-run]
 
 # Sync tests (operates on all environments by default)
-elevenlabs push-tests [--env prod] [--dry-run]
+elevenlabs tests push [--env prod] [--dry-run]
 
 # Check status
-elevenlabs status [--agent "Agent Name"]
+elevenlabs agents status [--agent "Agent Name"]
 
 # Pull agents from ElevenLabs (pulls from all environments by default)
-elevenlabs pull [--search "term"] [--env prod] [--dry-run]
+elevenlabs agents pull [--search "term"] [--env prod] [--dry-run]
 
 # Pull tools from ElevenLabs (pulls from all environments by default)
-elevenlabs pull-tools [--search "term"] [--tool "tool-name"] [--env prod] [--dry-run] [--output-dir tool_configs]
+elevenlabs tools pull [--search "term"] [--tool "tool-name"] [--env prod] [--dry-run] [--output-dir tool_configs]
 
 # Import tests from ElevenLabs (pulls from all environments by default)
-elevenlabs pull-tests [--output-dir test_configs] [--env prod] [--dry-run]
+elevenlabs tests pull [--output-dir test_configs] [--env prod] [--dry-run]
 
 # Create and run test
-elevenlabs add-test "Test Name" [--template basic-llm] [--env prod]
+elevenlabs tests add "Test Name" [--template basic-llm] [--env prod]
 
 # Run tests
-elevenlabs test "Agent Name"
+elevenlabs agents test "Agent Name"
 
 # Generate widget HTML (includes server-location for isolated regions)
-elevenlabs widget "Agent Name"
+elevenlabs agents widget "Agent Name"
 
 # List agents
-elevenlabs list
+elevenlabs agents list
 
 # Delete agent (removes locally and from ElevenLabs)
-elevenlabs delete <agent_id>
+elevenlabs agents delete <agent_id>
 
 # Delete tool locally and from ElevenLabs
-elevenlabs delete-tool <tool_id>
+elevenlabs tools delete <tool_id>
 
 # Delete all tools
-elevenlabs delete-tool --all
+elevenlabs tools delete --all
 
 # Delete all tools in specific environment
-elevenlabs delete-tool --all --env prod
+elevenlabs tools delete --all --env prod
 
 # Delete test locally and from ElevenLabs
-elevenlabs delete-test <test_id>
+elevenlabs tests delete <test_id>
 
 # Delete all tests
-elevenlabs delete-test --all
+elevenlabs tests delete --all
 
 # Delete all tests in specific environment
-elevenlabs delete-test --all --env dev
+elevenlabs tests delete --all --env dev
 
 # Add componenents from [ui.elevenlabs.io](https://ui.elevenlabs.io)
 elevenlabs components add "Component Name"
@@ -274,10 +274,10 @@ elevenlabs components add "Component Name"
 
 ```bash
 # List available templates
-elevenlabs templates list
+elevenlabs agents templates list
 
 # Show template details
-elevenlabs templates show customer-service
+elevenlabs agents templates show customer-service
 ```
 
 ## Available Templates
@@ -334,41 +334,41 @@ General purpose AI assistant configuration. Balanced creativity settings with he
 **New Project:**
 
 ```bash
-elevenlabs init
-elevenlabs login
-elevenlabs add "My Agent" --template assistant
-elevenlabs push
+elevenlabs agents init
+elevenlabs auth login
+elevenlabs agents add "My Agent" --template assistant
+elevenlabs agents push
 ```
 
 **Import Existing:**
 
 ```bash
-elevenlabs init
-elevenlabs login
-elevenlabs pull
-elevenlabs push
+elevenlabs agents init
+elevenlabs auth login
+elevenlabs agents pull
+elevenlabs agents push
 ```
 
 **Import and Use Tools:**
 
 ```bash
-elevenlabs init
-elevenlabs login
-elevenlabs pull-tools
+elevenlabs agents init
+elevenlabs auth login
+elevenlabs tools pull
 # Edit tool configs in tool_configs/
 # Tools will have 'env' field - modify if needed
 # Reference tools in your agent configurations
-elevenlabs push
+elevenlabs agents push
 ```
 
 **Delete Agent:**
 
 ```bash
 # List agents to find the agent ID
-elevenlabs list
+elevenlabs agents list
 
 # Delete agent by ID (removes locally and from ElevenLabs)
-elevenlabs delete agent_123456789
+elevenlabs agents delete agent_123456789
 ```
 
 > **Tip**: When `--env` is not specified, most commands operate across all configured environments.
@@ -379,64 +379,64 @@ elevenlabs delete agent_123456789
 
 ```bash
 # Initialise project
-elevenlabs init
+elevenlabs agents init
 
 # Login to all environments
-elevenlabs login --env dev
-elevenlabs login --env staging
-elevenlabs login --env prod
+elevenlabs auth login --env dev
+elevenlabs auth login --env staging
+elevenlabs auth login --env prod
 
 # Verify all environments
-elevenlabs whoami
+elevenlabs auth whoami
 ```
 
 **Develop and Promote Agents:**
 
 ```bash
 # Create agent in dev environment
-elevenlabs add "My Agent" --template assistant --env dev
+elevenlabs agents add "My Agent" --template assistant --env dev
 
 # Edit and test in dev
 # Edit agent_configs/my_agent.json
-elevenlabs push --env dev
+elevenlabs agents push --env dev
 
 # Pull to promote to staging
-elevenlabs pull --env dev
+elevenlabs agents pull --env dev
 # Update env field in agents.json from "dev" to "staging"
-elevenlabs push --env staging
+elevenlabs agents push --env staging
 
 # Promote to production
 # Update env field to "prod"
-elevenlabs push --env prod
+elevenlabs agents push --env prod
 ```
 
 **Environment-Specific Operations:**
 
 ```bash
 # Push only dev agents
-elevenlabs push --env dev
+elevenlabs agents push --env dev
 
 # Pull only prod agents
-elevenlabs pull --env prod
+elevenlabs agents pull --env prod
 
 # Delete all dev tools
-elevenlabs delete-tool --all --env dev
+elevenlabs tools delete --all --env dev
 
 # Pull tests from staging
-elevenlabs pull-tests --env staging
+elevenlabs tests pull --env staging
 ```
 
 **Cross-Environment Management:**
 
 ```bash
 # List all agents across all environments
-elevenlabs list
+elevenlabs agents list
 
 # Push all agents to their respective environments
-elevenlabs push
+elevenlabs agents push
 
 # Pull agents from all configured environments
-elevenlabs pull
+elevenlabs agents pull
 ```
 
 ## Troubleshooting
@@ -445,10 +445,10 @@ elevenlabs pull
 
 ```bash
 # Check login status
-elevenlabs whoami
+elevenlabs auth whoami
 
 # Login again
-elevenlabs login
+elevenlabs auth login
 
 # Or use environment variable
 export ELEVENLABS_API_KEY="your_api_key_here"
@@ -456,20 +456,20 @@ export ELEVENLABS_API_KEY="your_api_key_here"
 
 **Agent Not Found:**
 
-- Check: `elevenlabs list`
-- Verify: `elevenlabs status`
+- Check: `elevenlabs agents list`
+- Verify: `elevenlabs agents status`
 
 **Push Issues:**
 
-- Preview: `elevenlabs push --dry-run`
-- Check: `elevenlabs status`
+- Preview: `elevenlabs agents push --dry-run`
+- Check: `elevenlabs agents status`
 
 **Reset Project:**
 
 ```bash
-elevenlabs init --override
-elevenlabs login
-elevenlabs push
+elevenlabs agents init --override
+elevenlabs auth login
+elevenlabs agents push
 ```
 
 ## Development
@@ -511,8 +511,8 @@ npm test
 
 **Quick safety check before running tests:**
 ```bash
-npm run dev -- whoami --no-ui  # Verify you're using test account
-npm run dev -- list --no-ui     # Should be empty or only test agents
+npm run dev -- auth whoami --no-ui  # Verify you're using test account
+npm run dev -- agents list --no-ui  # Should be empty or only test agents
 ```
 
 ## Security
diff --git a/assets/Cover.png b/assets/Cover.png
new file mode 100644
index 0000000..2eed0d3
Binary files /dev/null and b/assets/Cover.png differ
diff --git a/assets/hero.png b/assets/hero.png
deleted file mode 100644
index eda55fd..0000000
Binary files a/assets/hero.png and /dev/null differ
diff --git a/jest.config.js b/jest.config.js
index b09dfab..24a8f53 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -4,7 +4,7 @@ export default {
   extensionsToTreatAsEsm: ['.ts'],
   testEnvironment: '<rootDir>/jest-environment.cjs',
   roots: ['<rootDir>/src'],
-  testMatch: ['**/__tests__/**/*.ts', '**/?(*.)+(spec|test).ts'],
+  testMatch: ['**/__tests__/**/*.ts', '**/*.spec.ts', '**/*.test.ts'],
   collectCoverageFrom: [
     'src/**/*.ts',
     '!src/**/*.d.ts',
diff --git a/package.json b/package.json
index 1da4b10..6e3bc01 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,6 @@
   "bugs": {
     "url": "https://github.com/elevenlabs/cli/issues"
   },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "bin": {
     "elevenlabs": "./bin/elevenlabs"
   },
diff --git a/src/__tests__/add-commands-filename.integration.test.ts b/src/__tests__/add-commands-filename.integration.test.ts
index 0ba5d09..4f610ac 100644
--- a/src/__tests__/add-commands-filename.integration.test.ts
+++ b/src/__tests__/add-commands-filename.integration.test.ts
@@ -24,7 +24,7 @@ const mockCreateToolApi = jest.fn();
 const mockCreateTestApi = jest.fn();
 const mockGetElevenLabsClient = jest.fn();
 
-jest.mock("../elevenlabs-api", () => ({
+jest.mock("../shared/elevenlabs-api", () => ({
   getElevenLabsClient: mockGetElevenLabsClient,
   createAgentApi: mockCreateAgentApi,
   createToolApi: mockCreateToolApi,
@@ -32,10 +32,10 @@ jest.mock("../elevenlabs-api", () => ({
 }));
 
 // Import after mocking
-import { readConfig, writeConfig, generateUniqueFilename, toCamelCaseKeys } from "../utils";
-import { getTemplateByName } from "../templates";
-import { createAgentApi } from "../elevenlabs-api";
-import { getBasicLLMTestTemplate } from "../test-templates";
+import { readConfig, writeConfig, generateUniqueFilename, toCamelCaseKeys } from "../shared/utils";
+import { getTemplateByName } from "../agents/templates";
+import { createAgentApi } from "../shared/elevenlabs-api";
+import { getBasicLLMTestTemplate } from "../tests/templates";
 
 describe("Add Commands - Name-based Filenames", () => {
   let tempDir: string;
diff --git a/src/__tests__/casing.test.ts b/src/__tests__/casing.test.ts
index 2c87317..0e3b00d 100644
--- a/src/__tests__/casing.test.ts
+++ b/src/__tests__/casing.test.ts
@@ -1,4 +1,4 @@
-import { createAgentApi, updateAgentApi, getAgentApi } from "../elevenlabs-api";
+import { createAgentApi, updateAgentApi, getAgentApi } from "../shared/elevenlabs-api";
 import { ElevenLabsClient } from "@elevenlabs/elevenlabs-js";
 
 describe("Key casing normalization", () => {
diff --git a/src/__tests__/cli.e2e.test.ts b/src/__tests__/cli.e2e.test.ts
index 0ef5ff0..41a4001 100644
--- a/src/__tests__/cli.e2e.test.ts
+++ b/src/__tests__/cli.e2e.test.ts
@@ -183,7 +183,7 @@ describe("CLI End-to-End Tests", () => {
 
   describe("[local] init command", () => {
     it("should initialize a new project", async () => {
-      const result = await runCli(["init"]);
+      const result = await runCli(["agents", "init"]);
 
       expect(result.exitCode).toBe(0);
       expect(result.stdout).toContain("Initializing project");
@@ -218,14 +218,14 @@ describe("CLI End-to-End Tests", () => {
 
     it("should not overwrite existing files", async () => {
       // Create project first
-      await runCli(["init"]);
+      await runCli(["agents", "init"]);
 
       // Modify agents.json
       const agentsJsonPath = path.join(tempDir, "agents.json");
       await fs.writeFile(agentsJsonPath, '{"agents": [{"name": "test"}]}');
 
       // Init again
-      const result = await runCli(["init"]);
+      const result = await runCli(["agents", "init"]);
 
       expect(result.exitCode).toBe(0);
 
@@ -237,25 +237,25 @@ describe("CLI End-to-End Tests", () => {
 
   describe("[local] templates command", () => {
     it("should list available templates", async () => {
-      const result = await runCli(["templates", "list"]);
+      const result = await runCli(["agents", "templates", "list"]);
 
       expect(result.exitCode).toBe(0);
-      expect(result.stdout).toContain("Available Agent Templates:");
+      expect(result.stdout).toContain("Available agent templates:");
       expect(result.stdout).toContain("default");
       expect(result.stdout).toContain("minimal");
       expect(result.stdout).toContain("customer-service");
     });
 
     it("should show template details", async () => {
-      const result = await runCli(["templates", "show", "default"]);
+      const result = await runCli(["agents", "templates", "show", "default"]);
 
       expect(result.exitCode).toBe(0);
       expect(result.stdout).toContain("Template: default");
-      expect(result.stdout).toContain("example_agent");
+      expect(result.stdout).toContain("Example");
     });
 
     it("should show error for invalid template", async () => {
-      const result = await runCli(["templates", "show", "invalid"]);
+      const result = await runCli(["agents", "templates", "show", "invalid"]);
 
       expect(result.exitCode).toBe(1);
       expect(result.stderr).toContain("Unknown template type");
@@ -264,7 +264,7 @@ describe("CLI End-to-End Tests", () => {
 
   describe("[local] whoami command", () => {
     it("should show not logged in when no API key", async () => {
-      const result = await runCli(["whoami"]);
+      const result = await runCli(["auth", "whoami"]);
 
       expect(result.exitCode).toBe(0);
       expect(result.stdout).toContain("Not logged in");
@@ -274,7 +274,7 @@ describe("CLI End-to-End Tests", () => {
   describe("[local] project workflow", () => {
     it("should handle basic project workflow without API key", async () => {
       // Initialize project
-      let result = await runCli(["init"]);
+      let result = await runCli(["agents", "init"]);
       expect(result.exitCode).toBe(0);
     });
   });
@@ -288,19 +288,19 @@ describe("CLI End-to-End Tests", () => {
     });
 
     it("should handle invalid arguments", async () => {
-      const result = await runCli(["add"]); // missing required argument
+      const result = await runCli(["agents", "add"]); // missing required argument
 
       expect(result.exitCode).toBe(1);
-      // Check both stdout and stderr for the usage message
+      // Check both stdout and stderr for the error message
       const output = result.stdout + result.stderr;
-      expect(output).toContain("Usage: elevenlabs add");
+      expect(output).toContain("missing required argument");
     });
   });
 
   describe("[local] configuration handling", () => {
     it("should handle agents.json operations", async () => {
       // Initialize project
-      await runCli(["init"]);
+      await runCli(["agents", "init"]);
 
       // Check that agents.json was created with correct structure
       const agentsJsonPath = path.join(tempDir, "agents.json");
@@ -314,11 +314,11 @@ describe("CLI End-to-End Tests", () => {
   describe("[local] push-tools command", () => {
     beforeEach(async () => {
       // Initialize project for each test
-      await runCli(["init"]);
+      await runCli(["agents", "init"]);
     });
 
     it("should show help for push-tools command", async () => {
-      const result = await runCli(["push-tools", "--help", "--no-ui"]);
+      const result = await runCli(["tools", "push", "--help", "--no-ui"]);
 
       // Command should be recognized, even if help doesn't work perfectly
       // The important thing is it's not "unknown command"
@@ -326,14 +326,14 @@ describe("CLI End-to-End Tests", () => {
     });
 
     it("should recognize push-tools command with dry-run option", async () => {
-      const result = await runCli(["push-tools", "--dry-run"]);
+      const result = await runCli(["tools", "push", "--dry-run"]);
 
       // Should succeed in dry-run mode with valid tools.json (created by init)
       expect(result.exitCode).toBe(0);
       expect(result.stderr).not.toContain("unknown command");
       expect(result.stderr).not.toContain("unknown option");
-      // Should show dry-run mode output
-      expect(result.stdout.toLowerCase()).toContain("tool(s) pushed");
+      // Should show dry-run mode output (pushing 0 tools is expected for empty tools.json)
+      expect(result.stdout.toLowerCase()).toContain("pushing");
     });
 
     it("should handle missing tools.json file", async () => {
@@ -341,7 +341,7 @@ describe("CLI End-to-End Tests", () => {
       const toolsJsonPath = path.join(tempDir, "tools.json");
       await fs.remove(toolsJsonPath);
 
-      const result = await runCli(["push-tools"]);
+      const result = await runCli(["tools", "push"]);
 
       expect(result.exitCode).toBe(1);
       // Should get tools.json not found error
@@ -349,13 +349,13 @@ describe("CLI End-to-End Tests", () => {
     });
 
     it("should handle specific tool name option", async () => {
-      const result = await runCli(["push-tools", "--tool", "test-tool"]);
+      // Note: tools push doesn't support --tool option, only --env
+      // This test verifies the command works with --env filter
+      const result = await runCli(["tools", "push", "--env", "test"]);
 
-      expect(result.exitCode).toBe(1);
-      // --tool option should be parsed correctly (no unknown option error)
+      // Should succeed (no tools to push is valid)
+      expect(result.exitCode).toBe(0);
       expect(result.stderr).not.toContain("unknown option");
-      // Should get tool not found error since test-tool doesn't exist in empty tools.json
-      expect(result.stderr).toContain("not found in configuration");
     });
   });
 
@@ -375,7 +375,7 @@ describe("CLI End-to-End Tests", () => {
       const apiKey = process.env.ELEVENLABS_API_KEY!;
 
       // Step 1: Initialize project
-      const initResult = await runCli(["init", "--no-ui"], {
+      const initResult = await runCli(["agents", "init", "--no-ui"], {
         includeApiKey: true,
       });
       expect(initResult.exitCode).toBe(0);
@@ -391,7 +391,7 @@ describe("CLI End-to-End Tests", () => {
       expect(toolsJsonExists).toBe(true);
 
       // Step 2: Login
-      const loginResult = await runCli(["login", "--no-ui"], {
+      const loginResult = await runCli(["auth", "login", "--no-ui"], {
         input: `${apiKey}\n`,
         includeApiKey: true,
       });
@@ -399,21 +399,21 @@ describe("CLI End-to-End Tests", () => {
       expect(loginResult.stdout).toBeTruthy();
 
       // Step 3: Check whoami
-      const whoamiResult = await runCli(["whoami", "--no-ui"], {
+      const whoamiResult = await runCli(["auth", "whoami", "--no-ui"], {
         includeApiKey: true,
       });
       expect(whoamiResult.exitCode).toBe(0);
       expect(whoamiResult.stdout).toBeTruthy();
 
       // Step 4: Check status
-      const statusResult = await runCli(["status", "--no-ui"], {
+      const statusResult = await runCli(["agents", "status", "--no-ui"], {
         includeApiKey: true,
       });
       expect(statusResult.exitCode).toBe(0);
       expect(statusResult.stdout).toBeTruthy();
 
       // Step 5: List agents
-      const listResult = await runCli(["list", "--no-ui"], {
+      const listResult = await runCli(["agents", "list", "--no-ui"], {
         includeApiKey: true,
       });
       expect(listResult.exitCode).toBe(0);
@@ -434,21 +434,21 @@ describe("CLI End-to-End Tests", () => {
       
       try {
         // Initialize project
-        await runCli(["init", "--no-ui"], {
+        await runCli(["agents", "init", "--no-ui"], {
           cwd: cleanupTempDir,
           includeApiKey: true,
         });
 
         // Login
         const apiKey = process.env.ELEVENLABS_API_KEY!;
-        await runCli(["login", "--no-ui"], {
+        await runCli(["auth", "login", "--no-ui"], {
           cwd: cleanupTempDir,
           input: `${apiKey}\n`,
           includeApiKey: true,
         });
 
         // Pull all agents from remote
-        await runCli(["pull", "--all", "--no-ui"], {
+        await runCli(["agents", "pull", "--all", "--no-ui"], {
           cwd: cleanupTempDir,
           includeApiKey: true,
           input: "y\n", // Answer the "Proceed?" prompt
@@ -456,7 +456,7 @@ describe("CLI End-to-End Tests", () => {
 
         // Delete all agents at once
         try {
-          await runCli(["delete", "--all", "--no-ui"], {
+          await runCli(["agents", "delete", "--all", "--no-ui"], {
             cwd: cleanupTempDir,
             includeApiKey: true,
             input: "y\n", // Answer the "Are you sure?" prompt
@@ -476,7 +476,7 @@ describe("CLI End-to-End Tests", () => {
       pushPullTempDir = await fs.mkdtemp(path.join(os.tmpdir(), "agents-e2e-pushpull-"));
 
       // Initialize project
-      await runCli(["init", "--no-ui"], {
+      await runCli(["agents", "init", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
       });
@@ -501,7 +501,7 @@ describe("CLI End-to-End Tests", () => {
       
       // Pull all agents to ensure we have the current server state
       try {
-        await runCli(["pull", "--all", "--no-ui"], {
+        await runCli(["agents", "pull", "--all", "--no-ui"], {
           cwd: pushPullTempDir,
           includeApiKey: true,
           input: "y\n", // Answer the "Proceed?" prompt
@@ -530,6 +530,7 @@ describe("CLI End-to-End Tests", () => {
       // Create an agent using add command
       const agentName = `e2e-pushpull-test-${Date.now()}`;
       const addResult = await runCli([
+        "agents",
         "add",
         agentName,
         "--template",
@@ -566,7 +567,7 @@ describe("CLI End-to-End Tests", () => {
       );
 
       // Pull all agents from remote
-      const pullResult = await runCli(["pull", "--all", "--no-ui"], {
+      const pullResult = await runCli(["agents", "pull", "--all", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n", // Answer the "Proceed?" prompt
@@ -604,6 +605,7 @@ describe("CLI End-to-End Tests", () => {
       
       // Step 1: Create agent locally using add command
       const addResult = await runCli([
+        "agents",
         "add",
         agentName,
         "--template",
@@ -639,7 +641,7 @@ describe("CLI End-to-End Tests", () => {
       await fs.remove(createdAgentConfigPath);
 
       // Step 3: Pull all agents from remote
-      const pullResult = await runCli(["pull", "--all", "--no-ui"], {
+      const pullResult = await runCli(["agents", "pull", "--all", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n", // Answer the "Proceed?" prompt
@@ -673,7 +675,7 @@ describe("CLI End-to-End Tests", () => {
       console.log(`✓ Pulled agent config matches original`);
 
       // Step 5: Delete the agent
-      const deleteResult = await runCli(["delete", createdAgentId, "--no-ui"], {
+      const deleteResult = await runCli(["agents", "delete", createdAgentId, "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
       });
@@ -687,7 +689,7 @@ describe("CLI End-to-End Tests", () => {
         JSON.stringify({ agents: [] }, null, 2)
       );
 
-      const finalPullResult = await runCli(["pull", "--all", "--no-ui"], {
+      const finalPullResult = await runCli(["agents", "pull", "--all", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -759,7 +761,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step (d): Pull -> check that nothing changed
       console.log("Step (d): Pulling without --all, expecting no changes...");
-      const pullResult1 = await runCli(["pull", "--no-ui"], {
+      const pullResult1 = await runCli(["agents", "pull", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -791,7 +793,7 @@ describe("CLI End-to-End Tests", () => {
       console.log(
         "Step (f): Pulling to restore third agent, first two unchanged..."
       );
-      const pullResult2 = await runCli(["pull", "--no-ui"], {
+      const pullResult2 = await runCli(["agents", "pull", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -831,7 +833,7 @@ describe("CLI End-to-End Tests", () => {
       console.log(
         "Step (h): Pulling with --update, expecting first to be overridden..."
       );
-      const pullResult3 = await runCli(["pull", "--update", "--no-ui"], {
+      const pullResult3 = await runCli(["agents", "pull", "--update", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -884,7 +886,7 @@ describe("CLI End-to-End Tests", () => {
       console.log(
         "Step (j): Pulling with --all, expecting all overridden and third restored..."
       );
-      const pullResult4 = await runCli(["pull", "--all", "--no-ui"], {
+      const pullResult4 = await runCli(["agents", "pull", "--all", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -944,7 +946,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 1: Create first agent with the name
       const addResult1 = await runCli(
-        ["add", duplicateName, "--template", "minimal", "--no-ui"],
+        ["agents", "add", duplicateName, "--template", "minimal", "--no-ui"],
         {
           cwd: pushPullTempDir,
           includeApiKey: true,
@@ -956,7 +958,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 2: Create second agent with the same name
       const addResult2 = await runCli(
-        ["add", duplicateName, "--template", "minimal", "--no-ui"],
+        ["agents", "add", duplicateName, "--template", "minimal", "--no-ui"],
         {
           cwd: pushPullTempDir,
           includeApiKey: true,
@@ -1013,7 +1015,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 4: Pull agents from remote
       console.log(`Pulling agents from remote...`);
-      const pullResult = await runCli(["pull", "--all", "--no-ui"], {
+      const pullResult = await runCli(["agents", "pull", "--all", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n", // Answer the "Proceed?" prompt
@@ -1145,7 +1147,7 @@ describe("CLI End-to-End Tests", () => {
       console.log(`✓ Created two local agents with the same name`);
 
       // Step 3: Push to create them remotely and get IDs
-      const pushResult = await runCli(["push", "--no-ui"], {
+      const pushResult = await runCli(["agents", "push", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
       });
@@ -1189,7 +1191,7 @@ describe("CLI End-to-End Tests", () => {
       console.log(`✓ Removed local config files and cleared agents.json`);
 
       // Step 5: Pull agents back from remote
-      const pullResult = await runCli(["pull", "--all", "--no-ui"], {
+      const pullResult = await runCli(["agents", "pull", "--all", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -1273,21 +1275,21 @@ describe("CLI End-to-End Tests", () => {
       
       try {
         // Initialize project
-        await runCli(["init", "--no-ui"], {
+        await runCli(["agents", "init", "--no-ui"], {
           cwd: cleanupTempDir,
           includeApiKey: true,
         });
 
         // Login
         const apiKey = process.env.ELEVENLABS_API_KEY!;
-        await runCli(["login", "--no-ui"], {
+        await runCli(["auth", "login", "--no-ui"], {
           cwd: cleanupTempDir,
           input: `${apiKey}\n`,
           includeApiKey: true,
         });
 
         // Pull all tests from remote
-        await runCli(["pull-tests", "--all", "--no-ui"], {
+        await runCli(["tests", "pull", "--all", "--no-ui"], {
           cwd: cleanupTempDir,
           includeApiKey: true,
           input: "y\n", // Answer the "Proceed?" prompt
@@ -1295,7 +1297,7 @@ describe("CLI End-to-End Tests", () => {
 
         // Delete all tests at once
         try {
-          await runCli(["delete-test", "--all", "--no-ui"], {
+          await runCli(["tests", "delete", "--all", "--no-ui"], {
             cwd: cleanupTempDir,
             includeApiKey: true,
             input: "y\n", // Answer the "Are you sure?" prompt
@@ -1315,7 +1317,7 @@ describe("CLI End-to-End Tests", () => {
       pushPullTempDir = await fs.mkdtemp(path.join(os.tmpdir(), "tests-e2e-pushpull-"));
 
       // Initialize project
-      await runCli(["init", "--no-ui"], {
+      await runCli(["agents", "init", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
       });
@@ -1340,7 +1342,7 @@ describe("CLI End-to-End Tests", () => {
       
       // Pull all tests to ensure we have the current server state
       try {
-        await runCli(["pull-tests", "--all", "--no-ui"], {
+        await runCli(["tests", "pull", "--all", "--no-ui"], {
           cwd: pushPullTempDir,
           includeApiKey: true,
           input: "y\n", // Answer the "Proceed?" prompt
@@ -1369,7 +1371,8 @@ describe("CLI End-to-End Tests", () => {
       // Create a test using add-test command
       const testName = `e2e-pushpull-test-${Date.now()}`;
       const addResult = await runCli([
-        "add-test",
+        "tests",
+        "add",
         testName,
         "--template",
         "basic-llm",
@@ -1399,7 +1402,7 @@ describe("CLI End-to-End Tests", () => {
       );
 
       // Pull all tests from remote
-      const pullResult = await runCli(["pull-tests", "--all", "--no-ui"], {
+      const pullResult = await runCli(["tests", "pull", "--all", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n", // Answer the "Proceed?" prompt
@@ -1431,7 +1434,8 @@ describe("CLI End-to-End Tests", () => {
       
       // Step 1: Create test locally using add-test command
       const addResult = await runCli([
-        "add-test",
+        "tests",
+        "add",
         testName,
         "--template",
         "basic-llm",
@@ -1466,7 +1470,7 @@ describe("CLI End-to-End Tests", () => {
       await fs.remove(createdTestConfigPath);
 
       // Step 3: Pull all tests from remote
-      const pullResult = await runCli(["pull-tests", "--all", "--no-ui"], {
+      const pullResult = await runCli(["tests", "pull", "--all", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n", // Answer the "Proceed?" prompt
@@ -1501,7 +1505,7 @@ describe("CLI End-to-End Tests", () => {
       console.log(`✓ Pulled test config matches original`);
 
       // Step 5: Delete the test
-      const deleteResult = await runCli(["delete-test", createdTestId, "--no-ui"], {
+      const deleteResult = await runCli(["tests", "delete", createdTestId, "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
       });
@@ -1515,7 +1519,7 @@ describe("CLI End-to-End Tests", () => {
         JSON.stringify({ tests: [] }, null, 2)
       );
 
-      const finalPullResult = await runCli(["pull-tests", "--all", "--no-ui"], {
+      const finalPullResult = await runCli(["tests", "pull", "--all", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -1587,7 +1591,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step (d): Pull -> check that nothing changed
       console.log("Step (d): Pulling without --all, expecting no changes...");
-      const pullResult1 = await runCli(["pull-tests", "--no-ui"], {
+      const pullResult1 = await runCli(["tests", "pull", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -1617,7 +1621,7 @@ describe("CLI End-to-End Tests", () => {
       console.log(
         "Step (f): Pulling to restore third test, first two unchanged..."
       );
-      const pullResult2 = await runCli(["pull-tests", "--no-ui"], {
+      const pullResult2 = await runCli(["tests", "pull", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -1655,7 +1659,7 @@ describe("CLI End-to-End Tests", () => {
       console.log(
         "Step (h): Pulling with --update, expecting first to be overridden..."
       );
-      const pullResult3 = await runCli(["pull-tests", "--update", "--no-ui"], {
+      const pullResult3 = await runCli(["tests", "pull", "--update", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -1702,7 +1706,7 @@ describe("CLI End-to-End Tests", () => {
       console.log(
         "Step (j): Pulling with --all, expecting all overridden and third restored..."
       );
-      const pullResult4 = await runCli(["pull-tests", "--all", "--no-ui"], {
+      const pullResult4 = await runCli(["tests", "pull", "--all", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -1752,7 +1756,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 1: Create first test with the name
       const addResult1 = await runCli(
-        ["add-test", duplicateName, "--template", "basic-llm", "--no-ui"],
+        ["tests", "add", duplicateName, "--template", "basic-llm", "--no-ui"],
         {
           cwd: pushPullTempDir,
           includeApiKey: true,
@@ -1764,7 +1768,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 2: Create second test with the same name
       const addResult2 = await runCli(
-        ["add-test", duplicateName, "--template", "basic-llm", "--no-ui"],
+        ["tests", "add", duplicateName, "--template", "basic-llm", "--no-ui"],
         {
           cwd: pushPullTempDir,
           includeApiKey: true,
@@ -1815,7 +1819,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 4: Pull tests from remote
       console.log(`Pulling tests from remote...`);
-      const pullResult = await runCli(["pull-tests", "--all", "--no-ui"], {
+      const pullResult = await runCli(["tests", "pull", "--all", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n", // Answer the "Proceed?" prompt
@@ -1892,21 +1896,21 @@ describe("CLI End-to-End Tests", () => {
       
       try {
         // Initialize project
-        await runCli(["init", "--no-ui"], {
+        await runCli(["agents", "init", "--no-ui"], {
           cwd: cleanupTempDir,
           includeApiKey: true,
         });
 
         // Login
         const apiKey = process.env.ELEVENLABS_API_KEY!;
-        await runCli(["login", "--no-ui"], {
+        await runCli(["auth", "login", "--no-ui"], {
           cwd: cleanupTempDir,
           input: `${apiKey}\n`,
           includeApiKey: true,
         });
 
         // Pull all tools from remote
-        await runCli(["pull-tools", "--all", "--no-ui"], {
+        await runCli(["tools", "pull", "--all", "--no-ui"], {
           cwd: cleanupTempDir,
           includeApiKey: true,
           input: "y\n", // Answer the "Proceed?" prompt
@@ -1914,7 +1918,7 @@ describe("CLI End-to-End Tests", () => {
 
         // Delete all tools at once
         try {
-          await runCli(["delete-tool", "--all", "--no-ui"], {
+          await runCli(["tools", "delete", "--all", "--no-ui"], {
             cwd: cleanupTempDir,
             includeApiKey: true,
             input: "y\n", // Answer the "Are you sure?" prompt
@@ -1934,7 +1938,7 @@ describe("CLI End-to-End Tests", () => {
       pushPullTempDir = await fs.mkdtemp(path.join(os.tmpdir(), "tools-e2e-pushpull-"));
 
       // Initialize project
-      await runCli(["init", "--no-ui"], {
+      await runCli(["agents", "init", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
       });
@@ -1959,7 +1963,7 @@ describe("CLI End-to-End Tests", () => {
       
       // Pull all tools to ensure we have the current server state
       try {
-        await runCli(["pull-tools", "--all", "--no-ui"], {
+        await runCli(["tools", "pull", "--all", "--no-ui"], {
           cwd: pushPullTempDir,
           includeApiKey: true,
           input: "y\n", // Answer the "Proceed?" prompt
@@ -1985,18 +1989,16 @@ describe("CLI End-to-End Tests", () => {
     });
 
     // Helper to get the add command for a tool type
-    const getAddCommand = (toolType: 'webhook' | 'client') => 
-      toolType === 'webhook' ? 'add-webhook-tool' : 'add-client-tool';
+    const getAddCommand = (toolType: 'webhook' | 'client', name: string) =>
+      ['tools', 'add', name, '--type', toolType];
 
     // Test 1: Run for both webhook and client tools
     (['webhook', 'client'] as const).forEach((toolType) => {
       it(`should verify ${toolType} tool created by add is the only one after pull (--no-ui)`, async () => {
         // Create a tool using add command
         const toolName = `e2e-pushpull-${toolType}-${Date.now()}`;
-        const addResult = await runCli([
-          getAddCommand(toolType),
-          toolName,
-        ], {
+        const addResult = await runCli(
+          getAddCommand(toolType, toolName), {
           cwd: pushPullTempDir,
           includeApiKey: true,
         });
@@ -2021,7 +2023,7 @@ describe("CLI End-to-End Tests", () => {
         );
 
         // Pull all tools from remote
-        const pullResult = await runCli(["pull-tools", "--all", "--no-ui"], {
+        const pullResult = await runCli(["tools", "pull", "--all", "--no-ui"], {
           cwd: pushPullTempDir,
           includeApiKey: true,
           input: "y\n", // Answer the "Proceed?" prompt
@@ -2041,7 +2043,7 @@ describe("CLI End-to-End Tests", () => {
         console.log(`✓ Verified ${toolType} tool '${toolName}' is the only tool after pull`);
 
         // Clean up: delete the tool
-        await runCli(["delete-tool", createdTool.id, "--no-ui"], {
+        await runCli(["tools", "delete", createdTool.id, "--no-ui"], {
           cwd: pushPullTempDir,
           includeApiKey: true,
         });
@@ -2055,10 +2057,8 @@ describe("CLI End-to-End Tests", () => {
         const toolsJsonPath = path.join(pushPullTempDir, "tools.json");
         
         // Step 1: Create tool locally using add command
-        const addResult = await runCli([
-          getAddCommand(toolType),
-          toolName,
-        ], {
+        const addResult = await runCli(
+          getAddCommand(toolType, toolName), {
           cwd: pushPullTempDir,
           includeApiKey: true,
         });
@@ -2088,7 +2088,7 @@ describe("CLI End-to-End Tests", () => {
         await fs.remove(createdToolConfigPath);
 
         // Step 3: Pull all tools from remote
-        const pullResult = await runCli(["pull-tools", "--all", "--no-ui"], {
+        const pullResult = await runCli(["tools", "pull", "--all", "--no-ui"], {
           cwd: pushPullTempDir,
           includeApiKey: true,
           input: "y\n", // Answer the "Proceed?" prompt
@@ -2121,7 +2121,7 @@ describe("CLI End-to-End Tests", () => {
         console.log(`✓ Pulled ${toolType} tool config matches original`);
 
         // Step 5: Delete the tool
-        const deleteResult = await runCli(["delete-tool", createdToolId, "--no-ui"], {
+        const deleteResult = await runCli(["tools", "delete", createdToolId, "--no-ui"], {
           cwd: pushPullTempDir,
           includeApiKey: true,
         });
@@ -2135,7 +2135,7 @@ describe("CLI End-to-End Tests", () => {
           JSON.stringify({ tools: [] }, null, 2)
         );
 
-        const finalPullResult = await runCli(["pull-tools", "--all", "--no-ui"], {
+        const finalPullResult = await runCli(["tools", "pull", "--all", "--no-ui"], {
           cwd: pushPullTempDir,
           includeApiKey: true,
           input: "y\n",
@@ -2167,10 +2167,8 @@ describe("CLI End-to-End Tests", () => {
         console.log(`Step (a) & (b): Creating 3 ${toolType} tools...`);
         
         for (const toolName of toolNames) {
-          const addResult = await runCli([
-            getAddCommand(toolType),
-            toolName,
-          ], {
+          const addResult = await runCli(
+            getAddCommand(toolType, toolName), {
             cwd: pushPullTempDir,
             includeApiKey: true,
           });
@@ -2207,7 +2205,7 @@ describe("CLI End-to-End Tests", () => {
 
         // Step (d): Pull -> check that nothing changed
         console.log("Step (d): Pulling without --all, expecting no changes...");
-        const pullResult1 = await runCli(["pull-tools", "--no-ui"], {
+        const pullResult1 = await runCli(["tools", "pull", "--no-ui"], {
           cwd: pushPullTempDir,
           includeApiKey: true,
           input: "y\n",
@@ -2237,7 +2235,7 @@ describe("CLI End-to-End Tests", () => {
         console.log(
           "Step (f): Pulling to restore third tool, first two unchanged..."
         );
-        const pullResult2 = await runCli(["pull-tools", "--no-ui"], {
+        const pullResult2 = await runCli(["tools", "pull", "--no-ui"], {
           cwd: pushPullTempDir,
           includeApiKey: true,
           input: "y\n",
@@ -2275,7 +2273,7 @@ describe("CLI End-to-End Tests", () => {
         console.log(
           "Step (h): Pulling with --update, expecting first to be overridden..."
         );
-        const pullResult3 = await runCli(["pull-tools", "--update", "--no-ui"], {
+        const pullResult3 = await runCli(["tools", "pull", "--update", "--no-ui"], {
           cwd: pushPullTempDir,
           includeApiKey: true,
           input: "y\n",
@@ -2322,7 +2320,7 @@ describe("CLI End-to-End Tests", () => {
         console.log(
           "Step (j): Pulling with --all, expecting all overridden and third restored..."
         );
-        const pullResult4 = await runCli(["pull-tools", "--all", "--no-ui"], {
+        const pullResult4 = await runCli(["tools", "pull", "--all", "--no-ui"], {
           cwd: pushPullTempDir,
           includeApiKey: true,
           input: "y\n",
@@ -2373,7 +2371,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 1: Create first tool with the name
       const addResult1 = await runCli(
-        ["add-webhook-tool", duplicateName],
+        ["tools", "add", duplicateName, "--type", "webhook"],
         {
           cwd: pushPullTempDir,
           includeApiKey: true,
@@ -2385,7 +2383,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 2: Create second tool with the same name
       const addResult2 = await runCli(
-        ["add-webhook-tool", duplicateName],
+        ["tools", "add", duplicateName, "--type", "webhook"],
         {
           cwd: pushPullTempDir,
           includeApiKey: true,
@@ -2443,7 +2441,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 4: Pull tools from remote
       console.log(`Pulling tools from remote...`);
-      const pullResult = await runCli(["pull-tools", "--all", "--no-ui"], {
+      const pullResult = await runCli(["tools", "pull", "--all", "--no-ui"], {
         cwd: pushPullTempDir,
         includeApiKey: true,
         input: "y\n", // Answer the "Proceed?" prompt
@@ -2540,27 +2538,27 @@ describe("CLI End-to-End Tests", () => {
       
       try {
         // Initialize project
-        await runCli(["init", "--no-ui"], {
+        await runCli(["agents", "init", "--no-ui"], {
           cwd: cleanupTempDir,
           includeApiKey: true,
         });
 
         // Cleanup prod environment
         const prodApiKey = process.env.ELEVENLABS_API_KEY!;
-        await runCli(["login", "--no-ui", "--env", "prod"], {
+        await runCli(["auth", "login", "--no-ui", "--env", "prod"], {
           cwd: cleanupTempDir,
           input: `${prodApiKey}\n`,
           includeApiKey: true,
         });
 
-        await runCli(["pull", "--all", "--no-ui", "--env", "prod"], {
+        await runCli(["agents", "pull", "--all", "--no-ui", "--env", "prod"], {
           cwd: cleanupTempDir,
           includeApiKey: true,
           input: "y\n",
         });
 
         try {
-          await runCli(["delete", "--all", "--no-ui", "--env", "prod"], {
+          await runCli(["agents", "delete", "--all", "--no-ui", "--env", "prod"], {
             cwd: cleanupTempDir,
             includeApiKey: true,
             input: "y\n",
@@ -2572,20 +2570,20 @@ describe("CLI End-to-End Tests", () => {
 
         // Cleanup test environment
         const testApiKey = process.env.ELEVENLABS_TEST_API_KEY!;
-        await runCli(["login", "--no-ui", "--env", "test"], {
+        await runCli(["auth", "login", "--no-ui", "--env", "test"], {
           cwd: cleanupTempDir,
           input: `${testApiKey}\n`,
           includeApiKey: true,
         });
 
-        await runCli(["pull", "--all", "--no-ui", "--env", "test"], {
+        await runCli(["agents", "pull", "--all", "--no-ui", "--env", "test"], {
           cwd: cleanupTempDir,
           includeApiKey: true,
           input: "y\n",
         });
 
         try {
-          await runCli(["delete", "--all", "--no-ui", "--env", "test"], {
+          await runCli(["agents", "delete", "--all", "--no-ui", "--env", "test"], {
             cwd: cleanupTempDir,
             includeApiKey: true,
             input: "y\n",
@@ -2613,7 +2611,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 1: Initialize project
       console.log("Step 1: Initializing project...");
-      const initResult = await runCli(["init", "--no-ui"], {
+      const initResult = await runCli(["agents", "init", "--no-ui"], {
         cwd: multiEnvTempDir,
         includeApiKey: true,
       });
@@ -2639,7 +2637,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Verify both environments are logged in
       // Don't include API key env var so whoami reads from stored keys
-      const whoamiResult = await runCli(["whoami", "--no-ui"], {
+      const whoamiResult = await runCli(["auth", "whoami", "--no-ui"], {
         cwd: multiEnvTempDir,
         includeApiKey: false,
       });
@@ -2649,7 +2647,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 4: Add agent to prod (default)
       console.log("Step 4: Adding agent to prod environment...");
-      const addProdResult = await runCli(["add", "prod-agent", "--no-ui"], {
+      const addProdResult = await runCli(["agents", "add", "prod-agent", "--no-ui"], {
         cwd: multiEnvTempDir,
         includeApiKey: true,
       });
@@ -2657,7 +2655,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 5: Add agent to test environment
       console.log("Step 5: Adding agent to test environment...");
-      const addTestResult = await runCli(["add", "test-agent", "--no-ui", "--env", "test"], {
+      const addTestResult = await runCli(["agents", "add", "test-agent", "--no-ui", "--env", "test"], {
         cwd: multiEnvTempDir,
         includeApiKey: true,
       });
@@ -2684,7 +2682,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 7: Pull from test environment only
       console.log("Step 7: Pulling from test environment...");
-      const pullTestResult = await runCli(["pull", "--all", "--no-ui", "--env", "test"], {
+      const pullTestResult = await runCli(["agents", "pull", "--all", "--no-ui", "--env", "test"], {
         cwd: multiEnvTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -2705,7 +2703,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 9: Pull from prod environment
       console.log("Step 9: Pulling from prod environment...");
-      const pullProdResult = await runCli(["pull", "--all", "--no-ui", "--env", "prod"], {
+      const pullProdResult = await runCli(["agents", "pull", "--all", "--no-ui", "--env", "prod"], {
         cwd: multiEnvTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -2742,7 +2740,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 12: Push changes
       console.log("Step 12: Pushing changes...");
-      const pushResult = await runCli(["push", "--no-ui"], {
+      const pushResult = await runCli(["agents", "push", "--no-ui"], {
         cwd: multiEnvTempDir,
         includeApiKey: true,
       });
@@ -2756,7 +2754,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 14: Pull from test environment
       console.log("Step 14: Pulling from test environment...");
-      await runCli(["pull", "--all", "--no-ui", "--env", "test"], {
+      await runCli(["agents", "pull", "--all", "--no-ui", "--env", "test"], {
         cwd: multiEnvTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -2774,7 +2772,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 16: Pull from prod environment
       console.log("Step 16: Pulling from prod environment...");
-      await runCli(["pull", "--all", "--no-ui", "--env", "prod"], {
+      await runCli(["agents", "pull", "--all", "--no-ui", "--env", "prod"], {
         cwd: multiEnvTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -2793,7 +2791,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 18: Delete all agents
       console.log("Step 18: Deleting all agents...");
-      const deleteAllResult = await runCli(["delete", "--all", "--no-ui"], {
+      const deleteAllResult = await runCli(["agents", "delete", "--all", "--no-ui"], {
         cwd: multiEnvTempDir,
         includeApiKey: true,
         input: "y\n",
@@ -2807,7 +2805,7 @@ describe("CLI End-to-End Tests", () => {
 
       // Step 19: Pull from both environments
       console.log("Step 19: Pulling from both environments...");
-      const finalPullResult = await runCli(["pull", "--all", "--no-ui"], {
+      const finalPullResult = await runCli(["agents", "pull", "--all", "--no-ui"], {
         cwd: multiEnvTempDir,
         includeApiKey: true,
         input: "y\n",
diff --git a/src/__tests__/config.test.ts b/src/__tests__/config.test.ts
index eb8bd2b..fedd9f1 100644
--- a/src/__tests__/config.test.ts
+++ b/src/__tests__/config.test.ts
@@ -14,7 +14,7 @@ import {
   isLoggedIn,
   getResidency,
   setResidency,
-} from "../config";
+} from "../shared/config";
 import {
   describe,
   it,
@@ -31,7 +31,7 @@ jest.mock("os", () => ({
 }));
 
 // Mock auth module for better isolation
-jest.mock("../auth", () => {
+jest.mock("../shared/auth", () => {
   let storedApiKey: string | undefined;
   const resetStoredApiKey = () => {
     storedApiKey = undefined;
@@ -74,7 +74,7 @@ describe("Config Management", () => {
     // Mock os.homedir to return our temp directory
     mockedOs.homedir.mockReturnValue(tempDir);
     // Reset mock state
-    const authMock = jest.mocked(await import("../auth.js"));
+    const authMock = jest.mocked(await import("../shared/auth.js"));
     if (
       "__resetStoredApiKey" in authMock &&
       typeof authMock.__resetStoredApiKey === "function"
diff --git a/src/__tests__/filename-generation.integration.test.ts b/src/__tests__/filename-generation.integration.test.ts
index b6ea67a..59ffb37 100644
--- a/src/__tests__/filename-generation.integration.test.ts
+++ b/src/__tests__/filename-generation.integration.test.ts
@@ -1,4 +1,4 @@
-import { generateUniqueFilename } from "../utils";
+import { generateUniqueFilename } from "../shared/utils";
 import fs from "fs-extra";
 import path from "path";
 import os from "os";
diff --git a/src/__tests__/residency.test.ts b/src/__tests__/residency.test.ts
index 09ee813..63ad01f 100644
--- a/src/__tests__/residency.test.ts
+++ b/src/__tests__/residency.test.ts
@@ -5,8 +5,8 @@
 import * as fs from "fs-extra";
 import * as path from "path";
 import * as os from "os";
-import { getElevenLabsClient } from "../elevenlabs-api";
-import { setResidency, setApiKey } from "../config";
+import { getElevenLabsClient } from "../shared/elevenlabs-api";
+import { setResidency, setApiKey } from "../shared/config";
 import {
   describe,
   it,
@@ -34,7 +34,7 @@ jest.mock("os", () => ({
 }));
 
 // Mock auth module for better isolation
-jest.mock("../auth", () => {
+jest.mock("../shared/auth", () => {
   let storedApiKey: string | undefined;
   return {
     storeApiKey: jest.fn().mockImplementation((key: unknown) => {
@@ -136,7 +136,7 @@ describe("Residency-specific API Client", () => {
     delete process.env.ELEVENLABS_API_KEY;
 
     // Clear the stored API key from the mocked auth module
-    const { removeApiKey } = await import("../config");
+    const { removeApiKey } = await import("../shared/config");
     await removeApiKey();
 
     // Clear the temp directory to remove any stored config
@@ -147,7 +147,7 @@ describe("Residency-specific API Client", () => {
     mockedOs.homedir.mockReturnValue(tempDir);
 
     await expect(getElevenLabsClient()).rejects.toThrow(
-      "No API key found for environment 'prod'. Use 'elevenlabs login --env prod' to authenticate or set ELEVENLABS_API_KEY environment variable."
+      "No API key found for environment 'prod'. Use 'elevenlabs auth login --env prod' to authenticate or set ELEVENLABS_API_KEY environment variable."
     );
   });
 });
diff --git a/src/__tests__/utils.test.ts b/src/__tests__/utils.test.ts
index afc5ede..05979b0 100644
--- a/src/__tests__/utils.test.ts
+++ b/src/__tests__/utils.test.ts
@@ -1,4 +1,4 @@
-import { calculateConfigHash, toCamelCaseKeys, generateUniqueFilename } from "../utils";
+import { calculateConfigHash, toCamelCaseKeys, generateUniqueFilename } from "../shared/utils";
 import fs from "fs-extra";
 import path from "path";
 import os from "os";
diff --git a/src/__tests__/widget.test.ts b/src/agents/__tests__/widget.test.ts
similarity index 98%
rename from src/__tests__/widget.test.ts
rename to src/agents/__tests__/widget.test.ts
index 5bc1d7b..5dee215 100644
--- a/src/__tests__/widget.test.ts
+++ b/src/agents/__tests__/widget.test.ts
@@ -2,7 +2,7 @@
  * Tests for widget generation logic with residency support
  */
 
-import { getResidency, setResidency } from "../config";
+import { getResidency, setResidency } from "../../shared/config";
 import {
   describe,
   it,
diff --git a/src/agents/commands/add.ts b/src/agents/commands/add.ts
new file mode 100644
index 0000000..48e56b3
--- /dev/null
+++ b/src/agents/commands/add.ts
@@ -0,0 +1,128 @@
+import { Command } from 'commander';
+import { render } from 'ink';
+import React from 'react';
+import path from 'path';
+import fs from 'fs-extra';
+import AddAgentView from '../ui/AddAgentView.js';
+import { readConfig, writeConfig, generateUniqueFilename } from '../../shared/utils.js';
+import { getTemplateByName, AgentConfig } from '../templates.js';
+import { getElevenLabsClient, createAgentApi } from '../../shared/elevenlabs-api.js';
+
+const AGENTS_CONFIG_FILE = "agents.json";
+
+interface AgentsConfig {
+  agents: Array<{
+    config: string;
+    id?: string;
+    env?: string;
+  }>;
+}
+
+interface AgentDefinition {
+  config: string;
+  id?: string;
+  env?: string;
+}
+
+interface AddOptions {
+  configPath?: string;
+  template: string;
+  env: string;
+}
+
+export function createAddCommand(): Command {
+  return new Command('add')
+    .description('Add a new agent - creates config, uploads to ElevenLabs, and saves ID')
+    .argument('<name>', 'Name of the agent to create')
+    .option('--config-path <path>', 'Custom config path (optional)')
+    .option('--template <template>', 'Template type to use', 'default')
+    .option('--env <environment>', 'Environment to create agent in', 'prod')
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (name: string, options: AddOptions & { ui: boolean }) => {
+      try {
+        if (options.ui !== false && !options.configPath) {
+          // Use Ink UI for agent creation
+          const { waitUntilExit } = render(
+            React.createElement(AddAgentView, {
+              initialName: name,
+              template: options.template,
+              environment: options.env || 'prod'
+            })
+          );
+          await waitUntilExit();
+          return;
+        }
+        // Check if agents.json exists
+        const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
+        if (!(await fs.pathExists(agentsConfigPath))) {
+          console.error('agents.json not found. Run \'elevenlabs agents init\' first.');
+          process.exit(1);
+        }
+
+        // Load existing config
+        const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
+
+        // Create agent config using template (in memory first)
+        let agentConfig: AgentConfig;
+        try {
+          agentConfig = getTemplateByName(name, options.template);
+        } catch (error) {
+          console.error(`${error}`);
+          process.exit(1);
+        }
+
+        // Create agent in ElevenLabs first to get ID
+        const environment = options.env || 'prod';
+        console.log(`Creating agent '${name}' in ElevenLabs (environment: ${environment})...`);
+
+        const client = await getElevenLabsClient(environment);
+
+        // Extract config components
+        const conversationConfig = agentConfig.conversation_config || {};
+        const platformSettings = agentConfig.platform_settings;
+        const tags = agentConfig.tags || [];
+
+        // Create new agent
+        const agentId = await createAgentApi(
+          client,
+          name,
+          conversationConfig,
+          platformSettings,
+          tags
+        );
+
+        console.log(`Created agent in ElevenLabs with ID: ${agentId}`);
+
+        // Generate config path using agent name (or custom path if provided)
+        let configPath = options.configPath;
+        if (!configPath) {
+          configPath = await generateUniqueFilename('agent_configs', name);
+        }
+
+        // Create config directory and file
+        const configFilePath = path.resolve(configPath);
+        await fs.ensureDir(path.dirname(configFilePath));
+
+        await writeConfig(configFilePath, agentConfig);
+        console.log(`Created config file: ${configPath} (template: ${options.template})`);
+
+        // Store agent ID in index file
+        const newAgent: AgentDefinition = {
+          config: configPath,
+          id: agentId,
+          env: environment
+        };
+        agentsConfig.agents.push(newAgent);
+
+        // Save updated agents.json
+        await writeConfig(agentsConfigPath, agentsConfig);
+        console.log(`Added agent '${name}' to agents.json`);
+
+        console.log(`Edit ${configPath} to customize your agent, then run 'elevenlabs agents push' to update`);
+
+      } catch (error) {
+        console.error(`Error creating agent: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/agents/commands/delete-impl.ts b/src/agents/commands/delete-impl.ts
new file mode 100644
index 0000000..9454c68
--- /dev/null
+++ b/src/agents/commands/delete-impl.ts
@@ -0,0 +1,166 @@
+import path from 'path';
+import fs from 'fs-extra';
+import { readConfig, writeConfig } from '../../shared/utils.js';
+import { getElevenLabsClient, deleteAgentApi } from '../../shared/elevenlabs-api.js';
+import { getAgentName, promptForConfirmation } from './utils.js';
+
+const AGENTS_CONFIG_FILE = "agents.json";
+
+interface AgentDefinition {
+  config: string;
+  id?: string;
+  env?: string;
+}
+
+interface AgentsConfig {
+  agents: AgentDefinition[];
+}
+
+export async function deleteAgent(agentId: string): Promise<void> {
+  // Load agents configuration
+  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
+  if (!(await fs.pathExists(agentsConfigPath))) {
+    throw new Error('agents.json not found. Run \'elevenlabs agents init\' first.');
+  }
+
+  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
+
+  // Find the agent by ID
+  const agentIndex = agentsConfig.agents.findIndex(agent => agent.id === agentId);
+
+  if (agentIndex === -1) {
+    throw new Error(`Agent with ID '${agentId}' not found in local configuration`);
+  }
+
+  const agentDef = agentsConfig.agents[agentIndex];
+  const agentName = await getAgentName(agentDef.config);
+  const configPath = agentDef.config;
+  const environment = agentDef.env || 'prod';
+
+  console.log(`Deleting agent '${agentName}' (ID: ${agentId}) [${environment}]...`);
+
+  // Delete from ElevenLabs (globally)
+  console.log('Deleting from ElevenLabs...');
+  const client = await getElevenLabsClient(environment);
+
+  try {
+    await deleteAgentApi(client, agentId);
+    console.log('✓ Successfully deleted from ElevenLabs');
+  } catch (error) {
+    console.error(`Warning: Failed to delete from ElevenLabs: ${error}`);
+    console.log('Continuing with local deletion...');
+  }
+
+  // Remove from local agents.json
+  agentsConfig.agents.splice(agentIndex, 1);
+  await writeConfig(agentsConfigPath, agentsConfig);
+  console.log(`✓ Removed '${agentName}' from ${AGENTS_CONFIG_FILE}`);
+
+  // Remove config file
+  if (configPath && await fs.pathExists(configPath)) {
+    await fs.remove(configPath);
+    console.log(`✓ Deleted config file: ${configPath}`);
+  }
+
+  console.log(`\n✓ Successfully deleted agent '${agentName}'`);
+}
+
+export async function deleteAllAgents(ui: boolean = true, env?: string): Promise<void> {
+  // Load agents configuration
+  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
+  if (!(await fs.pathExists(agentsConfigPath))) {
+    throw new Error('agents.json not found. Run \'elevenlabs agents init\' first.');
+  }
+
+  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
+
+  if (agentsConfig.agents.length === 0) {
+    console.log('No agents found to delete');
+    return;
+  }
+
+  // Filter agents by environment if specified
+  const agentsToDelete = env
+    ? agentsConfig.agents.filter(agent => (agent.env || 'prod') === env)
+    : agentsConfig.agents;
+
+  if (agentsToDelete.length === 0) {
+    console.log(env ? `No agents found in environment '${env}'` : 'No agents found to delete');
+    return;
+  }
+
+  // Show what will be deleted
+  const envInfo = env ? ` in environment '${env}'` : '';
+  console.log(`\nFound ${agentsToDelete.length} agent(s) to delete${envInfo}:`);
+  for (let i = 0; i < agentsToDelete.length; i++) {
+    const agent = agentsToDelete[i];
+    const agentName = await getAgentName(agent.config);
+    const agentEnv = agent.env || 'prod';
+    console.log(`  ${i + 1}. ${agentName} (${agent.id}) [${agentEnv}]`);
+  }
+
+  // Confirm deletion (skip if --no-ui)
+  if (ui) {
+    const warningMsg = env
+      ? `\nWARNING: This will delete ${agentsToDelete.length} agent(s) from environment '${env}' in both local configuration and ElevenLabs.`
+      : '\nWARNING: This will delete ALL agents from both local configuration and ElevenLabs.';
+    console.log(warningMsg);
+    const confirmed = await promptForConfirmation('Are you sure you want to delete these agents?');
+
+    if (!confirmed) {
+      console.log('Deletion cancelled');
+      return;
+    }
+  }
+
+  console.log('\nDeleting agents...\n');
+
+  let successCount = 0;
+  let failCount = 0;
+  const deletedIds = new Set<string>();
+
+  // Delete each agent
+  for (const agentDef of agentsToDelete) {
+    try {
+      const agentName = await getAgentName(agentDef.config);
+      const environment = agentDef.env || 'prod';
+      console.log(`Deleting '${agentName}' (${agentDef.id}) [${environment}]...`);
+
+      // Delete from ElevenLabs
+      if (agentDef.id) {
+        try {
+          const client = await getElevenLabsClient(environment);
+          await deleteAgentApi(client, agentDef.id);
+          console.log(`  ✓ Deleted from ElevenLabs`);
+        } catch (error) {
+          console.error(`  Warning: Failed to delete from ElevenLabs: ${error}`);
+        }
+      } else {
+        console.log(`  Warning: No agent ID found, skipping ElevenLabs deletion`);
+      }
+
+      // Remove config file
+      if (agentDef.config && await fs.pathExists(agentDef.config)) {
+        await fs.remove(agentDef.config);
+        console.log(`  ✓ Deleted config file: ${agentDef.config}`);
+      }
+
+      if (agentDef.id) {
+        deletedIds.add(agentDef.id);
+      }
+      successCount++;
+    } catch (error) {
+      const agentName = await getAgentName(agentDef.config);
+      console.error(`  Failed to delete '${agentName}': ${error}`);
+      failCount++;
+    }
+  }
+
+  // Remove deleted agents from config (only the ones that were successfully deleted)
+  agentsConfig.agents = agentsConfig.agents.filter(agent => !deletedIds.has(agent.id || ''));
+  await writeConfig(agentsConfigPath, agentsConfig);
+  console.log(`\n✓ Updated ${AGENTS_CONFIG_FILE}`);
+
+  // Summary
+  console.log(`\n✓ Deletion complete: ${successCount} succeeded, ${failCount} failed`);
+}
diff --git a/src/agents/commands/delete.ts b/src/agents/commands/delete.ts
new file mode 100644
index 0000000..d08086d
--- /dev/null
+++ b/src/agents/commands/delete.ts
@@ -0,0 +1,40 @@
+import { Command } from 'commander';
+
+// These will be imported from a shared utils or implementation file
+import { deleteAgent, deleteAllAgents } from './delete-impl.js';
+
+export function createDeleteCommand(): Command {
+  return new Command('delete')
+    .description('Delete an agent locally and from ElevenLabs')
+    .argument('[agent_id]', 'ID of the agent to delete (omit with --all to delete all agents)')
+    .option('--all', 'Delete all agents', false)
+    .option('--env <environment>', 'Filter agents by environment (use with --all)')
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (agentId: string | undefined, options: { all: boolean; env?: string; ui: boolean }) => {
+      try {
+        if (options.all && agentId) {
+          console.error('Error: Cannot specify both agent_id and --all flag');
+          process.exit(1);
+        }
+
+        if (!options.all && !agentId) {
+          console.error('Error: Must specify either agent_id or --all flag');
+          process.exit(1);
+        }
+
+        if (options.env && !options.all) {
+          console.error('Error: --env flag can only be used with --all');
+          process.exit(1);
+        }
+
+        if (options.all) {
+          await deleteAllAgents(options.ui, options.env);
+        } else {
+          await deleteAgent(agentId!);
+        }
+      } catch (error) {
+        console.error(`Error deleting agent: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/agents/commands/index.ts b/src/agents/commands/index.ts
new file mode 100644
index 0000000..7e20f7f
--- /dev/null
+++ b/src/agents/commands/index.ts
@@ -0,0 +1,29 @@
+import { Command } from 'commander';
+import { createInitCommand } from './init.js';
+import { createAddCommand } from './add.js';
+import { createListCommand } from './list.js';
+import { createDeleteCommand } from './delete.js';
+import { createStatusCommand } from './status.js';
+import { createPushCommand } from './push.js';
+import { createPullCommand } from './pull.js';
+import { createTemplatesCommand } from './templates.js';
+import { createWidgetCommand } from './widget.js';
+import { createTestCommand } from './test.js';
+
+export function createAgentsCommand(): Command {
+  const agents = new Command('agents');
+  agents.description('Manage ElevenLabs agents');
+
+  agents.addCommand(createInitCommand());
+  agents.addCommand(createAddCommand());
+  agents.addCommand(createListCommand());
+  agents.addCommand(createDeleteCommand());
+  agents.addCommand(createStatusCommand());
+  agents.addCommand(createPushCommand());
+  agents.addCommand(createPullCommand());
+  agents.addCommand(createTemplatesCommand());
+  agents.addCommand(createWidgetCommand());
+  agents.addCommand(createTestCommand());
+
+  return agents;
+}
diff --git a/src/agents/commands/init.ts b/src/agents/commands/init.ts
new file mode 100644
index 0000000..c23b97a
--- /dev/null
+++ b/src/agents/commands/init.ts
@@ -0,0 +1,129 @@
+import { Command } from 'commander';
+import { render } from 'ink';
+import React from 'react';
+import path from 'path';
+import fs from 'fs-extra';
+import InitView from '../ui/InitView.js';
+import { writeConfig } from '../../shared/utils.js';
+import { writeToolsConfig, ToolsConfig } from '../../shared/tools.js';
+
+const AGENTS_CONFIG_FILE = "agents.json";
+const TOOLS_CONFIG_FILE = "tools.json";
+const TESTS_CONFIG_FILE = "tests.json";
+
+interface AgentsConfig {
+  agents: Array<{
+    config: string;
+    id?: string;
+    env?: string;
+  }>;
+}
+
+interface TestsConfig {
+  tests: Array<{
+    config: string;
+    id?: string;
+    env?: string;
+  }>;
+}
+
+export function createInitCommand(): Command {
+  return new Command('init')
+    .description('Initialize a new agent management project')
+    .argument('[path]', 'Path to initialize the project in', '.')
+    .option('--no-ui', 'Disable interactive UI')
+    .option('--override', 'Override existing files and recreate from scratch', false)
+    .action(async (projectPath: string, options: { ui: boolean; override: boolean }) => {
+      try {
+        if (options.ui !== false) {
+          // Use Ink UI for initialization
+          const { waitUntilExit } = render(
+            React.createElement(InitView, { projectPath, override: options.override })
+          );
+          await waitUntilExit();
+        } else {
+          // Fallback to original implementation
+          const fullPath = path.resolve(projectPath);
+          console.log(`Initializing project in ${fullPath}`);
+          if (options.override) {
+            console.log('⚠ Override mode: existing files will be overwritten');
+          }
+
+          // Create directory if it doesn't exist
+          await fs.ensureDir(fullPath);
+
+          // Create agents.json file
+          const agentsConfigPath = path.join(fullPath, AGENTS_CONFIG_FILE);
+          if (!options.override && await fs.pathExists(agentsConfigPath)) {
+            console.log(`${AGENTS_CONFIG_FILE} already exists (skipped)`);
+          } else {
+            const initialConfig: AgentsConfig = {
+              agents: []
+            };
+            await writeConfig(agentsConfigPath, initialConfig);
+            console.log(`Created ${AGENTS_CONFIG_FILE}`);
+          }
+
+          // Create tools.json file
+          const toolsConfigPath = path.join(fullPath, TOOLS_CONFIG_FILE);
+          if (!options.override && await fs.pathExists(toolsConfigPath)) {
+            console.log(`${TOOLS_CONFIG_FILE} already exists (skipped)`);
+          } else {
+            const initialToolsConfig: ToolsConfig = {
+              tools: []
+            };
+            await writeToolsConfig(toolsConfigPath, initialToolsConfig);
+            console.log(`Created ${TOOLS_CONFIG_FILE}`);
+          }
+
+          // Create tests.json file
+          const testsConfigPath = path.join(fullPath, TESTS_CONFIG_FILE);
+          if (!options.override && await fs.pathExists(testsConfigPath)) {
+            console.log(`${TESTS_CONFIG_FILE} already exists (skipped)`);
+          } else {
+            const initialTestsConfig: TestsConfig = {
+              tests: []
+            };
+            await writeConfig(testsConfigPath, initialTestsConfig);
+            console.log(`Created ${TESTS_CONFIG_FILE}`);
+          }
+
+          // Create directory structure
+          const configDirs = ['agent_configs', 'tool_configs', 'test_configs'];
+          for (const dir of configDirs) {
+            const dirPath = path.join(fullPath, dir);
+            if (options.override && await fs.pathExists(dirPath)) {
+              await fs.remove(dirPath);
+            }
+            await fs.ensureDir(dirPath);
+            const existed = await fs.pathExists(dirPath);
+            console.log(`Created directory: ${dir}${!options.override && existed ? ' (already existed)' : ''}`);
+          }
+
+          // Create .env.example file
+          const envExamplePath = path.join(fullPath, '.env.example');
+          if (!options.override && await fs.pathExists(envExamplePath)) {
+            console.log('.env.example already exists (skipped)');
+          } else {
+            const envExample = `# ElevenLabs API Key
+ELEVENLABS_API_KEY=your_api_key_here
+`;
+            await fs.writeFile(envExamplePath, envExample);
+            console.log('Created .env.example');
+          }
+
+          console.log('\nProject initialized successfully!');
+          console.log('Next steps:');
+          console.log('1. Set your ElevenLabs API key: elevenlabs auth login');
+          console.log('2. Create an agent: elevenlabs agents add "My Agent" --template default');
+          console.log('3. Create tools: elevenlabs tools add "My Webhook" --type webhook');
+          console.log('4. Create tests: elevenlabs tests add "My Test" --template basic-llm');
+          console.log('5. Push to ElevenLabs: elevenlabs agents push && elevenlabs tools push && elevenlabs tests push');
+          console.log('6. Run tests: elevenlabs agents test "My Agent"');
+        }
+      } catch (error) {
+        console.error(`Error initializing project: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/agents/commands/list.ts b/src/agents/commands/list.ts
new file mode 100644
index 0000000..ff1eda2
--- /dev/null
+++ b/src/agents/commands/list.ts
@@ -0,0 +1,28 @@
+import { Command } from 'commander';
+import { render } from 'ink';
+import React from 'react';
+import ListAgentsView from '../ui/ListAgentsView.js';
+
+export function createListCommand(): Command {
+  return new Command('list')
+    .description('List all configured agents')
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (options: { ui: boolean }) => {
+      try {
+        if (options.ui !== false) {
+          // Use Ink UI for list-agents
+          const { waitUntilExit } = render(
+            React.createElement(ListAgentsView)
+          );
+          await waitUntilExit();
+        } else {
+          // Use the original implementation
+          const { listConfiguredAgents } = await import('./utils.js');
+          await listConfiguredAgents();
+        }
+      } catch (error) {
+        console.error(`Error listing agents: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/agents/commands/pull-impl.ts b/src/agents/commands/pull-impl.ts
new file mode 100644
index 0000000..558b5ee
--- /dev/null
+++ b/src/agents/commands/pull-impl.ts
@@ -0,0 +1,262 @@
+import path from 'path';
+import fs from 'fs-extra';
+import { readConfig, writeConfig, generateUniqueFilename } from '../../shared/utils.js';
+import { getElevenLabsClient, listAgentsApi, getAgentApi } from '../../shared/elevenlabs-api.js';
+import { AgentConfig } from '../templates.js';
+import { listEnvironments } from '../../shared/config.js';
+import { promptForConfirmation } from './utils.js';
+
+const AGENTS_CONFIG_FILE = "agents.json";
+
+interface AgentDefinition {
+  config: string;
+  id?: string;
+  env?: string;
+}
+
+interface AgentsConfig {
+  agents: AgentDefinition[];
+}
+
+interface PullOptions {
+  agent?: string;
+  outputDir: string;
+  dryRun: boolean;
+  update?: boolean;
+  all?: boolean;
+  env?: string;
+}
+
+export async function pullAgents(options: PullOptions): Promise<void> {
+  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
+
+  // Determine which environments to pull from
+  const environmentsToPull: string[] = options.env
+    ? [options.env]
+    : await listEnvironments();
+
+  if (environmentsToPull.length === 0) {
+    console.log('No environments configured. Use "elevenlabs auth login" to add an environment.');
+    return;
+  }
+
+  if (!options.env) {
+    console.log(`Pulling from ${environmentsToPull.length} environment(s): ${environmentsToPull.join(', ')}`);
+  }
+
+  // Pull from each environment
+  for (const environment of environmentsToPull) {
+    console.log(`\n${'='.repeat(50)}`);
+    console.log(`Environment: ${environment}`);
+    console.log('='.repeat(50));
+
+    await pullAgentsFromEnvironment(options, environment, agentsConfigPath);
+  }
+}
+
+async function pullAgentsFromEnvironment(options: PullOptions, environment: string, agentsConfigPath: string): Promise<void> {
+  const client = await getElevenLabsClient(environment);
+
+  // Load existing config
+  let agentsConfig: AgentsConfig;
+
+  if (!(await fs.pathExists(agentsConfigPath))) {
+    console.log(`${AGENTS_CONFIG_FILE} not found. Creating initial agents configuration...`);
+    agentsConfig = { agents: [] };
+    await writeConfig(agentsConfigPath, agentsConfig);
+  } else {
+    agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
+  }
+
+  let agentsList: unknown[];
+
+  if (options.agent) {
+    // Pull specific agent by ID
+    console.log(`Pulling agent with ID: ${options.agent}...`);
+    try {
+      const agentDetails = await getAgentApi(client, options.agent);
+      const agentDetailsTyped = agentDetails as { agentId?: string; agent_id?: string; name: string };
+      const agentId = agentDetailsTyped.agentId || agentDetailsTyped.agent_id || options.agent;
+      agentsList = [{
+        agentId: agentId,
+        agent_id: agentId,
+        name: agentDetailsTyped.name
+      }];
+      console.log(`Found agent: ${agentDetailsTyped.name}`);
+    } catch (error) {
+      throw new Error(`Failed to fetch agent with ID '${options.agent}': ${error}`);
+    }
+  } else {
+    // Pull all agents from ElevenLabs
+    console.log('Pulling all agents from ElevenLabs...');
+    agentsList = await listAgentsApi(client, 30);
+
+    if (agentsList.length === 0) {
+      console.log('No agents found in your ElevenLabs workspace.');
+      return;
+    }
+
+    console.log(`Found ${agentsList.length} agent(s)`);
+  }
+
+  // Build map of existing agents by ID for this environment
+  const existingAgentIds = new Map(
+    agentsConfig.agents
+      .filter(agent => (agent.env || 'prod') === environment)
+      .map(agent => [agent.id, agent])
+  );
+
+  // Track operations for summary
+  const operations = { create: 0, update: 0, skip: 0 };
+  type OperationItem = {
+    action: 'create' | 'update' | 'skip';
+    agent: { id: string; name: string };
+    existingEntry?: AgentDefinition;
+  };
+  const itemsToProcess: OperationItem[] = [];
+
+  // First pass: determine what will happen
+  for (const agentMeta of agentsList) {
+    const agentMetaTyped = agentMeta as { agentId?: string; agent_id?: string; name: string };
+    const agentId = agentMetaTyped.agentId || agentMetaTyped.agent_id;
+    if (!agentId) {
+      console.log(`Warning: Skipping agent '${agentMetaTyped.name}' - no agent ID found`);
+      continue;
+    }
+
+    let agentNameRemote = agentMetaTyped.name;
+    const existingEntry = existingAgentIds.get(agentId);
+
+    if (existingEntry) {
+      // Agent with this ID already exists locally
+      if (options.update || options.all) {
+        // --update or --all: update existing
+        itemsToProcess.push({ action: 'update', agent: { id: agentId, name: agentNameRemote }, existingEntry });
+        operations.update++;
+      } else {
+        // Default: skip existing
+        itemsToProcess.push({ action: 'skip', agent: { id: agentId, name: agentNameRemote }, existingEntry });
+        operations.skip++;
+      }
+    } else {
+      // New agent (not present locally)
+      if (options.update) {
+        // --update mode: skip new items (only update existing)
+        itemsToProcess.push({ action: 'skip', agent: { id: agentId, name: agentNameRemote } });
+        operations.skip++;
+      } else {
+        // Default or --all: create new items
+        itemsToProcess.push({ action: 'create', agent: { id: agentId, name: agentNameRemote } });
+        operations.create++;
+      }
+    }
+  }
+
+  // Show summary
+  console.log(`\nPlan: ${operations.create} create, ${operations.update} update, ${operations.skip} skip`);
+
+  if (operations.skip > 0 && !options.update && !options.all) {
+    if (operations.create === 0) {
+      console.log(`\n💡 Tip: Use --update to update existing agents or --all to pull everything`);
+    } else {
+      console.log(`\n💡 Tip: Use --all to also update existing agents`);
+    }
+  }
+
+  // Prompt for confirmation if not --dry-run
+  if (!options.dryRun && (operations.create > 0 || operations.update > 0)) {
+    const confirmed = await promptForConfirmation('Proceed?');
+    if (!confirmed) {
+      console.log('Pull cancelled');
+      return;
+    }
+  }
+
+  // Second pass: execute operations
+  let itemsProcessed = 0;
+  for (const item of itemsToProcess) {
+    const { action, agent, existingEntry } = item;
+
+    if (action === 'skip') {
+      console.log(`⊘ Skipping '${agent.name}' (already exists, use --update to overwrite)`);
+      continue;
+    }
+
+    if (options.dryRun) {
+      console.log(`[DRY RUN] Would ${action} agent: ${agent.name} (ID: ${agent.id})`);
+      continue;
+    }
+
+    try {
+      // Fetch detailed agent configuration
+      console.log(`${action === 'update' ? '↻ Updating' : '+ Pulling'} config for '${agent.name}'...`);
+      const agentDetails = await getAgentApi(client, agent.id);
+
+      // Extract configuration components
+      const agentDetailsTyped = agentDetails as {
+        conversationConfig: Record<string, unknown>;
+        conversation_config: Record<string, unknown>;
+        platformSettings: Record<string, unknown>;
+        platform_settings: Record<string, unknown>;
+        tags: string[];
+      };
+
+      const conversationConfig = agentDetailsTyped.conversationConfig || agentDetailsTyped.conversation_config || {};
+      const platformSettings = agentDetailsTyped.platformSettings || agentDetailsTyped.platform_settings || {};
+      const tags = agentDetailsTyped.tags || [];
+
+      // Create agent config structure (without agent_id - it goes in index file)
+      const agentConfig: AgentConfig = {
+        name: agent.name,
+        conversation_config: conversationConfig as AgentConfig['conversation_config'],
+        platform_settings: platformSettings,
+        tags
+      };
+
+      if (action === 'update' && existingEntry) {
+        // Update existing entry - overwrite the config file
+        const configFilePath = path.resolve(existingEntry.config);
+        await fs.ensureDir(path.dirname(configFilePath));
+        await writeConfig(configFilePath, agentConfig);
+        console.log(`  ✓ Updated '${agent.name}' (config: ${existingEntry.config})`);
+      } else {
+        // Create new entry
+        const configPath = await generateUniqueFilename(options.outputDir, agent.name);
+        const configFilePath = path.resolve(configPath);
+        await fs.ensureDir(path.dirname(configFilePath));
+        await writeConfig(configFilePath, agentConfig);
+
+        const newAgent: AgentDefinition = {
+          config: configPath,
+          id: agent.id,
+          env: environment
+        };
+
+        agentsConfig.agents.push(newAgent);
+        console.log(`  ✓ Added '${agent.name}' (config: ${configPath}) [${environment}]`);
+      }
+
+      itemsProcessed++;
+
+    } catch (error) {
+      console.log(`  ✗ Error ${action === 'update' ? 'updating' : 'pulling'} agent '${agent.name}': ${error}`);
+      continue;
+    }
+  }
+
+  // Save updated agents.json if there were changes
+  if (!options.dryRun && itemsProcessed > 0) {
+    await writeConfig(agentsConfigPath, agentsConfig);
+    console.log(`\nUpdated ${AGENTS_CONFIG_FILE}`);
+  }
+
+  // Final summary
+  if (options.dryRun) {
+    console.log(`\n[DRY RUN] Would process ${operations.create + operations.update} agent(s)`);
+  } else {
+    console.log(`\n✓ Summary: ${operations.create} created, ${operations.update} updated, ${operations.skip} skipped`);
+    if (itemsProcessed > 0) {
+      console.log(`You can now edit the config files in '${options.outputDir}/' and run 'elevenlabs agents push' to update`);
+    }
+  }
+}
diff --git a/src/agents/commands/pull.ts b/src/agents/commands/pull.ts
new file mode 100644
index 0000000..bbe2f0f
--- /dev/null
+++ b/src/agents/commands/pull.ts
@@ -0,0 +1,50 @@
+import { Command } from 'commander';
+import { render } from 'ink';
+import React from 'react';
+import PullView from '../ui/PullView.js';
+import { pullAgents } from './pull-impl.js';
+
+interface PullOptions {
+  agent?: string;
+  outputDir: string;
+  dryRun: boolean;
+  update?: boolean;
+  all?: boolean;
+  env?: string;
+}
+
+export function createPullCommand(): Command {
+  return new Command('pull')
+    .description('Pull agents from ElevenLabs')
+    .option('--agent <agent_id>', 'Specific agent ID to pull')
+    .option('--output-dir <directory>', 'Output directory for configs', 'agent_configs')
+    .option('--dry-run', 'Show what would be done without making changes', false)
+    .option('--update', 'Update existing items only, skip new')
+    .option('--all', 'Pull all (new + existing)')
+    .option('--env <environment>', 'Environment to pull from (defaults to all)')
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (options: PullOptions & { ui: boolean }) => {
+      try {
+        if (options.ui !== false) {
+          // Use Ink UI for pull
+          const environments = options.env ? [options.env] : ['prod']; // Default to prod if no env specified
+          const { waitUntilExit } = render(
+            React.createElement(PullView, {
+              agent: options.agent,
+              outputDir: options.outputDir,
+              dryRun: options.dryRun,
+              update: options.update,
+              all: options.all,
+              environments
+            })
+          );
+          await waitUntilExit();
+        } else {
+          await pullAgents(options);
+        }
+      } catch (error) {
+        console.error(`Error during pull: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/agents/commands/push-impl.ts b/src/agents/commands/push-impl.ts
new file mode 100644
index 0000000..43485e6
--- /dev/null
+++ b/src/agents/commands/push-impl.ts
@@ -0,0 +1,139 @@
+import path from 'path';
+import fs from 'fs-extra';
+import { readConfig, writeConfig } from '../../shared/utils.js';
+import { getElevenLabsClient, createAgentApi, updateAgentApi } from '../../shared/elevenlabs-api.js';
+import { AgentConfig } from '../templates.js';
+
+const AGENTS_CONFIG_FILE = "agents.json";
+
+interface AgentDefinition {
+  config: string;
+  id?: string;
+  env?: string;
+}
+
+interface AgentsConfig {
+  agents: AgentDefinition[];
+}
+
+export async function pushAgents(dryRun: boolean = false, environment?: string): Promise<void> {
+  // Load agents configuration
+  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
+  if (!(await fs.pathExists(agentsConfigPath))) {
+    throw new Error('agents.json not found. Run \'elevenlabs agents init\' first.');
+  }
+
+  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
+
+  // Filter agents by environment if specified
+  const agentsToProcess = environment
+    ? agentsConfig.agents.filter(agent => (agent.env || 'prod') === environment)
+    : agentsConfig.agents;
+
+  if (environment && agentsToProcess.length === 0) {
+    console.log(`No agents found for environment '${environment}'`);
+    return;
+  }
+
+  if (!environment) {
+    const envs = [...new Set(agentsToProcess.map(a => a.env || 'prod'))];
+    console.log(`Pushing ${agentsToProcess.length} agent(s) across ${envs.length} environment(s): ${envs.join(', ')}`);
+  }
+
+  let changesMade = false;
+
+  for (const agentDef of agentsToProcess) {
+    const configPath = agentDef.config;
+    const environment = agentDef.env || 'prod';
+
+    if (!configPath) {
+      console.log(`Warning: No config path found for agent`);
+      continue;
+    }
+
+    // Check if config file exists
+    if (!(await fs.pathExists(configPath))) {
+      console.log(`Warning: Config file not found: ${configPath}`);
+      continue;
+    }
+
+    // Load agent config
+    let agentConfig: AgentConfig;
+    try {
+      agentConfig = await readConfig<AgentConfig>(configPath);
+    } catch (error) {
+      console.log(`Error reading config for ${configPath}: ${error}`);
+      continue;
+    }
+
+    const agentDefName = agentConfig.name || 'Unnamed Agent';
+
+    // Get agent ID from index file
+    const agentId = agentDef.id;
+
+    // Always push (force override)
+    console.log(`${agentDefName} [${environment}]: Will push (force override)`);
+
+    if (dryRun) {
+      console.log(`[DRY RUN] Would update agent: ${agentDefName} [${environment}]`);
+      continue;
+    }
+
+    // Initialize ElevenLabs client for this agent's environment
+    let client;
+    try {
+      client = await getElevenLabsClient(environment);
+    } catch (error) {
+      console.log(`Error: ${error}`);
+      console.log(`Skipping agent ${agentDefName} - environment '${environment}' not configured`);
+      continue;
+    }
+
+    // Perform API operation
+    try {
+      // Extract config components
+      const conversationConfig = agentConfig.conversation_config || {};
+      const platformSettings = agentConfig.platform_settings;
+      const tags = agentConfig.tags || [];
+
+      const agentDisplayName = agentConfig.name;
+
+      if (!agentId) {
+        // Create new agent
+        const newAgentId = await createAgentApi(
+          client,
+          agentDisplayName,
+          conversationConfig,
+          platformSettings,
+          tags
+        );
+        console.log(`Created agent ${agentDefName} (ID: ${newAgentId}) [${environment}]`);
+
+        // Store agent ID in index file
+        agentDef.id = newAgentId;
+        changesMade = true;
+      } else {
+        // Update existing agent
+        await updateAgentApi(
+          client,
+          agentId,
+          agentDisplayName,
+          conversationConfig,
+          platformSettings,
+          tags
+        );
+        console.log(`Updated agent ${agentDefName} (ID: ${agentId}) [${environment}]`);
+      }
+
+      changesMade = true;
+
+    } catch (error) {
+      console.log(`Error processing ${agentDefName}: ${error}`);
+    }
+  }
+
+  // Save updated agents.json if there were changes
+  if (changesMade) {
+    await writeConfig(agentsConfigPath, agentsConfig);
+  }
+}
diff --git a/src/agents/commands/push.ts b/src/agents/commands/push.ts
new file mode 100644
index 0000000..be18467
--- /dev/null
+++ b/src/agents/commands/push.ts
@@ -0,0 +1,79 @@
+import { Command } from 'commander';
+import { render } from 'ink';
+import React from 'react';
+import path from 'path';
+import fs from 'fs-extra';
+import PushView from '../ui/PushView.js';
+import { readConfig } from '../../shared/utils.js';
+import { getAgentName } from './utils.js';
+import { pushAgents } from './push-impl.js';
+
+const AGENTS_CONFIG_FILE = "agents.json";
+
+interface AgentsConfig {
+  agents: Array<{
+    config: string;
+    id?: string;
+    env?: string;
+  }>;
+}
+
+interface PushOptions {
+  dryRun: boolean;
+}
+
+export function createPushCommand(): Command {
+  return new Command('push')
+    .description('Push agents to ElevenLabs API when configs change')
+    .option('--env <environment>', 'Filter agents by environment (defaults to all environments)')
+    .option('--dry-run', 'Show what would be done without making changes', false)
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (options: PushOptions & { ui: boolean; env?: string }) => {
+      try {
+        if (options.ui !== false) {
+          // Use new Ink UI for push
+          const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
+          if (!(await fs.pathExists(agentsConfigPath))) {
+            throw new Error('agents.json not found. Run \'elevenlabs agents init\' first.');
+          }
+
+          const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
+
+          // Filter agents by environment if specified
+          const agentsToProcess = options.env
+            ? agentsConfig.agents.filter(agent => (agent.env || 'prod') === options.env)
+            : agentsConfig.agents;
+
+          if (options.env && agentsToProcess.length === 0) {
+            console.log(`No agents found for environment '${options.env}'`);
+            return;
+          }
+
+          // Prepare agents for UI
+          const pushAgentsData = await Promise.all(
+            agentsToProcess.map(async agent => ({
+              name: await getAgentName(agent.config),
+              configPath: agent.config,
+              status: 'pending' as const,
+              agentId: agent.id,
+              env: agent.env || 'prod'
+            }))
+          );
+
+          const { waitUntilExit } = render(
+            React.createElement(PushView, {
+              agents: pushAgentsData,
+              dryRun: options.dryRun
+            })
+          );
+          await waitUntilExit();
+        } else {
+          // Use existing non-UI push
+          await pushAgents(options.dryRun, options.env);
+        }
+      } catch (error) {
+        console.error(`Error during push: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/agents/commands/status-impl.ts b/src/agents/commands/status-impl.ts
new file mode 100644
index 0000000..714c455
--- /dev/null
+++ b/src/agents/commands/status-impl.ts
@@ -0,0 +1,71 @@
+import path from 'path';
+import fs from 'fs-extra';
+import { readConfig } from '../../shared/utils.js';
+import { AgentConfig } from '../templates.js';
+import { getAgentName } from './utils.js';
+
+const AGENTS_CONFIG_FILE = "agents.json";
+
+interface AgentDefinition {
+  config: string;
+  id?: string;
+  env?: string;
+}
+
+interface AgentsConfig {
+  agents: AgentDefinition[];
+}
+
+export async function showStatus(): Promise<void> {
+  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
+  if (!(await fs.pathExists(agentsConfigPath))) {
+    throw new Error('agents.json not found. Run \'elevenlabs agents init\' first.');
+  }
+
+  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
+
+  if (agentsConfig.agents.length === 0) {
+    console.log('No agents configured');
+    return;
+  }
+
+  const agentsToShow = agentsConfig.agents;
+
+  console.log('Agent Status:');
+  console.log('='.repeat(50));
+
+  for (const agentDef of agentsToShow) {
+    const agentNameCurrent = await getAgentName(agentDef.config);
+    const configPath = agentDef.config;
+
+    if (!configPath) {
+      continue;
+    }
+
+    console.log(`\n${agentNameCurrent}`);
+    console.log(`   Config: ${configPath}`);
+
+    // Get agent ID from index file
+    const agentId = agentDef.id || 'Not created yet';
+    console.log(`   Agent ID: ${agentId}`);
+
+    // Check config file status
+    if (await fs.pathExists(configPath)) {
+      try {
+        await readConfig<AgentConfig>(configPath);
+
+        // Simple status based on whether ID exists
+        if (agentDef.id) {
+          console.log(`   Status: Created (use push to update)`);
+        } else {
+          console.log(`   Status: Not pushed yet`);
+        }
+
+      } catch (error) {
+        console.log(`   Status: Config error: ${error}`);
+      }
+    } else {
+      console.log('   Status: Config file not found');
+    }
+  }
+}
diff --git a/src/agents/commands/status.ts b/src/agents/commands/status.ts
new file mode 100644
index 0000000..762ecf1
--- /dev/null
+++ b/src/agents/commands/status.ts
@@ -0,0 +1,31 @@
+import { Command } from 'commander';
+import { render } from 'ink';
+import React from 'react';
+import StatusView from '../ui/StatusView.js';
+import { showStatus } from './status-impl.js';
+
+interface StatusOptions {
+  agent?: string;
+}
+
+export function createStatusCommand(): Command {
+  return new Command('status')
+    .description('Show the status of agents')
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (options: StatusOptions & { ui: boolean }) => {
+      try {
+        if (options.ui !== false) {
+          // Use Ink UI for status display
+          const { waitUntilExit } = render(
+            React.createElement(StatusView, {})
+          );
+          await waitUntilExit();
+        } else {
+          await showStatus();
+        }
+      } catch (error) {
+        console.error(`Error showing status: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/agents/commands/templates.ts b/src/agents/commands/templates.ts
new file mode 100644
index 0000000..132dd77
--- /dev/null
+++ b/src/agents/commands/templates.ts
@@ -0,0 +1,39 @@
+import { Command } from 'commander';
+import { getTemplateOptions, getTemplateByName } from '../templates.js';
+
+export function createTemplatesCommand(): Command {
+  const templates = new Command('templates');
+  templates.description('Manage agent templates');
+
+  templates
+    .command('list')
+    .description('List available agent templates')
+    .action(() => {
+      const templates = getTemplateOptions();
+      console.log('Available agent templates:');
+      console.log('='.repeat(50));
+      for (const [templateName, description] of Object.entries(templates)) {
+        console.log(`\n${templateName}`);
+        console.log(`   ${description}`);
+      }
+      console.log('\nUse \'elevenlabs agents add <name> --template <template_name>\' to create an agent with a specific template');
+    });
+
+  templates
+    .command('show')
+    .description('Show template configuration')
+    .argument('<template>', 'Template name to display')
+    .action((templateName: string) => {
+      try {
+        const template = getTemplateByName('Example', templateName);
+        console.log(`Template: ${templateName}`);
+        console.log('='.repeat(50));
+        console.log(JSON.stringify(template, null, 2));
+      } catch (error) {
+        console.error(`Error loading template: ${error}`);
+        process.exit(1);
+      }
+    });
+
+  return templates;
+}
diff --git a/src/agents/commands/test-impl.ts b/src/agents/commands/test-impl.ts
new file mode 100644
index 0000000..9d76548
--- /dev/null
+++ b/src/agents/commands/test-impl.ts
@@ -0,0 +1,126 @@
+import path from 'path';
+import fs from 'fs-extra';
+import { readConfig } from '../../shared/utils.js';
+import { getElevenLabsClient } from '../../shared/elevenlabs-api.js';
+import { AgentConfig } from '../templates.js';
+import { getAgentName } from './utils.js';
+
+const AGENTS_CONFIG_FILE = "agents.json";
+
+interface AgentDefinition {
+  config: string;
+  id?: string;
+  env?: string;
+}
+
+interface AgentsConfig {
+  agents: AgentDefinition[];
+}
+
+export async function runAgentTests(agentId: string): Promise<void> {
+  // Load agents configuration and get agent details
+  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
+  if (!(await fs.pathExists(agentsConfigPath))) {
+    throw new Error('agents.json not found. Run \'elevenlabs agents init\' first.');
+  }
+
+  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
+  const agentDef = agentsConfig.agents.find(agent => agent.id === agentId);
+
+  if (!agentDef) {
+    throw new Error(`Agent with ID '${agentId}' not found in configuration`);
+  }
+
+  // Get agent config to find attached tests
+  const configPath = agentDef.config;
+
+  if (!configPath || !(await fs.pathExists(configPath))) {
+    const agentName = await getAgentName(configPath);
+    throw new Error(`Config file not found for agent '${agentName}': ${configPath}`);
+  }
+
+  const agentConfig = await readConfig<AgentConfig>(configPath);
+  const attachedTests = agentConfig.platform_settings?.testing?.attached_tests || [];
+  const agentName = agentConfig.name || 'Unnamed Agent';
+
+  if (attachedTests.length === 0) {
+    throw new Error(`No tests attached to agent '${agentName}'. Add tests to the agent's testing configuration.`);
+  }
+
+  const testIds = attachedTests.map(test => test.test_id);
+
+  // Get agent environment
+  const environment = agentDef.env || 'prod';
+
+  console.log(`Running ${testIds.length} test(s) for agent '${agentName}' [${environment}]...`);
+  console.log('');
+
+  // Run tests without UI
+  const client = await getElevenLabsClient(environment);
+
+  try {
+    // Import the API functions we need
+    const { runTestsOnAgentApi, getTestInvocationApi } = await import('../../shared/elevenlabs-api.js');
+
+    // Start the test run
+    const invocationResponse = await runTestsOnAgentApi(client, agentId, testIds) as { id: string };
+    const invocationId = invocationResponse.id;
+
+    console.log(`Test invocation started (ID: ${invocationId})`);
+    console.log('Waiting for tests to complete...');
+    console.log('');
+
+    // Poll for test completion
+    let allComplete = false;
+    let attempts = 0;
+    const maxAttempts = 60; // 5 minutes with 5 second intervals
+
+    while (!allComplete && attempts < maxAttempts) {
+      await new Promise(resolve => setTimeout(resolve, 5000)); // Wait 5 seconds
+      attempts++;
+
+      const invocationStatus = await getTestInvocationApi(client, invocationId) as { test_runs?: Array<{ status: string; test_name?: string; test_id?: string }> };
+      const testRuns = invocationStatus.test_runs || [];
+
+      allComplete = testRuns.every((run: { status: string }) =>
+        run.status === 'passed' || run.status === 'failed'
+      );
+
+      if (allComplete) {
+        console.log('Test Results:');
+        console.log('='.repeat(50));
+
+        let passedCount = 0;
+        let failedCount = 0;
+
+        for (const testRun of testRuns) {
+          const status = testRun.status === 'passed' ? '✓' : '✗';
+          const testName = testRun.test_name || testRun.test_id || 'Unknown';
+          console.log(`${status} ${testName}: ${testRun.status}`);
+
+          if (testRun.status === 'passed') {
+            passedCount++;
+          } else {
+            failedCount++;
+          }
+        }
+
+        console.log('='.repeat(50));
+        console.log(`Total: ${testRuns.length} | Passed: ${passedCount} | Failed: ${failedCount}`);
+
+        if (failedCount > 0) {
+          process.exit(1);
+        }
+      }
+    }
+
+    if (!allComplete) {
+      console.error('Tests did not complete within the timeout period.');
+      process.exit(1);
+    }
+
+  } catch (error) {
+    console.error(`Error running tests: ${error}`);
+    process.exit(1);
+  }
+}
diff --git a/src/agents/commands/test.ts b/src/agents/commands/test.ts
new file mode 100644
index 0000000..aae6da6
--- /dev/null
+++ b/src/agents/commands/test.ts
@@ -0,0 +1,24 @@
+import { Command } from 'commander';
+import { runAgentTests } from './test-impl.js';
+
+export function createTestCommand(): Command {
+  return new Command('test')
+    .description('Run tests for an agent')
+    .argument('<agent>', 'Name or ID of the agent to test')
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (agentId: string, options: { ui: boolean }) => {
+      try {
+        if (options.ui !== false) {
+          // Use Ink UI for testing
+          // Note: TestView requires agentName, agentId, and testIds
+          // For now, we'll use the implementation function which will gather these details
+          await runAgentTests(agentId);
+        } else {
+          await runAgentTests(agentId);
+        }
+      } catch (error) {
+        console.error(`Error running tests: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/agents/commands/utils.ts b/src/agents/commands/utils.ts
new file mode 100644
index 0000000..6f40989
--- /dev/null
+++ b/src/agents/commands/utils.ts
@@ -0,0 +1,70 @@
+import path from 'path';
+import fs from 'fs-extra';
+import { readConfig } from '../../shared/utils.js';
+
+const AGENTS_CONFIG_FILE = "agents.json";
+
+interface AgentsConfig {
+  agents: Array<{
+    config: string;
+    id?: string;
+    env?: string;
+  }>;
+}
+
+export async function getAgentName(configPath: string): Promise<string> {
+  try {
+    const fullPath = path.resolve(configPath);
+    if (await fs.pathExists(fullPath)) {
+      const config = await readConfig<{ name?: string }>(fullPath);
+      return config.name || 'Unnamed Agent';
+    }
+    return 'Unknown Agent';
+  } catch (error) {
+    return 'Unknown Agent';
+  }
+}
+
+export async function listConfiguredAgents(): Promise<void> {
+  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
+  if (!(await fs.pathExists(agentsConfigPath))) {
+    throw new Error('agents.json not found. Run \'elevenlabs agents init\' first.');
+  }
+
+  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
+
+  if (agentsConfig.agents.length === 0) {
+    console.log('No agents configured');
+    return;
+  }
+
+  console.log('Configured Agents:');
+  console.log('='.repeat(50));
+
+  for (let i = 0; i < agentsConfig.agents.length; i++) {
+    const agentDef = agentsConfig.agents[i];
+    const agentName = await getAgentName(agentDef.config);
+    const environment = agentDef.env || 'prod';
+    const agentId = agentDef.id || 'No ID';
+    console.log(`${i + 1}. ${agentName} [${environment}]`);
+    console.log(`   ID: ${agentId}`);
+    const configPath = agentDef.config || 'No config path';
+    console.log(`   Config: ${configPath}`);
+    console.log();
+  }
+}
+
+export async function promptForConfirmation(message: string): Promise<boolean> {
+  const readline = await import('readline');
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
+  return new Promise<boolean>((resolve) => {
+    rl.question(`${message} (y/N): `, (answer) => {
+      rl.close();
+      resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes');
+    });
+  });
+}
diff --git a/src/agents/commands/widget-impl.ts b/src/agents/commands/widget-impl.ts
new file mode 100644
index 0000000..6041306
--- /dev/null
+++ b/src/agents/commands/widget-impl.ts
@@ -0,0 +1,53 @@
+import path from 'path';
+import fs from 'fs-extra';
+import { readConfig } from '../../shared/utils.js';
+import { getResidency } from '../../shared/config.js';
+import { getAgentName } from './utils.js';
+
+const AGENTS_CONFIG_FILE = "agents.json";
+
+interface AgentDefinition {
+  config: string;
+  id?: string;
+  env?: string;
+}
+
+interface AgentsConfig {
+  agents: AgentDefinition[];
+}
+
+export async function generateWidget(agentId: string): Promise<void> {
+  // Load agents configuration
+  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
+  if (!(await fs.pathExists(agentsConfigPath))) {
+    throw new Error('agents.json not found. Run \'elevenlabs agents init\' first.');
+  }
+
+  // Check if agent exists in config
+  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
+  const agentDef = agentsConfig.agents.find(agent => agent.id === agentId);
+
+  if (!agentDef) {
+    throw new Error(`Agent with ID '${agentId}' not found in configuration`);
+  }
+
+  const residency = await getResidency();
+
+  // Generate HTML widget snippet with server-location attribute
+  let htmlSnippet = `<elevenlabs-convai agent-id="${agentId}"`;
+
+  // Add server-location attribute for isolated regions
+  if (residency !== 'global' && residency !== 'us') {
+    htmlSnippet += ` server-location="${residency}"`;
+  }
+
+  htmlSnippet += `></elevenlabs-convai>
+<script src="https://unpkg.com/@elevenlabs/convai-widget-embed" async type="text/javascript"></script>`;
+
+  const agentName = await getAgentName(agentDef.config);
+  console.log(`HTML Widget for agent '${agentName}' (residency: ${residency}):`);
+  console.log('='.repeat(60));
+  console.log(htmlSnippet);
+  console.log('='.repeat(60));
+  console.log(`Agent ID: ${agentId}`);
+}
diff --git a/src/agents/commands/widget.ts b/src/agents/commands/widget.ts
new file mode 100644
index 0000000..367999c
--- /dev/null
+++ b/src/agents/commands/widget.ts
@@ -0,0 +1,16 @@
+import { Command } from 'commander';
+import { generateWidget } from './widget-impl.js';
+
+export function createWidgetCommand(): Command {
+  return new Command('widget')
+    .description('Generate HTML widget snippet for an agent')
+    .argument('<name>', 'Name or ID of the agent')
+    .action(async (agentId: string) => {
+      try {
+        await generateWidget(agentId);
+      } catch (error) {
+        console.error(`Error generating widget: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/templates.ts b/src/agents/templates.ts
similarity index 100%
rename from src/templates.ts
rename to src/agents/templates.ts
diff --git a/src/ui/views/AddAgentView.tsx b/src/agents/ui/AddAgentView.tsx
similarity index 94%
rename from src/ui/views/AddAgentView.tsx
rename to src/agents/ui/AddAgentView.tsx
index 2ed23c0..0ef1ed4 100644
--- a/src/ui/views/AddAgentView.tsx
+++ b/src/agents/ui/AddAgentView.tsx
@@ -2,13 +2,13 @@ import React, { useState } from 'react';
 import { Box, Text, useApp, useInput } from 'ink';
 import SelectInput from 'ink-select-input';
 import TextInput from 'ink-text-input';
-import App from '../App.js';
-import StatusCard from '../components/StatusCard.js';
-import theme from '../themes/elevenlabs.js';
-import { getTemplateByName, getTemplateOptions } from '../../templates.js';
-import { writeConfig, generateUniqueFilename } from '../../utils.js';
-import { createAgentApi } from '../../elevenlabs-api.js';
-import { getElevenLabsClient } from '../../elevenlabs-api.js';
+import App from '../../ui/App.js';
+import StatusCard from '../../ui/components/StatusCard.js';
+import theme from '../../ui/themes/elevenlabs.js';
+import { getTemplateByName, getTemplateOptions } from '../templates.js';
+import { writeConfig, generateUniqueFilename } from '../../shared/utils.js';
+import { createAgentApi } from '../../shared/elevenlabs-api.js';
+import { getElevenLabsClient } from '../../shared/elevenlabs-api.js';
 import path from 'path';
 import fs from 'fs-extra';
 
diff --git a/src/ui/views/InitView.tsx b/src/agents/ui/InitView.tsx
similarity index 97%
rename from src/ui/views/InitView.tsx
rename to src/agents/ui/InitView.tsx
index 941bd3c..531557e 100644
--- a/src/ui/views/InitView.tsx
+++ b/src/agents/ui/InitView.tsx
@@ -2,8 +2,8 @@ import React, { useState, useEffect } from 'react';
 import { Box, Text, useApp } from 'ink';
 import path from 'path';
 import fs from 'fs-extra';
-import App from '../App.js';
-import theme from '../themes/elevenlabs.js';
+import App from '../../ui/App.js';
+import theme from '../../ui/themes/elevenlabs.js';
 
 interface InitViewProps {
   projectPath: string;
@@ -258,9 +258,9 @@ export const InitView: React.FC<InitViewProps> = ({ projectPath, override = fals
             </Text>
             <Box marginTop={1} flexDirection="column">
               <Text color={theme.colors.text.secondary}>Next steps:</Text>
-              <Text color={theme.colors.text.secondary}>1. Set your API key: elevenlabs login</Text>
-              <Text color={theme.colors.text.secondary}>2. Create an agent: elevenlabs add "My Agent" --template default</Text>
-              <Text color={theme.colors.text.secondary}>3. Push to ElevenLabs: elevenlabs push</Text>
+              <Text color={theme.colors.text.secondary}>1. Set your API key: elevenlabs auth login</Text>
+              <Text color={theme.colors.text.secondary}>2. Create an agent: elevenlabs agents add "My Agent" --template default</Text>
+              <Text color={theme.colors.text.secondary}>3. Push to ElevenLabs: elevenlabs agents push</Text>
             </Box>
           </Box>
         )}
diff --git a/src/ui/views/ListAgentsView.tsx b/src/agents/ui/ListAgentsView.tsx
similarity index 90%
rename from src/ui/views/ListAgentsView.tsx
rename to src/agents/ui/ListAgentsView.tsx
index ce9e216..dfb4881 100644
--- a/src/ui/views/ListAgentsView.tsx
+++ b/src/agents/ui/ListAgentsView.tsx
@@ -1,9 +1,9 @@
 import React, { useState, useEffect } from 'react';
 import { Box, Text, useApp } from 'ink';
-import App from '../App.js';
-import StatusCard from '../components/StatusCard.js';
-import theme from '../themes/elevenlabs.js';
-import { readConfig } from '../../utils.js';
+import App from '../../ui/App.js';
+import StatusCard from '../../ui/components/StatusCard.js';
+import theme from '../../ui/themes/elevenlabs.js';
+import { readConfig } from '../../shared/utils.js';
 import path from 'path';
 import fs from 'fs-extra';
 
@@ -30,7 +30,7 @@ export const ListAgentsView: React.FC<ListAgentsViewProps> = ({ onComplete }) =>
         const agentsConfigPath = path.resolve('agents.json');
         
         if (!(await fs.pathExists(agentsConfigPath))) {
-          setError('agents.json not found. Run "elevenlabs init" first.');
+          setError('agents.json not found. Run "elevenlabs agents init" first.');
           setLoading(false);
           return;
         }
@@ -114,7 +114,7 @@ export const ListAgentsView: React.FC<ListAgentsViewProps> = ({ onComplete }) =>
             />
             <Box marginTop={1}>
               <Text color={theme.colors.text.secondary}>
-                Run 'elevenlabs add "agent-name"' to create your first agent
+                Run 'elevenlabs agents add "agent-name"' to create your first agent
               </Text>
             </Box>
           </>
@@ -173,13 +173,13 @@ export const ListAgentsView: React.FC<ListAgentsViewProps> = ({ onComplete }) =>
                 Commands:
               </Text>
               <Text color={theme.colors.text.muted}>
-                • 'elevenlabs status' - Check push status
+                • 'elevenlabs agents status' - Check push status
               </Text>
               <Text color={theme.colors.text.muted}>
-                • 'elevenlabs push' - Deploy to ElevenLabs
+                • 'elevenlabs agents push' - Deploy to ElevenLabs
               </Text>
               <Text color={theme.colors.text.muted}>
-                • 'elevenlabs add' - Add new agent
+                • 'elevenlabs agents add' - Add new agent
               </Text>
             </Box>
           </>
diff --git a/src/ui/views/PullView.tsx b/src/agents/ui/PullView.tsx
similarity index 98%
rename from src/ui/views/PullView.tsx
rename to src/agents/ui/PullView.tsx
index 5c69c7d..09c95ca 100644
--- a/src/ui/views/PullView.tsx
+++ b/src/agents/ui/PullView.tsx
@@ -1,11 +1,11 @@
 import React, { useState, useEffect } from 'react';
 import { Box, Text, useApp } from 'ink';
-import App from '../App.js';
-import theme from '../themes/elevenlabs.js';
+import App from '../../ui/App.js';
+import theme from '../../ui/themes/elevenlabs.js';
 import path from 'path';
 import fs from 'fs-extra';
-import { readConfig, writeConfig, generateUniqueFilename } from '../../utils.js';
-import { getElevenLabsClient, listAgentsApi, getAgentApi } from '../../elevenlabs-api.js';
+import { readConfig, writeConfig, generateUniqueFilename } from '../../shared/utils.js';
+import { getElevenLabsClient, listAgentsApi, getAgentApi } from '../../shared/elevenlabs-api.js';
 
 interface PullAgent {
   name: string;
@@ -48,7 +48,7 @@ export const PullView: React.FC<PullViewProps> = ({
         // Check if agents.json exists
         const agentsConfigPath = path.resolve('agents.json');
         if (!(await fs.pathExists(agentsConfigPath))) {
-          throw new Error('agents.json not found. Run "elevenlabs init" first.');
+          throw new Error('agents.json not found. Run "elevenlabs agents init" first.');
         }
 
         // Load existing config
diff --git a/src/ui/views/PushView.tsx b/src/agents/ui/PushView.tsx
similarity index 97%
rename from src/ui/views/PushView.tsx
rename to src/agents/ui/PushView.tsx
index ca8e83e..2dfc115 100644
--- a/src/ui/views/PushView.tsx
+++ b/src/agents/ui/PushView.tsx
@@ -1,9 +1,9 @@
 import React, { useState, useEffect } from 'react';
 import { Box, Text, useApp } from 'ink';
-import App from '../App.js';
-import theme from '../themes/elevenlabs.js';
-import { getElevenLabsClient, createAgentApi, updateAgentApi } from '../../elevenlabs-api.js';
-import { readConfig, writeConfig } from '../../utils.js';
+import App from '../../ui/App.js';
+import theme from '../../ui/themes/elevenlabs.js';
+import { getElevenLabsClient, createAgentApi, updateAgentApi } from '../../shared/elevenlabs-api.js';
+import { readConfig, writeConfig } from '../../shared/utils.js';
 import fs from 'fs-extra';
 import path from 'path';
 
diff --git a/src/ui/views/StatusDashboard.tsx b/src/agents/ui/StatusDashboard.tsx
similarity index 96%
rename from src/ui/views/StatusDashboard.tsx
rename to src/agents/ui/StatusDashboard.tsx
index b7f6952..0b3feb3 100644
--- a/src/ui/views/StatusDashboard.tsx
+++ b/src/agents/ui/StatusDashboard.tsx
@@ -1,9 +1,9 @@
 import React, { useState, useEffect } from 'react';
 import { Box, Text, useApp, useInput } from 'ink';
-import App from '../App.js';
-import StatusCard from '../components/StatusCard.js';
-import CommandPanel from '../components/CommandPanel.js';
-import theme from '../themes/elevenlabs.js';
+import App from '../../ui/App.js';
+import StatusCard from '../../ui/components/StatusCard.js';
+import CommandPanel from '../../ui/components/CommandPanel.js';
+import theme from '../../ui/themes/elevenlabs.js';
 
 interface AgentStatus {
   name: string;
diff --git a/src/ui/views/StatusView.tsx b/src/agents/ui/StatusView.tsx
similarity index 96%
rename from src/ui/views/StatusView.tsx
rename to src/agents/ui/StatusView.tsx
index f64cb35..78a3eec 100644
--- a/src/ui/views/StatusView.tsx
+++ b/src/agents/ui/StatusView.tsx
@@ -1,9 +1,9 @@
 import React, { useState, useEffect } from 'react';
 import { Box, Text, useApp } from 'ink';
-import App from '../App.js';
-import StatusCard from '../components/StatusCard.js';
-import theme from '../themes/elevenlabs.js';
-import { readConfig } from '../../utils.js';
+import App from '../../ui/App.js';
+import StatusCard from '../../ui/components/StatusCard.js';
+import theme from '../../ui/themes/elevenlabs.js';
+import { readConfig } from '../../shared/utils.js';
 import path from 'path';
 import fs from 'fs-extra';
 
@@ -33,7 +33,7 @@ export const StatusView: React.FC<StatusViewProps> = ({
         // Load agents configuration
         const agentsConfigPath = path.resolve('agents.json');
         if (!(await fs.pathExists(agentsConfigPath))) {
-          throw new Error('agents.json not found. Run "elevenlabs init" first.');
+          throw new Error('agents.json not found. Run "elevenlabs agents init" first.');
         }
 
         const agentsConfig = await readConfig<any>(agentsConfigPath);
diff --git a/src/ui/views/TestView.tsx b/src/agents/ui/TestView.tsx
similarity index 95%
rename from src/ui/views/TestView.tsx
rename to src/agents/ui/TestView.tsx
index ce55c14..d379e56 100644
--- a/src/ui/views/TestView.tsx
+++ b/src/agents/ui/TestView.tsx
@@ -1,9 +1,9 @@
 import React, { useState, useEffect } from 'react';
 import { Box, Text, useApp } from 'ink';
-import App from '../App.js';
-import StatusCard from '../components/StatusCard.js';
-import ProgressFlow from '../components/ProgressFlow.js';
-import theme from '../themes/elevenlabs.js';
+import App from '../../ui/App.js';
+import StatusCard from '../../ui/components/StatusCard.js';
+import ProgressFlow from '../../ui/components/ProgressFlow.js';
+import theme from '../../ui/themes/elevenlabs.js';
 
 interface TestRun {
   test_run_id: string;
@@ -52,7 +52,7 @@ export const TestView: React.FC<TestViewProps> = ({
   useEffect(() => {
     const startTests = async () => {
       try {
-        const { getElevenLabsClient, runTestsOnAgentApi } = await import('../../elevenlabs-api.js');
+        const { getElevenLabsClient, runTestsOnAgentApi } = await import('../../shared/elevenlabs-api.js');
         const client = await getElevenLabsClient();
 
         const result = await runTestsOnAgentApi(client, agentId, testIds) as TestInvocation;
@@ -73,7 +73,7 @@ export const TestView: React.FC<TestViewProps> = ({
 
     const pollInterval = setInterval(async () => {
       try {
-        const { getElevenLabsClient, getTestInvocationApi } = await import('../../elevenlabs-api.js');
+        const { getElevenLabsClient, getTestInvocationApi } = await import('../../shared/elevenlabs-api.js');
         const client = await getElevenLabsClient();
 
         const result = await getTestInvocationApi(client, testInvocation.id) as TestInvocation;
diff --git a/src/auth/commands/index.ts b/src/auth/commands/index.ts
new file mode 100644
index 0000000..17d41a2
--- /dev/null
+++ b/src/auth/commands/index.ts
@@ -0,0 +1,17 @@
+import { Command } from 'commander';
+import { createLoginCommand } from './login.js';
+import { createLogoutCommand } from './logout.js';
+import { createWhoamiCommand } from './whoami.js';
+import { createResidencyCommand } from './residency.js';
+
+export function createAuthCommand(): Command {
+  const auth = new Command('auth');
+  auth.description('Authentication and configuration commands');
+
+  auth.addCommand(createLoginCommand());
+  auth.addCommand(createLogoutCommand());
+  auth.addCommand(createWhoamiCommand());
+  auth.addCommand(createResidencyCommand());
+
+  return auth;
+}
diff --git a/src/auth/commands/login.ts b/src/auth/commands/login.ts
new file mode 100644
index 0000000..3130eab
--- /dev/null
+++ b/src/auth/commands/login.ts
@@ -0,0 +1,76 @@
+import { Command } from 'commander';
+import { render } from 'ink';
+import React from 'react';
+import LoginView from '../ui/LoginView.js';
+import { setApiKey, loadConfig } from '../../shared/config.js';
+import { getApiBaseUrl } from '../../shared/elevenlabs-api.js';
+import { listAgentsApi } from '../../shared/elevenlabs-api.js';
+import { ElevenLabsClient } from '@elevenlabs/elevenlabs-js';
+
+export function createLoginCommand(): Command {
+  return new Command('login')
+    .description('Login with your ElevenLabs API key')
+    .option('--env <environment>', 'Environment name', 'prod')
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (options: { ui: boolean; env: string }) => {
+      try {
+        const environment = options.env || 'prod';
+
+        if (options.ui !== false) {
+          // Use Ink UI for login
+          const { waitUntilExit } = render(
+            React.createElement(LoginView, { environment })
+          );
+          await waitUntilExit();
+        } else {
+          // Fallback to text-based login
+          const { read } = await import('read');
+
+          console.log(`Logging in to environment: ${environment}`);
+          const apiKey = await read({
+            prompt: 'Enter your ElevenLabs API key: ',
+            silent: true,
+            replace: '*'
+          });
+
+          if (!apiKey || apiKey.trim() === '') {
+            console.error('API key is required');
+            process.exit(1);
+          }
+
+          // Test the API key by making a simple request
+          // Create client directly with the provided API key for validation
+          const config = await loadConfig();
+          const baseURL = getApiBaseUrl(config.residency);
+          const testClient = new ElevenLabsClient({
+            apiKey: apiKey.trim(),
+            baseUrl: baseURL,
+            headers: {
+              'X-Source': 'agents-cli'
+            }
+          });
+
+          try {
+            await listAgentsApi(testClient, 1);
+            console.log('API key verified successfully');
+          } catch (error: unknown) {
+            const err = error as { statusCode?: number; message?: string; code?: string };
+            if (err?.statusCode === 401 || err?.message?.includes('401')) {
+              console.error('Invalid API key');
+            } else if (err?.code === 'ENOTFOUND' || err?.code === 'ETIMEDOUT' || err?.message?.includes('network')) {
+              console.error('Network error: Unable to connect to ElevenLabs API');
+            } else {
+              console.error('Error verifying API key:', err?.message || error);
+            }
+            process.exit(1);
+          }
+
+          await setApiKey(apiKey.trim(), environment);
+          console.log(`Login successful! API key saved securely for environment '${environment}'.`);
+        }
+      } catch (error) {
+        console.error(`Error during login: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/auth/commands/logout.ts b/src/auth/commands/logout.ts
new file mode 100644
index 0000000..3c54ede
--- /dev/null
+++ b/src/auth/commands/logout.ts
@@ -0,0 +1,38 @@
+import { Command } from 'commander';
+import { render } from 'ink';
+import React from 'react';
+import LogoutView from '../ui/LogoutView.js';
+import { removeApiKey, isLoggedIn } from '../../shared/config.js';
+
+export function createLogoutCommand(): Command {
+  return new Command('logout')
+    .description('Logout and remove stored API key')
+    .option('--env <environment>', 'Environment to logout from', 'prod')
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (options: { ui: boolean; env: string }) => {
+      try {
+        const environment = options.env || 'prod';
+
+        if (options.ui !== false) {
+          // Use Ink UI for logout
+          const { waitUntilExit } = render(
+            React.createElement(LogoutView, { environment })
+          );
+          await waitUntilExit();
+        } else {
+          // Fallback to text-based logout
+          const loggedIn = await isLoggedIn(environment);
+          if (!loggedIn) {
+            console.log(`You are not logged in to environment '${environment}'`);
+            return;
+          }
+
+          await removeApiKey(environment);
+          console.log(`Logged out successfully from environment '${environment}'. API key removed.`);
+        }
+      } catch (error) {
+        console.error(`Error during logout: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/auth/commands/residency.ts b/src/auth/commands/residency.ts
new file mode 100644
index 0000000..8bae2f1
--- /dev/null
+++ b/src/auth/commands/residency.ts
@@ -0,0 +1,54 @@
+import { Command } from 'commander';
+import { render } from 'ink';
+import React from 'react';
+import ResidencyView from '../ui/ResidencyView.js';
+import { getResidency, setResidency, Location, LOCATIONS } from '../../shared/config.js';
+
+export function createResidencyCommand(): Command {
+  return new Command('residency')
+    .description('Set the API residency location')
+    .argument('[residency]', `Residency location (${LOCATIONS.join(', ')})`)
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (residency: string | undefined, options: { ui: boolean }) => {
+      try {
+        if (options.ui !== false && !residency) {
+          // Use Ink UI for interactive residency selection
+          const { waitUntilExit } = render(
+            React.createElement(ResidencyView)
+          );
+          await waitUntilExit();
+        } else if (residency) {
+          // Direct residency setting (with or without UI)
+          function isValidLocation(value: string): value is Location {
+            return LOCATIONS.includes(value as Location);
+          }
+
+          if (!isValidLocation(residency)) {
+            console.error(`Invalid residency: ${residency}`);
+            console.error(`Valid options: ${LOCATIONS.join(', ')}`);
+            process.exit(1);
+          }
+
+          if (options.ui !== false) {
+            // Use UI even with direct argument
+            const { waitUntilExit } = render(
+              React.createElement(ResidencyView, { initialResidency: residency })
+            );
+            await waitUntilExit();
+          } else {
+            // Fallback to text-based
+            await setResidency(residency);
+            console.log(`Residency set to: ${residency}`);
+          }
+        } else {
+          // No residency provided and UI disabled - show current residency
+          const currentResidency = await getResidency();
+          console.log(`Current residency: ${currentResidency || 'Not set (using default)'}`);
+          console.log(`To set residency, use: elevenlabs auth residency <${LOCATIONS.join('|')}>`);
+        }
+      } catch (error) {
+        console.error(`Error setting residency: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/auth/commands/whoami.ts b/src/auth/commands/whoami.ts
new file mode 100644
index 0000000..7f95bc8
--- /dev/null
+++ b/src/auth/commands/whoami.ts
@@ -0,0 +1,56 @@
+import { Command } from 'commander';
+import { render } from 'ink';
+import React from 'react';
+import WhoamiView from '../ui/WhoamiView.js';
+import { getApiKey, getResidency, listEnvironments } from '../../shared/config.js';
+
+export function createWhoamiCommand(): Command {
+  return new Command('whoami')
+    .description('Show current login status')
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (options: { ui: boolean }) => {
+      try {
+        if (options.ui !== false) {
+          // Use Ink UI for whoami
+          const { waitUntilExit } = render(
+            React.createElement(WhoamiView)
+          );
+          await waitUntilExit();
+        } else {
+          // Fallback to text-based output
+          const residency = await getResidency();
+
+          // Check if using environment variable
+          if (process.env.ELEVENLABS_API_KEY) {
+            const maskedKey = process.env.ELEVENLABS_API_KEY.slice(0, 8) + '...' + process.env.ELEVENLABS_API_KEY.slice(-4);
+            console.log('Logged in with API key from environment variable:');
+            console.log(`  prod: ${maskedKey}`);
+            console.log(`Residency: ${residency}`);
+          } else {
+            // Load all configured environments
+            const environments = await listEnvironments();
+
+            if (environments.length > 0) {
+              console.log(`Logged in to ${environments.length} environment${environments.length > 1 ? 's' : ''}:`);
+
+              for (const env of environments) {
+                const apiKey = await getApiKey(env);
+                if (apiKey) {
+                  const maskedKey = apiKey.slice(0, 8) + '...' + apiKey.slice(-4);
+                  console.log(`  ${env}: ${maskedKey}`);
+                }
+              }
+
+              console.log(`Residency: ${residency}`);
+            } else {
+              console.log('Not logged in');
+              console.log('Use "elevenlabs auth login" to authenticate');
+            }
+          }
+        }
+      } catch (error) {
+        console.error(`Error checking login status: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/ui/views/LoginView.tsx b/src/auth/ui/LoginView.tsx
similarity index 95%
rename from src/ui/views/LoginView.tsx
rename to src/auth/ui/LoginView.tsx
index 43793cc..eae816b 100644
--- a/src/ui/views/LoginView.tsx
+++ b/src/auth/ui/LoginView.tsx
@@ -1,9 +1,9 @@
 import React, { useState } from 'react';
 import { Box, Text, useApp, useInput } from 'ink';
-import App from '../App.js';
-import StatusCard from '../components/StatusCard.js';
-import theme from '../themes/elevenlabs.js';
-import { setApiKey } from '../../config.js';
+import App from '../../ui/App.js';
+import StatusCard from '../../ui/components/StatusCard.js';
+import theme from '../../ui/themes/elevenlabs.js';
+import { setApiKey } from '../../shared/config.js';
 
 interface LoginViewProps {
   onComplete?: () => void;
diff --git a/src/ui/views/LogoutView.tsx b/src/auth/ui/LogoutView.tsx
similarity index 93%
rename from src/ui/views/LogoutView.tsx
rename to src/auth/ui/LogoutView.tsx
index 2956e5e..ea0dd30 100644
--- a/src/ui/views/LogoutView.tsx
+++ b/src/auth/ui/LogoutView.tsx
@@ -1,9 +1,9 @@
 import React, { useState, useEffect } from 'react';
 import { Box, Text, useApp, useInput } from 'ink';
-import App from '../App.js';
-import StatusCard from '../components/StatusCard.js';
-import theme from '../themes/elevenlabs.js';
-import { isLoggedIn, removeApiKey } from '../../config.js';
+import App from '../../ui/App.js';
+import StatusCard from '../../ui/components/StatusCard.js';
+import theme from '../../ui/themes/elevenlabs.js';
+import { isLoggedIn, removeApiKey } from '../../shared/config.js';
 
 interface LogoutViewProps {
   onComplete?: () => void;
@@ -127,7 +127,7 @@ export const LogoutView: React.FC<LogoutViewProps> = ({ onComplete, environment
             
             <Box marginTop={1}>
               <Text color={theme.colors.text.secondary}>
-                Run 'elevenlabs login --env {environment}' to authenticate again
+                Run 'elevenlabs auth login --env {environment}' to authenticate again
               </Text>
             </Box>
           </>
diff --git a/src/ui/views/ResidencyView.tsx b/src/auth/ui/ResidencyView.tsx
similarity index 94%
rename from src/ui/views/ResidencyView.tsx
rename to src/auth/ui/ResidencyView.tsx
index 59cab1d..cc2851f 100644
--- a/src/ui/views/ResidencyView.tsx
+++ b/src/auth/ui/ResidencyView.tsx
@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
 import { Box, Text, useApp } from 'ink';
 import SelectInput from 'ink-select-input';
-import App from '../App.js';
-import StatusCard from '../components/StatusCard.js';
-import theme from '../themes/elevenlabs.js';
-import { setResidency, getResidency, LOCATIONS } from '../../config.js';
+import App from '../../ui/App.js';
+import StatusCard from '../../ui/components/StatusCard.js';
+import theme from '../../ui/themes/elevenlabs.js';
+import { setResidency, getResidency, LOCATIONS } from '../../shared/config.js';
 
 interface ResidencyViewProps {
   initialResidency?: string;
diff --git a/src/ui/views/WhoamiView.tsx b/src/auth/ui/WhoamiView.tsx
similarity index 93%
rename from src/ui/views/WhoamiView.tsx
rename to src/auth/ui/WhoamiView.tsx
index b754c53..49b0926 100644
--- a/src/ui/views/WhoamiView.tsx
+++ b/src/auth/ui/WhoamiView.tsx
@@ -1,9 +1,9 @@
 import React, { useState, useEffect } from 'react';
 import { Box, Text, useApp } from 'ink';
-import App from '../App.js';
-import StatusCard from '../components/StatusCard.js';
-import theme from '../themes/elevenlabs.js';
-import { getApiKey, getResidency, listEnvironments } from '../../config.js';
+import App from '../../ui/App.js';
+import StatusCard from '../../ui/components/StatusCard.js';
+import theme from '../../ui/themes/elevenlabs.js';
+import { getApiKey, getResidency, listEnvironments } from '../../shared/config.js';
 
 interface WhoamiViewProps {
   onComplete?: () => void;
@@ -126,7 +126,7 @@ export const WhoamiView: React.FC<WhoamiViewProps> = ({ onComplete }) => {
 
             <Box marginTop={1}>
               <Text color={theme.colors.text.muted}>
-                Use 'agents logout --env &lt;name&gt;' to sign out from specific environment
+                Use 'elevenlabs auth logout --env &lt;name&gt;' to sign out from specific environment
               </Text>
             </Box>
           </>
@@ -149,7 +149,7 @@ export const WhoamiView: React.FC<WhoamiViewProps> = ({ onComplete }) => {
             
             <Box marginTop={1}>
               <Text color={theme.colors.text.secondary}>
-                Run 'elevenlabs login' to authenticate with your API key
+                Run 'elevenlabs auth login' to authenticate with your API key
               </Text>
             </Box>
           </>
diff --git a/src/cli.ts b/src/cli.ts
index 77ce6ae..2b6dab4 100644
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -1,173 +1,30 @@
 #!/usr/bin/env node
 
 import { Command } from 'commander';
-import path from 'path';
-import fs from 'fs-extra';
-import dotenv from 'dotenv';
-import {
-  readConfig,
-  writeConfig,
-  toCamelCaseKeys,
-  generateUniqueFilename
-} from './utils.js';
-import { 
-  getTemplateByName, 
-  getTemplateOptions,
-  AgentConfig 
-} from './templates.js';
-import {
-  getElevenLabsClient,
-  getApiBaseUrl,
-  createAgentApi,
-  updateAgentApi,
-  listAgentsApi,
-  getAgentApi,
-  deleteAgentApi,
-  createToolApi,
-  updateToolApi,
-  listToolsApi,
-  getToolApi,
-  deleteToolApi,
-  createTestApi,
-  getTestApi,
-  listTestsApi,
-  updateTestApi,
-  deleteTestApi
-} from './elevenlabs-api.js';
-import { ElevenLabs, ElevenLabsClient } from '@elevenlabs/elevenlabs-js';
-import { 
-  getApiKey, 
-  setApiKey, 
-  removeApiKey, 
-  isLoggedIn,
-  getResidency,
-  setResidency,
-  listEnvironments,
-  loadConfig,
-  Location,
-  LOCATIONS
-} from './config.js';
-import {
-  readToolsConfig,
-  writeToolsConfig,
-  writeToolConfig,
-  ToolsConfig,
-  ToolDefinition,
-  type Tool
-} from './tools.js';
 import { readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const packageJson = JSON.parse(readFileSync(join(__dirname, '../package.json'), 'utf-8'));
-const { version } = packageJson;
 import { render } from 'ink';
 import React from 'react';
-import InitView from './ui/views/InitView.js';
-import PushView from './ui/views/PushView.js';
-import PushToolsView from './ui/views/PushToolsView.js';
-import LoginView from './ui/views/LoginView.js';
-import AddAgentView from './ui/views/AddAgentView.js';
-import StatusView from './ui/views/StatusView.js';
-import WhoamiView from './ui/views/WhoamiView.js';
-import ListAgentsView from './ui/views/ListAgentsView.js';
-import LogoutView from './ui/views/LogoutView.js';
-import ResidencyView from './ui/views/ResidencyView.js';
+import dotenv from 'dotenv';
 import HelpView from './ui/views/HelpView.js';
-import PullToolsView from './ui/views/PullToolsView.js';
-import PullView from './ui/views/PullView.js';
-import TestView from './ui/views/TestView.js';
-import AddTestView from './ui/views/AddTestView.js';
-import { spawnSync } from 'child_process';
-import { URL } from 'url';
+
+// Import command groups
+import { createAuthCommand } from './auth/commands/index.js';
+import { createAgentsCommand } from './agents/commands/index.js';
+import { createToolsCommand } from './tools/commands/index.js';
+import { createTestsCommand } from './tests/commands/index.js';
+import { createComponentsCommand } from './components/commands/index.js';
 
 // Load environment variables
 dotenv.config();
 
-const program = new Command();
-
-// Default file names
-const AGENTS_CONFIG_FILE = "agents.json";
-const TOOLS_CONFIG_FILE = "tools.json";
-const TESTS_CONFIG_FILE = "tests.json";
-
-interface AgentDefinition {
-  config: string;
-  id?: string;
-  env?: string;
-}
-
-interface AgentsConfig {
-  agents: AgentDefinition[];
-}
-
-/**
- * Helper function to read agent name from config file
- */
-async function getAgentName(configPath: string): Promise<string> {
-  try {
-    const fullPath = path.resolve(configPath);
-    if (await fs.pathExists(fullPath)) {
-      const config = await readConfig<AgentConfig>(fullPath);
-      return config.name || 'Unnamed Agent';
-    }
-    return 'Unknown Agent';
-  } catch (error) {
-    return 'Unknown Agent';
-  }
-}
-
-interface TestDefinition {
-  config: string;
-  type?: string;
-  id?: string;
-  env?: string;
-}
-
-interface TestsConfig {
-  tests: TestDefinition[];
-}
-
-interface AddOptions {
-  configPath?: string;
-  template: string;
-  env?: string;
-}
-
-interface PushOptions {
-  agent?: string;
-  dryRun: boolean;
-}
-
-interface StatusOptions {
-  agent?: string;
-}
-
-interface PullOptions {
-  agent?: string; // Agent ID to pull specifically
-  outputDir: string;
-  dryRun: boolean;
-  update?: boolean; // Update existing items only
-  all?: boolean; // Pull all (new + existing)
-  env?: string; // Environment to pull from
-}
-
-interface PullToolsOptions {
-  tool?: string; // Tool ID to pull specifically
-  outputDir: string;
-  dryRun: boolean;
-  update?: boolean; // Update existing items only
-  all?: boolean; // Pull all (new + existing)
-  env?: string; // Environment to pull from
-}
-
-// Widget options interface removed - no longer needed
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const packageJson = JSON.parse(readFileSync(join(__dirname, '../package.json'), 'utf-8'));
+const { version } = packageJson;
 
-interface TemplateShowOptions {
-  agentName: string;
-}
+const program = new Command();
 
 program
   .name('elevenlabs')
@@ -188,2983 +45,14 @@ program
 
   });
 
-program
-  .command('init')
-  .description('Initialize a new agent management project')
-  .argument('[path]', 'Path to initialize the project in', '.')
-  .option('--no-ui', 'Disable interactive UI')
-  .option('--override', 'Override existing files and recreate from scratch', false)
-  .action(async (projectPath: string, options: { ui: boolean; override: boolean }) => {
-    try {
-      if (options.ui !== false) {
-        // Use Ink UI for initialization
-        const { waitUntilExit } = render(
-          React.createElement(InitView, { projectPath, override: options.override })
-        );
-        await waitUntilExit();
-      } else {
-        // Fallback to original implementation
-        const fullPath = path.resolve(projectPath);
-        console.log(`Initializing project in ${fullPath}`);
-        if (options.override) {
-          console.log('⚠ Override mode: existing files will be overwritten');
-        }
-        
-        // Create directory if it doesn't exist
-        await fs.ensureDir(fullPath);
-        
-        // Create agents.json file
-        const agentsConfigPath = path.join(fullPath, AGENTS_CONFIG_FILE);
-        if (!options.override && await fs.pathExists(agentsConfigPath)) {
-          console.log(`${AGENTS_CONFIG_FILE} already exists (skipped)`);
-        } else {
-          const initialConfig: AgentsConfig = {
-            agents: []
-          };
-          await writeConfig(agentsConfigPath, initialConfig);
-          console.log(`Created ${AGENTS_CONFIG_FILE}`);
-        }
-        
-        // Create tools.json file
-        const toolsConfigPath = path.join(fullPath, TOOLS_CONFIG_FILE);
-        if (!options.override && await fs.pathExists(toolsConfigPath)) {
-          console.log(`${TOOLS_CONFIG_FILE} already exists (skipped)`);
-        } else {
-          const initialToolsConfig: ToolsConfig = {
-            tools: []
-          };
-          await writeToolsConfig(toolsConfigPath, initialToolsConfig);
-          console.log(`Created ${TOOLS_CONFIG_FILE}`);
-        }
-
-        // Create tests.json file
-        const testsConfigPath = path.join(fullPath, TESTS_CONFIG_FILE);
-        if (!options.override && await fs.pathExists(testsConfigPath)) {
-          console.log(`${TESTS_CONFIG_FILE} already exists (skipped)`);
-        } else {
-          const initialTestsConfig: TestsConfig = {
-            tests: []
-          };
-          await writeConfig(testsConfigPath, initialTestsConfig);
-          console.log(`Created ${TESTS_CONFIG_FILE}`);
-        }
-        
-        // Create directory structure
-        const configDirs = ['agent_configs', 'tool_configs', 'test_configs'];
-        for (const dir of configDirs) {
-          const dirPath = path.join(fullPath, dir);
-          if (options.override && await fs.pathExists(dirPath)) {
-            await fs.remove(dirPath);
-          }
-          await fs.ensureDir(dirPath);
-          const existed = await fs.pathExists(dirPath);
-          console.log(`Created directory: ${dir}${!options.override && existed ? ' (already existed)' : ''}`);
-        }
-        
-        // Create .env.example file
-        const envExamplePath = path.join(fullPath, '.env.example');
-        if (!options.override && await fs.pathExists(envExamplePath)) {
-          console.log('.env.example already exists (skipped)');
-        } else {
-          const envExample = `# ElevenLabs API Key
-ELEVENLABS_API_KEY=your_api_key_here
-`;
-          await fs.writeFile(envExamplePath, envExample);
-          console.log('Created .env.example');
-        }
-        
-        console.log('\nProject initialized successfully!');
-        console.log('Next steps:');
-        console.log('1. Set your ElevenLabs API key: elevenlabs login');
-        console.log('2. Create an agent: elevenlabs add "My Agent" --template default');
-        console.log('3. Create tools: elevenlabs add-webhook-tool "My Webhook" or elevenlabs add-client-tool "My Client"');
-        console.log('4. Create tests: elevenlabs add-test "My Test" --template basic-llm');
-        console.log('5. Push to ElevenLabs: elevenlabs push && elevenlabs push-tools && elevenlabs push-tests');
-        console.log('6. Run tests: elevenlabs test "My Agent"');
-      }
-    } catch (error) {
-      console.error(`Error initializing project: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('login')
-  .description('Login with your ElevenLabs API key')
-  .option('--env <environment>', 'Environment name', 'prod')
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (options: { ui: boolean; env: string }) => {
-    try {
-      const environment = options.env || 'prod';
-      
-      if (options.ui !== false) {
-        // Use Ink UI for login
-        const { waitUntilExit } = render(
-          React.createElement(LoginView, { environment })
-        );
-        await waitUntilExit();
-      } else {
-        // Fallback to text-based login
-        const { read } = await import('read');
-        
-        console.log(`Logging in to environment: ${environment}`);
-        const apiKey = await read({
-          prompt: 'Enter your ElevenLabs API key: ',
-          silent: true,
-          replace: '*'
-        });
-        
-        if (!apiKey || apiKey.trim() === '') {
-          console.error('API key is required');
-          process.exit(1);
-        }
-        
-        // Test the API key by making a simple request
-        // Create client directly with the provided API key for validation
-        const config = await loadConfig();
-        const baseURL = getApiBaseUrl(config.residency);
-        const testClient = new ElevenLabsClient({
-          apiKey: apiKey.trim(),
-          baseUrl: baseURL,
-          headers: {
-            'X-Source': 'agents-cli'
-          }
-        });
-        
-        try {
-          await listAgentsApi(testClient, 1);
-          console.log('API key verified successfully');
-        } catch (error: unknown) {
-          const err = error as { statusCode?: number; message?: string; code?: string };
-          if (err?.statusCode === 401 || err?.message?.includes('401')) {
-            console.error('Invalid API key');
-          } else if (err?.code === 'ENOTFOUND' || err?.code === 'ETIMEDOUT' || err?.message?.includes('network')) {
-            console.error('Network error: Unable to connect to ElevenLabs API');
-          } else {
-            console.error('Error verifying API key:', err?.message || error);
-          }
-          process.exit(1);
-        }
-        
-        await setApiKey(apiKey.trim(), environment);
-        console.log(`Login successful! API key saved securely for environment '${environment}'.`);
-      }
-    } catch (error) {
-      console.error(`Error during login: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('logout')
-  .description('Logout and remove stored API key')
-  .option('--env <environment>', 'Environment to logout from', 'prod')
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (options: { ui: boolean; env: string }) => {
-    try {
-      const environment = options.env || 'prod';
-      
-      if (options.ui !== false) {
-        // Use Ink UI for logout
-        const { waitUntilExit } = render(
-          React.createElement(LogoutView, { environment })
-        );
-        await waitUntilExit();
-      } else {
-        // Fallback to text-based logout
-        const loggedIn = await isLoggedIn(environment);
-        if (!loggedIn) {
-          console.log(`You are not logged in to environment '${environment}'`);
-          return;
-        }
-        
-        await removeApiKey(environment);
-        console.log(`Logged out successfully from environment '${environment}'. API key removed.`);
-      }
-    } catch (error) {
-      console.error(`Error during logout: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('whoami')
-  .description('Show current login status')
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (options: { ui: boolean }) => {
-    try {
-      if (options.ui !== false) {
-        // Use Ink UI for whoami
-        const { waitUntilExit } = render(
-          React.createElement(WhoamiView)
-        );
-        await waitUntilExit();
-      } else {
-        // Fallback to text-based output
-        const { listEnvironments } = await import('./config.js');
-        const residency = await getResidency();
-        
-        // Check if using environment variable
-        if (process.env.ELEVENLABS_API_KEY) {
-          const maskedKey = process.env.ELEVENLABS_API_KEY.slice(0, 8) + '...' + process.env.ELEVENLABS_API_KEY.slice(-4);
-          console.log('Logged in with API key from environment variable:');
-          console.log(`  prod: ${maskedKey}`);
-          console.log(`Residency: ${residency}`);
-        } else {
-          // Load all configured environments
-          const environments = await listEnvironments();
-          
-          if (environments.length > 0) {
-            console.log(`Logged in to ${environments.length} environment${environments.length > 1 ? 's' : ''}:`);
-            
-            for (const env of environments) {
-              const apiKey = await getApiKey(env);
-              if (apiKey) {
-                const maskedKey = apiKey.slice(0, 8) + '...' + apiKey.slice(-4);
-                console.log(`  ${env}: ${maskedKey}`);
-              }
-            }
-            
-            console.log(`Residency: ${residency}`);
-          } else {
-            console.log('Not logged in');
-            console.log('Use "elevenlabs login" to authenticate');
-          }
-        }
-      }
-    } catch (error) {
-      console.error(`Error checking login status: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('residency')
-  .description('Set the API residency location')
-  .argument('[residency]', `Residency location (${LOCATIONS.join(', ')})`)
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (residency: string | undefined, options: { ui: boolean }) => {
-    try {
-      if (options.ui !== false && !residency) {
-        // Use Ink UI for interactive residency selection
-        const { waitUntilExit } = render(
-          React.createElement(ResidencyView)
-        );
-        await waitUntilExit();
-      } else if (residency) {
-        // Direct residency setting (with or without UI)
-        function isValidLocation(value: string): value is Location {
-          return LOCATIONS.includes(value as Location);
-        }
-        
-        if (!isValidLocation(residency)) {
-          console.error(`Invalid residency: ${residency}`);
-          console.error(`Valid options: ${LOCATIONS.join(', ')}`);
-          process.exit(1);
-        }
-        
-        if (options.ui !== false) {
-          // Use UI even with direct argument
-          const { waitUntilExit } = render(
-            React.createElement(ResidencyView, { initialResidency: residency })
-          );
-          await waitUntilExit();
-        } else {
-          // Fallback to text-based
-          await setResidency(residency);
-          console.log(`Residency set to: ${residency}`);
-        }
-      } else {
-        // No residency provided and UI disabled - show current residency
-        const currentResidency = await getResidency();
-        console.log(`Current residency: ${currentResidency || 'Not set (using default)'}`);
-        console.log(`To set residency, use: agents residency <${LOCATIONS.join('|')}>`);
-      }
-    } catch (error) {
-      console.error(`Error setting residency: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('add')
-  .description('Add a new agent - creates config, uploads to ElevenLabs, and saves ID')
-  .argument('<name>', 'Name of the agent to create')
-  .option('--config-path <path>', 'Custom config path (optional)')
-  .option('--template <template>', 'Template type to use', 'default')
-  .option('--env <environment>', 'Environment to create agent in', 'prod')
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (name: string, options: AddOptions & { ui: boolean }) => {
-    try {
-      if (options.ui !== false && !options.configPath) {
-        // Use Ink UI for agent creation
-        const { waitUntilExit } = render(
-          React.createElement(AddAgentView, {
-            initialName: name,
-            template: options.template,
-            environment: options.env || 'prod'
-          })
-        );
-        await waitUntilExit();
-        return;
-      }
-      // Check if agents.json exists
-      const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
-      if (!(await fs.pathExists(agentsConfigPath))) {
-        console.error('agents.json not found. Run \'elevenlabs init\' first.');
-        process.exit(1);
-      }
-      
-      // Load existing config
-      const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
-      
-      // Create agent config using template (in memory first)
-      let agentConfig: AgentConfig;
-      try {
-        agentConfig = getTemplateByName(name, options.template);
-      } catch (error) {
-        console.error(`${error}`);
-        process.exit(1);
-      }
-      
-      // Create agent in ElevenLabs first to get ID
-      const environment = options.env || 'prod';
-      console.log(`Creating agent '${name}' in ElevenLabs (environment: ${environment})...`);
-      
-      const client = await getElevenLabsClient(environment);
-      
-      // Extract config components
-      const conversationConfig = agentConfig.conversation_config || {};
-      const platformSettings = agentConfig.platform_settings;
-      const tags = agentConfig.tags || [];
-      
-      // Create new agent
-      const agentId = await createAgentApi(
-        client,
-        name,
-        conversationConfig,
-        platformSettings,
-        tags
-      );
-      
-      console.log(`Created agent in ElevenLabs with ID: ${agentId}`);
-      
-      // Generate config path using agent name (or custom path if provided)
-      let configPath = options.configPath;
-      if (!configPath) {
-        configPath = await generateUniqueFilename('agent_configs', name);
-      }
-      
-      // Create config directory and file
-      const configFilePath = path.resolve(configPath);
-      await fs.ensureDir(path.dirname(configFilePath));
-      
-      await writeConfig(configFilePath, agentConfig);
-      console.log(`Created config file: ${configPath} (template: ${options.template})`);
-      
-      // Store agent ID in index file
-      const newAgent: AgentDefinition = {
-        config: configPath,
-        id: agentId,
-        env: environment
-      };
-      agentsConfig.agents.push(newAgent);
-      
-      // Save updated agents.json
-      await writeConfig(agentsConfigPath, agentsConfig);
-      console.log(`Added agent '${name}' to agents.json`);
-      
-      console.log(`Edit ${configPath} to customize your agent, then run 'elevenlabs push' to update`);
-      
-    } catch (error) {
-      console.error(`Error creating agent: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('add-webhook-tool')
-  .description('Add a new webhook tool - creates config and uploads to ElevenLabs')
-  .argument('<name>', 'Name of the webhook tool to create')
-  .option('--config-path <path>', 'Custom config path (optional)')
-  .option('--env <environment>', 'Environment to create tool in', 'prod')
-  .action(async (name: string, options: { configPath?: string; env?: string }) => {
-    try {
-      await addTool(name, 'webhook', options.configPath, options.env);
-    } catch (error) {
-      console.error(`Error creating webhook tool: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('add-client-tool')
-  .description('Add a new client tool - creates config and uploads to ElevenLabs')
-  .argument('<name>', 'Name of the client tool to create')
-  .option('--config-path <path>', 'Custom config path (optional)')
-  .option('--env <environment>', 'Environment to create tool in', 'prod')
-  .action(async (name: string, options: { configPath?: string; env?: string }) => {
-    try {
-      await addTool(name, 'client', options.configPath, options.env);
-    } catch (error) {
-      console.error(`Error creating client tool: ${error}`);
-      process.exit(1);
-    }
-  });
-
-const templatesCommand = program
-  .command('templates')
-  .description('Manage agent templates');
-
-templatesCommand
-  .command('list')
-  .description('List available agent templates')
-  .action(() => {
-    const templateOptions = getTemplateOptions();
-    
-    console.log('Available Agent Templates:');
-    console.log('='.repeat(40));
-    
-    for (const [templateName, description] of Object.entries(templateOptions)) {
-      console.log(`\n${templateName}`);
-      console.log(`   ${description}`);
-    }
-    
-    console.log('\nUse \'elevenlabs add <name> --template <template_name>\' to create an agent with a specific template');
-  });
-
-templatesCommand
-  .command('show')
-  .description('Show the configuration for a specific template')
-  .argument('<template>', 'Template name to show')
-  .option('--agent-name <name>', 'Agent name to use in template', 'example_agent')
-  .action((templateName: string, options: TemplateShowOptions) => {
-    try {
-      const templateConfig = getTemplateByName(options.agentName, templateName);
-      console.log(`Template: ${templateName}`);
-      console.log('='.repeat(40));
-      console.log(JSON.stringify(templateConfig, null, 2));
-    } catch (error) {
-      console.error(`${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('push')
-  .description('Push agents to ElevenLabs API when configs change')
-  .option('--env <environment>', 'Filter agents by environment (defaults to all environments)')
-  .option('--dry-run', 'Show what would be done without making changes', false)
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (options: PushOptions & { ui: boolean; env?: string }) => {
-    try {
-      if (options.ui !== false) {
-        // Use new Ink UI for push
-        const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
-        if (!(await fs.pathExists(agentsConfigPath))) {
-          throw new Error('agents.json not found. Run \'init\' first.');
-        }
-        
-        const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
-        
-        // Filter agents by environment if specified
-        const agentsToProcess = options.env 
-          ? agentsConfig.agents.filter(agent => (agent.env || 'prod') === options.env)
-          : agentsConfig.agents;
-        
-        if (options.env && agentsToProcess.length === 0) {
-          console.log(`No agents found for environment '${options.env}'`);
-          return;
-        }
-        
-        // Prepare agents for UI
-        const pushAgentsData = await Promise.all(
-          agentsToProcess.map(async agent => ({
-            name: await getAgentName(agent.config),
-            configPath: agent.config,
-            status: 'pending' as const,
-            agentId: agent.id,
-            env: agent.env || 'prod'
-          }))
-        );
-        
-        const { waitUntilExit } = render(
-          React.createElement(PushView, { 
-            agents: pushAgentsData,
-            dryRun: options.dryRun
-          })
-        );
-        await waitUntilExit();
-      } else {
-        // Use existing non-UI push
-        await pushAgents(options.dryRun, options.env);
-      }
-    } catch (error) {
-      console.error(`Error during push: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('status')
-  .description('Show the status of agents')
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (options: StatusOptions & { ui: boolean }) => {
-    try {
-      if (options.ui !== false) {
-        // Use Ink UI for status display
-        const { waitUntilExit } = render(
-          React.createElement(StatusView, {})
-        );
-        await waitUntilExit();
-      } else {
-        await showStatus();
-      }
-    } catch (error) {
-      console.error(`Error showing status: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('list')
-  .description('List all configured agents')
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (options: { ui: boolean }) => {
-    try {
-      if (options.ui !== false) {
-        // Use Ink UI for list-agents
-        const { waitUntilExit } = render(
-          React.createElement(ListAgentsView)
-        );
-        await waitUntilExit();
-      } else {
-        // Fallback to text-based listing
-        await listConfiguredAgents();
-      }
-    } catch (error) {
-      console.error(`Error listing agents: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('delete')
-  .description('Delete an agent locally and from ElevenLabs')
-  .argument('[agent_id]', 'ID of the agent to delete (omit with --all to delete all agents)')
-  .option('--all', 'Delete all agents', false)
-  .option('--env <environment>', 'Filter agents by environment (use with --all)')
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (agentId: string | undefined, options: { all: boolean; env?: string; ui: boolean }) => {
-    try {
-      if (options.all && agentId) {
-        console.error('Error: Cannot specify both agent_id and --all flag');
-        process.exit(1);
-      }
-      
-      if (!options.all && !agentId) {
-        console.error('Error: Must specify either agent_id or --all flag');
-        process.exit(1);
-      }
-
-      if (options.env && !options.all) {
-        console.error('Error: --env flag can only be used with --all');
-        process.exit(1);
-      }
-      
-      if (options.all) {
-        await deleteAllAgents(options.ui, options.env);
-      } else {
-        await deleteAgent(agentId!);
-      }
-    } catch (error) {
-      console.error(`Error deleting agent: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('delete-tool')
-  .description('Delete a tool locally and from ElevenLabs')
-  .argument('[tool_id]', 'ID of the tool to delete (omit with --all to delete all tools)')
-  .option('--all', 'Delete all tools', false)
-  .option('--env <environment>', 'Filter tools by environment (use with --all)')
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (toolId: string | undefined, options: { all: boolean; env?: string; ui: boolean }) => {
-    try {
-      if (options.all && toolId) {
-        console.error('Error: Cannot specify both tool_id and --all flag');
-        process.exit(1);
-      }
-      
-      if (!options.all && !toolId) {
-        console.error('Error: Must specify either tool_id or --all flag');
-        process.exit(1);
-      }
-
-      if (options.env && !options.all) {
-        console.error('Error: --env flag can only be used with --all');
-        process.exit(1);
-      }
-      
-      if (options.all) {
-        await deleteAllTools(options.ui, options.env);
-      } else {
-        await deleteTool(toolId!);
-      }
-    } catch (error) {
-      console.error(`Error deleting tool: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('delete-test')
-  .description('Delete a test locally and from ElevenLabs')
-  .argument('[test_id]', 'ID of the test to delete (omit with --all to delete all tests)')
-  .option('--all', 'Delete all tests', false)
-  .option('--env <environment>', 'Filter tests by environment (use with --all)')
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (testId: string | undefined, options: { all: boolean; env?: string; ui: boolean }) => {
-    try {
-      if (options.all && testId) {
-        console.error('Error: Cannot specify both test_id and --all flag');
-        process.exit(1);
-      }
-      
-      if (!options.all && !testId) {
-        console.error('Error: Must specify either test_id or --all flag');
-        process.exit(1);
-      }
-
-      if (options.env && !options.all) {
-        console.error('Error: --env flag can only be used with --all');
-        process.exit(1);
-      }
-      
-      if (options.all) {
-        await deleteAllTests(options.ui, options.env);
-      } else {
-        await deleteTest(testId!);
-      }
-    } catch (error) {
-      console.error(`Error deleting test: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('pull')
-  .description('Pull all agents from ElevenLabs workspace and add them to local configuration')
-  .option('--agent <id>', 'Specific agent ID to pull')
-  .option('--output-dir <dir>', 'Directory to store pulled agent configs', 'agent_configs')
-  .option('--update', 'Update existing agents only (skip new)', false)
-  .option('--all', 'Pull all agents (new + existing)', false)
-  .option('--dry-run', 'Show what would be pulled without making changes', false)
-  .option('--env <environment>', 'Environment to pull from (defaults to all environments)')
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (options: PullOptions & { ui: boolean; env?: string }) => {
-    try {
-      if (options.ui !== false) {
-        // Determine which environments to pull from
-        const environmentsToPull: string[] = options.env 
-          ? [options.env] 
-          : await listEnvironments();
-        
-        if (environmentsToPull.length === 0) {
-          console.log('No environments configured. Use "elevenlabs login" to add an environment.');
-          return;
-        }
-        
-        // Use Ink UI for pull
-        const { waitUntilExit } = render(
-          React.createElement(PullView, {
-            agent: options.agent,
-            outputDir: options.outputDir,
-            dryRun: options.dryRun,
-            update: options.update,
-            all: options.all,
-            environments: environmentsToPull
-          })
-        );
-        await waitUntilExit();
-      } else {
-        // Use existing non-UI pull
-        await pullAgents(options);
-      }
-    } catch (error) {
-      console.error(`Error pulling agents: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('pull-tools')
-  .description('Pull all tools from ElevenLabs workspace and add them to local configuration')
-  .option('--tool <id>', 'Specific tool ID to pull')
-  .option('--output-dir <dir>', 'Directory to store pulled tool configs', 'tool_configs')
-  .option('--update', 'Update existing tools only (skip new)', false)
-  .option('--all', 'Pull all tools (new + existing)', false)
-  .option('--dry-run', 'Show what would be pulled without making changes', false)
-  .option('--env <environment>', 'Environment to pull from (defaults to all environments)')
-  .option('--no-ui', 'Disable interactive UI', false)
-  .action(async (options: PullToolsOptions & { ui: boolean; env?: string }) => {
-    try {
-      if (options.ui !== false) {
-        // Determine which environments to pull from
-        const environmentsToPull: string[] = options.env 
-          ? [options.env] 
-          : await listEnvironments();
-        
-        if (environmentsToPull.length === 0) {
-          console.log('No environments configured. Use "elevenlabs login" to add an environment.');
-          return;
-        }
-        
-        // Use Ink UI for pull-tools
-        const { waitUntilExit } = render(
-          React.createElement(PullToolsView, {
-            tool: options.tool,
-            outputDir: options.outputDir,
-            dryRun: options.dryRun,
-            update: options.update,
-            all: options.all,
-            environments: environmentsToPull
-          })
-        );
-        await waitUntilExit();
-      } else {
-        // Fallback to text-based pulling
-        await pullTools(options);
-      }
-    } catch (error) {
-      console.error(`Error pulling tools: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('widget')
-  .description('Generate HTML widget snippet for an agent')
-  .argument('<id>', 'ID of the agent to generate widget for')
-  .action(async (id: string) => {
-    try {
-      await generateWidget(id);
-    } catch (error) {
-      console.error(`Error generating widget: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('add-test')
-  .description('Add a new test - creates config and uploads to ElevenLabs')
-  .argument('<name>', 'Name of the test to create')
-  .option('--template <template>', 'Test template type to use', 'basic-llm')
-  .option('--env <environment>', 'Environment to create test in', 'prod')
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (name: string, options: { template: string; ui: boolean; env?: string }) => {
-    try {
-      if (options.ui !== false) {
-        // Use Ink UI for test creation
-        const { waitUntilExit } = render(
-          React.createElement(AddTestView, {
-            initialName: name,
-            environment: options.env || 'prod'
-          })
-        );
-        await waitUntilExit();
-      } else {
-        await addTest(name, options.template, options.env);
-      }
-    } catch (error) {
-      console.error(`Error creating test: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('push-tests')
-  .description('Push tests to ElevenLabs API when configs change')
-  .option('--test <id>', 'Specific test ID to push (defaults to all tests)')
-  .option('--env <environment>', 'Filter tests by environment (defaults to all environments)')
-  .option('--dry-run', 'Show what would be done without making changes', false)
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (options: { test?: string; env?: string; dryRun: boolean; ui: boolean }) => {
-    try {
-      // For now, always use non-UI mode (UI can be added later if needed)
-      await pushTests(options.test, options.dryRun, options.env);
-    } catch (error) {
-      console.error(`Error during test push: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('push-tools')
-  .description('Push tools to ElevenLabs API when configs change')
-  .option('--tool <id>', 'Specific tool ID to push (defaults to all tools)')
-  .option('--env <environment>', 'Filter tools by environment (defaults to all environments)')
-  .option('--dry-run', 'Show what would be done without making changes', false)
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (options: { tool?: string; env?: string; dryRun: boolean; ui: boolean }) => {
-    try {
-      if (options.ui !== false) {
-        // Use new Ink UI for push-tools
-        const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
-        if (!(await fs.pathExists(toolsConfigPath))) {
-          throw new Error('tools.json not found. Run \'elevenlabs add-webhook-tool\' or \'elevenlabs add-client-tool\' first.');
-        }
-
-        const toolsConfig = await readToolsConfig(toolsConfigPath);
-
-        // Filter tools by environment and/or tool ID
-        let toolsToProcess = toolsConfig.tools;
-        
-        if (options.env) {
-          toolsToProcess = toolsToProcess.filter(tool => (tool.env || 'prod') === options.env);
-        }
-        
-        if (options.tool) {
-          toolsToProcess = toolsToProcess.filter(tool => tool.id === options.tool);
-          if (toolsToProcess.length === 0) {
-            throw new Error(`Tool with ID '${options.tool}' not found in configuration`);
-          }
-        }
-        
-        if (options.env && toolsToProcess.length === 0) {
-          console.log(`No tools found for environment '${options.env}'`);
-          return;
-        }
-
-
-        // Prepare tools for UI - read names from config files
-        const pushToolsData = await Promise.all(toolsToProcess.map(async tool => {
-          let name = tool.id || 'Unknown';
-          if (tool.config && await fs.pathExists(tool.config)) {
-            try {
-              const toolConfig = await readConfig(tool.config) as { name?: string };
-              name = toolConfig.name || tool.id || 'Unknown';
-            } catch {
-              // Use ID if config read fails
-            }
-          }
-          return {
-            name,
-            type: tool.type,
-            configPath: tool.config || `tool_configs/${tool.id}.json`,
-            status: 'pending' as const,
-            toolId: tool.id,
-            env: tool.env || 'prod'
-          };
-        }));
-
-        const { waitUntilExit } = render(
-          React.createElement(PushToolsView, {
-            tools: pushToolsData,
-            dryRun: options.dryRun,
-            toolsConfigPath: toolsConfigPath
-          })
-        );
-        await waitUntilExit();
-      } else {
-        // Use existing non-UI push
-        await pushTools(options.tool, options.dryRun, options.env);
-      }
-    } catch (error) {
-      console.error(`Error during tool push: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('pull-tests')
-  .description('Pull all tests from ElevenLabs workspace and add them to local configuration')
-  .option('--test <id>', 'Specific test ID to pull')
-  .option('--output-dir <dir>', 'Directory to store pulled test configs', 'test_configs')
-  .option('--update', 'Update existing tests only (skip new)', false)
-  .option('--all', 'Pull all tests (new + existing)', false)
-  .option('--dry-run', 'Show what would be pulled without making changes', false)
-  .option('--env <environment>', 'Environment to pull from (defaults to all environments)')
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (options: { test?: string; outputDir: string; dryRun: boolean; update?: boolean; all?: boolean; ui: boolean; env?: string }) => {
-    try {
-      // For now, always use non-UI mode (UI can be added later if needed)
-      await pullTests(options);
-    } catch (error) {
-      console.error(`Error pulling tests: ${error}`);
-      process.exit(1);
-    }
-  });
-
-program
-  .command('test')
-  .description('Run tests attached to an agent')
-  .argument('<id>', 'ID of the agent to test')
-  .option('--no-ui', 'Disable interactive UI')
-  .action(async (id: string, options: { ui: boolean }) => {
-    try {
-      if (options.ui !== false) {
-        await runAgentTestsWithUI(id);
-      } else {
-        await runAgentTests(id);
-      }
-    } catch (error) {
-      console.error(`Error running tests: ${error}`);
-      process.exit(1);
-    }
-  });
-
-const componentsCommand = program
-  .command('components')
-  .description('Import components from the ElevenLabs UI registry (https://ui.elevenlabs.io)');
-
-componentsCommand
-  .command('add')
-  .description('Add a new component from the ElevenLabs UI registry')
-  .argument('[name]', 'Name of the component')
-  .action(async (name?: string) => {
-    function getCommandPrefix(): string {
-      if (process.env.npm_config_user_agent) {
-        const userAgent = process.env.npm_config_user_agent;
-
-        if (userAgent.includes('pnpm')) {
-          return 'pnpm dlx';
-        }
-        if (userAgent.includes('yarn')) {
-          return 'yarn dlx';
-        }
-        if (userAgent.includes('bun')) {
-          return 'bunx';
-        }
-      }
-
-      return 'npx -y';
-    }
-
-    const commandPrefix = getCommandPrefix();
-
-    const component = name || 'all';
-
-    const targetUrl = new URL(
-      `/r/${component}.json`,
-      'https://ui.elevenlabs.io'
-    ).toString();
-
-    const fullCommand = `${commandPrefix} shadcn@latest add ${targetUrl}`;
-
-    console.log(`Installing ${component} from ElevenLabs UI registry...`);
-    console.log(`Running: ${fullCommand}`);
-
-    const result = spawnSync(fullCommand, {
-      stdio: 'inherit',
-      shell: true,
-    });
-
-    if (result.error) {
-      console.error('Failed to execute command:', result.error.message);
-      process.exit(1);
-    } else if (result.status !== 0) {
-      console.error(`Command failed with exit code ${result.status}`);
-      process.exit(1);
-    }
-  });
-
-// Helper functions
-
-async function addTool(name: string, type: 'webhook' | 'client', configPath?: string, environment?: string): Promise<void> {
-  // Check if tools.json exists, create if not
-  const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
-  let toolsConfig: ToolsConfig;
-  
-  try {
-    toolsConfig = await readToolsConfig(toolsConfigPath);
-  } catch (error) {
-    // Initialize tools.json if it doesn't exist
-    toolsConfig = { tools: [] };
-    await writeToolsConfig(toolsConfigPath, toolsConfig);
-    console.log(`Created ${TOOLS_CONFIG_FILE}`);
-  }
-  
-  // Create tool config using appropriate template (in memory first)
-  let toolConfig;
-  if (type === 'webhook') {
-    toolConfig = {
-      name,
-      description: `${name} webhook tool`,
-      type: 'webhook' as const,
-      api_schema: {
-        url: 'https://api.example.com/webhook',
-        method: 'POST',
-        request_body_schema: {
-          type: 'object',
-          description: 'Request body for the webhook',
-          properties: {}
-        },
-        request_headers: {
-          'Content-Type': 'application/json'
-        }
-      },
-      response_timeout_secs: 30,
-      dynamic_variables: {
-        dynamic_variable_placeholders: {}
-      },
-      assignments: [],
-      disable_interruptions: false,
-      force_pre_tool_speech: false
-    };
-  } else {
-    toolConfig = {
-      name,
-      description: `${name} client tool`,
-      type: 'client' as const,
-      expects_response: false,
-      response_timeout_secs: 30,
-      parameters: {
-        type: 'object',
-        description: 'Parameters for the client tool',
-        properties: {}
-      },
-      dynamic_variables: {
-        dynamic_variable_placeholders: {}
-      }
-    };
-  }
-  
-  // Create tool in ElevenLabs first to get ID
-  const env = environment || 'prod';
-  console.log(`Creating ${type} tool '${name}' in ElevenLabs (environment: ${env})...`);
-  
-  const client = await getElevenLabsClient(env);
-  
-  try {
-    const response = await createToolApi(client, toolConfig);
-    const toolId = response.id;
-    
-    console.log(`Created ${type} tool in ElevenLabs with ID: ${toolId}`);
-    
-    // Generate config path using tool name (or custom path if provided)
-    if (!configPath) {
-      configPath = await generateUniqueFilename('tool_configs', name);
-    }
-    
-    // Create config directory and file
-    const configFilePath = path.resolve(configPath);
-    await fs.ensureDir(path.dirname(configFilePath));
-    
-    await writeToolConfig(configFilePath, toolConfig);
-    console.log(`Created config file: ${configPath}`);
-    
-    // Add to tools.json
-    const newTool: ToolDefinition = {
-      type,
-      config: configPath,
-      id: toolId,
-      env: env
-    };
-    toolsConfig.tools.push(newTool);
-    await writeToolsConfig(toolsConfigPath, toolsConfig);
-    console.log(`Added tool '${name}' to tools.json`);
-    
-    console.log(`Edit ${configPath} to customize your tool, then run 'elevenlabs push-tools' to update`);
-    
-  } catch (error) {
-    console.error(`Error creating tool in ElevenLabs: ${error}`);
-    process.exit(1);
-  }
-}
-
-async function pushAgents(dryRun = false, environment?: string): Promise<void> {
-  // Load agents configuration
-  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
-  if (!(await fs.pathExists(agentsConfigPath))) {
-    throw new Error('agents.json not found. Run \'init\' first.');
-  }
-  
-  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
-  
-  // Filter agents by environment if specified
-  const agentsToProcess = environment 
-    ? agentsConfig.agents.filter(agent => (agent.env || 'prod') === environment)
-    : agentsConfig.agents;
-  
-  if (environment && agentsToProcess.length === 0) {
-    console.log(`No agents found for environment '${environment}'`);
-    return;
-  }
-  
-  if (!environment) {
-    const envs = [...new Set(agentsToProcess.map(a => a.env || 'prod'))];
-    console.log(`Pushing ${agentsToProcess.length} agent(s) across ${envs.length} environment(s): ${envs.join(', ')}`);
-  }
-  
-  let changesMade = false;
-  
-  for (const agentDef of agentsToProcess) {
-    const configPath = agentDef.config;
-    const environment = agentDef.env || 'prod';
-    
-    if (!configPath) {
-      console.log(`Warning: No config path found for agent`);
-      continue;
-    }
-    
-    // Check if config file exists
-    if (!(await fs.pathExists(configPath))) {
-      console.log(`Warning: Config file not found: ${configPath}`);
-      continue;
-    }
-    
-    // Load agent config
-    let agentConfig: AgentConfig;
-    try {
-      agentConfig = await readConfig<AgentConfig>(configPath);
-    } catch (error) {
-      console.log(`Error reading config for ${configPath}: ${error}`);
-      continue;
-    }
-
-    const agentDefName = agentConfig.name || 'Unnamed Agent';
-    
-    // Get agent ID from index file
-    const agentId = agentDef.id;
-    
-    // Always push (force override)
-    console.log(`${agentDefName} [${environment}]: Will push (force override)`);
-    
-    if (dryRun) {
-      console.log(`[DRY RUN] Would update agent: ${agentDefName} [${environment}]`);
-      continue;
-    }
-    
-    // Initialize ElevenLabs client for this agent's environment
-    let client;
-    try {
-      client = await getElevenLabsClient(environment);
-    } catch (error) {
-      console.log(`Error: ${error}`);
-      console.log(`Skipping agent ${agentDefName} - environment '${environment}' not configured`);
-      continue;
-    }
-    
-    // Perform API operation
-    try {
-      // Extract config components
-      const conversationConfig = agentConfig.conversation_config || {};
-      const platformSettings = agentConfig.platform_settings;
-      const tags = agentConfig.tags || [];
-      
-      const agentDisplayName = agentConfig.name;
-      
-      if (!agentId) {
-        // Create new agent
-        const newAgentId = await createAgentApi(
-          client,
-          agentDisplayName,
-          conversationConfig,
-          platformSettings,
-          tags
-        );
-        console.log(`Created agent ${agentDefName} (ID: ${newAgentId}) [${environment}]`);
-        
-        // Store agent ID in index file
-        agentDef.id = newAgentId;
-        changesMade = true;
-      } else {
-        // Update existing agent
-        await updateAgentApi(
-          client,
-          agentId,
-          agentDisplayName,
-          conversationConfig,
-          platformSettings,
-          tags
-        );
-        console.log(`Updated agent ${agentDefName} (ID: ${agentId}) [${environment}]`);
-      }
-      
-      changesMade = true;
-      
-    } catch (error) {
-      console.log(`Error processing ${agentDefName}: ${error}`);
-    }
-  }
-  
-  // Save updated agents.json if there were changes
-  if (changesMade) {
-    await writeConfig(agentsConfigPath, agentsConfig);
-  }
-}
-
-async function showStatus(): Promise<void> {
-  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
-  if (!(await fs.pathExists(agentsConfigPath))) {
-    throw new Error('agents.json not found. Run \'init\' first.');
-  }
-  
-  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
-  
-  if (agentsConfig.agents.length === 0) {
-    console.log('No agents configured');
-    return;
-  }
-  
-  const agentsToShow = agentsConfig.agents;
-  
-  console.log('Agent Status:');
-  console.log('='.repeat(50));
-  
-  for (const agentDef of agentsToShow) {
-    const agentNameCurrent = await getAgentName(agentDef.config);
-    const configPath = agentDef.config;
-    
-    if (!configPath) {
-      continue;
-    }
-    
-    console.log(`\n${agentNameCurrent}`);
-    console.log(`   Config: ${configPath}`);
-    
-    // Get agent ID from index file
-    const agentId = agentDef.id || 'Not created yet';
-    console.log(`   Agent ID: ${agentId}`);
-    
-    // Check config file status
-    if (await fs.pathExists(configPath)) {
-      try {
-        await readConfig<AgentConfig>(configPath);
-        
-        // Simple status based on whether ID exists
-        if (agentDef.id) {
-          console.log(`   Status: Created (use push to update)`);
-        } else {
-          console.log(`   Status: Not pushed yet`);
-        }
-        
-      } catch (error) {
-        console.log(`   Status: Config error: ${error}`);
-      }
-    } else {
-      console.log('   Status: Config file not found');
-    }
-  }
-}
-
-async function listConfiguredAgents(): Promise<void> {
-  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
-  if (!(await fs.pathExists(agentsConfigPath))) {
-    throw new Error('agents.json not found. Run \'init\' first.');
-  }
-  
-  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
-  
-  if (agentsConfig.agents.length === 0) {
-    console.log('No agents configured');
-    return;
-  }
-  
-  console.log('Configured Agents:');
-  console.log('='.repeat(50));
-  
-  for (let i = 0; i < agentsConfig.agents.length; i++) {
-    const agentDef = agentsConfig.agents[i];
-    const agentName = await getAgentName(agentDef.config);
-    const environment = agentDef.env || 'prod';
-    const agentId = agentDef.id || 'No ID';
-    console.log(`${i + 1}. ${agentName} [${environment}]`);
-    console.log(`   ID: ${agentId}`);
-    const configPath = agentDef.config || 'No config path';
-    console.log(`   Config: ${configPath}`);
-    console.log();
-  }
-}
-
-/**
- * Prompts the user for confirmation. Returns true if user confirms, false otherwise.
- */
-async function promptForConfirmation(message: string): Promise<boolean> {
-  const readline = await import('readline');
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-
-  return new Promise<boolean>((resolve) => {
-    rl.question(`${message} [y/N] `, (answer) => {
-      rl.close();
-      resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes');
-    });
-  });
-}
-
-async function pullAgents(options: PullOptions): Promise<void> {
-  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
-  
-  // Determine which environments to pull from
-  const environmentsToPull: string[] = options.env 
-    ? [options.env] 
-    : await listEnvironments();
-  
-  if (environmentsToPull.length === 0) {
-    console.log('No environments configured. Use "elevenlabs login" to add an environment.');
-    return;
-  }
-  
-  if (!options.env) {
-    console.log(`Pulling from ${environmentsToPull.length} environment(s): ${environmentsToPull.join(', ')}`);
-  }
-  
-  // Pull from each environment
-  for (const environment of environmentsToPull) {
-    console.log(`\n${'='.repeat(50)}`);
-    console.log(`Environment: ${environment}`);
-    console.log('='.repeat(50));
-    
-    await pullAgentsFromEnvironment(options, environment, agentsConfigPath);
-  }
-}
-
-async function pullAgentsFromEnvironment(options: PullOptions, environment: string, agentsConfigPath: string): Promise<void> {
-  const client = await getElevenLabsClient(environment);
-  
-  // Load existing config
-  let agentsConfig: AgentsConfig;
-  
-  if (!(await fs.pathExists(agentsConfigPath))) {
-    console.log(`${AGENTS_CONFIG_FILE} not found. Creating initial agents configuration...`);
-    agentsConfig = { agents: [] };
-    await writeConfig(agentsConfigPath, agentsConfig);
-  } else {
-    agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
-  }
-  
-  let agentsList: unknown[];
-  
-  if (options.agent) {
-    // Pull specific agent by ID
-    console.log(`Pulling agent with ID: ${options.agent}...`);
-    try {
-      const agentDetails = await getAgentApi(client, options.agent);
-      const agentDetailsTyped = agentDetails as { agentId?: string; agent_id?: string; name: string };
-      const agentId = agentDetailsTyped.agentId || agentDetailsTyped.agent_id || options.agent;
-      agentsList = [{ 
-        agentId: agentId,
-        agent_id: agentId,
-        name: agentDetailsTyped.name 
-      }];
-      console.log(`Found agent: ${agentDetailsTyped.name}`);
-    } catch (error) {
-      throw new Error(`Failed to fetch agent with ID '${options.agent}': ${error}`);
-    }
-  } else {
-    // Pull all agents from ElevenLabs
-    console.log('Pulling all agents from ElevenLabs...');
-    agentsList = await listAgentsApi(client, 30);
-    
-    if (agentsList.length === 0) {
-      console.log('No agents found in your ElevenLabs workspace.');
-      return;
-    }
-    
-    console.log(`Found ${agentsList.length} agent(s)`);
-  }
-  
-  // Build map of existing agents by ID for this environment
-  const existingAgentIds = new Map(
-    agentsConfig.agents
-      .filter(agent => (agent.env || 'prod') === environment)
-      .map(agent => [agent.id, agent])
-  );
+// Add new command groups
+program.addCommand(createAuthCommand());
+program.addCommand(createAgentsCommand());
+program.addCommand(createToolsCommand());
+program.addCommand(createTestsCommand());
+program.addCommand(createComponentsCommand());
 
-  // Track operations for summary
-  const operations = { create: 0, update: 0, skip: 0 };
-  type OperationItem = {
-    action: 'create' | 'update' | 'skip';
-    agent: { id: string; name: string };
-    existingEntry?: AgentDefinition;
-  };
-  const itemsToProcess: OperationItem[] = [];
-
-  // First pass: determine what will happen
-  for (const agentMeta of agentsList) {
-    const agentMetaTyped = agentMeta as { agentId?: string; agent_id?: string; name: string };
-    const agentId = agentMetaTyped.agentId || agentMetaTyped.agent_id;
-    if (!agentId) {
-      console.log(`Warning: Skipping agent '${agentMetaTyped.name}' - no agent ID found`);
-      continue;
-    }
-    
-    let agentNameRemote = agentMetaTyped.name;
-    const existingEntry = existingAgentIds.get(agentId);
-    
-    if (existingEntry) {
-      // Agent with this ID already exists locally
-      if (options.update || options.all) {
-        // --update or --all: update existing
-        itemsToProcess.push({ action: 'update', agent: { id: agentId, name: agentNameRemote }, existingEntry });
-        operations.update++;
-      } else {
-        // Default: skip existing
-        itemsToProcess.push({ action: 'skip', agent: { id: agentId, name: agentNameRemote }, existingEntry });
-        operations.skip++;
-      }
-    } else {
-      // New agent (not present locally)
-      if (options.update) {
-        // --update mode: skip new items (only update existing)
-        itemsToProcess.push({ action: 'skip', agent: { id: agentId, name: agentNameRemote } });
-        operations.skip++;
-      } else {
-        // Default or --all: create new items
-        itemsToProcess.push({ action: 'create', agent: { id: agentId, name: agentNameRemote } });
-        operations.create++;
-      }
-    }
-  }
-
-  // Show summary
-  console.log(`\nPlan: ${operations.create} create, ${operations.update} update, ${operations.skip} skip`);
-  
-  if (operations.skip > 0 && !options.update && !options.all) {
-    if (operations.create === 0) {
-      console.log(`\n💡 Tip: Use --update to update existing agents or --all to pull everything`);
-    } else {
-      console.log(`\n💡 Tip: Use --all to also update existing agents`);
-    }
-  }
-
-  // Prompt for confirmation if not --dry-run
-  if (!options.dryRun && (operations.create > 0 || operations.update > 0)) {
-    const confirmed = await promptForConfirmation('Proceed?');
-    if (!confirmed) {
-      console.log('Pull cancelled');
-      return;
-    }
-  }
-
-  // Second pass: execute operations
-  let itemsProcessed = 0;
-  for (const item of itemsToProcess) {
-    const { action, agent, existingEntry } = item;
-    
-    if (action === 'skip') {
-      console.log(`⊘ Skipping '${agent.name}' (already exists, use --update to overwrite)`);
-      continue;
-    }
-    
-    if (options.dryRun) {
-      console.log(`[DRY RUN] Would ${action} agent: ${agent.name} (ID: ${agent.id})`);
-      continue;
-    }
-    
-    try {
-      // Fetch detailed agent configuration
-      console.log(`${action === 'update' ? '↻ Updating' : '+ Pulling'} config for '${agent.name}'...`);
-      const agentDetails = await getAgentApi(client, agent.id);
-      
-      // Extract configuration components
-      const agentDetailsTyped = agentDetails as {
-        conversationConfig: Record<string, unknown>;
-        conversation_config: Record<string, unknown>;
-        platformSettings: Record<string, unknown>;
-        platform_settings: Record<string, unknown>;
-        tags: string[];
-      };
-
-      const conversationConfig = agentDetailsTyped.conversationConfig || agentDetailsTyped.conversation_config || {};
-      const platformSettings = agentDetailsTyped.platformSettings || agentDetailsTyped.platform_settings || {};
-      const tags = agentDetailsTyped.tags || [];
-      
-      // Create agent config structure (without agent_id - it goes in index file)
-      const agentConfig: AgentConfig = {
-        name: agent.name,
-        conversation_config: conversationConfig as AgentConfig['conversation_config'],
-        platform_settings: platformSettings,
-        tags
-      };
-      
-      if (action === 'update' && existingEntry) {
-        // Update existing entry - overwrite the config file
-        const configFilePath = path.resolve(existingEntry.config);
-        await fs.ensureDir(path.dirname(configFilePath));
-        await writeConfig(configFilePath, agentConfig);
-        console.log(`  ✓ Updated '${agent.name}' (config: ${existingEntry.config})`);
-      } else {
-        // Create new entry
-        const configPath = await generateUniqueFilename(options.outputDir, agent.name);
-        const configFilePath = path.resolve(configPath);
-        await fs.ensureDir(path.dirname(configFilePath));
-        await writeConfig(configFilePath, agentConfig);
-        
-        const newAgent: AgentDefinition = {
-          config: configPath,
-          id: agent.id,
-          env: environment
-        };
-        
-        agentsConfig.agents.push(newAgent);
-        console.log(`  ✓ Added '${agent.name}' (config: ${configPath}) [${environment}]`);
-      }
-      
-      itemsProcessed++;
-      
-    } catch (error) {
-      console.log(`  ✗ Error ${action === 'update' ? 'updating' : 'pulling'} agent '${agent.name}': ${error}`);
-      continue;
-    }
-  }
-  
-  // Save updated agents.json if there were changes
-  if (!options.dryRun && itemsProcessed > 0) {
-    await writeConfig(agentsConfigPath, agentsConfig);
-    console.log(`\nUpdated ${AGENTS_CONFIG_FILE}`);
-  }
-  
-  // Final summary
-  if (options.dryRun) {
-    console.log(`\n[DRY RUN] Would process ${operations.create + operations.update} agent(s)`);
-  } else {
-    console.log(`\n✓ Summary: ${operations.create} created, ${operations.update} updated, ${operations.skip} skipped`);
-    if (itemsProcessed > 0) {
-      console.log(`You can now edit the config files in '${options.outputDir}/' and run 'elevenlabs push' to update`);
-    }
-  }
-}
-
-async function pullTools(options: PullToolsOptions): Promise<void> {
-  // Check if tools.json exists, create if not
-  const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
-  
-  // Determine which environments to pull from
-  const environmentsToPull: string[] = options.env 
-    ? [options.env] 
-    : await listEnvironments();
-  
-  if (environmentsToPull.length === 0) {
-    console.log('No environments configured. Use "elevenlabs login" to add an environment.');
-    return;
-  }
-  
-  if (!options.env) {
-    console.log(`Pulling from ${environmentsToPull.length} environment(s): ${environmentsToPull.join(', ')}`);
-  }
-  
-  // Pull from each environment
-  for (const environment of environmentsToPull) {
-    console.log(`\n${'='.repeat(50)}`);
-    console.log(`Environment: ${environment}`);
-    console.log('='.repeat(50));
-    
-    await pullToolsFromEnvironment(options, environment, toolsConfigPath);
-  }
-}
-
-async function pullToolsFromEnvironment(options: PullToolsOptions, environment: string, toolsConfigPath: string): Promise<void> {
-  let toolsConfig: ToolsConfig;
-
-  if (!(await fs.pathExists(toolsConfigPath))) {
-    console.log(`${TOOLS_CONFIG_FILE} not found. Creating initial tools configuration...`);
-    toolsConfig = { tools: [] };
-    await writeToolsConfig(toolsConfigPath, toolsConfig);
-  } else {
-    toolsConfig = await readToolsConfig(toolsConfigPath);
-  }
-
-  const client = await getElevenLabsClient(environment);
-
-  let filteredTools: unknown[];
-
-  if (options.tool) {
-    // Pull specific tool by ID
-    console.log(`Pulling tool with ID: ${options.tool}...`);
-    try {
-      const toolDetails = await getToolApi(client, options.tool);
-      const toolDetailsTyped = toolDetails as { tool_id?: string; toolId?: string; id?: string; tool_config?: { name?: string } & Tool };
-      const toolId = toolDetailsTyped.tool_id || toolDetailsTyped.toolId || toolDetailsTyped.id || options.tool;
-      const toolName = toolDetailsTyped.tool_config?.name;
-      
-      if (!toolName) {
-        throw new Error(`Tool with ID '${options.tool}' has no name`);
-      }
-      
-      filteredTools = [{
-        tool_id: toolId,
-        toolId: toolId,
-        id: toolId,
-        tool_config: toolDetailsTyped.tool_config
-      }];
-      console.log(`Found tool: ${toolName}`);
-    } catch (error) {
-      throw new Error(`Failed to fetch tool with ID '${options.tool}': ${error}`);
-    }
-  } else {
-    // Pull all tools from ElevenLabs
-    console.log('Pulling all tools from ElevenLabs...');
-    const toolsList = await listToolsApi(client);
-
-    if (toolsList.length === 0) {
-      console.log('No tools found in your ElevenLabs workspace.');
-      return;
-    }
-
-    console.log(`Found ${toolsList.length} tool(s)`);
-    filteredTools = toolsList;
-  }
-
-  // Build map of existing tools by ID for this environment
-  const existingToolIds = new Map(
-    toolsConfig.tools
-      .filter(tool => (tool.env || 'prod') === environment)
-      .map(tool => [tool.id, tool])
-  );
-
-  // Track operations for summary
-  const operations = { create: 0, update: 0, skip: 0 };
-  type OperationItem = {
-    action: 'create' | 'update' | 'skip';
-    tool: { id: string; name: string };
-    existingEntry?: ToolDefinition;
-  };
-  const itemsToProcess: OperationItem[] = [];
-
-  // First pass: determine what will happen
-  for (const toolMeta of filteredTools) {
-    const toolMetaTyped = toolMeta as { tool_id?: string; toolId?: string; id?: string; tool_config?: { name?: string } };
-    const toolId = toolMetaTyped.tool_id || toolMetaTyped.toolId || toolMetaTyped.id;
-    const toolName = toolMetaTyped.tool_config?.name;
-    if (!toolId) {
-      console.log(`Warning: Skipping tool '${toolName || 'unknown'}' - no tool ID found`);
-      continue;
-    }
-    if (!toolName) {
-      console.log(`Warning: Skipping tool with ID '${toolId}' - no tool name found`);
-      continue;
-    }
-
-    let toolNameRemote = toolName;
-    const existingEntry = existingToolIds.get(toolId);
-
-    if (existingEntry) {
-      // Tool with this ID already exists locally
-      if (options.update || options.all) {
-        // --update or --all: update existing
-        itemsToProcess.push({ action: 'update', tool: { id: toolId, name: toolNameRemote }, existingEntry });
-        operations.update++;
-      } else {
-        // Default: skip existing
-        itemsToProcess.push({ action: 'skip', tool: { id: toolId, name: toolNameRemote }, existingEntry });
-        operations.skip++;
-      }
-    } else {
-      // New tool (not present locally)
-      if (options.update) {
-        // --update mode: skip new items (only update existing)
-        itemsToProcess.push({ action: 'skip', tool: { id: toolId, name: toolNameRemote } });
-        operations.skip++;
-      } else {
-        // Default or --all: create new items
-        itemsToProcess.push({ action: 'create', tool: { id: toolId, name: toolNameRemote } });
-        operations.create++;
-      }
-    }
-  }
-
-  // Show summary
-  console.log(`\nPlan: ${operations.create} create, ${operations.update} update, ${operations.skip} skip`);
-  
-  if (operations.skip > 0 && !options.update && !options.all) {
-    if (operations.create === 0) {
-      console.log(`\n💡 Tip: Use --update to update existing tools or --all to pull everything`);
-    } else {
-      console.log(`\n💡 Tip: Use --all to also update existing tools`);
-    }
-  }
-
-  // Prompt for confirmation if not --dry-run
-  if (!options.dryRun && (operations.create > 0 || operations.update > 0)) {
-    const confirmed = await promptForConfirmation('Proceed?');
-    if (!confirmed) {
-      console.log('Pull cancelled');
-      return;
-    }
-  }
-
-  // Second pass: execute operations
-  let itemsProcessed = 0;
-  for (const item of itemsToProcess) {
-    const { action, tool, existingEntry } = item;
-    
-    if (action === 'skip') {
-      console.log(`⊘ Skipping '${tool.name}' (already exists, use --update to overwrite)`);
-      continue;
-    }
-    
-    if (options.dryRun) {
-      console.log(`[DRY RUN] Would ${action} tool: ${tool.name} (ID: ${tool.id})`);
-      continue;
-    }
-    
-    try {
-      // Fetch detailed tool configuration
-      console.log(`${action === 'update' ? '↻ Updating' : '+ Pulling'} config for '${tool.name}'...`);
-      const toolDetails = await getToolApi(client, tool.id);
-
-      // Extract the tool_config from the response
-      const toolDetailsTyped = toolDetails as { tool_config?: Tool & { type?: string } };
-      const toolConfig = toolDetailsTyped.tool_config;
-      
-      if (!toolConfig) {
-        console.log(`  ✗ Warning: No tool_config found for '${tool.name}' - skipping`);
-        continue;
-      }
-      
-      // Determine tool type from the tool_config
-      const toolType = toolConfig.type || 'unknown';
-      
-      if (action === 'update' && existingEntry && existingEntry.config) {
-        // Update existing entry - overwrite the config file
-        const configFilePath = path.resolve(existingEntry.config);
-        await fs.ensureDir(path.dirname(configFilePath));
-        await writeToolConfig(configFilePath, toolConfig as Tool);
-        console.log(`  ✓ Updated '${tool.name}' (config: ${existingEntry.config})`);
-      } else {
-        // Create new entry
-        const configPath = await generateUniqueFilename(options.outputDir, tool.name);
-        const configFilePath = path.resolve(configPath);
-        await fs.ensureDir(path.dirname(configFilePath));
-        await writeToolConfig(configFilePath, toolConfig as Tool);
-        
-        const newTool: ToolDefinition = {
-          type: toolType as 'webhook' | 'client',
-          config: configPath,
-          id: tool.id,
-          env: environment
-        };
-        
-        toolsConfig.tools.push(newTool);
-        console.log(`  ✓ Added '${tool.name}' (config: ${configPath}, type: ${toolType}) [${environment}]`);
-      }
-      
-      itemsProcessed++;
-      
-    } catch (error) {
-      console.log(`  ✗ Error ${action === 'update' ? 'updating' : 'pulling'} tool '${tool.name}': ${error}`);
-      continue;
-    }
-  }
-
-  // Save updated tools.json if there were changes
-  if (!options.dryRun && itemsProcessed > 0) {
-    await writeToolsConfig(toolsConfigPath, toolsConfig);
-    console.log(`\nUpdated ${TOOLS_CONFIG_FILE}`);
-  }
-
-  // Final summary
-  if (options.dryRun) {
-    console.log(`\n[DRY RUN] Would process ${operations.create + operations.update} tool(s)`);
-  } else {
-    console.log(`\n✓ Summary: ${operations.create} created, ${operations.update} updated, ${operations.skip} skipped`);
-    if (itemsProcessed > 0) {
-      console.log(`You can now edit the config files in '${options.outputDir}/' and use them in your agents`);
-    }
-  }
-}
-
-async function generateWidget(agentId: string): Promise<void> {
-  // Load agents configuration
-  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
-  if (!(await fs.pathExists(agentsConfigPath))) {
-    throw new Error('agents.json not found. Run \'elevenlabs init\' first.');
-  }
-  
-  // Check if agent exists in config
-  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
-  const agentDef = agentsConfig.agents.find(agent => agent.id === agentId);
-  
-  if (!agentDef) {
-    throw new Error(`Agent with ID '${agentId}' not found in configuration`);
-  }
-  
-  const residency = await getResidency();
-  
-  // Generate HTML widget snippet with server-location attribute
-  let htmlSnippet = `<elevenlabs-convai agent-id="${agentId}"`;
-  
-  // Add server-location attribute for isolated regions
-  if (residency !== 'global' && residency !== 'us') {
-    htmlSnippet += ` server-location="${residency}"`;
-  }
-  
-  htmlSnippet += `></elevenlabs-convai>
-<script src="https://unpkg.com/@elevenlabs/convai-widget-embed" async type="text/javascript"></script>`;
-  
-  const agentName = await getAgentName(agentDef.config);
-  console.log(`HTML Widget for agent '${agentName}' (residency: ${residency}):`);
-  console.log('='.repeat(60));
-  console.log(htmlSnippet);
-  console.log('='.repeat(60));
-  console.log(`Agent ID: ${agentId}`);
-}
-
-// Test helper functions
-
-async function addTest(name: string, templateType: string = "basic-llm", environment?: string): Promise<void> {
-  const { getTestTemplateByName } = await import('./test-templates.js');
-
-  // Check if tests.json exists
-  const testsConfigPath = path.resolve(TESTS_CONFIG_FILE);
-  let testsConfig: TestsConfig;
-
-  try {
-    testsConfig = await readConfig<TestsConfig>(testsConfigPath);
-  } catch (error) {
-    // Initialize tests.json if it doesn't exist
-    testsConfig = { tests: [] };
-    await writeConfig(testsConfigPath, testsConfig);
-    console.log(`Created ${TESTS_CONFIG_FILE}`);
-  }
-
-  // Create test config using template (in memory first)
-  const testConfig = getTestTemplateByName(name, templateType);
-
-  // Create test in ElevenLabs first to get ID
-  const env = environment || 'prod';
-  console.log(`Creating test '${name}' in ElevenLabs (environment: ${env})...`);
-
-  const client = await getElevenLabsClient(env);
-
-  try {
-    const testApiConfig = toCamelCaseKeys(testConfig) as unknown as ElevenLabs.conversationalAi.CreateUnitTestRequest;
-    const response = await createTestApi(client, testApiConfig);
-    const testId = response.id;
-
-    console.log(`Created test in ElevenLabs with ID: ${testId}`);
-
-    // Generate config path using test name
-    const configPath = await generateUniqueFilename('test_configs', name);
-
-    // Create config directory and file
-    const configFilePath = path.resolve(configPath);
-    await fs.ensureDir(path.dirname(configFilePath));
-
-    await writeConfig(configFilePath, testConfig);
-    console.log(`Created config file: ${configPath} (template: ${templateType})`);
-
-    // Add to tests.json if not already present
-    const newTest: TestDefinition = {
-      config: configPath,
-      type: templateType,
-      id: testId,
-      env: env
-    };
-    testsConfig.tests.push(newTest);
-    await writeConfig(testsConfigPath, testsConfig);
-    console.log(`Added test '${name}' to tests.json`);
-
-    console.log(`Edit ${configPath} to customize your test, then run 'elevenlabs push-tests' to update`);
-
-  } catch (error) {
-    console.error(`Error creating test in ElevenLabs: ${error}`);
-    process.exit(1);
-  }
-}
-
-async function pushTests(testId?: string, dryRun = false, environment?: string): Promise<void> {
-  // Load tests configuration
-  const testsConfigPath = path.resolve(TESTS_CONFIG_FILE);
-  if (!(await fs.pathExists(testsConfigPath))) {
-    throw new Error('tests.json not found. Run \'elevenlabs add-test\' first.');
-  }
-
-  const testsConfig = await readConfig<TestsConfig>(testsConfigPath);
-
-  // Filter tests by environment and/or test ID
-  let testsToProcess = testsConfig.tests;
-  
-  if (environment) {
-    testsToProcess = testsToProcess.filter(test => (test.env || 'prod') === environment);
-  }
-  
-  if (testId) {
-    testsToProcess = testsToProcess.filter(test => test.id === testId);
-    if (testsToProcess.length === 0) {
-      throw new Error(`Test with ID '${testId}' not found in configuration`);
-    }
-  }
-  
-  if (environment && testsToProcess.length === 0) {
-    console.log(`No tests found for environment '${environment}'`);
-    return;
-  }
-  
-  if (!environment) {
-    const envs = [...new Set(testsToProcess.map(t => t.env || 'prod'))];
-    console.log(`Pushing ${testsToProcess.length} test(s) across ${envs.length} environment(s): ${envs.join(', ')}`);
-  }
-
-  let changesMade = false;
-
-  for (const testDef of testsToProcess) {
-    const configPath = testDef.config;
-    const environment = testDef.env || 'prod';
-
-    // Check if config file exists
-    if (!(await fs.pathExists(configPath))) {
-      console.log(`Warning: Config file not found: ${configPath}`);
-      continue;
-    }
-
-    // Load test config
-    let testConfig: { name?: string };
-    try {
-      testConfig = await readConfig(configPath);
-    } catch (error) {
-      console.log(`Error reading config from ${configPath}: ${error}`);
-      continue;
-    }
-
-    const testDefName = testConfig.name || 'Unnamed Test';
-
-    // Get test ID from index file
-    const testId = testDef.id;
-
-    // Always push (force override)
-    console.log(`${testDefName} [${environment}]: Will push (force override)`);
-
-    if (dryRun) {
-      console.log(`[DRY RUN] Would update test: ${testDefName} [${environment}]`);
-      continue;
-    }
-
-    // Initialize ElevenLabs client for this test's environment
-    let client;
-    try {
-      client = await getElevenLabsClient(environment);
-    } catch (error) {
-      console.log(`Error: ${error}`);
-      console.log(`Skipping test ${testDefName} - environment '${environment}' not configured`);
-      continue;
-    }
-
-    // Perform API operation
-    try {
-      const testApiConfig = toCamelCaseKeys(testConfig) as unknown as ElevenLabs.conversationalAi.CreateUnitTestRequest;
-
-      if (!testId) {
-        // Create new test
-        const response = await createTestApi(client, testApiConfig);
-        const newTestId = response.id;
-        console.log(`Created test ${testDefName} (ID: ${newTestId}) [${environment}]`);
-        
-        // Store test ID in index file
-        testDef.id = newTestId;
-        changesMade = true;
-      } else {
-        // Update existing test
-        await updateTestApi(client, testId, testApiConfig as ElevenLabs.conversationalAi.UpdateUnitTestRequest);
-        console.log(`Updated test ${testDefName} (ID: ${testId}) [${environment}]`);
-      }
-
-      changesMade = true;
-
-    } catch (error) {
-      console.log(`Error processing ${testDefName}: ${error}`);
-    }
-  }
-  
-  // Save updated tests.json if there were changes
-  if (changesMade) {
-    await writeConfig(testsConfigPath, testsConfig);
-  }
-}
-
-async function pushTools(toolId?: string, dryRun = false, environment?: string): Promise<void> {
-  // Load tools configuration
-  const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
-  if (!(await fs.pathExists(toolsConfigPath))) {
-    throw new Error('tools.json not found. Run \'elevenlabs add-webhook-tool\' or \'elevenlabs add-client-tool\' first.');
-  }
-
-  const toolsConfig = await readToolsConfig(toolsConfigPath);
-
-  // Filter tools by environment and/or tool ID
-  let toolsToProcess = toolsConfig.tools;
-  
-  if (environment) {
-    toolsToProcess = toolsToProcess.filter(tool => (tool.env || 'prod') === environment);
-  }
-  
-  if (toolId) {
-    toolsToProcess = toolsToProcess.filter(tool => tool.id === toolId);
-    if (toolsToProcess.length === 0) {
-      throw new Error(`Tool with ID '${toolId}' not found in configuration`);
-    }
-  }
-  
-  if (environment && toolsToProcess.length === 0) {
-    console.log(`No tools found for environment '${environment}'`);
-    return;
-  }
-  
-  if (!environment) {
-    const envs = [...new Set(toolsToProcess.map(t => t.env || 'prod'))];
-    console.log(`Pushing ${toolsToProcess.length} tool(s) across ${envs.length} environment(s): ${envs.join(', ')}`);
-  }
-
-  let changesMade = false;
-
-  for (const toolDef of toolsToProcess) {
-    const configPath = toolDef.config;
-    const environment = toolDef.env || 'prod';
-
-    if (!configPath) {
-      console.log(`Warning: No config path specified`);
-      continue;
-    }
-
-    // Check if config file exists
-    if (!(await fs.pathExists(configPath))) {
-      console.log(`Warning: Config file not found: ${configPath}`);
-      continue;
-    }
-
-    // Load tool config
-    let toolConfig: { name?: string };
-    try {
-      toolConfig = await readConfig(configPath);
-    } catch (error) {
-      console.log(`Error reading config from ${configPath}: ${error}`);
-      continue;
-    }
-
-    const toolDefName = toolConfig.name || 'Unnamed Tool';
-
-    // Get tool ID from index file
-    const toolId = toolDef.id;
-
-    // Always push (force override)
-    console.log(`${toolDefName} [${environment}]: Will push (force override)`);
-
-    if (dryRun) {
-      console.log(`[DRY RUN] Would update tool: ${toolDefName} [${environment}]`);
-      continue;
-    }
-
-    // Initialize ElevenLabs client for this tool's environment
-    let client;
-    try {
-      client = await getElevenLabsClient(environment);
-    } catch (error) {
-      console.log(`Error: ${error}`);
-      console.log(`Skipping tool ${toolDefName} - environment '${environment}' not configured`);
-      continue;
-    }
-
-    // Perform API operation
-    try {
-      if (!toolId) {
-        // Create new tool
-        const response = await createToolApi(client, toolConfig);
-        const newToolId = (response as { toolId?: string }).toolId || `tool_${Date.now()}`;
-        console.log(`Created tool ${toolDefName} (ID: ${newToolId}) [${environment}]`);
-        
-        // Store tool ID in index file
-        toolDef.id = newToolId;
-        changesMade = true;
-      } else {
-        // Update existing tool
-        await updateToolApi(client, toolId, toolConfig);
-        console.log(`Updated tool ${toolDefName} (ID: ${toolId}) [${environment}]`);
-      }
-
-      changesMade = true;
-
-    } catch (error) {
-      console.log(`Error processing ${toolDefName}: ${error}`);
-    }
-  }
-  
-  // Save updated tools.json if there were changes
-  if (changesMade) {
-    await writeToolsConfig(toolsConfigPath, toolsConfig);
-  }
-}
-
-async function pullTests(options: { test?: string; outputDir: string; dryRun: boolean; update?: boolean; all?: boolean; env?: string }): Promise<void> {
-  // Check if tests.json exists
-  const testsConfigPath = path.resolve(TESTS_CONFIG_FILE);
-  
-  // Determine which environments to pull from
-  const environmentsToPull: string[] = options.env 
-    ? [options.env] 
-    : await listEnvironments();
-  
-  if (environmentsToPull.length === 0) {
-    console.log('No environments configured. Use "elevenlabs login" to add an environment.');
-    return;
-  }
-  
-  if (!options.env) {
-    console.log(`Pulling from ${environmentsToPull.length} environment(s): ${environmentsToPull.join(', ')}`);
-  }
-  
-  // Pull from each environment
-  for (const environment of environmentsToPull) {
-    console.log(`\n${'='.repeat(50)}`);
-    console.log(`Environment: ${environment}`);
-    console.log('='.repeat(50));
-    
-    await pullTestsFromEnvironment(options, environment, testsConfigPath);
-  }
-}
-
-async function pullTestsFromEnvironment(options: { test?: string; outputDir: string; dryRun: boolean; update?: boolean; all?: boolean }, environment: string, testsConfigPath: string): Promise<void> {
-  let testsConfig: TestsConfig;
-
-  try {
-    testsConfig = await readConfig<TestsConfig>(testsConfigPath);
-  } catch (error) {
-    testsConfig = { tests: [] };
-    await writeConfig(testsConfigPath, testsConfig);
-    console.log(`Created ${TESTS_CONFIG_FILE}`);
-  }
-
-  const client = await getElevenLabsClient(environment);
-
-  let testsList: unknown[];
-
-  if (options.test) {
-    // Pull specific test by ID
-    console.log(`Pulling test with ID: ${options.test}...`);
-    try {
-      const testDetails = await getTestApi(client, options.test);
-      const testDetailsTyped = testDetails as { id?: string; name: string };
-      const testId = testDetailsTyped.id || options.test;
-      testsList = [{
-        id: testId,
-        name: testDetailsTyped.name
-      }];
-      console.log(`Found test: ${testDetailsTyped.name}`);
-    } catch (error) {
-      throw new Error(`Failed to fetch test with ID '${options.test}': ${error}`);
-    }
-  } else {
-    // Fetch all tests from ElevenLabs
-    console.log('Fetching all tests from ElevenLabs...');
-    testsList = await listTestsApi(client, 30);
-
-    if (testsList.length === 0) {
-      console.log('No tests found in your ElevenLabs workspace.');
-      return;
-    }
-
-    console.log(`Found ${testsList.length} test(s)`);
-  }
-
-  // Build map of existing tests by ID for this environment
-  const existingTestIds = new Map(
-    testsConfig.tests
-      .filter(test => (test.env || 'prod') === environment)
-      .map(test => [test.id, test])
-  );
-
-  // Track operations for summary
-  const operations = { create: 0, update: 0, skip: 0 };
-  type OperationItem = {
-    action: 'create' | 'update' | 'skip';
-    test: { id: string; name: string };
-    existingEntry?: TestDefinition;
-  };
-  const itemsToProcess: OperationItem[] = [];
-
-  // First pass: determine what will happen
-  for (const testMeta of testsList) {
-    const testMetaTyped = testMeta as { id?: string; name: string };
-    const testId = testMetaTyped.id;
-    if (!testId) {
-      console.log(`Warning: Skipping test '${testMetaTyped.name}' - no test ID found`);
-      continue;
-    }
-
-    let testNameRemote = testMetaTyped.name;
-    const existingEntry = existingTestIds.get(testId);
-
-    if (existingEntry) {
-      // Test with this ID already exists locally
-      if (options.update || options.all) {
-        // --update or --all: update existing
-        itemsToProcess.push({ action: 'update', test: { id: testId, name: testNameRemote }, existingEntry });
-        operations.update++;
-      } else {
-        // Default: skip existing
-        itemsToProcess.push({ action: 'skip', test: { id: testId, name: testNameRemote }, existingEntry });
-        operations.skip++;
-      }
-    } else {
-      // New test (not present locally)
-      if (options.update) {
-        // --update mode: skip new items (only update existing)
-        itemsToProcess.push({ action: 'skip', test: { id: testId, name: testNameRemote } });
-        operations.skip++;
-      } else {
-        // Default or --all: create new items
-        itemsToProcess.push({ action: 'create', test: { id: testId, name: testNameRemote } });
-        operations.create++;
-      }
-    }
-  }
-
-  // Show summary
-  console.log(`\nPlan: ${operations.create} create, ${operations.update} update, ${operations.skip} skip`);
-  
-  if (operations.skip > 0 && !options.update && !options.all) {
-    if (operations.create === 0) {
-      console.log(`\n💡 Tip: Use --update to update existing tests or --all to pull everything`);
-    } else {
-      console.log(`\n💡 Tip: Use --all to also update existing tests`);
-    }
-  }
-
-  // Prompt for confirmation if not --dry-run
-  if (!options.dryRun && (operations.create > 0 || operations.update > 0)) {
-    const confirmed = await promptForConfirmation('Proceed?');
-    if (!confirmed) {
-      console.log('Pull cancelled');
-      return;
-    }
-  }
-
-  // Second pass: execute operations
-  let itemsProcessed = 0;
-  for (const item of itemsToProcess) {
-    const { action, test, existingEntry } = item;
-    
-    if (action === 'skip') {
-      console.log(`⊘ Skipping '${test.name}' (already exists, use --update to overwrite)`);
-      continue;
-    }
-    
-    if (options.dryRun) {
-      console.log(`[DRY RUN] Would ${action} test: ${test.name} (ID: ${test.id})`);
-      continue;
-    }
-    
-    try {
-      // Fetch detailed test configuration
-      console.log(`${action === 'update' ? '↻ Updating' : '+ Pulling'} config for '${test.name}'...`);
-      const testDetails = await getTestApi(client, test.id);
-      const testDetailsTyped = testDetails as { type?: string };
-      
-      if (action === 'update' && existingEntry) {
-        // Update existing entry - overwrite the config file
-        const configFilePath = path.resolve(existingEntry.config);
-        await fs.ensureDir(path.dirname(configFilePath));
-        await writeConfig(configFilePath, testDetails);
-        console.log(`  ✓ Updated '${test.name}' (config: ${existingEntry.config})`);
-      } else {
-        // Create new entry
-        const configPath = await generateUniqueFilename(options.outputDir, test.name);
-        const configFilePath = path.resolve(configPath);
-        await fs.ensureDir(path.dirname(configFilePath));
-        await writeConfig(configFilePath, testDetails);
-        
-        const newTest: TestDefinition = {
-          config: configPath,
-          id: test.id,
-          type: testDetailsTyped.type || 'conversational',
-          env: environment
-        };
-        
-        testsConfig.tests.push(newTest);
-        console.log(`  ✓ Added '${test.name}' (config: ${configPath}) [${environment}]`);
-      }
-      
-      itemsProcessed++;
-      
-    } catch (error) {
-      console.log(`  ✗ Error ${action === 'update' ? 'updating' : 'pulling'} test '${test.name}': ${error}`);
-      continue;
-    }
-  }
-
-  // Save updated tests.json if there were changes
-  if (!options.dryRun && itemsProcessed > 0) {
-    await writeConfig(testsConfigPath, testsConfig);
-    console.log(`\nUpdated ${TESTS_CONFIG_FILE}`);
-  }
-
-  // Final summary
-  if (options.dryRun) {
-    console.log(`\n[DRY RUN] Would process ${operations.create + operations.update} test(s)`);
-  } else {
-    console.log(`\n✓ Summary: ${operations.create} created, ${operations.update} updated, ${operations.skip} skipped`);
-    if (itemsProcessed > 0) {
-      console.log(`You can now edit the config files in '${options.outputDir}/' and run 'elevenlabs push-tests' to update`);
-    }
-  }
-}
-
-async function runAgentTestsWithUI(agentId: string): Promise<void> {
-  // Load agents configuration and get agent details
-  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
-  if (!(await fs.pathExists(agentsConfigPath))) {
-    throw new Error('agents.json not found. Run \'elevenlabs init\' first.');
-  }
-
-  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
-  const agentDef = agentsConfig.agents.find(agent => agent.id === agentId);
-
-  if (!agentDef) {
-    throw new Error(`Agent with ID '${agentId}' not found in configuration`);
-  }
-
-  // Get agent config to find attached tests
-  const configPath = agentDef.config;
-
-  if (!configPath || !(await fs.pathExists(configPath))) {
-    const agentName = await getAgentName(configPath);
-    throw new Error(`Config file not found for agent '${agentName}': ${configPath}`);
-  }
-
-  const agentConfig = await readConfig<AgentConfig>(configPath);
-  const attachedTests = agentConfig.platform_settings?.testing?.attached_tests || [];
-  const agentName = agentConfig.name || 'Unnamed Agent';
-
-  if (attachedTests.length === 0) {
-    throw new Error(`No tests attached to agent '${agentName}'. Add tests to the agent's testing configuration.`);
-  }
-
-  const testIds = attachedTests.map(test => test.test_id);
-
-  // Use TestView UI
-  const { waitUntilExit } = render(
-    React.createElement(TestView, {
-      agentName,
-      agentId,
-      testIds
-    })
-  );
-  await waitUntilExit();
-}
-
-async function runAgentTests(agentId: string): Promise<void> {
-  // Load agents configuration and get agent details
-  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
-  if (!(await fs.pathExists(agentsConfigPath))) {
-    throw new Error('agents.json not found. Run \'elevenlabs init\' first.');
-  }
-
-  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
-  const agentDef = agentsConfig.agents.find(agent => agent.id === agentId);
-
-  if (!agentDef) {
-    throw new Error(`Agent with ID '${agentId}' not found in configuration`);
-  }
-
-  // Get agent config to find attached tests
-  const configPath = agentDef.config;
-
-  if (!configPath || !(await fs.pathExists(configPath))) {
-    const agentName = await getAgentName(configPath);
-    throw new Error(`Config file not found for agent '${agentName}': ${configPath}`);
-  }
-
-  const agentConfig = await readConfig<AgentConfig>(configPath);
-  const attachedTests = agentConfig.platform_settings?.testing?.attached_tests || [];
-  const agentName = agentConfig.name || 'Unnamed Agent';
-
-  if (attachedTests.length === 0) {
-    throw new Error(`No tests attached to agent '${agentName}'. Add tests to the agent's testing configuration.`);
-  }
-
-  const testIds = attachedTests.map(test => test.test_id);
-  
-  // Get agent environment
-  const environment = agentDef.env || 'prod';
-
-  console.log(`Running ${testIds.length} test(s) for agent '${agentName}' [${environment}]...`);
-  console.log('');
-
-  // Run tests without UI
-  const client = await getElevenLabsClient(environment);
-  
-  try {
-    // Import the API functions we need
-    const { runTestsOnAgentApi, getTestInvocationApi } = await import('./elevenlabs-api.js');
-    
-    // Start the test run
-    const invocationResponse = await runTestsOnAgentApi(client, agentId, testIds) as { id: string };
-    const invocationId = invocationResponse.id;
-    
-    console.log(`Test invocation started (ID: ${invocationId})`);
-    console.log('Waiting for tests to complete...');
-    console.log('');
-    
-    // Poll for test completion
-    let allComplete = false;
-    let attempts = 0;
-    const maxAttempts = 60; // 5 minutes with 5 second intervals
-    
-    while (!allComplete && attempts < maxAttempts) {
-      await new Promise(resolve => setTimeout(resolve, 5000)); // Wait 5 seconds
-      attempts++;
-      
-      const invocationStatus = await getTestInvocationApi(client, invocationId) as { test_runs?: Array<{ status: string; test_name?: string; test_id?: string }> };
-      const testRuns = invocationStatus.test_runs || [];
-      
-      allComplete = testRuns.every((run: { status: string }) => 
-        run.status === 'passed' || run.status === 'failed'
-      );
-      
-      if (allComplete) {
-        console.log('Test Results:');
-        console.log('='.repeat(50));
-        
-        let passedCount = 0;
-        let failedCount = 0;
-        
-        for (const testRun of testRuns) {
-          const status = testRun.status === 'passed' ? '✓' : '✗';
-          const testName = testRun.test_name || testRun.test_id || 'Unknown';
-          console.log(`${status} ${testName}: ${testRun.status}`);
-          
-          if (testRun.status === 'passed') {
-            passedCount++;
-          } else {
-            failedCount++;
-          }
-        }
-        
-        console.log('='.repeat(50));
-        console.log(`Total: ${testRuns.length} | Passed: ${passedCount} | Failed: ${failedCount}`);
-        
-        if (failedCount > 0) {
-          process.exit(1);
-        }
-      }
-    }
-    
-    if (!allComplete) {
-      console.error('Tests did not complete within the timeout period.');
-      process.exit(1);
-    }
-    
-  } catch (error) {
-    console.error(`Error running tests: ${error}`);
-    process.exit(1);
-  }
-}
-
-async function deleteAgent(agentId: string): Promise<void> {
-  // Load agents configuration
-  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
-  if (!(await fs.pathExists(agentsConfigPath))) {
-    throw new Error('agents.json not found. Run \'elevenlabs init\' first.');
-  }
-
-  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
-  
-  // Find the agent by ID
-  const agentIndex = agentsConfig.agents.findIndex(agent => agent.id === agentId);
-  
-  if (agentIndex === -1) {
-    throw new Error(`Agent with ID '${agentId}' not found in local configuration`);
-  }
-  
-  const agentDef = agentsConfig.agents[agentIndex];
-  const agentName = await getAgentName(agentDef.config);
-  const configPath = agentDef.config;
-  const environment = agentDef.env || 'prod';
-  
-  console.log(`Deleting agent '${agentName}' (ID: ${agentId}) [${environment}]...`);
-  
-  // Delete from ElevenLabs (globally)
-  console.log('Deleting from ElevenLabs...');
-  const client = await getElevenLabsClient(environment);
-  
-  try {
-    await deleteAgentApi(client, agentId);
-    console.log('✓ Successfully deleted from ElevenLabs');
-  } catch (error) {
-    console.error(`Warning: Failed to delete from ElevenLabs: ${error}`);
-    console.log('Continuing with local deletion...');
-  }
-  
-  // Remove from local agents.json
-  agentsConfig.agents.splice(agentIndex, 1);
-  await writeConfig(agentsConfigPath, agentsConfig);
-  console.log(`✓ Removed '${agentName}' from ${AGENTS_CONFIG_FILE}`);
-  
-  // Remove config file
-  if (configPath && await fs.pathExists(configPath)) {
-    await fs.remove(configPath);
-    console.log(`✓ Deleted config file: ${configPath}`);
-  }
-  
-  console.log(`\n✓ Successfully deleted agent '${agentName}'`);
-}
-
-async function deleteAllAgents(ui: boolean = true, env?: string): Promise<void> {
-  // Load agents configuration
-  const agentsConfigPath = path.resolve(AGENTS_CONFIG_FILE);
-  if (!(await fs.pathExists(agentsConfigPath))) {
-    throw new Error('agents.json not found. Run \'elevenlabs init\' first.');
-  }
-
-  const agentsConfig = await readConfig<AgentsConfig>(agentsConfigPath);
-  
-  if (agentsConfig.agents.length === 0) {
-    console.log('No agents found to delete');
-    return;
-  }
-
-  // Filter agents by environment if specified
-  const agentsToDelete = env 
-    ? agentsConfig.agents.filter(agent => (agent.env || 'prod') === env)
-    : agentsConfig.agents;
-  
-  if (agentsToDelete.length === 0) {
-    console.log(env ? `No agents found in environment '${env}'` : 'No agents found to delete');
-    return;
-  }
-  
-  // Show what will be deleted
-  const envInfo = env ? ` in environment '${env}'` : '';
-  console.log(`\nFound ${agentsToDelete.length} agent(s) to delete${envInfo}:`);
-  for (let i = 0; i < agentsToDelete.length; i++) {
-    const agent = agentsToDelete[i];
-    const agentName = await getAgentName(agent.config);
-    const agentEnv = agent.env || 'prod';
-    console.log(`  ${i + 1}. ${agentName} (${agent.id}) [${agentEnv}]`);
-  }
-  
-  // Confirm deletion (skip if --no-ui)
-  if (ui) {
-    const warningMsg = env 
-      ? `\nWARNING: This will delete ${agentsToDelete.length} agent(s) from environment '${env}' in both local configuration and ElevenLabs.`
-      : '\nWARNING: This will delete ALL agents from both local configuration and ElevenLabs.';
-    console.log(warningMsg);
-    const confirmed = await promptForConfirmation('Are you sure you want to delete these agents?');
-    
-    if (!confirmed) {
-      console.log('Deletion cancelled');
-      return;
-    }
-  }
-  
-  console.log('\nDeleting agents...\n');
-  
-  let successCount = 0;
-  let failCount = 0;
-  const deletedIds = new Set<string>();
-  
-  // Delete each agent
-  for (const agentDef of agentsToDelete) {
-    try {
-      const agentName = await getAgentName(agentDef.config);
-      const environment = agentDef.env || 'prod';
-      console.log(`Deleting '${agentName}' (${agentDef.id}) [${environment}]...`);
-      
-      // Delete from ElevenLabs
-      if (agentDef.id) {
-        try {
-          const client = await getElevenLabsClient(environment);
-          await deleteAgentApi(client, agentDef.id);
-          console.log(`  ✓ Deleted from ElevenLabs`);
-        } catch (error) {
-          console.error(`  Warning: Failed to delete from ElevenLabs: ${error}`);
-        }
-      } else {
-        console.log(`  Warning: No agent ID found, skipping ElevenLabs deletion`);
-      }
-      
-      // Remove config file
-      if (agentDef.config && await fs.pathExists(agentDef.config)) {
-        await fs.remove(agentDef.config);
-        console.log(`  ✓ Deleted config file: ${agentDef.config}`);
-      }
-      
-      if (agentDef.id) {
-        deletedIds.add(agentDef.id);
-      }
-      successCount++;
-    } catch (error) {
-      const agentName = await getAgentName(agentDef.config);
-      console.error(`  Failed to delete '${agentName}': ${error}`);
-      failCount++;
-    }
-  }
-  
-  // Remove deleted agents from config (only the ones that were successfully deleted)
-  agentsConfig.agents = agentsConfig.agents.filter(agent => !deletedIds.has(agent.id || ''));
-  await writeConfig(agentsConfigPath, agentsConfig);
-  console.log(`\n✓ Updated ${AGENTS_CONFIG_FILE}`);
-  
-  // Summary
-  console.log(`\n✓ Deletion complete: ${successCount} succeeded, ${failCount} failed`);
-}
-
-async function deleteTool(toolId: string): Promise<void> {
-  // Load tools configuration
-  const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
-  if (!(await fs.pathExists(toolsConfigPath))) {
-    throw new Error('tools.json not found. Run \'elevenlabs init\' first.');
-  }
-
-  const toolsConfig = await readToolsConfig(toolsConfigPath);
-  
-  // Find the tool by ID
-  const toolIndex = toolsConfig.tools.findIndex(tool => tool.id === toolId);
-  
-  if (toolIndex === -1) {
-    throw new Error(`Tool with ID '${toolId}' not found in local configuration`);
-  }
-  
-  const toolDef = toolsConfig.tools[toolIndex];
-  const configPath = toolDef.config;
-  const environment = toolDef.env || 'prod';
-  
-  // Read tool name from config if available
-  let toolName = toolId;
-  if (configPath && await fs.pathExists(configPath)) {
-    try {
-      const toolConfig = await readConfig(configPath) as { name?: string };
-      toolName = toolConfig.name || toolId;
-    } catch {
-      // If reading fails, just use ID
-    }
-  }
-  
-  console.log(`Deleting tool '${toolName}' (ID: ${toolId}) [${environment}]...`);
-  
-  // Delete from ElevenLabs
-  console.log('Deleting from ElevenLabs...');
-  const client = await getElevenLabsClient(environment);
-  
-  try {
-    await deleteToolApi(client, toolId);
-    console.log('✓ Successfully deleted from ElevenLabs');
-  } catch (error) {
-    console.error(`Warning: Failed to delete from ElevenLabs: ${error}`);
-    console.log('Continuing with local deletion...');
-  }
-  
-  // Remove from local tools.json
-  toolsConfig.tools.splice(toolIndex, 1);
-  await writeToolsConfig(toolsConfigPath, toolsConfig);
-  console.log(`✓ Removed '${toolName}' from ${TOOLS_CONFIG_FILE}`);
-  
-  // Remove config file
-  if (configPath && await fs.pathExists(configPath)) {
-    await fs.remove(configPath);
-    console.log(`✓ Deleted config file: ${configPath}`);
-  }
-  
-  console.log(`\n✓ Successfully deleted tool '${toolName}'`);
-}
-
-async function deleteAllTools(ui: boolean = true, env?: string): Promise<void> {
-  // Load tools configuration
-  const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
-  if (!(await fs.pathExists(toolsConfigPath))) {
-    throw new Error('tools.json not found. Run \'elevenlabs init\' first.');
-  }
-
-  const toolsConfig = await readToolsConfig(toolsConfigPath);
-  
-  if (toolsConfig.tools.length === 0) {
-    console.log('No tools found to delete');
-    return;
-  }
-
-  // Filter tools by environment if specified
-  const toolsToDelete = env 
-    ? toolsConfig.tools.filter(tool => (tool.env || 'prod') === env)
-    : toolsConfig.tools;
-  
-  if (toolsToDelete.length === 0) {
-    console.log(env ? `No tools found in environment '${env}'` : 'No tools found to delete');
-    return;
-  }
-  
-  // Show what will be deleted
-  const envInfo = env ? ` in environment '${env}'` : '';
-  console.log(`\nFound ${toolsToDelete.length} tool(s) to delete${envInfo}:`);
-  for (let i = 0; i < toolsToDelete.length; i++) {
-    const tool = toolsToDelete[i];
-    let toolName = tool.id || 'Unknown';
-    if (tool.config && await fs.pathExists(tool.config)) {
-      try {
-        const toolConfig = await readConfig(tool.config) as { name?: string };
-        toolName = toolConfig.name || tool.id || 'Unknown';
-      } catch {
-        // Use ID if config read fails
-      }
-    }
-    const toolEnv = tool.env || 'prod';
-    console.log(`  ${i + 1}. ${toolName} (${tool.id}) [${toolEnv}]`);
-  }
-  
-  // Confirm deletion (skip if --no-ui)
-  if (ui) {
-    const warningMsg = env 
-      ? `\nWARNING: This will delete ${toolsToDelete.length} tool(s) from environment '${env}' in both local configuration and ElevenLabs.`
-      : '\nWARNING: This will delete ALL tools from both local configuration and ElevenLabs.';
-    console.log(warningMsg);
-    const confirmed = await promptForConfirmation('Are you sure you want to delete these tools?');
-    
-    if (!confirmed) {
-      console.log('Deletion cancelled');
-      return;
-    }
-  }
-  
-  console.log('\nDeleting tools...\n');
-  
-  let successCount = 0;
-  let failCount = 0;
-  const deletedIds = new Set<string>();
-  
-  // Delete each tool
-  for (const toolDef of toolsToDelete) {
-    try {
-      const environment = toolDef.env || 'prod';
-      
-      // Read tool name from config if available
-      let toolName = toolDef.id || 'Unknown';
-      if (toolDef.config && await fs.pathExists(toolDef.config)) {
-        try {
-          const toolConfig = await readConfig(toolDef.config) as { name?: string };
-          toolName = toolConfig.name || toolDef.id || 'Unknown';
-        } catch {
-          // If reading fails, just use ID
-        }
-      }
-      
-      console.log(`Deleting '${toolName}' (${toolDef.id}) [${environment}]...`);
-      
-      // Delete from ElevenLabs
-      if (toolDef.id) {
-        try {
-          const client = await getElevenLabsClient(environment);
-          await deleteToolApi(client, toolDef.id);
-          console.log(`  ✓ Deleted from ElevenLabs`);
-        } catch (error) {
-          console.error(`  Warning: Failed to delete from ElevenLabs: ${error}`);
-        }
-      } else {
-        console.log(`  Warning: No tool ID found, skipping ElevenLabs deletion`);
-      }
-      
-      // Remove config file
-      if (toolDef.config && await fs.pathExists(toolDef.config)) {
-        await fs.remove(toolDef.config);
-        console.log(`  ✓ Deleted config file: ${toolDef.config}`);
-      }
-      
-      if (toolDef.id) {
-        deletedIds.add(toolDef.id);
-      }
-      successCount++;
-    } catch (error) {
-      console.error(`  Failed to delete tool: ${error}`);
-      failCount++;
-    }
-  }
-  
-  // Remove deleted tools from config (only the ones that were successfully deleted)
-  toolsConfig.tools = toolsConfig.tools.filter(tool => !deletedIds.has(tool.id || ''));
-  await writeToolsConfig(toolsConfigPath, toolsConfig);
-  console.log(`\n✓ Updated ${TOOLS_CONFIG_FILE}`);
-  
-  // Summary
-  console.log(`\n✓ Deletion complete: ${successCount} succeeded, ${failCount} failed`);
-}
-
-async function deleteTest(testId: string): Promise<void> {
-  // Load tests configuration
-  const testsConfigPath = path.resolve(TESTS_CONFIG_FILE);
-  if (!(await fs.pathExists(testsConfigPath))) {
-    throw new Error('tests.json not found. Run \'elevenlabs init\' first.');
-  }
-
-  const testsConfig = await readConfig<TestsConfig>(testsConfigPath);
-  
-  // Find the test by ID
-  const testIndex = testsConfig.tests.findIndex(test => test.id === testId);
-  
-  if (testIndex === -1) {
-    throw new Error(`Test with ID '${testId}' not found in local configuration`);
-  }
-  
-  const testDef = testsConfig.tests[testIndex];
-  const configPath = testDef.config;
-  const environment = testDef.env || 'prod';
-  
-  // Read test name from config if available
-  let testName = testId;
-  if (configPath && await fs.pathExists(configPath)) {
-    try {
-      const testConfig = await readConfig(configPath) as { name?: string };
-      testName = testConfig.name || testId;
-    } catch {
-      // If reading fails, just use ID
-    }
-  }
-  
-  console.log(`Deleting test '${testName}' (ID: ${testId}) [${environment}]...`);
-  
-  // Delete from ElevenLabs
-  console.log('Deleting from ElevenLabs...');
-  const client = await getElevenLabsClient(environment);
-  
-  try {
-    await deleteTestApi(client, testId);
-    console.log('✓ Successfully deleted from ElevenLabs');
-  } catch (error) {
-    console.error(`Warning: Failed to delete from ElevenLabs: ${error}`);
-    console.log('Continuing with local deletion...');
-  }
-  
-  // Remove from local tests.json
-  testsConfig.tests.splice(testIndex, 1);
-  await writeConfig(testsConfigPath, testsConfig);
-  console.log(`✓ Removed '${testName}' from ${TESTS_CONFIG_FILE}`);
-  
-  // Remove config file
-  if (configPath && await fs.pathExists(configPath)) {
-    await fs.remove(configPath);
-    console.log(`✓ Deleted config file: ${configPath}`);
-  }
-  
-  console.log(`\n✓ Successfully deleted test '${testName}'`);
-}
-
-async function deleteAllTests(ui: boolean = true, env?: string): Promise<void> {
-  // Load tests configuration
-  const testsConfigPath = path.resolve(TESTS_CONFIG_FILE);
-  if (!(await fs.pathExists(testsConfigPath))) {
-    throw new Error('tests.json not found. Run \'elevenlabs init\' first.');
-  }
-
-  const testsConfig = await readConfig<TestsConfig>(testsConfigPath);
-  
-  if (testsConfig.tests.length === 0) {
-    console.log('No tests found to delete');
-    return;
-  }
-
-  // Filter tests by environment if specified
-  const testsToDelete = env 
-    ? testsConfig.tests.filter(test => (test.env || 'prod') === env)
-    : testsConfig.tests;
-  
-  if (testsToDelete.length === 0) {
-    console.log(env ? `No tests found in environment '${env}'` : 'No tests found to delete');
-    return;
-  }
-  
-  // Show what will be deleted
-  const envInfo = env ? ` in environment '${env}'` : '';
-  console.log(`\nFound ${testsToDelete.length} test(s) to delete${envInfo}:`);
-  for (let i = 0; i < testsToDelete.length; i++) {
-    const test = testsToDelete[i];
-    let testName = test.id || 'Unknown';
-    if (test.config && await fs.pathExists(test.config)) {
-      try {
-        const testConfig = await readConfig(test.config) as { name?: string };
-        testName = testConfig.name || test.id || 'Unknown';
-      } catch {
-        // Use ID if config read fails
-      }
-    }
-    const testEnv = test.env || 'prod';
-    console.log(`  ${i + 1}. ${testName} (${test.id}) [${testEnv}]`);
-  }
-  
-  // Confirm deletion (skip if --no-ui)
-  if (ui) {
-    const warningMsg = env 
-      ? `\nWARNING: This will delete ${testsToDelete.length} test(s) from environment '${env}' in both local configuration and ElevenLabs.`
-      : '\nWARNING: This will delete ALL tests from both local configuration and ElevenLabs.';
-    console.log(warningMsg);
-    const confirmed = await promptForConfirmation('Are you sure you want to delete these tests?');
-    
-    if (!confirmed) {
-      console.log('Deletion cancelled');
-      return;
-    }
-  }
-  
-  console.log('\nDeleting tests...\n');
-  
-  let successCount = 0;
-  let failCount = 0;
-  const deletedIds = new Set<string>();
-  
-  // Delete each test
-  for (const testDef of testsToDelete) {
-    try {
-      const environment = testDef.env || 'prod';
-      
-      // Read test name from config if available
-      let testName = testDef.id || 'Unknown';
-      if (testDef.config && await fs.pathExists(testDef.config)) {
-        try {
-          const testConfig = await readConfig(testDef.config) as { name?: string };
-          testName = testConfig.name || testDef.id || 'Unknown';
-        } catch {
-          // If reading fails, just use ID
-        }
-      }
-      
-      console.log(`Deleting '${testName}' (${testDef.id}) [${environment}]...`);
-      
-      // Delete from ElevenLabs
-      if (testDef.id) {
-        try {
-          const client = await getElevenLabsClient(environment);
-          await deleteTestApi(client, testDef.id);
-          console.log(`  ✓ Deleted from ElevenLabs`);
-        } catch (error) {
-          console.error(`  Warning: Failed to delete from ElevenLabs: ${error}`);
-        }
-      } else {
-        console.log(`  Warning: No test ID found, skipping ElevenLabs deletion`);
-      }
-      
-      // Remove config file
-      if (testDef.config && await fs.pathExists(testDef.config)) {
-        await fs.remove(testDef.config);
-        console.log(`  ✓ Deleted config file: ${testDef.config}`);
-      }
-      
-      if (testDef.id) {
-        deletedIds.add(testDef.id);
-      }
-      successCount++;
-    } catch (error) {
-      console.error(`  Failed to delete test: ${error}`);
-      failCount++;
-    }
-  }
-  
-  // Remove deleted tests from config (only the ones that were successfully deleted)
-  testsConfig.tests = testsConfig.tests.filter(test => !deletedIds.has(test.id || ''));
-  await writeConfig(testsConfigPath, testsConfig);
-  console.log(`\n✓ Updated ${TESTS_CONFIG_FILE}`);
-  
-  // Summary
-  console.log(`\n✓ Deletion complete: ${successCount} succeeded, ${failCount} failed`);
-}
-
-// Handle SIGINT (Ctrl+C)
-process.on('SIGINT', () => {
-  console.log('\nExiting...');
-  process.exit(0);
-});
-
-// Show help if no arguments provided or if --help is used
+// Show help if no arguments provided
 const args = process.argv.slice(2);
 if (args.length === 0 || args.includes('--help') || args.includes('-h')) {
   (async () => {
@@ -3175,49 +63,6 @@ if (args.length === 0 || args.includes('--help') || args.includes('-h')) {
     process.exit(0);
   })();
 } else {
-  // Special handling for 'add' command without name argument
-  if (args[0] === 'add' && (args.length === 1 || args[1].startsWith('-'))) {
-    console.error('Error: Missing required argument');
-    console.error('Usage: elevenlabs add <name> [options]');
-    console.error('');
-    console.error('Example:');
-    console.error('  elevenlabs add "My Agent"');
-    console.error('  elevenlabs add "My Agent" --template advanced');
-    console.error('');
-    console.error('For other commands, see:');
-    console.error('  elevenlabs add-webhook-tool <name>');
-    console.error('  elevenlabs add-client-tool <name>');
-    process.exit(1);
-  }
-
-  // Special handling for 'templates' command without subcommand
-  if (args[0] === 'templates' && (args.length === 1 || args[1].startsWith('-'))) {
-    console.error('Error: Missing required subcommand');
-    console.error('Usage: elevenlabs templates <list|show>');
-    console.error('');
-    console.error('Available subcommands:');
-    console.error('  list                List available agent templates');
-    console.error('  show <template>     Show configuration for a specific template');
-    console.error('');
-    console.error('Examples:');
-    console.error('  agents templates list');
-    console.error('  agents templates show default');
-    process.exit(1);
-  }
-
-  // Special handling for 'components' command without subcommand
-  if (args[0] === 'components' && (args.length === 1 || args[1].startsWith('-'))) {
-    console.error('Error: Missing required subcommand');
-    console.error('Usage: elevenlabs components <add>');
-    console.error('');
-    console.error('Available subcommands:');
-    console.error('  add [name]     Add a component from ElevenLabs UI registry');
-    console.error('');
-    console.error('Examples:');
-    console.error('  agents components add');
-    console.error('  agents components add button');
-    process.exit(1);
-  }
-
-  program.parse();
+  // Parse and execute
+  program.parse(process.argv);
 }
diff --git a/src/components/commands/add.ts b/src/components/commands/add.ts
new file mode 100644
index 0000000..dccfa4b
--- /dev/null
+++ b/src/components/commands/add.ts
@@ -0,0 +1,44 @@
+import { Command } from 'commander';
+import { spawnSync } from 'child_process';
+
+export function createAddCommand(): Command {
+  return new Command('add')
+    .description('Add a component from the ElevenLabs UI registry')
+    .argument('[name]', 'Name of the component to add (optional)')
+    .action(async (componentName?: string) => {
+      try {
+        // Check if npx is available
+        const npxCheck = spawnSync('npx', ['--version'], { encoding: 'utf-8' });
+        if (npxCheck.error) {
+          console.error('Error: npx is not available. Please install Node.js/npm.');
+          process.exit(1);
+        }
+
+        console.log('Launching shadcn/ui CLI...');
+        console.log('Source: https://ui.elevenlabs.io\n');
+
+        // Prepare command arguments
+        const args = ['shadcn@latest', 'add'];
+        if (componentName) {
+          args.push(componentName);
+        }
+
+        // Run shadcn add command interactively
+        const result = spawnSync('npx', args, {
+          stdio: 'inherit', // Allow interactive prompts
+          shell: true
+        });
+
+        if (result.error) {
+          throw result.error;
+        }
+
+        if (result.status !== 0) {
+          process.exit(result.status || 1);
+        }
+      } catch (error) {
+        console.error(`Error adding component: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/components/commands/index.ts b/src/components/commands/index.ts
new file mode 100644
index 0000000..eea9af1
--- /dev/null
+++ b/src/components/commands/index.ts
@@ -0,0 +1,11 @@
+import { Command } from 'commander';
+import { createAddCommand } from './add.js';
+
+export function createComponentsCommand(): Command {
+  const components = new Command('components');
+  components.description('Import components from the ElevenLabs UI registry (https://ui.elevenlabs.io)');
+
+  components.addCommand(createAddCommand());
+
+  return components;
+}
diff --git a/src/index.ts b/src/index.ts
deleted file mode 100644
index e3beef3..0000000
--- a/src/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * ElevenLabs
- * TypeScript/Node.js implementation
- */
-
-export * from './utils.js';
-export * from './templates.js';
-export * from './elevenlabs-api.js';
-export * from './config.js';
-
-// Re-export main types
-export type { AgentConfig } from './templates.js';
-export type { CliConfig } from './config.js';
-
-// Version
-export { version } from '../package.json'; 
\ No newline at end of file
diff --git a/src/auth.ts b/src/shared/auth.ts
similarity index 100%
rename from src/auth.ts
rename to src/shared/auth.ts
diff --git a/src/config.ts b/src/shared/config.ts
similarity index 100%
rename from src/config.ts
rename to src/shared/config.ts
diff --git a/src/elevenlabs-api.ts b/src/shared/elevenlabs-api.ts
similarity index 99%
rename from src/elevenlabs-api.ts
rename to src/shared/elevenlabs-api.ts
index 9158025..d3321fc 100644
--- a/src/elevenlabs-api.ts
+++ b/src/shared/elevenlabs-api.ts
@@ -43,7 +43,7 @@ export function getApiBaseUrl(residency?: Location): string {
 export async function getElevenLabsClient(environment: string = 'prod'): Promise<ElevenLabsClient> {
   const apiKey = await getApiKey(environment);
   if (!apiKey) {
-    throw new Error(`No API key found for environment '${environment}'. Use 'elevenlabs login --env ${environment}' to authenticate or set ELEVENLABS_API_KEY environment variable.`);
+    throw new Error(`No API key found for environment '${environment}'. Use 'elevenlabs auth login --env ${environment}' to authenticate or set ELEVENLABS_API_KEY environment variable.`);
   }
   
   const config = await loadConfig();
diff --git a/src/tools.ts b/src/shared/tools.ts
similarity index 100%
rename from src/tools.ts
rename to src/shared/tools.ts
diff --git a/src/utils.ts b/src/shared/utils.ts
similarity index 100%
rename from src/utils.ts
rename to src/shared/utils.ts
diff --git a/src/__tests__/test-api.test.ts b/src/tests/__tests__/test-api.test.ts
similarity index 99%
rename from src/__tests__/test-api.test.ts
rename to src/tests/__tests__/test-api.test.ts
index 9055b01..8a87734 100644
--- a/src/__tests__/test-api.test.ts
+++ b/src/tests/__tests__/test-api.test.ts
@@ -6,7 +6,7 @@ import {
   updateTestApi,
   runTestsOnAgentApi,
   getTestInvocationApi,
-} from "../elevenlabs-api";
+} from "../../shared/elevenlabs-api";
 import { ElevenLabsClient } from "@elevenlabs/elevenlabs-js";
 import { ElevenLabs } from "@elevenlabs/elevenlabs-js";
 
diff --git a/src/__tests__/test-commands.integration.test.ts b/src/tests/__tests__/test-commands.integration.test.ts
similarity index 97%
rename from src/__tests__/test-commands.integration.test.ts
rename to src/tests/__tests__/test-commands.integration.test.ts
index f2f10f5..97a89bf 100644
--- a/src/__tests__/test-commands.integration.test.ts
+++ b/src/tests/__tests__/test-commands.integration.test.ts
@@ -37,11 +37,11 @@ import {
   writeConfig,
   calculateConfigHash,
   toSnakeCaseKeys,
-} from "../utils";
-import { getBasicLLMTestTemplate } from "../test-templates";
+} from "../../shared/utils";
+import { getBasicLLMTestTemplate } from "../templates";
 
 // Mock the ElevenLabs API
-jest.mock("../elevenlabs-api", () => ({
+jest.mock("../../shared/elevenlabs-api", () => ({
   getElevenLabsClient: jest.fn(),
   createTestApi: jest.fn(),
   getTestApi: jest.fn(),
@@ -52,7 +52,7 @@ jest.mock("../elevenlabs-api", () => ({
 }));
 
 // Import the mocked module
-import * as elevenlabsApi from "../elevenlabs-api";
+import * as elevenlabsApi from "../../shared/elevenlabs-api";
 const mockedApi = jest.mocked(elevenlabsApi);
 
 // Set up default mock implementations
diff --git a/src/__tests__/test-templates.test.ts b/src/tests/__tests__/test-templates.test.ts
similarity index 99%
rename from src/__tests__/test-templates.test.ts
rename to src/tests/__tests__/test-templates.test.ts
index d3a6318..d6f53ba 100644
--- a/src/__tests__/test-templates.test.ts
+++ b/src/tests/__tests__/test-templates.test.ts
@@ -7,7 +7,7 @@ import {
   getTestTemplateOptions,
   getTestTemplateByName,
   TestConfig,
-} from "../test-templates";
+} from "../templates";
 
 describe("Test Templates", () => {
   describe("getBasicLLMTestTemplate", () => {
diff --git a/src/tests/commands/add.ts b/src/tests/commands/add.ts
new file mode 100644
index 0000000..d39c19f
--- /dev/null
+++ b/src/tests/commands/add.ts
@@ -0,0 +1,33 @@
+import { Command } from 'commander';
+import { render } from 'ink';
+import React from 'react';
+import AddTestView from '../ui/AddTestView.js';
+import { addTest } from './impl.js';
+
+export function createAddCommand(): Command {
+  return new Command('add')
+    .description('Add a new test')
+    .argument('<name>', 'Name of the test to create')
+    .option('--template <template>', 'Test template type', 'basic-llm')
+    .option('--env <environment>', 'Environment to create test in', 'prod')
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (name: string, options: { template: string; env: string; ui: boolean }) => {
+      try {
+        if (options.ui !== false) {
+          // Use Ink UI for test creation
+          const { waitUntilExit } = render(
+            React.createElement(AddTestView, {
+              initialName: name,
+              environment: options.env || 'prod'
+            })
+          );
+          await waitUntilExit();
+        } else {
+          await addTest(name, options.template, options.env);
+        }
+      } catch (error) {
+        console.error(`Error creating test: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/tests/commands/delete.ts b/src/tests/commands/delete.ts
new file mode 100644
index 0000000..0768f6b
--- /dev/null
+++ b/src/tests/commands/delete.ts
@@ -0,0 +1,38 @@
+import { Command } from 'commander';
+import { deleteTest, deleteAllTests } from './impl.js';
+
+export function createDeleteCommand(): Command {
+  return new Command('delete')
+    .description('Delete a test locally and from ElevenLabs')
+    .argument('[test_id]', 'ID of the test to delete (omit with --all to delete all tests)')
+    .option('--all', 'Delete all tests', false)
+    .option('--env <environment>', 'Filter tests by environment (use with --all)')
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (testId: string | undefined, options: { all: boolean; env?: string; ui: boolean }) => {
+      try {
+        if (options.all && testId) {
+          console.error('Error: Cannot specify both test_id and --all flag');
+          process.exit(1);
+        }
+
+        if (!options.all && !testId) {
+          console.error('Error: Must specify either test_id or --all flag');
+          process.exit(1);
+        }
+
+        if (options.env && !options.all) {
+          console.error('Error: --env flag can only be used with --all');
+          process.exit(1);
+        }
+
+        if (options.all) {
+          await deleteAllTests(options.ui, options.env);
+        } else {
+          await deleteTest(testId!);
+        }
+      } catch (error) {
+        console.error(`Error deleting test: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/tests/commands/impl.ts b/src/tests/commands/impl.ts
new file mode 100644
index 0000000..31e1408
--- /dev/null
+++ b/src/tests/commands/impl.ts
@@ -0,0 +1,601 @@
+import path from 'path';
+import fs from 'fs-extra';
+import { readConfig, writeConfig, generateUniqueFilename, toCamelCaseKeys } from '../../shared/utils.js';
+import {
+  getElevenLabsClient,
+  createTestApi,
+  updateTestApi,
+  listTestsApi,
+  getTestApi,
+  deleteTestApi
+} from '../../shared/elevenlabs-api.js';
+import { listEnvironments } from '../../shared/config.js';
+import { ElevenLabs } from '@elevenlabs/elevenlabs-js';
+
+const TESTS_CONFIG_FILE = "tests.json";
+
+interface TestDefinition {
+  config: string;
+  type?: string;
+  id?: string;
+  env?: string;
+}
+
+interface TestsConfig {
+  tests: TestDefinition[];
+}
+
+// Helper function for prompting confirmation
+async function promptForConfirmation(message: string): Promise<boolean> {
+  const readline = await import('readline');
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
+  return new Promise((resolve) => {
+    rl.question(`${message} (y/n): `, (answer) => {
+      rl.close();
+      resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes');
+    });
+  });
+}
+
+async function addTest(name: string, templateType: string = "basic-llm", environment?: string): Promise<void> {
+  const { getTestTemplateByName } = await import('../templates.js');
+
+  // Check if tests.json exists
+  const testsConfigPath = path.resolve(TESTS_CONFIG_FILE);
+  let testsConfig: TestsConfig;
+
+  try {
+    testsConfig = await readConfig<TestsConfig>(testsConfigPath);
+  } catch (error) {
+    // Initialize tests.json if it doesn't exist
+    testsConfig = { tests: [] };
+    await writeConfig(testsConfigPath, testsConfig);
+    console.log(`Created ${TESTS_CONFIG_FILE}`);
+  }
+
+  // Create test config using template (in memory first)
+  const testConfig = getTestTemplateByName(name, templateType);
+
+  // Create test in ElevenLabs first to get ID
+  const env = environment || 'prod';
+  console.log(`Creating test '${name}' in ElevenLabs (environment: ${env})...`);
+
+  const client = await getElevenLabsClient(env);
+
+  try {
+    const testApiConfig = toCamelCaseKeys(testConfig) as unknown as ElevenLabs.conversationalAi.CreateUnitTestRequest;
+    const response = await createTestApi(client, testApiConfig);
+    const testId = response.id;
+
+    console.log(`Created test in ElevenLabs with ID: ${testId}`);
+
+    // Generate config path using test name
+    const configPath = await generateUniqueFilename('test_configs', name);
+
+    // Create config directory and file
+    const configFilePath = path.resolve(configPath);
+    await fs.ensureDir(path.dirname(configFilePath));
+
+    await writeConfig(configFilePath, testConfig);
+    console.log(`Created config file: ${configPath} (template: ${templateType})`);
+
+    // Add to tests.json if not already present
+    const newTest: TestDefinition = {
+      config: configPath,
+      type: templateType,
+      id: testId,
+      env: env
+    };
+    testsConfig.tests.push(newTest);
+    await writeConfig(testsConfigPath, testsConfig);
+    console.log(`Added test '${name}' to tests.json`);
+
+    console.log(`Edit ${configPath} to customize your test, then run 'elevenlabs push-tests' to update`);
+
+  } catch (error) {
+    console.error(`Error creating test in ElevenLabs: ${error}`);
+    process.exit(1);
+  }
+}
+async function pushTests(testId?: string, dryRun = false, environment?: string): Promise<void> {
+  // Load tests configuration
+  const testsConfigPath = path.resolve(TESTS_CONFIG_FILE);
+  if (!(await fs.pathExists(testsConfigPath))) {
+    throw new Error('tests.json not found. Run \'elevenlabs add-test\' first.');
+  }
+
+  const testsConfig = await readConfig<TestsConfig>(testsConfigPath);
+
+  // Filter tests by environment and/or test ID
+  let testsToProcess = testsConfig.tests;
+  
+  if (environment) {
+    testsToProcess = testsToProcess.filter(test => (test.env || 'prod') === environment);
+  }
+  
+  if (testId) {
+    testsToProcess = testsToProcess.filter(test => test.id === testId);
+    if (testsToProcess.length === 0) {
+      throw new Error(`Test with ID '${testId}' not found in configuration`);
+    }
+  }
+  
+  if (environment && testsToProcess.length === 0) {
+    console.log(`No tests found for environment '${environment}'`);
+    return;
+  }
+  
+  if (!environment) {
+    const envs = [...new Set(testsToProcess.map(t => t.env || 'prod'))];
+    console.log(`Pushing ${testsToProcess.length} test(s) across ${envs.length} environment(s): ${envs.join(', ')}`);
+  }
+
+  let changesMade = false;
+
+  for (const testDef of testsToProcess) {
+    const configPath = testDef.config;
+    const environment = testDef.env || 'prod';
+
+    // Check if config file exists
+    if (!(await fs.pathExists(configPath))) {
+      console.log(`Warning: Config file not found: ${configPath}`);
+      continue;
+    }
+
+    // Load test config
+    let testConfig: { name?: string };
+    try {
+      testConfig = await readConfig(configPath);
+    } catch (error) {
+      console.log(`Error reading config from ${configPath}: ${error}`);
+      continue;
+    }
+
+    const testDefName = testConfig.name || 'Unnamed Test';
+
+    // Get test ID from index file
+    const testId = testDef.id;
+
+    // Always push (force override)
+    console.log(`${testDefName} [${environment}]: Will push (force override)`);
+
+    if (dryRun) {
+      console.log(`[DRY RUN] Would update test: ${testDefName} [${environment}]`);
+      continue;
+    }
+
+    // Initialize ElevenLabs client for this test's environment
+    let client;
+    try {
+      client = await getElevenLabsClient(environment);
+    } catch (error) {
+      console.log(`Error: ${error}`);
+      console.log(`Skipping test ${testDefName} - environment '${environment}' not configured`);
+      continue;
+    }
+
+    // Perform API operation
+    try {
+      const testApiConfig = toCamelCaseKeys(testConfig) as unknown as ElevenLabs.conversationalAi.CreateUnitTestRequest;
+
+      if (!testId) {
+        // Create new test
+        const response = await createTestApi(client, testApiConfig);
+        const newTestId = response.id;
+        console.log(`Created test ${testDefName} (ID: ${newTestId}) [${environment}]`);
+        
+        // Store test ID in index file
+        testDef.id = newTestId;
+        changesMade = true;
+      } else {
+        // Update existing test
+        await updateTestApi(client, testId, testApiConfig as ElevenLabs.conversationalAi.UpdateUnitTestRequest);
+        console.log(`Updated test ${testDefName} (ID: ${testId}) [${environment}]`);
+      }
+
+      changesMade = true;
+
+    } catch (error) {
+      console.log(`Error processing ${testDefName}: ${error}`);
+    }
+  }
+  
+  // Save updated tests.json if there were changes
+  if (changesMade) {
+    await writeConfig(testsConfigPath, testsConfig);
+  }
+}
+async function pullTests(options: { test?: string; outputDir: string; dryRun: boolean; update?: boolean; all?: boolean; env?: string }): Promise<void> {
+  // Check if tests.json exists
+  const testsConfigPath = path.resolve(TESTS_CONFIG_FILE);
+  
+  // Determine which environments to pull from
+  const environmentsToPull: string[] = options.env 
+    ? [options.env] 
+    : await listEnvironments();
+  
+  if (environmentsToPull.length === 0) {
+    console.log('No environments configured. Use "elevenlabs auth login" to add an environment.');
+    return;
+  }
+  
+  if (!options.env) {
+    console.log(`Pulling from ${environmentsToPull.length} environment(s): ${environmentsToPull.join(', ')}`);
+  }
+  
+  // Pull from each environment
+  for (const environment of environmentsToPull) {
+    console.log(`\n${'='.repeat(50)}`);
+    console.log(`Environment: ${environment}`);
+    console.log('='.repeat(50));
+    
+    await pullTestsFromEnvironment(options, environment, testsConfigPath);
+  }
+}
+
+async function pullTestsFromEnvironment(options: { test?: string; outputDir: string; dryRun: boolean; update?: boolean; all?: boolean }, environment: string, testsConfigPath: string): Promise<void> {
+  let testsConfig: TestsConfig;
+
+  try {
+    testsConfig = await readConfig<TestsConfig>(testsConfigPath);
+  } catch (error) {
+    testsConfig = { tests: [] };
+    await writeConfig(testsConfigPath, testsConfig);
+    console.log(`Created ${TESTS_CONFIG_FILE}`);
+  }
+
+  const client = await getElevenLabsClient(environment);
+
+  let testsList: unknown[];
+
+  if (options.test) {
+    // Pull specific test by ID
+    console.log(`Pulling test with ID: ${options.test}...`);
+    try {
+      const testDetails = await getTestApi(client, options.test);
+      const testDetailsTyped = testDetails as { id?: string; name: string };
+      const testId = testDetailsTyped.id || options.test;
+      testsList = [{
+        id: testId,
+        name: testDetailsTyped.name
+      }];
+      console.log(`Found test: ${testDetailsTyped.name}`);
+    } catch (error) {
+      throw new Error(`Failed to fetch test with ID '${options.test}': ${error}`);
+    }
+  } else {
+    // Fetch all tests from ElevenLabs
+    console.log('Fetching all tests from ElevenLabs...');
+    testsList = await listTestsApi(client, 30);
+
+    if (testsList.length === 0) {
+      console.log('No tests found in your ElevenLabs workspace.');
+      return;
+    }
+
+    console.log(`Found ${testsList.length} test(s)`);
+  }
+
+  // Build map of existing tests by ID for this environment
+  const existingTestIds = new Map(
+    testsConfig.tests
+      .filter(test => (test.env || 'prod') === environment)
+      .map(test => [test.id, test])
+  );
+
+  // Track operations for summary
+  const operations = { create: 0, update: 0, skip: 0 };
+  type OperationItem = {
+    action: 'create' | 'update' | 'skip';
+    test: { id: string; name: string };
+    existingEntry?: TestDefinition;
+  };
+  const itemsToProcess: OperationItem[] = [];
+
+  // First pass: determine what will happen
+  for (const testMeta of testsList) {
+    const testMetaTyped = testMeta as { id?: string; name: string };
+    const testId = testMetaTyped.id;
+    if (!testId) {
+      console.log(`Warning: Skipping test '${testMetaTyped.name}' - no test ID found`);
+      continue;
+    }
+
+    let testNameRemote = testMetaTyped.name;
+    const existingEntry = existingTestIds.get(testId);
+
+    if (existingEntry) {
+      // Test with this ID already exists locally
+      if (options.update || options.all) {
+        // --update or --all: update existing
+        itemsToProcess.push({ action: 'update', test: { id: testId, name: testNameRemote }, existingEntry });
+        operations.update++;
+      } else {
+        // Default: skip existing
+        itemsToProcess.push({ action: 'skip', test: { id: testId, name: testNameRemote }, existingEntry });
+        operations.skip++;
+      }
+    } else {
+      // New test (not present locally)
+      if (options.update) {
+        // --update mode: skip new items (only update existing)
+        itemsToProcess.push({ action: 'skip', test: { id: testId, name: testNameRemote } });
+        operations.skip++;
+      } else {
+        // Default or --all: create new items
+        itemsToProcess.push({ action: 'create', test: { id: testId, name: testNameRemote } });
+        operations.create++;
+      }
+    }
+  }
+
+  // Show summary
+  console.log(`\nPlan: ${operations.create} create, ${operations.update} update, ${operations.skip} skip`);
+  
+  if (operations.skip > 0 && !options.update && !options.all) {
+    if (operations.create === 0) {
+      console.log(`\n💡 Tip: Use --update to update existing tests or --all to pull everything`);
+    } else {
+      console.log(`\n💡 Tip: Use --all to also update existing tests`);
+    }
+  }
+
+  // Prompt for confirmation if not --dry-run
+  if (!options.dryRun && (operations.create > 0 || operations.update > 0)) {
+    const confirmed = await promptForConfirmation('Proceed?');
+    if (!confirmed) {
+      console.log('Pull cancelled');
+      return;
+    }
+  }
+
+  // Second pass: execute operations
+  let itemsProcessed = 0;
+  for (const item of itemsToProcess) {
+    const { action, test, existingEntry } = item;
+    
+    if (action === 'skip') {
+      console.log(`⊘ Skipping '${test.name}' (already exists, use --update to overwrite)`);
+      continue;
+    }
+    
+    if (options.dryRun) {
+      console.log(`[DRY RUN] Would ${action} test: ${test.name} (ID: ${test.id})`);
+      continue;
+    }
+    
+    try {
+      // Fetch detailed test configuration
+      console.log(`${action === 'update' ? '↻ Updating' : '+ Pulling'} config for '${test.name}'...`);
+      const testDetails = await getTestApi(client, test.id);
+      const testDetailsTyped = testDetails as { type?: string };
+      
+      if (action === 'update' && existingEntry) {
+        // Update existing entry - overwrite the config file
+        const configFilePath = path.resolve(existingEntry.config);
+        await fs.ensureDir(path.dirname(configFilePath));
+        await writeConfig(configFilePath, testDetails);
+        console.log(`  ✓ Updated '${test.name}' (config: ${existingEntry.config})`);
+      } else {
+        // Create new entry
+        const configPath = await generateUniqueFilename(options.outputDir, test.name);
+        const configFilePath = path.resolve(configPath);
+        await fs.ensureDir(path.dirname(configFilePath));
+        await writeConfig(configFilePath, testDetails);
+        
+        const newTest: TestDefinition = {
+          config: configPath,
+          id: test.id,
+          type: testDetailsTyped.type || 'conversational',
+          env: environment
+        };
+        
+        testsConfig.tests.push(newTest);
+        console.log(`  ✓ Added '${test.name}' (config: ${configPath}) [${environment}]`);
+      }
+      
+      itemsProcessed++;
+      
+    } catch (error) {
+      console.log(`  ✗ Error ${action === 'update' ? 'updating' : 'pulling'} test '${test.name}': ${error}`);
+      continue;
+    }
+  }
+
+  // Save updated tests.json if there were changes
+  if (!options.dryRun && itemsProcessed > 0) {
+    await writeConfig(testsConfigPath, testsConfig);
+    console.log(`\nUpdated ${TESTS_CONFIG_FILE}`);
+  }
+
+  // Final summary
+  if (options.dryRun) {
+    console.log(`\n[DRY RUN] Would process ${operations.create + operations.update} test(s)`);
+  } else {
+    console.log(`\n✓ Summary: ${operations.create} created, ${operations.update} updated, ${operations.skip} skipped`);
+    if (itemsProcessed > 0) {
+      console.log(`You can now edit the config files in '${options.outputDir}/' and run 'elevenlabs push-tests' to update`);
+    }
+  }
+}
+async function deleteTest(testId: string): Promise<void> {
+  // Load tests configuration
+  const testsConfigPath = path.resolve(TESTS_CONFIG_FILE);
+  if (!(await fs.pathExists(testsConfigPath))) {
+    throw new Error('tests.json not found. Run \'elevenlabs agents init\' first.');
+  }
+
+  const testsConfig = await readConfig<TestsConfig>(testsConfigPath);
+  
+  // Find the test by ID
+  const testIndex = testsConfig.tests.findIndex(test => test.id === testId);
+  
+  if (testIndex === -1) {
+    throw new Error(`Test with ID '${testId}' not found in local configuration`);
+  }
+  
+  const testDef = testsConfig.tests[testIndex];
+  const configPath = testDef.config;
+  const environment = testDef.env || 'prod';
+  
+  // Read test name from config if available
+  let testName = testId;
+  if (configPath && await fs.pathExists(configPath)) {
+    try {
+      const testConfig = await readConfig(configPath) as { name?: string };
+      testName = testConfig.name || testId;
+    } catch {
+      // If reading fails, just use ID
+    }
+  }
+  
+  console.log(`Deleting test '${testName}' (ID: ${testId}) [${environment}]...`);
+  
+  // Delete from ElevenLabs
+  console.log('Deleting from ElevenLabs...');
+  const client = await getElevenLabsClient(environment);
+  
+  try {
+    await deleteTestApi(client, testId);
+    console.log('✓ Successfully deleted from ElevenLabs');
+  } catch (error) {
+    console.error(`Warning: Failed to delete from ElevenLabs: ${error}`);
+    console.log('Continuing with local deletion...');
+  }
+  
+  // Remove from local tests.json
+  testsConfig.tests.splice(testIndex, 1);
+  await writeConfig(testsConfigPath, testsConfig);
+  console.log(`✓ Removed '${testName}' from ${TESTS_CONFIG_FILE}`);
+  
+  // Remove config file
+  if (configPath && await fs.pathExists(configPath)) {
+    await fs.remove(configPath);
+    console.log(`✓ Deleted config file: ${configPath}`);
+  }
+  
+  console.log(`\n✓ Successfully deleted test '${testName}'`);
+}
+async function deleteAllTests(ui: boolean = true, env?: string): Promise<void> {
+  // Load tests configuration
+  const testsConfigPath = path.resolve(TESTS_CONFIG_FILE);
+  if (!(await fs.pathExists(testsConfigPath))) {
+    throw new Error('tests.json not found. Run \'elevenlabs agents init\' first.');
+  }
+
+  const testsConfig = await readConfig<TestsConfig>(testsConfigPath);
+  
+  if (testsConfig.tests.length === 0) {
+    console.log('No tests found to delete');
+    return;
+  }
+
+  // Filter tests by environment if specified
+  const testsToDelete = env 
+    ? testsConfig.tests.filter(test => (test.env || 'prod') === env)
+    : testsConfig.tests;
+  
+  if (testsToDelete.length === 0) {
+    console.log(env ? `No tests found in environment '${env}'` : 'No tests found to delete');
+    return;
+  }
+  
+  // Show what will be deleted
+  const envInfo = env ? ` in environment '${env}'` : '';
+  console.log(`\nFound ${testsToDelete.length} test(s) to delete${envInfo}:`);
+  for (let i = 0; i < testsToDelete.length; i++) {
+    const test = testsToDelete[i];
+    let testName = test.id || 'Unknown';
+    if (test.config && await fs.pathExists(test.config)) {
+      try {
+        const testConfig = await readConfig(test.config) as { name?: string };
+        testName = testConfig.name || test.id || 'Unknown';
+      } catch {
+        // Use ID if config read fails
+      }
+    }
+    const testEnv = test.env || 'prod';
+    console.log(`  ${i + 1}. ${testName} (${test.id}) [${testEnv}]`);
+  }
+  
+  // Confirm deletion (skip if --no-ui)
+  if (ui) {
+    const warningMsg = env 
+      ? `\nWARNING: This will delete ${testsToDelete.length} test(s) from environment '${env}' in both local configuration and ElevenLabs.`
+      : '\nWARNING: This will delete ALL tests from both local configuration and ElevenLabs.';
+    console.log(warningMsg);
+    const confirmed = await promptForConfirmation('Are you sure you want to delete these tests?');
+    
+    if (!confirmed) {
+      console.log('Deletion cancelled');
+      return;
+    }
+  }
+  
+  console.log('\nDeleting tests...\n');
+  
+  let successCount = 0;
+  let failCount = 0;
+  const deletedIds = new Set<string>();
+  
+  // Delete each test
+  for (const testDef of testsToDelete) {
+    try {
+      const environment = testDef.env || 'prod';
+      
+      // Read test name from config if available
+      let testName = testDef.id || 'Unknown';
+      if (testDef.config && await fs.pathExists(testDef.config)) {
+        try {
+          const testConfig = await readConfig(testDef.config) as { name?: string };
+          testName = testConfig.name || testDef.id || 'Unknown';
+        } catch {
+          // If reading fails, just use ID
+        }
+      }
+      
+      console.log(`Deleting '${testName}' (${testDef.id}) [${environment}]...`);
+      
+      // Delete from ElevenLabs
+      if (testDef.id) {
+        try {
+          const client = await getElevenLabsClient(environment);
+          await deleteTestApi(client, testDef.id);
+          console.log(`  ✓ Deleted from ElevenLabs`);
+        } catch (error) {
+          console.error(`  Warning: Failed to delete from ElevenLabs: ${error}`);
+        }
+      } else {
+        console.log(`  Warning: No test ID found, skipping ElevenLabs deletion`);
+      }
+      
+      // Remove config file
+      if (testDef.config && await fs.pathExists(testDef.config)) {
+        await fs.remove(testDef.config);
+        console.log(`  ✓ Deleted config file: ${testDef.config}`);
+      }
+      
+      if (testDef.id) {
+        deletedIds.add(testDef.id);
+      }
+      successCount++;
+    } catch (error) {
+      console.error(`  Failed to delete test: ${error}`);
+      failCount++;
+    }
+  }
+  
+  // Remove deleted tests from config (only the ones that were successfully deleted)
+  testsConfig.tests = testsConfig.tests.filter(test => !deletedIds.has(test.id || ''));
+  await writeConfig(testsConfigPath, testsConfig);
+  console.log(`\n✓ Updated ${TESTS_CONFIG_FILE}`);
+  
+  // Summary
+  console.log(`\n✓ Deletion complete: ${successCount} succeeded, ${failCount} failed`);
+}
+
+export { addTest, pushTests, pullTests, deleteTest, deleteAllTests };
diff --git a/src/tests/commands/index.ts b/src/tests/commands/index.ts
new file mode 100644
index 0000000..c8d5e4e
--- /dev/null
+++ b/src/tests/commands/index.ts
@@ -0,0 +1,17 @@
+import { Command } from 'commander';
+import { createAddCommand } from './add.js';
+import { createDeleteCommand } from './delete.js';
+import { createPushCommand } from './push.js';
+import { createPullCommand } from './pull.js';
+
+export function createTestsCommand(): Command {
+  const tests = new Command('tests');
+  tests.description('Manage ElevenLabs tests');
+
+  tests.addCommand(createAddCommand());
+  tests.addCommand(createDeleteCommand());
+  tests.addCommand(createPushCommand());
+  tests.addCommand(createPullCommand());
+
+  return tests;
+}
diff --git a/src/tests/commands/pull.ts b/src/tests/commands/pull.ts
new file mode 100644
index 0000000..17544a8
--- /dev/null
+++ b/src/tests/commands/pull.ts
@@ -0,0 +1,31 @@
+import { Command } from 'commander';
+import { pullTests } from './impl.js';
+
+interface PullTestsOptions {
+  test?: string;
+  outputDir: string;
+  dryRun: boolean;
+  update?: boolean;
+  all?: boolean;
+  env?: string;
+}
+
+export function createPullCommand(): Command {
+  return new Command('pull')
+    .description('Pull tests from ElevenLabs')
+    .option('--test <test_id>', 'Specific test ID to pull')
+    .option('--output-dir <directory>', 'Output directory for configs', 'test_configs')
+    .option('--dry-run', 'Show what would be done without making changes', false)
+    .option('--update', 'Update existing items only, skip new')
+    .option('--all', 'Pull all (new + existing)')
+    .option('--env <environment>', 'Environment to pull from')
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (options: PullTestsOptions & { ui: boolean }) => {
+      try {
+        await pullTests(options);
+      } catch (error) {
+        console.error(`Error during pull: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/tests/commands/push.ts b/src/tests/commands/push.ts
new file mode 100644
index 0000000..2e57727
--- /dev/null
+++ b/src/tests/commands/push.ts
@@ -0,0 +1,18 @@
+import { Command } from 'commander';
+import { pushTests } from './impl.js';
+
+export function createPushCommand(): Command {
+  return new Command('push')
+    .description('Push tests to ElevenLabs API')
+    .option('--env <environment>', 'Filter tests by environment')
+    .option('--dry-run', 'Show what would be done without making changes', false)
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (options: { dryRun: boolean; env?: string; ui: boolean }) => {
+      try {
+        await pushTests(undefined, options.dryRun, options.env);
+      } catch (error) {
+        console.error(`Error during push: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/test-templates.ts b/src/tests/templates.ts
similarity index 100%
rename from src/test-templates.ts
rename to src/tests/templates.ts
diff --git a/src/ui/views/AddTestView.tsx b/src/tests/ui/AddTestView.tsx
similarity index 97%
rename from src/ui/views/AddTestView.tsx
rename to src/tests/ui/AddTestView.tsx
index 95e8f5d..ed86bdd 100644
--- a/src/ui/views/AddTestView.tsx
+++ b/src/tests/ui/AddTestView.tsx
@@ -2,9 +2,9 @@ import React, { useState, useEffect } from 'react';
 import { Box, Text, useApp, useInput } from 'ink';
 import TextInput from 'ink-text-input';
 import SelectInput from 'ink-select-input';
-import App from '../App.js';
-import StatusCard from '../components/StatusCard.js';
-import theme from '../themes/elevenlabs.js';
+import App from '../../ui/App.js';
+import StatusCard from '../../ui/components/StatusCard.js';
+import theme from '../../ui/themes/elevenlabs.js';
 
 interface AddTestViewProps {
   initialName?: string;
@@ -139,8 +139,8 @@ export const AddTestView: React.FC<AddTestViewProps> = ({
       const {
         writeConfig,
         readConfig,
-      } = await import('../../utils.js');
-      const { getTestTemplateByName } = await import('../../test-templates.js');
+      } = await import('../../shared/utils.js');
+      const { getTestTemplateByName } = await import('../templates.js');
 
       // Create test config using template (in memory first)
       const testConfig = getTestTemplateByName(testName, selectedTemplate, {
@@ -151,10 +151,10 @@ export const AddTestView: React.FC<AddTestViewProps> = ({
       });
 
       // Create test in ElevenLabs first to get ID
-      const { getElevenLabsClient, createTestApi } = await import('../../elevenlabs-api.js');
+      const { getElevenLabsClient, createTestApi } = await import('../../shared/elevenlabs-api.js');
       const client = await getElevenLabsClient(environment);
 
-      const { toCamelCaseKeys, generateUniqueFilename } = await import('../../utils.js');
+      const { toCamelCaseKeys, generateUniqueFilename } = await import('../../shared/utils.js');
       const testApiConfig = toCamelCaseKeys(testConfig) as unknown as any;
       const response = await createTestApi(client, testApiConfig);
       const testId = response.id;
diff --git a/src/__tests__/push-tools.integration.test.ts b/src/tools/__tests__/push-tools.integration.test.ts
similarity index 96%
rename from src/__tests__/push-tools.integration.test.ts
rename to src/tools/__tests__/push-tools.integration.test.ts
index ad72c3e..4b8b886 100644
--- a/src/__tests__/push-tools.integration.test.ts
+++ b/src/tools/__tests__/push-tools.integration.test.ts
@@ -5,23 +5,23 @@
 import * as fs from "fs-extra";
 import * as path from "path";
 import * as os from "os";
-import { calculateConfigHash, toSnakeCaseKeys } from "../utils";
+import { calculateConfigHash, toSnakeCaseKeys } from "../../shared/utils";
 import {
   writeToolsConfig,
   writeToolConfig,
   readToolsConfig,
   ToolsConfig,
-} from "../tools";
-import * as elevenLabsApi from "../elevenlabs-api";
-import * as config from "../config";
+} from "../../shared/tools";
+import * as elevenLabsApi from "../../shared/elevenlabs-api";
+import * as config from "../../shared/config";
 import { ElevenLabs, ElevenLabsClient } from "@elevenlabs/elevenlabs-js";
 
 // Mock the entire elevenlabs-api module
-jest.mock("../elevenlabs-api");
+jest.mock("../../shared/elevenlabs-api");
 const mockedElevenLabsApi = elevenLabsApi as jest.Mocked<typeof elevenLabsApi>;
 
 // Mock the config module
-jest.mock("../config");
+jest.mock("../../shared/config");
 const mockedConfig = config as jest.Mocked<typeof config>;
 
 // Mock os module for config path
diff --git a/src/__tests__/tools.test.ts b/src/tools/__tests__/tools.test.ts
similarity index 99%
rename from src/__tests__/tools.test.ts
rename to src/tools/__tests__/tools.test.ts
index 46f58f3..4846eb6 100644
--- a/src/__tests__/tools.test.ts
+++ b/src/tools/__tests__/tools.test.ts
@@ -4,22 +4,22 @@ import {
   readToolsConfig,
   writeToolsConfig,
   ToolsConfig,
-} from "../tools";
+} from "../../shared/tools";
 import {
   calculateConfigHash,
-} from "../utils";
+} from "../../shared/utils";
 import {
   getElevenLabsClient,
   listToolsApi,
   getToolApi,
-} from "../elevenlabs-api";
+} from "../../shared/elevenlabs-api";
 import { ElevenLabsClient } from "@elevenlabs/elevenlabs-js";
 import fs from "fs-extra";
 import path from "path";
 import os from "os";
 
 // Mock the elevenlabs-api module
-jest.mock("../elevenlabs-api");
+jest.mock("../../shared/elevenlabs-api");
 const mockGetElevenLabsClient = getElevenLabsClient as jest.MockedFunction<
   typeof getElevenLabsClient
 >;
diff --git a/src/tools/commands/add.ts b/src/tools/commands/add.ts
new file mode 100644
index 0000000..61820d4
--- /dev/null
+++ b/src/tools/commands/add.ts
@@ -0,0 +1,24 @@
+import { Command } from 'commander';
+import { addTool } from './impl.js';
+
+export function createAddCommand(): Command {
+  return new Command('add')
+    .description('Add a new tool')
+    .argument('<name>', 'Name of the tool to create')
+    .option('--type <type>', 'Tool type: webhook or client', 'webhook')
+    .option('--config-path <path>', 'Custom config path (optional)')
+    .option('--env <environment>', 'Environment to create tool in', 'prod')
+    .action(async (name: string, options: { type: string; configPath?: string; env: string }) => {
+      try {
+        if (options.type !== 'webhook' && options.type !== 'client') {
+          console.error('Error: --type must be either "webhook" or "client"');
+          process.exit(1);
+        }
+
+        await addTool(name, options.type as 'webhook' | 'client', options.configPath, options.env);
+      } catch (error) {
+        console.error(`Error creating tool: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/tools/commands/delete.ts b/src/tools/commands/delete.ts
new file mode 100644
index 0000000..77b26f1
--- /dev/null
+++ b/src/tools/commands/delete.ts
@@ -0,0 +1,38 @@
+import { Command } from 'commander';
+import { deleteTool, deleteAllTools } from './impl.js';
+
+export function createDeleteCommand(): Command {
+  return new Command('delete')
+    .description('Delete a tool locally and from ElevenLabs')
+    .argument('[tool_id]', 'ID of the tool to delete (omit with --all to delete all tools)')
+    .option('--all', 'Delete all tools', false)
+    .option('--env <environment>', 'Filter tools by environment (use with --all)')
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (toolId: string | undefined, options: { all: boolean; env?: string; ui: boolean }) => {
+      try {
+        if (options.all && toolId) {
+          console.error('Error: Cannot specify both tool_id and --all flag');
+          process.exit(1);
+        }
+
+        if (!options.all && !toolId) {
+          console.error('Error: Must specify either tool_id or --all flag');
+          process.exit(1);
+        }
+
+        if (options.env && !options.all) {
+          console.error('Error: --env flag can only be used with --all');
+          process.exit(1);
+        }
+
+        if (options.all) {
+          await deleteAllTools(options.ui, options.env);
+        } else {
+          await deleteTool(toolId!);
+        }
+      } catch (error) {
+        console.error(`Error deleting tool: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/tools/commands/impl.ts b/src/tools/commands/impl.ts
new file mode 100644
index 0000000..ac168a7
--- /dev/null
+++ b/src/tools/commands/impl.ts
@@ -0,0 +1,683 @@
+import path from 'path';
+import fs from 'fs-extra';
+import { readConfig, generateUniqueFilename } from '../../shared/utils.js';
+import {
+  getElevenLabsClient,
+  createToolApi,
+  updateToolApi,
+  listToolsApi,
+  getToolApi,
+  deleteToolApi
+} from '../../shared/elevenlabs-api.js';
+import {
+  readToolsConfig,
+  writeToolsConfig,
+  writeToolConfig,
+  ToolsConfig,
+  ToolDefinition,
+  type Tool
+} from '../../shared/tools.js';
+import { listEnvironments } from '../../shared/config.js';
+
+const TOOLS_CONFIG_FILE = "tools.json";
+
+// Helper function for prompting confirmation
+async function promptForConfirmation(message: string): Promise<boolean> {
+  // For non-UI mode, use readline
+  const readline = await import('readline');
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
+  return new Promise((resolve) => {
+    rl.question(`${message} (y/n): `, (answer) => {
+      rl.close();
+      resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes');
+    });
+  });
+}
+
+async function addTool(name: string, type: 'webhook' | 'client', configPath?: string, environment?: string): Promise<void> {
+  // Check if tools.json exists, create if not
+  const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
+  let toolsConfig: ToolsConfig;
+  
+  try {
+    toolsConfig = await readToolsConfig(toolsConfigPath);
+  } catch (error) {
+    // Initialize tools.json if it doesn't exist
+    toolsConfig = { tools: [] };
+    await writeToolsConfig(toolsConfigPath, toolsConfig);
+    console.log(`Created ${TOOLS_CONFIG_FILE}`);
+  }
+  
+  // Create tool config using appropriate template (in memory first)
+  let toolConfig;
+  if (type === 'webhook') {
+    toolConfig = {
+      name,
+      description: `${name} webhook tool`,
+      type: 'webhook' as const,
+      api_schema: {
+        url: 'https://api.example.com/webhook',
+        method: 'POST',
+        request_body_schema: {
+          type: 'object',
+          description: 'Request body for the webhook',
+          properties: {}
+        },
+        request_headers: {
+          'Content-Type': 'application/json'
+        }
+      },
+      response_timeout_secs: 30,
+      dynamic_variables: {
+        dynamic_variable_placeholders: {}
+      },
+      assignments: [],
+      disable_interruptions: false,
+      force_pre_tool_speech: false
+    };
+  } else {
+    toolConfig = {
+      name,
+      description: `${name} client tool`,
+      type: 'client' as const,
+      expects_response: false,
+      response_timeout_secs: 30,
+      parameters: {
+        type: 'object',
+        description: 'Parameters for the client tool',
+        properties: {}
+      },
+      dynamic_variables: {
+        dynamic_variable_placeholders: {}
+      }
+    };
+  }
+  
+  // Create tool in ElevenLabs first to get ID
+  const env = environment || 'prod';
+  console.log(`Creating ${type} tool '${name}' in ElevenLabs (environment: ${env})...`);
+  
+  const client = await getElevenLabsClient(env);
+  
+  try {
+    const response = await createToolApi(client, toolConfig);
+    const toolId = response.id;
+    
+    console.log(`Created ${type} tool in ElevenLabs with ID: ${toolId}`);
+    
+    // Generate config path using tool name (or custom path if provided)
+    if (!configPath) {
+      configPath = await generateUniqueFilename('tool_configs', name);
+    }
+    
+    // Create config directory and file
+    const configFilePath = path.resolve(configPath);
+    await fs.ensureDir(path.dirname(configFilePath));
+    
+    await writeToolConfig(configFilePath, toolConfig);
+    console.log(`Created config file: ${configPath}`);
+    
+    // Add to tools.json
+    const newTool: ToolDefinition = {
+      type,
+      config: configPath,
+      id: toolId,
+      env: env
+    };
+    toolsConfig.tools.push(newTool);
+    await writeToolsConfig(toolsConfigPath, toolsConfig);
+    console.log(`Added tool '${name}' to tools.json`);
+    
+    console.log(`Edit ${configPath} to customize your tool, then run 'elevenlabs push-tools' to update`);
+    
+  } catch (error) {
+    console.error(`Error creating tool in ElevenLabs: ${error}`);
+    process.exit(1);
+  }
+}
+async function pushTools(toolId?: string, dryRun = false, environment?: string): Promise<void> {
+  // Load tools configuration
+  const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
+  if (!(await fs.pathExists(toolsConfigPath))) {
+    throw new Error('tools.json not found. Run \'elevenlabs add-webhook-tool\' or \'elevenlabs add-client-tool\' first.');
+  }
+
+  const toolsConfig = await readToolsConfig(toolsConfigPath);
+
+  // Filter tools by environment and/or tool ID
+  let toolsToProcess = toolsConfig.tools;
+  
+  if (environment) {
+    toolsToProcess = toolsToProcess.filter(tool => (tool.env || 'prod') === environment);
+  }
+  
+  if (toolId) {
+    toolsToProcess = toolsToProcess.filter(tool => tool.id === toolId);
+    if (toolsToProcess.length === 0) {
+      throw new Error(`Tool with ID '${toolId}' not found in configuration`);
+    }
+  }
+  
+  if (environment && toolsToProcess.length === 0) {
+    console.log(`No tools found for environment '${environment}'`);
+    return;
+  }
+  
+  if (!environment) {
+    const envs = [...new Set(toolsToProcess.map(t => t.env || 'prod'))];
+    console.log(`Pushing ${toolsToProcess.length} tool(s) across ${envs.length} environment(s): ${envs.join(', ')}`);
+  }
+
+  let changesMade = false;
+
+  for (const toolDef of toolsToProcess) {
+    const configPath = toolDef.config;
+    const environment = toolDef.env || 'prod';
+
+    if (!configPath) {
+      console.log(`Warning: No config path specified`);
+      continue;
+    }
+
+    // Check if config file exists
+    if (!(await fs.pathExists(configPath))) {
+      console.log(`Warning: Config file not found: ${configPath}`);
+      continue;
+    }
+
+    // Load tool config
+    let toolConfig: { name?: string };
+    try {
+      toolConfig = await readConfig(configPath);
+    } catch (error) {
+      console.log(`Error reading config from ${configPath}: ${error}`);
+      continue;
+    }
+
+    const toolDefName = toolConfig.name || 'Unnamed Tool';
+
+    // Get tool ID from index file
+    const toolId = toolDef.id;
+
+    // Always push (force override)
+    console.log(`${toolDefName} [${environment}]: Will push (force override)`);
+
+    if (dryRun) {
+      console.log(`[DRY RUN] Would update tool: ${toolDefName} [${environment}]`);
+      continue;
+    }
+
+    // Initialize ElevenLabs client for this tool's environment
+    let client;
+    try {
+      client = await getElevenLabsClient(environment);
+    } catch (error) {
+      console.log(`Error: ${error}`);
+      console.log(`Skipping tool ${toolDefName} - environment '${environment}' not configured`);
+      continue;
+    }
+
+    // Perform API operation
+    try {
+      if (!toolId) {
+        // Create new tool
+        const response = await createToolApi(client, toolConfig);
+        const newToolId = (response as { toolId?: string }).toolId || `tool_${Date.now()}`;
+        console.log(`Created tool ${toolDefName} (ID: ${newToolId}) [${environment}]`);
+        
+        // Store tool ID in index file
+        toolDef.id = newToolId;
+        changesMade = true;
+      } else {
+        // Update existing tool
+        await updateToolApi(client, toolId, toolConfig);
+        console.log(`Updated tool ${toolDefName} (ID: ${toolId}) [${environment}]`);
+      }
+
+      changesMade = true;
+
+    } catch (error) {
+      console.log(`Error processing ${toolDefName}: ${error}`);
+    }
+  }
+  
+  // Save updated tools.json if there were changes
+  if (changesMade) {
+    await writeToolsConfig(toolsConfigPath, toolsConfig);
+  }
+}
+async function pullTools(options: PullToolsOptions): Promise<void> {
+  // Check if tools.json exists, create if not
+  const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
+  
+  // Determine which environments to pull from
+  const environmentsToPull: string[] = options.env 
+    ? [options.env] 
+    : await listEnvironments();
+  
+  if (environmentsToPull.length === 0) {
+    console.log('No environments configured. Use "elevenlabs auth login" to add an environment.');
+    return;
+  }
+  
+  if (!options.env) {
+    console.log(`Pulling from ${environmentsToPull.length} environment(s): ${environmentsToPull.join(', ')}`);
+  }
+  
+  // Pull from each environment
+  for (const environment of environmentsToPull) {
+    console.log(`\n${'='.repeat(50)}`);
+    console.log(`Environment: ${environment}`);
+    console.log('='.repeat(50));
+    
+    await pullToolsFromEnvironment(options, environment, toolsConfigPath);
+  }
+}
+
+async function pullToolsFromEnvironment(options: PullToolsOptions, environment: string, toolsConfigPath: string): Promise<void> {
+  let toolsConfig: ToolsConfig;
+
+  if (!(await fs.pathExists(toolsConfigPath))) {
+    console.log(`${TOOLS_CONFIG_FILE} not found. Creating initial tools configuration...`);
+    toolsConfig = { tools: [] };
+    await writeToolsConfig(toolsConfigPath, toolsConfig);
+  } else {
+    toolsConfig = await readToolsConfig(toolsConfigPath);
+  }
+
+  const client = await getElevenLabsClient(environment);
+
+  let filteredTools: unknown[];
+
+  if (options.tool) {
+    // Pull specific tool by ID
+    console.log(`Pulling tool with ID: ${options.tool}...`);
+    try {
+      const toolDetails = await getToolApi(client, options.tool);
+      const toolDetailsTyped = toolDetails as { tool_id?: string; toolId?: string; id?: string; tool_config?: { name?: string } & Tool };
+      const toolId = toolDetailsTyped.tool_id || toolDetailsTyped.toolId || toolDetailsTyped.id || options.tool;
+      const toolName = toolDetailsTyped.tool_config?.name;
+      
+      if (!toolName) {
+        throw new Error(`Tool with ID '${options.tool}' has no name`);
+      }
+      
+      filteredTools = [{
+        tool_id: toolId,
+        toolId: toolId,
+        id: toolId,
+        tool_config: toolDetailsTyped.tool_config
+      }];
+      console.log(`Found tool: ${toolName}`);
+    } catch (error) {
+      throw new Error(`Failed to fetch tool with ID '${options.tool}': ${error}`);
+    }
+  } else {
+    // Pull all tools from ElevenLabs
+    console.log('Pulling all tools from ElevenLabs...');
+    const toolsList = await listToolsApi(client);
+
+    if (toolsList.length === 0) {
+      console.log('No tools found in your ElevenLabs workspace.');
+      return;
+    }
+
+    console.log(`Found ${toolsList.length} tool(s)`);
+    filteredTools = toolsList;
+  }
+
+  // Build map of existing tools by ID for this environment
+  const existingToolIds = new Map(
+    toolsConfig.tools
+      .filter(tool => (tool.env || 'prod') === environment)
+      .map(tool => [tool.id, tool])
+  );
+
+  // Track operations for summary
+  const operations = { create: 0, update: 0, skip: 0 };
+  type OperationItem = {
+    action: 'create' | 'update' | 'skip';
+    tool: { id: string; name: string };
+    existingEntry?: ToolDefinition;
+  };
+  const itemsToProcess: OperationItem[] = [];
+
+  // First pass: determine what will happen
+  for (const toolMeta of filteredTools) {
+    const toolMetaTyped = toolMeta as { tool_id?: string; toolId?: string; id?: string; tool_config?: { name?: string } };
+    const toolId = toolMetaTyped.tool_id || toolMetaTyped.toolId || toolMetaTyped.id;
+    const toolName = toolMetaTyped.tool_config?.name;
+    if (!toolId) {
+      console.log(`Warning: Skipping tool '${toolName || 'unknown'}' - no tool ID found`);
+      continue;
+    }
+    if (!toolName) {
+      console.log(`Warning: Skipping tool with ID '${toolId}' - no tool name found`);
+      continue;
+    }
+
+    let toolNameRemote = toolName;
+    const existingEntry = existingToolIds.get(toolId);
+
+    if (existingEntry) {
+      // Tool with this ID already exists locally
+      if (options.update || options.all) {
+        // --update or --all: update existing
+        itemsToProcess.push({ action: 'update', tool: { id: toolId, name: toolNameRemote }, existingEntry });
+        operations.update++;
+      } else {
+        // Default: skip existing
+        itemsToProcess.push({ action: 'skip', tool: { id: toolId, name: toolNameRemote }, existingEntry });
+        operations.skip++;
+      }
+    } else {
+      // New tool (not present locally)
+      if (options.update) {
+        // --update mode: skip new items (only update existing)
+        itemsToProcess.push({ action: 'skip', tool: { id: toolId, name: toolNameRemote } });
+        operations.skip++;
+      } else {
+        // Default or --all: create new items
+        itemsToProcess.push({ action: 'create', tool: { id: toolId, name: toolNameRemote } });
+        operations.create++;
+      }
+    }
+  }
+
+  // Show summary
+  console.log(`\nPlan: ${operations.create} create, ${operations.update} update, ${operations.skip} skip`);
+  
+  if (operations.skip > 0 && !options.update && !options.all) {
+    if (operations.create === 0) {
+      console.log(`\n💡 Tip: Use --update to update existing tools or --all to pull everything`);
+    } else {
+      console.log(`\n💡 Tip: Use --all to also update existing tools`);
+    }
+  }
+
+  // Prompt for confirmation if not --dry-run
+  if (!options.dryRun && (operations.create > 0 || operations.update > 0)) {
+    const confirmed = await promptForConfirmation('Proceed?');
+    if (!confirmed) {
+      console.log('Pull cancelled');
+      return;
+    }
+  }
+
+  // Second pass: execute operations
+  let itemsProcessed = 0;
+  for (const item of itemsToProcess) {
+    const { action, tool, existingEntry } = item;
+    
+    if (action === 'skip') {
+      console.log(`⊘ Skipping '${tool.name}' (already exists, use --update to overwrite)`);
+      continue;
+    }
+    
+    if (options.dryRun) {
+      console.log(`[DRY RUN] Would ${action} tool: ${tool.name} (ID: ${tool.id})`);
+      continue;
+    }
+    
+    try {
+      // Fetch detailed tool configuration
+      console.log(`${action === 'update' ? '↻ Updating' : '+ Pulling'} config for '${tool.name}'...`);
+      const toolDetails = await getToolApi(client, tool.id);
+
+      // Extract the tool_config from the response
+      const toolDetailsTyped = toolDetails as { tool_config?: Tool & { type?: string } };
+      const toolConfig = toolDetailsTyped.tool_config;
+      
+      if (!toolConfig) {
+        console.log(`  ✗ Warning: No tool_config found for '${tool.name}' - skipping`);
+        continue;
+      }
+      
+      // Determine tool type from the tool_config
+      const toolType = toolConfig.type || 'unknown';
+      
+      if (action === 'update' && existingEntry && existingEntry.config) {
+        // Update existing entry - overwrite the config file
+        const configFilePath = path.resolve(existingEntry.config);
+        await fs.ensureDir(path.dirname(configFilePath));
+        await writeToolConfig(configFilePath, toolConfig as Tool);
+        console.log(`  ✓ Updated '${tool.name}' (config: ${existingEntry.config})`);
+      } else {
+        // Create new entry
+        const configPath = await generateUniqueFilename(options.outputDir, tool.name);
+        const configFilePath = path.resolve(configPath);
+        await fs.ensureDir(path.dirname(configFilePath));
+        await writeToolConfig(configFilePath, toolConfig as Tool);
+        
+        const newTool: ToolDefinition = {
+          type: toolType as 'webhook' | 'client',
+          config: configPath,
+          id: tool.id,
+          env: environment
+        };
+        
+        toolsConfig.tools.push(newTool);
+        console.log(`  ✓ Added '${tool.name}' (config: ${configPath}, type: ${toolType}) [${environment}]`);
+      }
+      
+      itemsProcessed++;
+      
+    } catch (error) {
+      console.log(`  ✗ Error ${action === 'update' ? 'updating' : 'pulling'} tool '${tool.name}': ${error}`);
+      continue;
+    }
+  }
+
+  // Save updated tools.json if there were changes
+  if (!options.dryRun && itemsProcessed > 0) {
+    await writeToolsConfig(toolsConfigPath, toolsConfig);
+    console.log(`\nUpdated ${TOOLS_CONFIG_FILE}`);
+  }
+
+  // Final summary
+  if (options.dryRun) {
+    console.log(`\n[DRY RUN] Would process ${operations.create + operations.update} tool(s)`);
+  } else {
+    console.log(`\n✓ Summary: ${operations.create} created, ${operations.update} updated, ${operations.skip} skipped`);
+    if (itemsProcessed > 0) {
+      console.log(`You can now edit the config files in '${options.outputDir}/' and use them in your agents`);
+    }
+  }
+}
+async function deleteTool(toolId: string): Promise<void> {
+  // Load tools configuration
+  const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
+  if (!(await fs.pathExists(toolsConfigPath))) {
+    throw new Error('tools.json not found. Run \'elevenlabs agents init\' first.');
+  }
+
+  const toolsConfig = await readToolsConfig(toolsConfigPath);
+  
+  // Find the tool by ID
+  const toolIndex = toolsConfig.tools.findIndex(tool => tool.id === toolId);
+  
+  if (toolIndex === -1) {
+    throw new Error(`Tool with ID '${toolId}' not found in local configuration`);
+  }
+  
+  const toolDef = toolsConfig.tools[toolIndex];
+  const configPath = toolDef.config;
+  const environment = toolDef.env || 'prod';
+  
+  // Read tool name from config if available
+  let toolName = toolId;
+  if (configPath && await fs.pathExists(configPath)) {
+    try {
+      const toolConfig = await readConfig(configPath) as { name?: string };
+      toolName = toolConfig.name || toolId;
+    } catch {
+      // If reading fails, just use ID
+    }
+  }
+  
+  console.log(`Deleting tool '${toolName}' (ID: ${toolId}) [${environment}]...`);
+  
+  // Delete from ElevenLabs
+  console.log('Deleting from ElevenLabs...');
+  const client = await getElevenLabsClient(environment);
+  
+  try {
+    await deleteToolApi(client, toolId);
+    console.log('✓ Successfully deleted from ElevenLabs');
+  } catch (error) {
+    console.error(`Warning: Failed to delete from ElevenLabs: ${error}`);
+    console.log('Continuing with local deletion...');
+  }
+  
+  // Remove from local tools.json
+  toolsConfig.tools.splice(toolIndex, 1);
+  await writeToolsConfig(toolsConfigPath, toolsConfig);
+  console.log(`✓ Removed '${toolName}' from ${TOOLS_CONFIG_FILE}`);
+  
+
+  // Remove from local tools.json
+  toolsConfig.tools.splice(toolIndex, 1);
+  await writeToolsConfig(toolsConfigPath, toolsConfig);
+  console.log(`✓ Removed '${toolName}' from ${TOOLS_CONFIG_FILE}`);
+
+  // Remove config file
+  if (configPath && await fs.pathExists(configPath)) {
+    await fs.remove(configPath);
+    console.log(`✓ Deleted config file: ${configPath}`);
+  }
+
+  console.log(`
+✓ Successfully deleted tool '${toolName}'`);
+}
+async function deleteAllTools(ui: boolean = true, env?: string): Promise<void> {
+  // Load tools configuration
+  const toolsConfigPath = path.resolve(TOOLS_CONFIG_FILE);
+  if (!(await fs.pathExists(toolsConfigPath))) {
+    throw new Error('tools.json not found. Run \'elevenlabs agents init\' first.');
+  }
+
+  const toolsConfig = await readToolsConfig(toolsConfigPath);
+  
+  if (toolsConfig.tools.length === 0) {
+    console.log('No tools found to delete');
+    return;
+  }
+
+  // Filter tools by environment if specified
+  const toolsToDelete = env 
+    ? toolsConfig.tools.filter(tool => (tool.env || 'prod') === env)
+    : toolsConfig.tools;
+  
+  if (toolsToDelete.length === 0) {
+    console.log(env ? `No tools found in environment '${env}'` : 'No tools found to delete');
+    return;
+  }
+  
+  // Show what will be deleted
+  const envInfo = env ? ` in environment '${env}'` : '';
+  console.log(`\nFound ${toolsToDelete.length} tool(s) to delete${envInfo}:`);
+  for (let i = 0; i < toolsToDelete.length; i++) {
+    const tool = toolsToDelete[i];
+    let toolName = tool.id || 'Unknown';
+    if (tool.config && await fs.pathExists(tool.config)) {
+      try {
+        const toolConfig = await readConfig(tool.config) as { name?: string };
+        toolName = toolConfig.name || tool.id || 'Unknown';
+      } catch {
+        // Use ID if config read fails
+      }
+    }
+    const toolEnv = tool.env || 'prod';
+    console.log(`  ${i + 1}. ${toolName} (${tool.id}) [${toolEnv}]`);
+  }
+  
+  // Confirm deletion (skip if --no-ui)
+  if (ui) {
+    const warningMsg = env 
+      ? `\nWARNING: This will delete ${toolsToDelete.length} tool(s) from environment '${env}' in both local configuration and ElevenLabs.`
+      : '\nWARNING: This will delete ALL tools from both local configuration and ElevenLabs.';
+    console.log(warningMsg);
+    const confirmed = await promptForConfirmation('Are you sure you want to delete these tools?');
+    
+    if (!confirmed) {
+      console.log('Deletion cancelled');
+      return;
+    }
+  }
+  
+  console.log('\nDeleting tools...\n');
+  
+  let successCount = 0;
+  let failCount = 0;
+  const deletedIds = new Set<string>();
+  
+  // Delete each tool
+  for (const toolDef of toolsToDelete) {
+    try {
+      const environment = toolDef.env || 'prod';
+      
+      // Read tool name from config if available
+      let toolName = toolDef.id || 'Unknown';
+      if (toolDef.config && await fs.pathExists(toolDef.config)) {
+        try {
+          const toolConfig = await readConfig(toolDef.config) as { name?: string };
+          toolName = toolConfig.name || toolDef.id || 'Unknown';
+        } catch {
+          // If reading fails, just use ID
+        }
+      }
+      
+      console.log(`Deleting '${toolName}' (${toolDef.id}) [${environment}]...`);
+      
+      // Delete from ElevenLabs
+      if (toolDef.id) {
+        try {
+          const client = await getElevenLabsClient(environment);
+          await deleteToolApi(client, toolDef.id);
+          console.log(`  ✓ Deleted from ElevenLabs`);
+        } catch (error) {
+          console.error(`  Warning: Failed to delete from ElevenLabs: ${error}`);
+        }
+      } else {
+        console.log(`  Warning: No tool ID found, skipping ElevenLabs deletion`);
+      }
+      
+      // Remove config file
+      if (toolDef.config && await fs.pathExists(toolDef.config)) {
+        await fs.remove(toolDef.config);
+        console.log(`  ✓ Deleted config file: ${toolDef.config}`);
+      }
+      
+      if (toolDef.id) {
+        deletedIds.add(toolDef.id);
+      }
+      successCount++;
+    } catch (error) {
+      console.error(`  Failed to delete tool: ${error}`);
+      failCount++;
+    }
+  }
+  
+  // Remove deleted tools from config (only the ones that were successfully deleted)
+  toolsConfig.tools = toolsConfig.tools.filter(tool => !deletedIds.has(tool.id || ''));
+  await writeToolsConfig(toolsConfigPath, toolsConfig);
+  console.log(`\n✓ Updated ${TOOLS_CONFIG_FILE}`);
+  
+  // Summary
+  console.log(`\n✓ Deletion complete: ${successCount} succeeded, ${failCount} failed`);
+}
+
+export { addTool, pushTools, pullTools, deleteTool, deleteAllTools };
+
+interface PullToolsOptions {
+  tool?: string;
+  outputDir: string;
+  dryRun: boolean;
+  update?: boolean;
+  all?: boolean;
+  env?: string;
+}
diff --git a/src/tools/commands/index.ts b/src/tools/commands/index.ts
new file mode 100644
index 0000000..a367d74
--- /dev/null
+++ b/src/tools/commands/index.ts
@@ -0,0 +1,17 @@
+import { Command } from 'commander';
+import { createAddCommand } from './add.js';
+import { createDeleteCommand } from './delete.js';
+import { createPushCommand } from './push.js';
+import { createPullCommand } from './pull.js';
+
+export function createToolsCommand(): Command {
+  const tools = new Command('tools');
+  tools.description('Manage ElevenLabs tools');
+
+  tools.addCommand(createAddCommand());
+  tools.addCommand(createDeleteCommand());
+  tools.addCommand(createPushCommand());
+  tools.addCommand(createPullCommand());
+
+  return tools;
+}
diff --git a/src/tools/commands/pull.ts b/src/tools/commands/pull.ts
new file mode 100644
index 0000000..1c4cd21
--- /dev/null
+++ b/src/tools/commands/pull.ts
@@ -0,0 +1,50 @@
+import { Command } from 'commander';
+import { render } from 'ink';
+import React from 'react';
+import PullToolsView from '../ui/PullToolsView.js';
+import { pullTools } from './impl.js';
+
+interface PullToolsOptions {
+  tool?: string;
+  outputDir: string;
+  dryRun: boolean;
+  update?: boolean;
+  all?: boolean;
+  env?: string;
+}
+
+export function createPullCommand(): Command {
+  return new Command('pull')
+    .description('Pull tools from ElevenLabs')
+    .option('--tool <tool_id>', 'Specific tool ID to pull')
+    .option('--output-dir <directory>', 'Output directory for configs', 'tool_configs')
+    .option('--dry-run', 'Show what would be done without making changes', false)
+    .option('--update', 'Update existing items only, skip new')
+    .option('--all', 'Pull all (new + existing)')
+    .option('--env <environment>', 'Environment to pull from')
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (options: PullToolsOptions & { ui: boolean }) => {
+      try {
+        if (options.ui !== false) {
+          // Use Ink UI for pull
+          const environments = options.env ? [options.env] : ['prod'];
+          const { waitUntilExit } = render(
+            React.createElement(PullToolsView, {
+              tool: options.tool,
+              outputDir: options.outputDir,
+              dryRun: options.dryRun,
+              update: options.update,
+              all: options.all,
+              environments
+            })
+          );
+          await waitUntilExit();
+        } else {
+          await pullTools(options);
+        }
+      } catch (error) {
+        console.error(`Error during pull: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/tools/commands/push.ts b/src/tools/commands/push.ts
new file mode 100644
index 0000000..6859d80
--- /dev/null
+++ b/src/tools/commands/push.ts
@@ -0,0 +1,24 @@
+import { Command } from 'commander';
+import { pushTools } from './impl.js';
+
+export function createPushCommand(): Command {
+  return new Command('push')
+    .description('Push tools to ElevenLabs API')
+    .option('--env <environment>', 'Filter tools by environment')
+    .option('--dry-run', 'Show what would be done without making changes', false)
+    .option('--no-ui', 'Disable interactive UI')
+    .action(async (options: { dryRun: boolean; env?: string; ui: boolean }) => {
+      try {
+        if (options.ui !== false) {
+          // PushToolsView requires tools array to be prepared
+          // For now, use the non-UI implementation
+          await pushTools(undefined, options.dryRun, options.env);
+        } else {
+          await pushTools(undefined, options.dryRun, options.env);
+        }
+      } catch (error) {
+        console.error(`Error during push: ${error}`);
+        process.exit(1);
+      }
+    });
+}
diff --git a/src/ui/views/PullToolsView.tsx b/src/tools/ui/PullToolsView.tsx
similarity index 97%
rename from src/ui/views/PullToolsView.tsx
rename to src/tools/ui/PullToolsView.tsx
index 611be5f..20371e9 100644
--- a/src/ui/views/PullToolsView.tsx
+++ b/src/tools/ui/PullToolsView.tsx
@@ -1,10 +1,10 @@
 import React, { useState, useEffect } from 'react';
 import { Box, Text, useApp } from 'ink';
-import App from '../App.js';
-import StatusCard from '../components/StatusCard.js';
-import ProgressFlow from '../components/ProgressFlow.js';
-import theme from '../themes/elevenlabs.js';
-import { getElevenLabsClient, listToolsApi, getToolApi } from '../../elevenlabs-api.js';
+import App from '../../ui/App.js';
+import StatusCard from '../../ui/components/StatusCard.js';
+import ProgressFlow from '../../ui/components/ProgressFlow.js';
+import theme from '../../ui/themes/elevenlabs.js';
+import { getElevenLabsClient, listToolsApi, getToolApi } from '../../shared/elevenlabs-api.js';
 import {
   readToolsConfig,
   writeToolsConfig,
@@ -12,10 +12,10 @@ import {
   ToolsConfig,
   ToolDefinition,
   type Tool
-} from '../../tools.js';
+} from '../../shared/tools.js';
 import path from 'path';
 import fs from 'fs-extra';
-import { generateUniqueFilename } from '../../utils.js';
+import { generateUniqueFilename } from '../../shared/utils.js';
 
 interface PullTool {
   name: string;
@@ -443,7 +443,7 @@ export const PullToolsView: React.FC<PullToolsViewProps> = ({
                   • Use tools in your agent configurations
                 </Text>
                 <Text color={theme.colors.text.muted}>
-                  • Run 'elevenlabs push' to deploy agents with tools
+                  • Run 'elevenlabs agents push' to deploy agents with tools
                 </Text>
               </Box>
             )}
diff --git a/src/ui/views/PushToolsView.tsx b/src/tools/ui/PushToolsView.tsx
similarity index 97%
rename from src/ui/views/PushToolsView.tsx
rename to src/tools/ui/PushToolsView.tsx
index 57e4fba..fee635d 100644
--- a/src/ui/views/PushToolsView.tsx
+++ b/src/tools/ui/PushToolsView.tsx
@@ -1,9 +1,9 @@
 import React, { useState, useEffect } from 'react';
 import { Box, Text, useApp } from 'ink';
-import App from '../App.js';
-import theme from '../themes/elevenlabs.js';
-import { getElevenLabsClient, createToolApi, updateToolApi } from '../../elevenlabs-api.js';
-import { readConfig, writeConfig } from '../../utils.js';
+import App from '../../ui/App.js';
+import theme from '../../ui/themes/elevenlabs.js';
+import { getElevenLabsClient, createToolApi, updateToolApi } from '../../shared/elevenlabs-api.js';
+import { readConfig, writeConfig } from '../../shared/utils.js';
 import fs from 'fs-extra';
 import path from 'path';
 
diff --git a/src/ui/views/HelpView.tsx b/src/ui/views/HelpView.tsx
index dd14e3a..d7fcd02 100644
--- a/src/ui/views/HelpView.tsx
+++ b/src/ui/views/HelpView.tsx
@@ -23,143 +23,132 @@ interface Command {
 const commands: Command[][] = [
   [
     {
-      name: "init [path]",
-      description: "Initialize project (use --override to recreate from scratch)",
-    },
-    {
-      name: "login",
-      description: "Login with your ElevenLabs API key",
-    },
-    {
-      name: "logout",
-      description: "Logout and remove stored API key",
-    },
-    {
-      name: "whoami",
-      description: "Show current login status",
-    },
-    {
-      name: "residency [location]",
-      description: "Set the API residency location",
-    },
-  ],
-  [
-    {
-      name: "add <name>",
-      description: "Create a new agent and push to remote",
-    },
-    {
-      name: "list",
-      description: "List all local agents",
-    },
-    {
-      name: "delete [agent_id]",
-      description: "Delete agent (use --all to delete all agents)",
-    },
-    {
-      name: "status",
-      description: "Show the status of agents",
-    },
-    {
-      name: "push",
-      description: "Push agents to ElevenLabs",
-    },
-    {
-      name: "pull",
-      description: "Pull agents from ElevenLabs",
+      name: "auth",
+      description: "Authentication commands",
       subcommands: [
         {
-          name: "(default)",
-          description: "Pull new items only, skip existing",
+          name: "login",
+          description: "Login with your ElevenLabs API key",
         },
         {
-          name: "--update",
-          description: "Update existing items only, skip new",
+          name: "logout",
+          description: "Logout and remove stored API key",
         },
         {
-          name: "--all",
-          description: "Pull everything (new + existing)",
+          name: "whoami",
+          description: "Show current login status",
         },
         {
-          name: "",
-          description: "",
+          name: "residency [location]",
+          description: "Set the API residency location",
         },
       ],
     },
   ],
   [
     {
-      name: "add-webhook-tool <name>",
-      description: "Add a new webhook tool",
-    },
-    {
-      name: "add-client-tool <name>",
-      description: "Add a new client tool",
-    },
-    {
-      name: "delete-tool [tool_id]",
-      description: "Delete tool (use --all to delete all tools)",
-    },
-    {
-      name: "push-tools",
-      description: "Push tools to ElevenLabs API",
-    },
-    {
-      name: "pull-tools",
-      description: "Pull tools from ElevenLabs (see pull for options)",
+      name: "agents",
+      description: "Agent management commands",
+      subcommands: [
+        {
+          name: "init [path]",
+          description: "Initialize project (use --override to recreate)",
+        },
+        {
+          name: "add <name>",
+          description: "Create a new agent and push to remote",
+        },
+        {
+          name: "list",
+          description: "List all local agents",
+        },
+        {
+          name: "delete [agent_id]",
+          description: "Delete agent (use --all for all)",
+        },
+        {
+          name: "status",
+          description: "Show the status of agents",
+        },
+        {
+          name: "push",
+          description: "Push agents to ElevenLabs",
+        },
+        {
+          name: "pull",
+          description: "Pull agents (--update, --all options)",
+        },
+        {
+          name: "test <agent>",
+          description: "Run tests for an agent",
+        },
+        {
+          name: "templates",
+          description: "Manage agent templates (list, show)",
+        },
+        {
+          name: "widget <name>",
+          description: "Generate HTML widget snippet",
+        },
+      ],
     },
   ],
   [
     {
-      name: "add-test <name>",
-      description: "Add a new test",
-    },
-    {
-      name: "delete-test [test_id]",
-      description: "Delete test (use --all to delete all tests)",
-    },
-    {
-      name: "push-tests",
-      description: "Push tests to ElevenLabs API",
-    },
-    {
-      name: "pull-tests",
-      description: "Pull tests from ElevenLabs (see pull for options)",
-    },
-    {
-      name: "test <agent>",
-      description: "Run tests for an agent",
+      name: "tools",
+      description: "Tool management commands",
+      subcommands: [
+        {
+          name: "add <name>",
+          description: "Add tool (--type webhook|client)",
+        },
+        {
+          name: "delete [tool_id]",
+          description: "Delete tool (use --all for all)",
+        },
+        {
+          name: "push",
+          description: "Push tools to ElevenLabs API",
+        },
+        {
+          name: "pull",
+          description: "Pull tools (--update, --all options)",
+        },
+      ],
     },
   ],
   [
     {
-      name: "templates",
-      description: "Manage agent templates",
+      name: "tests",
+      description: "Test management commands",
       subcommands: [
         {
-          name: "list",
-          description: "List available agent templates",
+          name: "add <name>",
+          description: "Add a new test",
+        },
+        {
+          name: "delete [test_id]",
+          description: "Delete test (use --all for all)",
         },
         {
-          name: "show <template>",
-          description: "Show template configuration",
+          name: "push",
+          description: "Push tests to ElevenLabs API",
+        },
+        {
+          name: "pull",
+          description: "Pull tests (--update, --all options)",
         },
       ],
     },
   ],
   [
-    {
-      name: "widget <name>",
-      description: "Generate HTML widget snippet for an agent",
-    },
     {
       name: "components",
-      description:
-        "Import components from the ElevenLabs UI registry (https://ui.elevenlabs.io)",
+      description: "UI component management",
       subcommands: [
         {
           name: "add [name]",
-          description: "Add component from registry",
+          description: "Add component from ElevenLabs UI registry",
         },
       ],
     },
@@ -245,21 +234,21 @@ export const HelpView: React.FC = () => {
         <Box flexDirection="column" marginLeft={2}>
           <Text color={theme.colors.text.secondary}>
             1. Initialize a project:{" "}
-            <Text color={theme.colors.success}>elevenlabs init</Text>
+            <Text color={theme.colors.success}>elevenlabs agents init</Text>
           </Text>
           <Text color={theme.colors.text.secondary}>
             2. Login with API key:{" "}
-            <Text color={theme.colors.success}>elevenlabs login</Text>
+            <Text color={theme.colors.success}>elevenlabs auth login</Text>
           </Text>
           <Text color={theme.colors.text.secondary}>
             3. Create an agent:{" "}
             <Text color={theme.colors.success}>
-              elevenlabs add "My Agent"
+              elevenlabs agents add "My Agent"
             </Text>
           </Text>
           <Text color={theme.colors.text.secondary}>
             4. Push to ElevenLabs:{" "}
-            <Text color={theme.colors.success}>elevenlabs push</Text>
+            <Text color={theme.colors.success}>elevenlabs agents push</Text>
           </Text>
         </Box>
       </Box>