diff --git a/cli/aitbc_cli/commands/config.py b/cli/aitbc_cli/commands/config.py
new file mode 100644
index 00000000..7d66688d
--- /dev/null
+++ b/cli/aitbc_cli/commands/config.py
@@ -0,0 +1,473 @@
+"""Configuration commands for AITBC CLI"""
+
+import click
+import os
+import shlex
+import subprocess
+import yaml
+import json
+from pathlib import Path
+from typing import Optional, Dict, Any
+from ..config import get_config, Config
+from ..utils import output, error, success
+
+
+@click.group()
+def config():
+    """Manage CLI configuration"""
+    pass
+
+
+@config.command()
+@click.pass_context
+def show(ctx):
+    """Show current configuration"""
+    config = ctx.obj['config']
+    
+    config_dict = {
+        "coordinator_url": config.coordinator_url,
+        "api_key": "***REDACTED***" if config.api_key else None,
+        "timeout": getattr(config, 'timeout', 30),
+        "config_file": getattr(config, 'config_file', None)
+    }
+    
+    output(config_dict, ctx.obj['output_format'])
+
+
+@config.command()
+@click.argument("key")
+@click.argument("value")
+@click.option("--global", "global_config", is_flag=True, help="Set global config")
+@click.pass_context
+def set(ctx, key: str, value: str, global_config: bool):
+    """Set configuration value"""
+    config = ctx.obj['config']
+    
+    # Determine config file path
+    if global_config:
+        config_dir = Path.home() / ".config" / "aitbc"
+        config_dir.mkdir(parents=True, exist_ok=True)
+        config_file = config_dir / "config.yaml"
+    else:
+        config_file = Path.cwd() / ".aitbc.yaml"
+    
+    # Load existing config
+    if config_file.exists():
+        with open(config_file) as f:
+            config_data = yaml.safe_load(f) or {}
+    else:
+        config_data = {}
+    
+    # Set the value
+    if key == "api_key":
+        config_data["api_key"] = value
+        if ctx.obj['output_format'] == 'table':
+            success("API key set (use --global to set permanently)")
+    elif key == "coordinator_url":
+        config_data["coordinator_url"] = value
+        if ctx.obj['output_format'] == 'table':
+            success(f"Coordinator URL set to: {value}")
+    elif key == "timeout":
+        try:
+            config_data["timeout"] = int(value)
+            if ctx.obj['output_format'] == 'table':
+                success(f"Timeout set to: {value}s")
+        except ValueError:
+            error("Timeout must be an integer")
+            ctx.exit(1)
+    else:
+        error(f"Unknown configuration key: {key}")
+        ctx.exit(1)
+    
+    # Save config
+    with open(config_file, 'w') as f:
+        yaml.dump(config_data, f, default_flow_style=False)
+    
+    output({
+        "config_file": str(config_file),
+        "key": key,
+        "value": value
+    }, ctx.obj['output_format'])
+
+
+@config.command()
+@click.option("--global", "global_config", is_flag=True, help="Show global config")
+def path(global_config: bool):
+    """Show configuration file path"""
+    if global_config:
+        config_dir = Path.home() / ".config" / "aitbc"
+        config_file = config_dir / "config.yaml"
+    else:
+        config_file = Path.cwd() / ".aitbc.yaml"
+    
+    output({
+        "config_file": str(config_file),
+        "exists": config_file.exists()
+    })
+
+
+@config.command()
+@click.option("--global", "global_config", is_flag=True, help="Edit global config")
+@click.pass_context
+def edit(ctx, global_config: bool):
+    """Open configuration file in editor"""
+    # Determine config file path
+    if global_config:
+        config_dir = Path.home() / ".config" / "aitbc"
+        config_dir.mkdir(parents=True, exist_ok=True)
+        config_file = config_dir / "config.yaml"
+    else:
+        config_file = Path.cwd() / ".aitbc.yaml"
+    
+    # Create if doesn't exist
+    if not config_file.exists():
+        config = ctx.obj['config']
+        config_data = {
+            "coordinator_url": config.coordinator_url,
+            "timeout": getattr(config, 'timeout', 30)
+        }
+        with open(config_file, 'w') as f:
+            yaml.dump(config_data, f, default_flow_style=False)
+    
+    # Open in editor
+    editor = os.getenv('EDITOR', 'nano').strip() or 'nano'
+    editor_cmd = shlex.split(editor)
+    subprocess.run([*editor_cmd, str(config_file)], check=False)
+
+
+@config.command()
+@click.option("--global", "global_config", is_flag=True, help="Reset global config")
+@click.pass_context
+def reset(ctx, global_config: bool):
+    """Reset configuration to defaults"""
+    # Determine config file path
+    if global_config:
+        config_dir = Path.home() / ".config" / "aitbc"
+        config_file = config_dir / "config.yaml"
+    else:
+        config_file = Path.cwd() / ".aitbc.yaml"
+    
+    if not config_file.exists():
+        output({"message": "No configuration file found"})
+        return
+    
+    if not click.confirm(f"Reset configuration at {config_file}?"):
+        return
+    
+    # Remove config file
+    config_file.unlink()
+    success("Configuration reset to defaults")
+
+
+@config.command()
+@click.option("--format", "output_format", type=click.Choice(['yaml', 'json']), default='yaml', help="Output format")
+@click.option("--global", "global_config", is_flag=True, help="Export global config")
+@click.pass_context
+def export(ctx, output_format: str, global_config: bool):
+    """Export configuration"""
+    # Determine config file path
+    if global_config:
+        config_dir = Path.home() / ".config" / "aitbc"
+        config_file = config_dir / "config.yaml"
+    else:
+        config_file = Path.cwd() / ".aitbc.yaml"
+    
+    if not config_file.exists():
+        error("No configuration file found")
+        ctx.exit(1)
+    
+    with open(config_file) as f:
+        config_data = yaml.safe_load(f) or {}
+    
+    # Redact sensitive data
+    if 'api_key' in config_data:
+        config_data['api_key'] = "***REDACTED***"
+    
+    if output_format == 'json':
+        click.echo(json.dumps(config_data, indent=2))
+    else:
+        click.echo(yaml.dump(config_data, default_flow_style=False))
+
+
+@config.command()
+@click.argument("file_path")
+@click.option("--merge", is_flag=True, help="Merge with existing config")
+@click.option("--global", "global_config", is_flag=True, help="Import to global config")
+@click.pass_context
+def import_config(ctx, file_path: str, merge: bool, global_config: bool):
+    """Import configuration from file"""
+    import_file = Path(file_path)
+    
+    if not import_file.exists():
+        error(f"File not found: {file_path}")
+        ctx.exit(1)
+    
+    # Load import file
+    try:
+        with open(import_file) as f:
+            if import_file.suffix.lower() == '.json':
+                import_data = json.load(f)
+            else:
+                import_data = yaml.safe_load(f)
+    except json.JSONDecodeError:
+        error("Invalid JSON data")
+        ctx.exit(1)
+    except Exception as e:
+        error(f"Failed to parse file: {e}")
+        ctx.exit(1)
+    
+    # Determine target config file
+    if global_config:
+        config_dir = Path.home() / ".config" / "aitbc"
+        config_dir.mkdir(parents=True, exist_ok=True)
+        config_file = config_dir / "config.yaml"
+    else:
+        config_file = Path.cwd() / ".aitbc.yaml"
+    
+    # Load existing config if merging
+    if merge and config_file.exists():
+        with open(config_file) as f:
+            config_data = yaml.safe_load(f) or {}
+        config_data.update(import_data)
+    else:
+        config_data = import_data
+    
+    # Save config
+    with open(config_file, 'w') as f:
+        yaml.dump(config_data, f, default_flow_style=False)
+    
+    if ctx.obj['output_format'] == 'table':
+        success(f"Configuration imported to {config_file}")
+
+
+@config.command()
+@click.pass_context
+def validate(ctx):
+    """Validate configuration"""
+    config = ctx.obj['config']
+    
+    errors = []
+    warnings = []
+    
+    # Validate coordinator URL
+    if not config.coordinator_url:
+        errors.append("Coordinator URL is not set")
+    elif not config.coordinator_url.startswith(('http://', 'https://')):
+        errors.append("Coordinator URL must start with http:// or https://")
+    
+    # Validate API key
+    if not config.api_key:
+        warnings.append("API key is not set")
+    elif len(config.api_key) < 10:
+        errors.append("API key appears to be too short")
+    
+    # Validate timeout
+    timeout = getattr(config, 'timeout', 30)
+    if not isinstance(timeout, (int, float)) or timeout <= 0:
+        errors.append("Timeout must be a positive number")
+    
+    # Output results
+    result = {
+        "valid": len(errors) == 0,
+        "errors": errors,
+        "warnings": warnings
+    }
+    
+    if errors:
+        error("Configuration validation failed")
+        ctx.exit(1)
+    elif warnings:
+        if ctx.obj['output_format'] == 'table':
+            success("Configuration valid with warnings")
+    else:
+        if ctx.obj['output_format'] == 'table':
+            success("Configuration is valid")
+    
+    output(result, ctx.obj['output_format'])
+
+
+@config.command()
+def environments():
+    """List available environments"""
+    env_vars = [
+        'AITBC_COORDINATOR_URL',
+        'AITBC_API_KEY',
+        'AITBC_TIMEOUT',
+        'AITBC_CONFIG_FILE',
+        'CLIENT_API_KEY',
+        'MINER_API_KEY',
+        'ADMIN_API_KEY'
+    ]
+    
+    env_data = {}
+    for var in env_vars:
+        value = os.getenv(var)
+        if value:
+            if 'API_KEY' in var:
+                value = "***REDACTED***"
+            env_data[var] = value
+    
+    output({
+        "environment_variables": env_data,
+        "note": "Use export VAR=value to set environment variables"
+    })
+
+
+@config.group()
+def profiles():
+    """Manage configuration profiles"""
+    pass
+
+
+@profiles.command()
+@click.argument("name")
+@click.pass_context
+def save(ctx, name: str):
+    """Save current configuration as a profile"""
+    config = ctx.obj['config']
+    
+    # Create profiles directory
+    profiles_dir = Path.home() / ".config" / "aitbc" / "profiles"
+    profiles_dir.mkdir(parents=True, exist_ok=True)
+    
+    profile_file = profiles_dir / f"{name}.yaml"
+    
+    # Save profile (without API key)
+    profile_data = {
+        "coordinator_url": config.coordinator_url,
+        "timeout": getattr(config, 'timeout', 30)
+    }
+    
+    with open(profile_file, 'w') as f:
+        yaml.dump(profile_data, f, default_flow_style=False)
+    
+    if ctx.obj['output_format'] == 'table':
+        success(f"Profile '{name}' saved")
+
+
+@profiles.command()
+def list():
+    """List available profiles"""
+    profiles_dir = Path.home() / ".config" / "aitbc" / "profiles"
+    
+    if not profiles_dir.exists():
+        output({"profiles": []})
+        return
+    
+    profiles = []
+    for profile_file in profiles_dir.glob("*.yaml"):
+        with open(profile_file) as f:
+            profile_data = yaml.safe_load(f)
+        
+        profiles.append({
+            "name": profile_file.stem,
+            "coordinator_url": profile_data.get("coordinator_url"),
+            "timeout": profile_data.get("timeout", 30)
+        })
+    
+    output({"profiles": profiles})
+
+
+@profiles.command()
+@click.argument("name")
+@click.pass_context
+def load(ctx, name: str):
+    """Load a configuration profile"""
+    profiles_dir = Path.home() / ".config" / "aitbc" / "profiles"
+    profile_file = profiles_dir / f"{name}.yaml"
+    
+    if not profile_file.exists():
+        error(f"Profile '{name}' not found")
+        ctx.exit(1)
+    
+    with open(profile_file) as f:
+        profile_data = yaml.safe_load(f)
+    
+    # Load to current config
+    config_file = Path.cwd() / ".aitbc.yaml"
+    
+    with open(config_file, 'w') as f:
+        yaml.dump(profile_data, f, default_flow_style=False)
+    
+    if ctx.obj['output_format'] == 'table':
+        success(f"Profile '{name}' loaded")
+
+
+@profiles.command()
+@click.argument("name")
+@click.pass_context
+def delete(ctx, name: str):
+    """Delete a configuration profile"""
+    profiles_dir = Path.home() / ".config" / "aitbc" / "profiles"
+    profile_file = profiles_dir / f"{name}.yaml"
+    
+    if not profile_file.exists():
+        error(f"Profile '{name}' not found")
+        ctx.exit(1)
+    
+    if not click.confirm(f"Delete profile '{name}'?"):
+        return
+    
+    profile_file.unlink()
+    if ctx.obj['output_format'] == 'table':
+        success(f"Profile '{name}' deleted")
+
+
+@config.command(name="set-secret")
+@click.argument("key")
+@click.argument("value")
+@click.pass_context
+def set_secret(ctx, key: str, value: str):
+    """Set an encrypted configuration value"""
+    from ..utils import encrypt_value
+    
+    config_dir = Path.home() / ".config" / "aitbc"
+    config_dir.mkdir(parents=True, exist_ok=True)
+    secrets_file = config_dir / "secrets.json"
+    
+    secrets = {}
+    if secrets_file.exists():
+        with open(secrets_file) as f:
+            secrets = json.load(f)
+    
+    secrets[key] = encrypt_value(value)
+    
+    with open(secrets_file, "w") as f:
+        json.dump(secrets, f, indent=2)
+    
+    # Restrict file permissions
+    secrets_file.chmod(0o600)
+    
+    if ctx.obj['output_format'] == 'table':
+        success(f"Secret '{key}' saved (encrypted)")
+    output({"key": key, "status": "encrypted"}, ctx.obj['output_format'])
+
+
+@config.command(name="get-secret")
+@click.argument("key")
+@click.pass_context
+def get_secret(ctx, key: str):
+    """Get a decrypted configuration value"""
+    from ..utils import decrypt_value
+    
+    secrets_file = Path.home() / ".config" / "aitbc" / "secrets.json"
+    
+    if not secrets_file.exists():
+        error("No secrets file found")
+        ctx.exit(1)
+        return
+    
+    with open(secrets_file) as f:
+        secrets = json.load(f)
+    
+    if key not in secrets:
+        error(f"Secret '{key}' not found")
+        ctx.exit(1)
+        return
+    
+    decrypted = decrypt_value(secrets[key])
+    output({"key": key, "value": decrypted}, ctx.obj['output_format'])
+
+
+# Add profiles group to config
+config.add_command(profiles)
diff --git a/tests/cli/test_config.py b/tests/cli/test_config.py
new file mode 100644
index 00000000..ad4f772e
--- /dev/null
+++ b/tests/cli/test_config.py
@@ -0,0 +1,570 @@
+"""Tests for config CLI commands"""
+
+import pytest
+import json
+import yaml
+import os
+import tempfile
+from pathlib import Path
+from click.testing import CliRunner
+from unittest.mock import Mock, patch
+from aitbc_cli.commands.config import config
+
+
+@pytest.fixture
+def runner():
+    """Create CLI runner"""
+    return CliRunner()
+
+
+@pytest.fixture
+def mock_config():
+    """Mock configuration"""
+    config = Mock()
+    config.coordinator_url = "http://127.0.0.1:18000"
+    config.api_key = None
+    config.timeout = 30
+    config.config_file = "/home/oib/.aitbc/config.yaml"
+    return config
+
+
+@pytest.fixture
+def temp_config_file():
+    """Create temporary config file"""
+    with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False) as f:
+        config_data = {
+            "coordinator_url": "http://test:8000",
+            "api_key": "test_key",
+            "timeout": 60
+        }
+        yaml.dump(config_data, f)
+        temp_path = f.name
+    
+    yield temp_path
+    
+    # Cleanup
+    os.unlink(temp_path)
+
+
+class TestConfigCommands:
+    """Test config command group"""
+    
+    def test_show_config(self, runner, mock_config):
+        """Test showing current configuration"""
+        result = runner.invoke(config, [
+            'show'
+        ], obj={'config': mock_config, 'output_format': 'json'})
+        
+        assert result.exit_code == 0
+        data = json.loads(result.output)
+        assert data['coordinator_url'] == 'http://127.0.0.1:18000'
+        assert data['api_key'] is None  # mock_config has api_key=None
+        assert data['timeout'] == 30
+    
+    def test_set_coordinator_url(self, runner, mock_config, tmp_path):
+        """Test setting coordinator URL"""
+        with runner.isolated_filesystem():
+            result = runner.invoke(config, [
+                'set',
+                'coordinator_url',
+                'http://new:8000'
+            ], obj={'config': mock_config, 'output_format': 'table'})
+            
+            assert result.exit_code == 0
+            assert 'Coordinator URL set to: http://new:8000' in result.output
+            
+            # Verify file was created in current directory
+            config_file = Path.cwd() / ".aitbc.yaml"
+            assert config_file.exists()
+            with open(config_file) as f:
+                saved_config = yaml.safe_load(f)
+            assert saved_config['coordinator_url'] == 'http://new:8000'
+    
+    def test_set_api_key(self, runner, mock_config):
+        """Test setting API key"""
+        result = runner.invoke(config, [
+            'set',
+            'api_key',
+            'new_test_key_12345'
+        ], obj={'config': mock_config, 'output_format': 'table'})
+        
+        assert result.exit_code == 0
+        assert 'API key set (use --global to set permanently)' in result.output
+    
+    def test_set_timeout(self, runner, mock_config):
+        """Test setting timeout"""
+        with runner.isolated_filesystem():
+            result = runner.invoke(config, [
+                'set',
+                'timeout',
+                '45'
+            ], obj={'config': mock_config, 'output_format': 'table'})
+            
+            assert result.exit_code == 0
+            assert 'Timeout set to: 45s' in result.output
+    
+    def test_set_invalid_timeout(self, runner, mock_config):
+        """Test setting invalid timeout"""
+        result = runner.invoke(config, [
+            'set',
+            'timeout',
+            'invalid'
+        ], obj={'config': mock_config, 'output_format': 'json'})
+        
+        assert result.exit_code != 0
+        assert 'Timeout must be an integer' in result.output
+    
+    def test_set_invalid_key(self, runner, mock_config):
+        """Test setting invalid configuration key"""
+        result = runner.invoke(config, [
+            'set',
+            'invalid_key',
+            'value'
+        ], obj={'config': mock_config, 'output_format': 'json'})
+        
+        assert result.exit_code != 0
+        assert 'Unknown configuration key' in result.output
+    
+    def test_path_command(self, runner, mock_config, tmp_path):
+        """Test showing configuration file path"""
+        with runner.isolated_filesystem():
+            result = runner.invoke(config, [
+                'path'
+            ], obj={'config': mock_config, 'output_format': 'table'})
+            
+            assert result.exit_code == 0
+            assert '.aitbc.yaml' in result.output
+    
+    def test_path_global(self, runner, mock_config):
+        """Test showing global config path"""
+        result = runner.invoke(config, [
+            'path',
+            '--global'
+        ], obj={'config': mock_config, 'output_format': 'table'})
+        
+        assert result.exit_code == 0
+        assert '.config/aitbc/config.yaml' in result.output
+    
+    @patch('aitbc_cli.commands.config.subprocess.run')
+    def test_edit_command(self, mock_run, runner, mock_config, tmp_path):
+        """Test editing configuration file"""
+        
+        # Change to the tmp_path directory
+        with runner.isolated_filesystem(temp_dir=tmp_path):
+            # The actual config file will be in the current working directory
+            actual_config_file = Path.cwd() / ".aitbc.yaml"
+            
+            result = runner.invoke(config, [
+                'edit'
+            ], obj={'config': mock_config, 'output_format': 'json'})
+            
+            assert result.exit_code == 0
+            # Verify editor was called
+            mock_run.assert_called_once()
+            args = mock_run.call_args[0][0]
+            assert args[0] == 'nano'
+            assert str(actual_config_file) in args
+    
+    def test_reset_config_cancelled(self, runner, mock_config, temp_config_file):
+        """Test config reset cancelled by user"""
+        # Change to the directory containing the config file
+        config_dir = Path(temp_config_file).parent
+        with runner.isolated_filesystem(temp_dir=config_dir):
+            # Copy the config file to the current directory
+            import shutil
+            local_config = Path.cwd() / ".aitbc.yaml"
+            shutil.copy2(temp_config_file, local_config)
+            
+            result = runner.invoke(config, [
+                'reset'
+            ], obj={'config': mock_config, 'output_format': 'json'}, input='n\n')
+            
+            assert result.exit_code == 0
+            # File should still exist
+            assert local_config.exists()
+    
+    def test_reset_config_confirmed(self, runner, mock_config, temp_config_file):
+        """Test config reset confirmed"""
+        # Change to the directory containing the config file
+        config_dir = Path(temp_config_file).parent
+        with runner.isolated_filesystem(temp_dir=config_dir):
+            # Copy the config file to the current directory
+            import shutil
+            local_config = Path.cwd() / ".aitbc.yaml"
+            shutil.copy2(temp_config_file, local_config)
+            
+            result = runner.invoke(config, [
+                'reset'
+            ], obj={'config': mock_config, 'output_format': 'table'}, input='y\n')
+            
+            assert result.exit_code == 0
+            assert 'Configuration reset' in result.output
+            # File should be deleted
+            assert not local_config.exists()
+    
+    def test_reset_no_config(self, runner, mock_config):
+        """Test reset when no config file exists"""
+        with runner.isolated_filesystem():
+            result = runner.invoke(config, [
+                'reset'
+            ], obj={'config': mock_config, 'output_format': 'json'})
+            
+            assert result.exit_code == 0
+            assert 'No configuration file found' in result.output
+    
+    def test_export_yaml(self, runner, mock_config, temp_config_file):
+        """Test exporting configuration as YAML"""
+        # Change to the directory containing the config file
+        config_dir = Path(temp_config_file).parent
+        with runner.isolated_filesystem(temp_dir=config_dir):
+            # Copy the config file to the current directory
+            import shutil
+            local_config = Path.cwd() / ".aitbc.yaml"
+            shutil.copy2(temp_config_file, local_config)
+            
+            result = runner.invoke(config, [
+                'export',
+                '--format', 'yaml'
+            ], obj={'config': mock_config, 'output_format': 'table'})
+            
+            assert result.exit_code == 0
+            output_data = yaml.safe_load(result.output)
+            assert output_data['coordinator_url'] == 'http://test:8000'
+            assert output_data['api_key'] == '***REDACTED***'
+    
+    def test_export_json(self, runner, mock_config, temp_config_file):
+        """Test exporting configuration as JSON"""
+        # Change to the directory containing the config file
+        config_dir = Path(temp_config_file).parent
+        with runner.isolated_filesystem(temp_dir=config_dir):
+            # Copy the config file to the current directory
+            import shutil
+            local_config = Path.cwd() / ".aitbc.yaml"
+            shutil.copy2(temp_config_file, local_config)
+            
+            result = runner.invoke(config, [
+                'export',
+                '--format', 'json'
+            ], obj={'config': mock_config, 'output_format': 'table'})
+            
+            assert result.exit_code == 0
+            data = json.loads(result.output)
+            assert data['coordinator_url'] == 'http://test:8000'
+            assert data['api_key'] == '***REDACTED***'
+    
+
+    def test_export_empty_yaml(self, runner, mock_config, tmp_path):
+        """Test exporting an empty YAML config file"""
+        with runner.isolated_filesystem(temp_dir=tmp_path):
+            local_config = Path.cwd() / ".aitbc.yaml"
+            local_config.write_text("")
+
+            result = runner.invoke(config, [
+                'export',
+                '--format', 'json'
+            ], obj={'config': mock_config, 'output_format': 'table'})
+
+            assert result.exit_code == 0
+            data = json.loads(result.output)
+            assert data == {}
+
+
+    def test_export_empty_yaml_yaml_format(self, runner, mock_config, tmp_path):
+        """Test exporting an empty YAML config file as YAML"""
+        with runner.isolated_filesystem(temp_dir=tmp_path):
+            local_config = Path.cwd() / ".aitbc.yaml"
+            local_config.write_text("")
+
+            result = runner.invoke(config, [
+                'export',
+                '--format', 'yaml'
+            ], obj={'config': mock_config, 'output_format': 'table'})
+
+            assert result.exit_code == 0
+            data = yaml.safe_load(result.output)
+            assert data == {}
+
+    def test_export_no_config(self, runner, mock_config):
+        """Test export when no config file exists"""
+        with runner.isolated_filesystem():
+            result = runner.invoke(config, [
+                'export'
+            ], obj={'config': mock_config, 'output_format': 'json'})
+            
+            assert result.exit_code != 0
+            assert 'No configuration file found' in result.output
+    
+    def test_import_config_yaml(self, runner, mock_config, tmp_path):
+        """Test importing YAML configuration"""
+        # Create import file
+        import_file = tmp_path / "import.yaml"
+        import_data = {
+            "coordinator_url": "http://imported:8000",
+            "timeout": 90
+        }
+        import_file.write_text(yaml.dump(import_data))
+        
+        with runner.isolated_filesystem(temp_dir=tmp_path):
+            # The config file will be created in the current directory
+            actual_config_file = Path.cwd() / ".aitbc.yaml"
+            
+            result = runner.invoke(config, [
+                'import-config',
+                str(import_file)
+            ], obj={'config': mock_config, 'output_format': 'table'})
+            
+            assert result.exit_code == 0
+            assert 'Configuration imported' in result.output
+            
+            # Verify import
+            with open(actual_config_file) as f:
+                saved_config = yaml.safe_load(f)
+            assert saved_config['coordinator_url'] == 'http://imported:8000'
+            assert saved_config['timeout'] == 90
+    
+    def test_import_config_json(self, runner, mock_config, tmp_path):
+        """Test importing JSON configuration"""
+        # Create import file
+        import_file = tmp_path / "import.json"
+        import_data = {
+            "coordinator_url": "http://json:8000",
+            "timeout": 60
+        }
+        import_file.write_text(json.dumps(import_data))
+        
+        config_file = tmp_path / ".aitbc.yaml"
+        
+        with runner.isolated_filesystem(temp_dir=tmp_path):
+            # The config file will be created in the current directory
+            actual_config_file = Path.cwd() / ".aitbc.yaml"
+            
+            result = runner.invoke(config, [
+                'import-config',
+                str(import_file)
+            ], obj={'config': mock_config, 'output_format': 'table'})
+            
+            assert result.exit_code == 0
+            
+            # Verify import
+            with open(actual_config_file) as f:
+                saved_config = yaml.safe_load(f)
+            assert saved_config['coordinator_url'] == 'http://json:8000'
+            assert saved_config['timeout'] == 60
+    
+    def test_import_merge(self, runner, mock_config, temp_config_file, tmp_path):
+        """Test importing with merge option"""
+        # Create import file
+        import_file = tmp_path / "import.yaml"
+        import_data = {
+            "timeout": 45
+        }
+        import_file.write_text(yaml.dump(import_data))
+        
+        # Change to the directory containing the config file
+        config_dir = Path(temp_config_file).parent
+        with runner.isolated_filesystem(temp_dir=config_dir):
+            # Copy the config file to the current directory
+            import shutil
+            local_config = Path.cwd() / ".aitbc.yaml"
+            shutil.copy2(temp_config_file, local_config)
+            
+            result = runner.invoke(config, [
+                'import-config',
+                str(import_file),
+                '--merge'
+            ], obj={'config': mock_config, 'output_format': 'table'})
+            
+            assert result.exit_code == 0
+            
+            # Verify merge - original values should remain
+            with open(local_config) as f:
+                saved_config = yaml.safe_load(f)
+            assert saved_config['coordinator_url'] == 'http://test:8000'  # Original
+            assert saved_config['timeout'] == 45  # Updated
+    
+    def test_import_nonexistent_file(self, runner, mock_config):
+        """Test importing non-existent file"""
+        result = runner.invoke(config, [
+            'import-config',
+            '/nonexistent/file.yaml'
+        ], obj={'config': mock_config, 'output_format': 'json'})
+        
+        assert result.exit_code != 0
+        assert 'File not found' in result.output
+    
+    def test_validate_valid_config(self, runner, mock_config):
+        """Test validating valid configuration"""
+        result = runner.invoke(config, [
+            'validate'
+        ], obj={'config': mock_config, 'output_format': 'table'})
+        
+        assert result.exit_code == 0
+        assert 'Configuration valid' in result.output
+    
+    def test_validate_missing_url(self, runner, mock_config):
+        """Test validating config with missing URL"""
+        mock_config.coordinator_url = None
+        
+        result = runner.invoke(config, [
+            'validate'
+        ], obj={'config': mock_config, 'output_format': 'table'})
+        
+        assert result.exit_code != 0
+        assert 'validation failed' in result.output
+    
+    def test_validate_invalid_url(self, runner, mock_config):
+        """Test validating config with invalid URL"""
+        mock_config.coordinator_url = "invalid-url"
+        
+        result = runner.invoke(config, [
+            'validate'
+        ], obj={'config': mock_config, 'output_format': 'table'})
+        
+        assert result.exit_code != 0
+        assert 'validation failed' in result.output
+    
+    def test_validate_short_api_key(self, runner, mock_config):
+        """Test validating config with short API key"""
+        mock_config.api_key = "short"
+        
+        result = runner.invoke(config, [
+            'validate'
+        ], obj={'config': mock_config, 'output_format': 'table'})
+        
+        assert result.exit_code != 0
+        assert 'validation failed' in result.output
+    
+    def test_validate_no_api_key(self, runner, mock_config):
+        """Test validating config without API key (warning)"""
+        mock_config.api_key = None
+        
+        result = runner.invoke(config, [
+            'validate'
+        ], obj={'config': mock_config, 'output_format': 'table'})
+        
+        assert result.exit_code == 0
+        assert 'valid with warnings' in result.output
+    
+    @patch.dict(os.environ, {'CLIENT_API_KEY': 'env_key_123'})
+    def test_environments(self, runner, mock_config):
+        """Test listing environment variables"""
+        result = runner.invoke(config, [
+            'environments'
+        ], obj={'config': mock_config, 'output_format': 'table'})
+        
+        assert result.exit_code == 0
+        assert 'CLIENT_API_KEY' in result.output
+    
+    def test_profiles_save(self, runner, mock_config, tmp_path):
+        """Test saving a configuration profile"""
+        # Patch Path.home to return tmp_path
+        with patch('pathlib.Path.home') as mock_home:
+            mock_home.return_value = tmp_path
+            
+            result = runner.invoke(config, [
+                'profiles',
+                'save',
+                'test_profile'
+            ], obj={'config': mock_config, 'output_format': 'table'})
+            
+            assert result.exit_code == 0
+            assert "Profile 'test_profile' saved" in result.output
+            
+            # Verify profile was created
+            profile_file = tmp_path / ".config" / "aitbc" / "profiles" / "test_profile.yaml"
+            assert profile_file.exists()
+            with open(profile_file) as f:
+                profile_data = yaml.safe_load(f)
+            assert profile_data['coordinator_url'] == 'http://127.0.0.1:18000'
+    
+    def test_profiles_list(self, runner, mock_config, tmp_path):
+        """Test listing configuration profiles"""
+        # Create test profiles
+        profiles_dir = tmp_path / ".config" / "aitbc" / "profiles"
+        profiles_dir.mkdir(parents=True, exist_ok=True)
+        
+        profile1 = profiles_dir / "profile1.yaml"
+        profile1.write_text(yaml.dump({"coordinator_url": "http://test1:8000"}))
+        
+        profile2 = profiles_dir / "profile2.yaml"
+        profile2.write_text(yaml.dump({"coordinator_url": "http://test2:8000"}))
+        
+        # Patch Path.home to return tmp_path
+        with patch('pathlib.Path.home') as mock_home:
+            mock_home.return_value = tmp_path
+            
+            result = runner.invoke(config, [
+                'profiles',
+                'list'
+            ], obj={'config': mock_config, 'output_format': 'table'})
+            
+            assert result.exit_code == 0
+            assert 'profile1' in result.output
+            assert 'profile2' in result.output
+    
+    def test_profiles_load(self, runner, mock_config, tmp_path):
+        """Test loading a configuration profile"""
+        # Create test profile
+        profiles_dir = tmp_path / ".config" / "aitbc" / "profiles"
+        profiles_dir.mkdir(parents=True, exist_ok=True)
+        
+        profile_file = profiles_dir / "load_me.yaml"
+        profile_file.write_text(yaml.dump({"coordinator_url": "http://127.0.0.1:18000"}))
+        
+        # Patch Path.home to return tmp_path
+        with patch('pathlib.Path.home') as mock_home:
+            mock_home.return_value = tmp_path
+            
+            result = runner.invoke(config, [
+                'profiles',
+                'load',
+                'load_me'
+            ], obj={'config': mock_config, 'output_format': 'table'})
+            
+            assert result.exit_code == 0
+            assert "Profile 'load_me' loaded" in result.output
+    
+    def test_profiles_delete(self, runner, mock_config, tmp_path):
+        """Test deleting a configuration profile"""
+        # Create test profile
+        profiles_dir = tmp_path / ".config" / "aitbc" / "profiles"
+        profiles_dir.mkdir(parents=True, exist_ok=True)
+        
+        profile_file = profiles_dir / "delete_me.yaml"
+        profile_file.write_text(yaml.dump({"coordinator_url": "http://test:8000"}))
+        
+        # Patch Path.home to return tmp_path
+        with patch('pathlib.Path.home') as mock_home:
+            mock_home.return_value = tmp_path
+            
+            result = runner.invoke(config, [
+                'profiles',
+                'delete',
+                'delete_me'
+            ], obj={'config': mock_config, 'output_format': 'table'}, input='y\n')
+            
+            assert result.exit_code == 0
+            assert "Profile 'delete_me' deleted" in result.output
+            assert not profile_file.exists()
+    
+    def test_profiles_delete_cancelled(self, runner, mock_config, tmp_path):
+        """Test profile deletion cancelled by user"""
+        # Create test profile
+        profiles_dir = tmp_path / ".config" / "aitbc" / "profiles"
+        profiles_dir.mkdir(parents=True, exist_ok=True)
+        
+        profile_file = profiles_dir / "keep_me.yaml"
+        profile_file.write_text(yaml.dump({"coordinator_url": "http://test:8000"}))
+        
+        # Patch Path.home to return tmp_path
+        with patch('pathlib.Path.home') as mock_home:
+            mock_home.return_value = tmp_path
+            
+            result = runner.invoke(config, [
+                'profiles',
+                'delete',
+                'keep_me'
+            ], obj={'config': mock_config, 'output_format': 'json'}, input='n\n')
+            
+            assert result.exit_code == 0
+            assert profile_file.exists()  # Should still exist