refactor: update kiro_gateway naming to kiro

docs/en/ARCHITECTURE.md

@@ -53,7 +53,7 @@ The system acts as a "translator", allowing the use of any tools, libraries, and
 
 ## 2. Project Structure
 
-The project is organized as a modular Python package `kiro_gateway/`:
+The project is organized as a modular Python package `kiro/`:
 
 ```
 kiro-gateway/
@@ -61,7 +61,7 @@ kiro-gateway/
 ├── requirements.txt           # Python dependencies
 ├── .env.example               # Environment configuration example
 │
-├── kiro_gateway/              # Main package
+├── kiro/              # Main package
 │   ├── __init__.py            # Package exports, version
 │   │
 │   │   # ═══════════════════════════════════════════════════════
@@ -140,7 +140,7 @@ The `main.py` file is responsible for:
 4. **Error handler registration** — `validation_exception_handler` for 422 errors
 5. **Route connection** — `app.include_router(router)`
 
-### 3.2. Configuration Module (`kiro_gateway/config.py`)
+### 3.2. Configuration Module (`kiro/config.py`)
 
 Centralized storage of all settings:
 
@@ -167,7 +167,7 @@ Centralized storage of all settings:
 - `get_kiro_q_host(region)` — Q API host
 - `get_internal_model_id(external_model)` — model name conversion
 
-### 3.3. Pydantic Models (`kiro_gateway/models.py`)
+### 3.3. Pydantic Models (`kiro/models.py`)
 
 #### Models for `/v1/models`
 
@@ -198,7 +198,7 @@ Centralized storage of all settings:
 
 ### 3.4. State Management Layer
 
-#### KiroAuthManager (`kiro_gateway/auth.py`)
+#### KiroAuthManager (`kiro/auth.py`)
 
 **Role:** Stateful singleton encapsulating Kiro token management logic.
 
@@ -234,7 +234,7 @@ auth_manager = KiroAuthManager(
 token = await auth_manager.get_access_token()
 ```
 
-#### ModelInfoCache (`kiro_gateway/cache.py`)
+#### ModelInfoCache (`kiro/cache.py`)
 
 **Role:** Thread-safe storage for model configurations.
 
@@ -250,7 +250,7 @@ token = await auth_manager.get_access_token()
 - `is_empty()` / `is_stale()` — cache state check
 - `get_all_model_ids()` — list of all model IDs
 
-### 3.5. Helper Utilities (`kiro_gateway/utils.py`)
+### 3.5. Helper Utilities (`kiro/utils.py`)
 
 | Function | Description |
 |----------|-------------|
@@ -260,7 +260,7 @@ token = await auth_manager.get_access_token()
 | `generate_conversation_id()` | UUID for conversation |
 | `generate_tool_call_id()` | ID in format `call_{uuid_hex[:8]}` |
 
-### 3.6. Conversion Layer (`kiro_gateway/converters.py`)
+### 3.6. Conversion Layer (`kiro/converters.py`)
 
 #### Message Conversion
 
@@ -310,7 +310,7 @@ External model names are converted to internal Kiro IDs:
 | `claude-3-7-sonnet-20250219` | `CLAUDE_3_7_SONNET_20250219_V1_0` |
 | `auto` | `claude-sonnet-4.5` (alias) |
 
-### 3.7. Parsing Layer (`kiro_gateway/parsers.py`)
+### 3.7. Parsing Layer (`kiro/parsers.py`)
 
 #### AwsEventStreamParser
 
@@ -340,7 +340,7 @@ Advanced AWS SSE format parser with support for:
 | `parse_bracket_tool_calls(response_text)` | Parse `[Called func with args: {...}]` |
 | `deduplicate_tool_calls(tool_calls)` | Remove duplicate tool calls |
 
-### 3.8. Streaming (`kiro_gateway/streaming.py`)
+### 3.8. Streaming (`kiro/streaming.py`)
 
 #### stream_kiro_to_openai
 
@@ -357,7 +357,7 @@ Async generator for transforming Kiro stream to OpenAI format.
 
 Collects full response from streaming for non-streaming mode.
 
-### 3.9. HTTP Client (`kiro_gateway/http_client.py`)
+### 3.9. HTTP Client (`kiro/http_client.py`)
 
 #### KiroHttpClient
 
@@ -378,7 +378,7 @@ Automatic error handling with exponential backoff:
 
 Supports async context manager (`async with`).
 
-### 3.10. Routes (`kiro_gateway/routes.py`)
+### 3.10. Routes (`kiro/routes.py`)
 
 | Endpoint | Method | Description |
 |----------|--------|-------------|
@@ -389,14 +389,14 @@ Supports async context manager (`async with`).
 
 **Authentication:** Bearer token in `Authorization` header
 
-### 3.11. Exception Handling (`kiro_gateway/exceptions.py`)
+### 3.11. Exception Handling (`kiro/exceptions.py`)
 
 | Function | Description |
 |----------|-------------|
 | `sanitize_validation_errors(errors)` | Convert bytes to strings for JSON serialization |
 | `validation_exception_handler(request, exc)` | Pydantic validation error handler (422) |
 
-### 3.12. Debug Logging (`kiro_gateway/debug_logger.py`)
+### 3.12. Debug Logging (`kiro/debug_logger.py`)
 
 **Class:** `DebugLogger` (singleton)
 
@@ -417,7 +417,7 @@ Supports async context manager (`async with`).
 - `response_stream_raw.txt` — raw stream from Kiro
 - `response_stream_modified.txt` — transformed stream (OpenAI format)
 
-### 3.13. Tokenizer (`kiro_gateway/tokenizer.py`)
+### 3.13. Tokenizer (`kiro/tokenizer.py`)
 
 **Problem:** Kiro API does not return token counts directly. Instead, the API only provides `context_usage_percentage` — the percentage of model context usage.
 
@@ -749,7 +749,7 @@ The modular architecture allows easy addition of support for other API formats.
 
 2. **Create conversion adapter** — `converters_gemini.py`
    ```python
-   from kiro_gateway.converters_core import build_kiro_payload
+   from kiro.converters_core import build_kiro_payload
    
    def gemini_to_kiro(request: GeminiRequest, ...) -> dict:
        """Converts Gemini request to Kiro payload."""
@@ -769,7 +769,7 @@ The modular architecture allows easy addition of support for other API formats.
 
 3. **Create streaming formatter** — `streaming_gemini.py`
    ```python
-   from kiro_gateway.streaming_core import parse_kiro_stream
+   from kiro.streaming_core import parse_kiro_stream
    
    async def stream_to_gemini(response, ...) -> AsyncGenerator[str, None]:
        """Formats Kiro events to Gemini SSE."""
@@ -788,7 +788,7 @@ The modular architecture allows easy addition of support for other API formats.
 
 5. **Connect in main.py**
    ```python
-   from kiro_gateway.routes_gemini import router as gemini_router
+   from kiro.routes_gemini import router as gemini_router
    app.include_router(gemini_router)
    ```
 

docs/ru/ARCHITECTURE.md

@@ -53,7 +53,7 @@
 
 ## 2. Структура Проекта
 
-Проект организован в виде модульного Python-пакета `kiro_gateway/`:
+Проект организован в виде модульного Python-пакета `kiro/`:
 
 ```
 kiro-gateway/
@@ -61,7 +61,7 @@ kiro-gateway/
 ├── requirements.txt           # Зависимости Python
 ├── .env.example               # Пример конфигурации окружения
 │
-├── kiro_gateway/              # Основной пакет
+├── kiro/              # Основной пакет
 │   ├── __init__.py            # Экспорты пакета, версия
 │   │
 │   │   # ═══════════════════════════════════════════════════════
@@ -140,7 +140,7 @@ kiro-gateway/
 4. **Регистрация обработчиков ошибок** — `validation_exception_handler` для ошибок 422
 5. **Подключение роутов** — `app.include_router(router)`
 
-### 3.2. Модуль конфигурации (`kiro_gateway/config.py`)
+### 3.2. Модуль конфигурации (`kiro/config.py`)
 
 Централизованное хранение всех настроек:
 
@@ -167,7 +167,7 @@ kiro-gateway/
 - `get_kiro_q_host(region)` — хост Q API
 - `get_internal_model_id(external_model)` — конвертация имени модели
 
-### 3.3. Pydantic Модели (`kiro_gateway/models.py`)
+### 3.3. Pydantic Модели (`kiro/models.py`)
 
 #### Модели для `/v1/models`
 
@@ -198,7 +198,7 @@ kiro-gateway/
 
 ### 3.4. Управление Состоянием (State Management Layer)
 
-#### KiroAuthManager (`kiro_gateway/auth.py`)
+#### KiroAuthManager (`kiro/auth.py`)
 
 **Роль:** Stateful-синглтон, инкапсулирующий логику управления токенами Kiro.
 
@@ -234,7 +234,7 @@ auth_manager = KiroAuthManager(
 token = await auth_manager.get_access_token()
 ```
 
-#### ModelInfoCache (`kiro_gateway/cache.py`)
+#### ModelInfoCache (`kiro/cache.py`)
 
 **Роль:** Потокобезопасное хранилище конфигураций моделей.
 
@@ -250,7 +250,7 @@ token = await auth_manager.get_access_token()
 - `is_empty()` / `is_stale()` — проверка состояния кэша
 - `get_all_model_ids()` — список всех ID моделей
 
-### 3.5. Вспомогательные Утилиты (`kiro_gateway/utils.py`)
+### 3.5. Вспомогательные Утилиты (`kiro/utils.py`)
 
 | Функция | Описание |
 |---------|----------|
@@ -260,7 +260,7 @@ token = await auth_manager.get_access_token()
 | `generate_conversation_id()` | UUID для разговора |
 | `generate_tool_call_id()` | ID в формате `call_{uuid_hex[:8]}` |
 
-### 3.6. Слой Конвертации (`kiro_gateway/converters.py`)
+### 3.6. Слой Конвертации (`kiro/converters.py`)
 
 #### Конвертация сообщений
 
@@ -310,7 +310,7 @@ OpenAI messages преобразуются в Kiro conversationState:
 | `claude-3-7-sonnet-20250219` | `CLAUDE_3_7_SONNET_20250219_V1_0` |
 | `auto` | `claude-sonnet-4.5` (алиас) |
 
-### 3.7. Слой Парсинга (`kiro_gateway/parsers.py`)
+### 3.7. Слой Парсинга (`kiro/parsers.py`)
 
 #### AwsEventStreamParser
 
@@ -340,7 +340,7 @@ OpenAI messages преобразуются в Kiro conversationState:
 | `parse_bracket_tool_calls(response_text)` | Парсинг `[Called func with args: {...}]` |
 | `deduplicate_tool_calls(tool_calls)` | Удаление дубликатов tool calls |
 
-### 3.8. Streaming (`kiro_gateway/streaming.py`)
+### 3.8. Streaming (`kiro/streaming.py`)
 
 #### stream_kiro_to_openai
 
@@ -357,7 +357,7 @@ OpenAI messages преобразуются в Kiro conversationState:
 
 Собирает полный ответ из streaming потока для non-streaming режима.
 
-### 3.9. HTTP Клиент (`kiro_gateway/http_client.py`)
+### 3.9. HTTP Клиент (`kiro/http_client.py`)
 
 #### KiroHttpClient
 
@@ -378,7 +378,7 @@ OpenAI messages преобразуются в Kiro conversationState:
 
 Поддерживает async context manager (`async with`).
 
-### 3.10. Роуты (`kiro_gateway/routes.py`)
+### 3.10. Роуты (`kiro/routes.py`)
 
 | Endpoint | Метод | Описание |
 |----------|-------|----------|
@@ -389,14 +389,14 @@ OpenAI messages преобразуются в Kiro conversationState:
 
 **Аутентификация:** Bearer token в заголовке `Authorization`
 
-### 3.11. Обработка Исключений (`kiro_gateway/exceptions.py`)
+### 3.11. Обработка Исключений (`kiro/exceptions.py`)
 
 | Функция | Описание |
 |---------|----------|
 | `sanitize_validation_errors(errors)` | Конвертация bytes в строки для JSON-сериализации |
 | `validation_exception_handler(request, exc)` | Обработчик ошибок валидации Pydantic (422) |
 
-### 3.12. Отладочное Логирование (`kiro_gateway/debug_logger.py`)
+### 3.12. Отладочное Логирование (`kiro/debug_logger.py`)
 
 **Класс:** `DebugLogger` (синглтон)
 
@@ -417,7 +417,7 @@ OpenAI messages преобразуются в Kiro conversationState:
 - `response_stream_raw.txt` — сырой поток от Kiro
 - `response_stream_modified.txt` — преобразованный поток (OpenAI формат)
 
-### 3.13. Токенизатор (`kiro_gateway/tokenizer.py`)
+### 3.13. Токенизатор (`kiro/tokenizer.py`)
 
 **Проблема:** Kiro API не возвращает напрямую количество токенов. Вместо этого API предоставляет только `context_usage_percentage` — процент использования контекста модели.
 
@@ -749,7 +749,7 @@ data: [DONE]
 
 2. **Создать адаптер конвертации** — `converters_gemini.py`
    ```python
-   from kiro_gateway.converters_core import build_kiro_payload
+   from kiro.converters_core import build_kiro_payload
    
    def gemini_to_kiro(request: GeminiRequest, ...) -> dict:
        """Конвертирует Gemini запрос в Kiro payload."""
@@ -769,7 +769,7 @@ data: [DONE]
 
 3. **Создать форматтер streaming** — `streaming_gemini.py`
    ```python
-   from kiro_gateway.streaming_core import parse_kiro_stream
+   from kiro.streaming_core import parse_kiro_stream
    
    async def stream_to_gemini(response, ...) -> AsyncGenerator[str, None]:
        """Форматирует Kiro события в Gemini SSE."""
@@ -788,7 +788,7 @@ data: [DONE]
 
 5. **Подключить в main.py**
    ```python
-   from kiro_gateway.routes_gemini import router as gemini_router
+   from kiro.routes_gemini import router as gemini_router
    app.include_router(gemini_router)
    ```
 

kiro/__init__.py

@@ -39,18 +39,18 @@ Modules:
 
 # Version is imported from config.py — the single source of truth
 # This allows changing the version in only one place
-from kiro_gateway.config import APP_VERSION as __version__
+from kiro.config import APP_VERSION as __version__
 
 __author__ = "Jwadow"
 
 # Main components for convenient import
-from kiro_gateway.auth import KiroAuthManager
-from kiro_gateway.cache import ModelInfoCache
-from kiro_gateway.http_client import KiroHttpClient
-from kiro_gateway.routes import router
+from kiro.auth import KiroAuthManager
+from kiro.cache import ModelInfoCache
+from kiro.http_client import KiroHttpClient
+from kiro.routes import router
 
 # Configuration
-from kiro_gateway.config import (
+from kiro.config import (
     PROXY_API_KEY,
     REGION,
     MODEL_MAPPING,
@@ -59,7 +59,7 @@ from kiro_gateway.config import (
 )
 
 # Models
-from kiro_gateway.models import (
+from kiro.models import (
     ChatCompletionRequest,
     ChatMessage,
     OpenAIModel,
@@ -67,26 +67,26 @@ from kiro_gateway.models import (
 )
 
 # Converters
-from kiro_gateway.converters import (
+from kiro.converters import (
     build_kiro_payload,
     extract_text_content,
     merge_adjacent_messages,
 )
 
 # Parsers
-from kiro_gateway.parsers import (
+from kiro.parsers import (
     AwsEventStreamParser,
     parse_bracket_tool_calls,
 )
 
 # Streaming
-from kiro_gateway.streaming import (
+from kiro.streaming import (
     stream_kiro_to_openai,
     collect_stream_response,
 )
 
 # Exceptions
-from kiro_gateway.exceptions import (
+from kiro.exceptions import (
     validation_exception_handler,
     sanitize_validation_errors,
 )

kiro/auth.py

@@ -38,14 +38,14 @@ from typing import Optional
 import httpx
 from loguru import logger
 
-from kiro_gateway.config import (
+from kiro.config import (
     TOKEN_REFRESH_THRESHOLD,
     get_kiro_refresh_url,
     get_kiro_api_host,
     get_kiro_q_host,
     get_aws_sso_oidc_url,
 )
-from kiro_gateway.utils import get_machine_fingerprint
+from kiro.utils import get_machine_fingerprint
 
 
 class AuthType(Enum):

kiro/cache.py

@@ -30,7 +30,7 @@ from typing import Any, Dict, List, Optional
 
 from loguru import logger
 
-from kiro_gateway.config import MODEL_CACHE_TTL, DEFAULT_MAX_INPUT_TOKENS
+from kiro.config import MODEL_CACHE_TTL, DEFAULT_MAX_INPUT_TOKENS
 
 
 class ModelInfoCache:

kiro/converters.py

@@ -32,13 +32,13 @@ from typing import Any, Dict, List, Optional, Tuple
 
 from loguru import logger
 
-from kiro_gateway.config import (
+from kiro.config import (
     get_internal_model_id,
     TOOL_DESCRIPTION_MAX_LENGTH,
     FAKE_REASONING_ENABLED,
     FAKE_REASONING_MAX_TOKENS,
 )
-from kiro_gateway.models import ChatMessage, ChatCompletionRequest, Tool
+from kiro.models import ChatMessage, ChatCompletionRequest, Tool
 
 
 def extract_text_content(content: Any) -> str:
@@ -408,7 +408,7 @@ def process_tools_with_long_descriptions(
             
             # Create copy of tool with reference description
             # Use Tool model to create new copy
-            from kiro_gateway.models import ToolFunction
+            from kiro.models import ToolFunction
             
             reference_description = f"[Full documentation in system prompt under '## Tool: {tool_name}']"
             

kiro/debug_logger.py

@@ -39,7 +39,7 @@ from pathlib import Path
 from typing import Optional
 from loguru import logger
 
-from kiro_gateway.config import DEBUG_MODE, DEBUG_DIR
+from kiro.config import DEBUG_MODE, DEBUG_DIR
 
 
 class DebugLogger:

kiro/http_client.py

@@ -34,9 +34,9 @@ import httpx
 from fastapi import HTTPException
 from loguru import logger
 
-from kiro_gateway.config import MAX_RETRIES, BASE_RETRY_DELAY, FIRST_TOKEN_MAX_RETRIES, STREAMING_READ_TIMEOUT
-from kiro_gateway.auth import KiroAuthManager
-from kiro_gateway.utils import get_kiro_headers
+from kiro.config import MAX_RETRIES, BASE_RETRY_DELAY, FIRST_TOKEN_MAX_RETRIES, STREAMING_READ_TIMEOUT
+from kiro.auth import KiroAuthManager
+from kiro.utils import get_kiro_headers
 
 
 class KiroHttpClient:

kiro/parsers.py

@@ -33,7 +33,7 @@ from typing import Any, Dict, List, Optional
 
 from loguru import logger
 
-from kiro_gateway.utils import generate_tool_call_id
+from kiro.utils import generate_tool_call_id
 
 
 def find_matching_brace(text: str, start_pos: int) -> int:

kiro/routes.py

@@ -35,26 +35,26 @@ from fastapi.responses import JSONResponse, StreamingResponse
 from fastapi.security import APIKeyHeader
 from loguru import logger
 
-from kiro_gateway.config import (
+from kiro.config import (
     PROXY_API_KEY,
     AVAILABLE_MODELS,
     APP_VERSION,
 )
-from kiro_gateway.models import (
+from kiro.models import (
     OpenAIModel,
     ModelList,
     ChatCompletionRequest,
 )
-from kiro_gateway.auth import KiroAuthManager, AuthType
-from kiro_gateway.cache import ModelInfoCache
-from kiro_gateway.converters import build_kiro_payload
-from kiro_gateway.streaming import stream_kiro_to_openai, collect_stream_response, stream_with_first_token_retry
-from kiro_gateway.http_client import KiroHttpClient
-from kiro_gateway.utils import get_kiro_headers, generate_conversation_id
+from kiro.auth import KiroAuthManager, AuthType
+from kiro.cache import ModelInfoCache
+from kiro.converters import build_kiro_payload
+from kiro.streaming import stream_kiro_to_openai, collect_stream_response, stream_with_first_token_retry
+from kiro.http_client import KiroHttpClient
+from kiro.utils import get_kiro_headers, generate_conversation_id
 
 # Import debug_logger
 try:
-    from kiro_gateway.debug_logger import debug_logger
+    from kiro.debug_logger import debug_logger
 except ImportError:
     debug_logger = None
 

kiro/streaming.py

@@ -35,24 +35,24 @@ import httpx
 from fastapi import HTTPException
 from loguru import logger
 
-from kiro_gateway.parsers import AwsEventStreamParser, parse_bracket_tool_calls, deduplicate_tool_calls
-from kiro_gateway.utils import generate_completion_id
-from kiro_gateway.config import (
+from kiro.parsers import AwsEventStreamParser, parse_bracket_tool_calls, deduplicate_tool_calls
+from kiro.utils import generate_completion_id
+from kiro.config import (
     FIRST_TOKEN_TIMEOUT,
     FIRST_TOKEN_MAX_RETRIES,
     FAKE_REASONING_ENABLED,
     FAKE_REASONING_HANDLING,
 )
-from kiro_gateway.tokenizer import count_tokens, count_message_tokens, count_tools_tokens
-from kiro_gateway.thinking_parser import ThinkingParser
+from kiro.tokenizer import count_tokens, count_message_tokens, count_tools_tokens
+from kiro.thinking_parser import ThinkingParser
 
 if TYPE_CHECKING:
-    from kiro_gateway.auth import KiroAuthManager
-    from kiro_gateway.cache import ModelInfoCache
+    from kiro.auth import KiroAuthManager
+    from kiro.cache import ModelInfoCache
 
 # Import debug_logger for logging
 try:
-    from kiro_gateway.debug_logger import debug_logger
+    from kiro.debug_logger import debug_logger
 except ImportError:
     debug_logger = None
 

kiro/thinking_parser.py

@@ -37,7 +37,7 @@ from dataclasses import dataclass, field
 
 from loguru import logger
 
-from kiro_gateway.config import (
+from kiro.config import (
     FAKE_REASONING_HANDLING,
     FAKE_REASONING_OPEN_TAGS,
     FAKE_REASONING_INITIAL_BUFFER_SIZE,

kiro/utils.py

@@ -31,7 +31,7 @@ from typing import TYPE_CHECKING
 from loguru import logger
 
 if TYPE_CHECKING:
-    from kiro_gateway.auth import KiroAuthManager
+    from kiro.auth import KiroAuthManager
 
 
 def get_machine_fingerprint() -> str:

main.py

@@ -50,7 +50,7 @@ from fastapi.exceptions import RequestValidationError
 from fastapi.middleware.cors import CORSMiddleware
 from loguru import logger
 
-from kiro_gateway.config import (
+from kiro.config import (
     APP_TITLE,
     APP_DESCRIPTION,
     APP_VERSION,
@@ -68,10 +68,10 @@ from kiro_gateway.config import (
     _warn_deprecated_debug_setting,
     _warn_timeout_configuration,
 )
-from kiro_gateway.auth import KiroAuthManager
-from kiro_gateway.cache import ModelInfoCache
-from kiro_gateway.routes import router
-from kiro_gateway.exceptions import validation_exception_handler
+from kiro.auth import KiroAuthManager
+from kiro.cache import ModelInfoCache
+from kiro.routes import router
+from kiro.exceptions import validation_exception_handler
 
 
 # --- Loguru Configuration ---

tests/README.md

@@ -2037,7 +2037,7 @@ To check code coverage:
 pip install pytest-cov
 
 # Run with coverage report
-pytest --cov=kiro_gateway --cov-report=html
+pytest --cov=kiro --cov-report=html
 
 # View report
 open htmlcov/index.html  # macOS/Linux

tests/conftest.py

@@ -355,10 +355,10 @@ def block_all_network_calls():
 
     # Patch AsyncClient in modules where it's used
     patchers = [
-        patch('kiro_gateway.auth.httpx.AsyncClient', return_value=mock_async_client),
-        patch('kiro_gateway.http_client.httpx.AsyncClient', return_value=mock_async_client),
-        patch('kiro_gateway.routes.httpx.AsyncClient', return_value=mock_async_client),
-        patch('kiro_gateway.streaming.httpx.AsyncClient', return_value=mock_async_client),
+        patch('kiro.auth.httpx.AsyncClient', return_value=mock_async_client),
+        patch('kiro.http_client.httpx.AsyncClient', return_value=mock_async_client),
+        patch('kiro.routes.httpx.AsyncClient', return_value=mock_async_client),
+        patch('kiro.streaming.httpx.AsyncClient', return_value=mock_async_client),
     ]
     
     # Start patchers
@@ -428,7 +428,7 @@ def mock_auth_manager():
     """
     Creates a mocked KiroAuthManager for tests.
     """
-    from kiro_gateway.auth import KiroAuthManager
+    from kiro.auth import KiroAuthManager
     
     manager = KiroAuthManager(
         refresh_token="test_refresh_token",
@@ -450,7 +450,7 @@ def expired_auth_manager():
     """
     Creates a KiroAuthManager with an expired token.
     """
-    from kiro_gateway.auth import KiroAuthManager
+    from kiro.auth import KiroAuthManager
     
     manager = KiroAuthManager(
         refresh_token="test_refresh_token",
@@ -509,7 +509,7 @@ def empty_model_cache():
     """
     Creates an empty ModelInfoCache.
     """
-    from kiro_gateway.cache import ModelInfoCache
+    from kiro.cache import ModelInfoCache
     return ModelInfoCache()
 
 
@@ -518,7 +518,7 @@ async def populated_model_cache(mock_kiro_models_response):
     """
     Creates a ModelInfoCache with pre-populated data.
     """
-    from kiro_gateway.cache import ModelInfoCache
+    from kiro.cache import ModelInfoCache
     
     cache = ModelInfoCache()
     await cache.update(mock_kiro_models_response["models"])
@@ -547,7 +547,7 @@ def mock_datetime():
     """
     fixed_time = datetime(2024, 1, 1, 12, 0, 0, tzinfo=timezone.utc)
     
-    with patch('kiro_gateway.auth.datetime') as mock_dt:
+    with patch('kiro.auth.datetime') as mock_dt:
         mock_dt.now.return_value = fixed_time
         mock_dt.fromisoformat = datetime.fromisoformat
         mock_dt.fromtimestamp = datetime.fromtimestamp
@@ -750,7 +750,7 @@ def aws_event_parser():
     """
     Creates an AwsEventStreamParser instance for tests.
     """
-    from kiro_gateway.parsers import AwsEventStreamParser
+    from kiro.parsers import AwsEventStreamParser
     return AwsEventStreamParser()
 
 

tests/integration/test_full_flow.py

@@ -13,7 +13,7 @@ from datetime import datetime, timezone, timedelta
 from fastapi.testclient import TestClient
 import httpx
 
-from kiro_gateway.config import PROXY_API_KEY, AVAILABLE_MODELS
+from kiro.config import PROXY_API_KEY, AVAILABLE_MODELS
 
 
 class TestFullChatCompletionFlow:
@@ -329,7 +329,7 @@ class TestStreamingFlagHandling:
         mock_response.aclose = AsyncMock()
         
         # Мокируем request_with_retry чтобы вернуть наш мок response
-        with patch('kiro_gateway.routes.KiroHttpClient') as MockHttpClient:
+        with patch('kiro.routes.KiroHttpClient') as MockHttpClient:
             mock_client_instance = AsyncMock()
             mock_client_instance.request_with_retry = AsyncMock(return_value=mock_response)
             mock_client_instance.client = AsyncMock()

tests/unit/test_auth_manager.py

@@ -11,8 +11,8 @@ from datetime import datetime, timezone, timedelta
 from unittest.mock import AsyncMock, Mock, patch
 import httpx
 
-from kiro_gateway.auth import KiroAuthManager, AuthType
-from kiro_gateway.config import TOKEN_REFRESH_THRESHOLD, get_aws_sso_oidc_url
+from kiro.auth import KiroAuthManager, AuthType
+from kiro.config import TOKEN_REFRESH_THRESHOLD, get_aws_sso_oidc_url
 
 
 class TestKiroAuthManagerInitialization:
@@ -204,7 +204,7 @@ class TestKiroAuthManagerTokenRefresh:
         mock_response.json = Mock(return_value=mock_kiro_token_response())
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -239,7 +239,7 @@ class TestKiroAuthManagerTokenRefresh:
         mock_response.json = Mock(return_value=mock_kiro_token_response())
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -268,7 +268,7 @@ class TestKiroAuthManagerTokenRefresh:
         mock_response.json = Mock(return_value={"expiresIn": 3600})  # No accessToken!
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -320,7 +320,7 @@ class TestKiroAuthManagerGetAccessToken:
         mock_response.json = Mock(return_value=mock_kiro_token_response())
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -350,7 +350,7 @@ class TestKiroAuthManagerGetAccessToken:
         manager._expires_at = datetime.now(timezone.utc) + timedelta(hours=1)
         
         print("Setup: Mocking httpx to track calls...")
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock()
             mock_client_class.return_value = mock_client
@@ -420,7 +420,7 @@ class TestKiroAuthManagerForceRefresh:
         mock_response.json = Mock(return_value=mock_kiro_token_response())
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -848,7 +848,7 @@ class TestKiroAuthManagerAwsSsoOidcRefresh:
         mock_response.json = Mock(return_value=mock_aws_sso_oidc_token_response())
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -947,7 +947,7 @@ class TestKiroAuthManagerAwsSsoOidcRefresh:
         mock_response.json = Mock(return_value=mock_aws_sso_oidc_token_response())
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -982,7 +982,7 @@ class TestKiroAuthManagerAwsSsoOidcRefresh:
         mock_response.json = Mock(return_value=mock_aws_sso_oidc_token_response())
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -1016,7 +1016,7 @@ class TestKiroAuthManagerAwsSsoOidcRefresh:
         mock_response.json = Mock(return_value=mock_aws_sso_oidc_token_response())
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -1050,7 +1050,7 @@ class TestKiroAuthManagerAwsSsoOidcRefresh:
         mock_response.json = Mock(return_value=mock_aws_sso_oidc_token_response())
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -1084,7 +1084,7 @@ class TestKiroAuthManagerAwsSsoOidcRefresh:
         mock_response.json = Mock(return_value=mock_aws_sso_oidc_token_response(expires_in=7200))
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -1123,7 +1123,7 @@ class TestKiroAuthManagerAwsSsoOidcRefresh:
         mock_response.json = Mock(return_value=mock_aws_sso_oidc_token_response())
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -1164,7 +1164,7 @@ class TestKiroAuthManagerAwsSsoOidcRefresh:
         mock_response.json = Mock(return_value=mock_aws_sso_oidc_token_response())
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -1340,7 +1340,7 @@ class TestKiroAuthManagerSsoRegionSeparation:
         mock_response.json = Mock(return_value=mock_aws_sso_oidc_token_response())
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -1380,7 +1380,7 @@ class TestKiroAuthManagerSsoRegionSeparation:
         mock_response.json = Mock(return_value=mock_aws_sso_oidc_token_response())
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -1439,7 +1439,7 @@ class TestKiroAuthManagerSsoRegionSeparation:
         mock_response.json = Mock(return_value=mock_aws_sso_oidc_token_response())
         mock_response.raise_for_status = Mock()
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -1568,7 +1568,7 @@ class TestKiroAuthManagerSsoRegionSeparation:
                 return mock_error_response
             return mock_success_response
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = mock_post
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -1619,7 +1619,7 @@ class TestKiroAuthManagerSsoRegionSeparation:
             )
         )
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_error_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)
@@ -1667,7 +1667,7 @@ class TestKiroAuthManagerSsoRegionSeparation:
             )
         )
         
-        with patch('kiro_gateway.auth.httpx.AsyncClient') as mock_client_class:
+        with patch('kiro.auth.httpx.AsyncClient') as mock_client_class:
             mock_client = AsyncMock()
             mock_client.post = AsyncMock(return_value=mock_error_response)
             mock_client.__aenter__ = AsyncMock(return_value=mock_client)

tests/unit/test_cache.py

@@ -9,8 +9,8 @@ import asyncio
 import time
 import pytest
 
-from kiro_gateway.cache import ModelInfoCache
-from kiro_gateway.config import DEFAULT_MAX_INPUT_TOKENS
+from kiro.cache import ModelInfoCache
+from kiro.config import DEFAULT_MAX_INPUT_TOKENS
 
 
 class TestModelInfoCacheInitialization:

tests/unit/test_config.py

@@ -36,7 +36,7 @@ class TestLogLevelConfig:
         with patch.object(os, 'getenv', side_effect=mock_getenv):
             # Reload config module with mocked getenv
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"LOG_LEVEL: {config_module.LOG_LEVEL}")
@@ -45,7 +45,7 @@ class TestLogLevelConfig:
         
         # Restore module with real values
         import importlib
-        import kiro_gateway.config as config_module
+        import kiro.config as config_module
         importlib.reload(config_module)
     
     def test_log_level_from_environment(self):
@@ -57,7 +57,7 @@ class TestLogLevelConfig:
         
         with patch.dict(os.environ, {"LOG_LEVEL": "DEBUG"}):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"LOG_LEVEL: {config_module.LOG_LEVEL}")
@@ -73,7 +73,7 @@ class TestLogLevelConfig:
         
         with patch.dict(os.environ, {"LOG_LEVEL": "warning"}):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"LOG_LEVEL: {config_module.LOG_LEVEL}")
@@ -89,7 +89,7 @@ class TestLogLevelConfig:
         
         with patch.dict(os.environ, {"LOG_LEVEL": "TRACE"}):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"LOG_LEVEL: {config_module.LOG_LEVEL}")
@@ -104,7 +104,7 @@ class TestLogLevelConfig:
         
         with patch.dict(os.environ, {"LOG_LEVEL": "ERROR"}):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"LOG_LEVEL: {config_module.LOG_LEVEL}")
@@ -119,7 +119,7 @@ class TestLogLevelConfig:
         
         with patch.dict(os.environ, {"LOG_LEVEL": "CRITICAL"}):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"LOG_LEVEL: {config_module.LOG_LEVEL}")
@@ -141,7 +141,7 @@ class TestToolDescriptionMaxLengthConfig:
                 del os.environ["TOOL_DESCRIPTION_MAX_LENGTH"]
             
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"TOOL_DESCRIPTION_MAX_LENGTH: {config_module.TOOL_DESCRIPTION_MAX_LENGTH}")
@@ -156,7 +156,7 @@ class TestToolDescriptionMaxLengthConfig:
         
         with patch.dict(os.environ, {"TOOL_DESCRIPTION_MAX_LENGTH": "5000"}):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"TOOL_DESCRIPTION_MAX_LENGTH: {config_module.TOOL_DESCRIPTION_MAX_LENGTH}")
@@ -171,7 +171,7 @@ class TestToolDescriptionMaxLengthConfig:
         
         with patch.dict(os.environ, {"TOOL_DESCRIPTION_MAX_LENGTH": "0"}):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"TOOL_DESCRIPTION_MAX_LENGTH: {config_module.TOOL_DESCRIPTION_MAX_LENGTH}")
@@ -193,7 +193,7 @@ class TestTimeoutConfigurationWarning:
             "STREAMING_READ_TIMEOUT": "300"
         }):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             # Call the warning function
@@ -218,7 +218,7 @@ class TestTimeoutConfigurationWarning:
             "STREAMING_READ_TIMEOUT": "300"
         }):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             # Call the warning function
@@ -242,7 +242,7 @@ class TestTimeoutConfigurationWarning:
             "STREAMING_READ_TIMEOUT": "300"
         }):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             # Call the warning function
@@ -269,7 +269,7 @@ class TestTimeoutConfigurationWarning:
             "STREAMING_READ_TIMEOUT": "300"
         }):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             # Call the warning function
@@ -292,7 +292,7 @@ class TestAwsSsoOidcUrlConfig:
         """
         print("Setup: Importing config module...")
         import importlib
-        import kiro_gateway.config as config_module
+        import kiro.config as config_module
         importlib.reload(config_module)
         
         print("Verification: AWS_SSO_OIDC_URL_TEMPLATE exists...")
@@ -309,7 +309,7 @@ class TestAwsSsoOidcUrlConfig:
         Purpose: Ensure the function formats URL correctly.
         """
         print("Setup: Importing get_aws_sso_oidc_url...")
-        from kiro_gateway.config import get_aws_sso_oidc_url
+        from kiro.config import get_aws_sso_oidc_url
         
         print("Action: Calling get_aws_sso_oidc_url('us-east-1')...")
         url = get_aws_sso_oidc_url("us-east-1")
@@ -325,7 +325,7 @@ class TestAwsSsoOidcUrlConfig:
         Purpose: Ensure the function works with various AWS regions.
         """
         print("Setup: Importing get_aws_sso_oidc_url...")
-        from kiro_gateway.config import get_aws_sso_oidc_url
+        from kiro.config import get_aws_sso_oidc_url
         
         test_cases = [
             ("us-east-1", "https://oidc.us-east-1.amazonaws.com/token"),
@@ -356,7 +356,7 @@ class TestServerHostConfig:
                 del os.environ["SERVER_HOST"]
             
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"SERVER_HOST: {config_module.SERVER_HOST}")
@@ -374,7 +374,7 @@ class TestServerHostConfig:
         
         with patch.dict(os.environ, {"SERVER_HOST": "127.0.0.1"}):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"SERVER_HOST: {config_module.SERVER_HOST}")
@@ -390,7 +390,7 @@ class TestServerHostConfig:
         
         with patch.dict(os.environ, {"SERVER_HOST": "192.168.1.100"}):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"SERVER_HOST: {config_module.SERVER_HOST}")
@@ -412,7 +412,7 @@ class TestServerPortConfig:
                 del os.environ["SERVER_PORT"]
             
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"SERVER_PORT: {config_module.SERVER_PORT}")
@@ -430,7 +430,7 @@ class TestServerPortConfig:
         
         with patch.dict(os.environ, {"SERVER_PORT": "9000"}):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"SERVER_PORT: {config_module.SERVER_PORT}")
@@ -446,7 +446,7 @@ class TestServerPortConfig:
         
         with patch.dict(os.environ, {"SERVER_PORT": "3000"}):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"SERVER_PORT: {config_module.SERVER_PORT}")
@@ -461,7 +461,7 @@ class TestServerPortConfig:
         
         with patch.dict(os.environ, {"SERVER_PORT": "8080"}):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"SERVER_PORT: {config_module.SERVER_PORT}")
@@ -480,7 +480,7 @@ class TestKiroCliDbFileConfig:
         """
         print("Setup: Importing config module...")
         import importlib
-        import kiro_gateway.config as config_module
+        import kiro.config as config_module
         importlib.reload(config_module)
         
         print("Verification: KIRO_CLI_DB_FILE exists...")
@@ -499,7 +499,7 @@ class TestKiroCliDbFileConfig:
         
         with patch.dict(os.environ, {"KIRO_CLI_DB_FILE": "~/.local/share/kiro-cli/data.sqlite3"}):
             import importlib
-            import kiro_gateway.config as config_module
+            import kiro.config as config_module
             importlib.reload(config_module)
             
             print(f"KIRO_CLI_DB_FILE: {config_module.KIRO_CLI_DB_FILE}")

tests/unit/test_converters.py

@@ -9,7 +9,7 @@ import pytest
 
 from unittest.mock import patch
 
-from kiro_gateway.converters import (
+from kiro.converters import (
     extract_text_content,
     merge_adjacent_messages,
     build_kiro_history,
@@ -21,7 +21,7 @@ from kiro_gateway.converters import (
     _build_user_input_context,
     _sanitize_json_schema
 )
-from kiro_gateway.models import ChatMessage, ChatCompletionRequest, Tool, ToolFunction
+from kiro.models import ChatMessage, ChatCompletionRequest, Tool, ToolFunction
 
 
 class TestExtractTextContent:
@@ -751,7 +751,7 @@ class TestProcessToolsWithLongDescriptions:
         )]
         
         print("Action: Processing tools...")
-        with patch('kiro_gateway.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
+        with patch('kiro.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
             processed, doc = process_tools_with_long_descriptions(tools)
         
         print(f"Comparing description: Expected 'Get weather for a location', Got '{processed[0].function.description}'")
@@ -776,7 +776,7 @@ class TestProcessToolsWithLongDescriptions:
         )]
         
         print("Action: Processing tools with limit 10000...")
-        with patch('kiro_gateway.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
+        with patch('kiro.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
             processed, doc = process_tools_with_long_descriptions(tools)
         
         print(f"Checking reference in description...")
@@ -816,7 +816,7 @@ class TestProcessToolsWithLongDescriptions:
         ]
         
         print("Action: Processing tools...")
-        with patch('kiro_gateway.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
+        with patch('kiro.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
             processed, doc = process_tools_with_long_descriptions(tools)
         
         print(f"Checking tools count: Expected 2, Got {len(processed)}")
@@ -854,7 +854,7 @@ class TestProcessToolsWithLongDescriptions:
         )]
         
         print("Action: Processing tools...")
-        with patch('kiro_gateway.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
+        with patch('kiro.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
             processed, doc = process_tools_with_long_descriptions(tools)
         
         print(f"Checking parameters preservation...")
@@ -877,7 +877,7 @@ class TestProcessToolsWithLongDescriptions:
         )]
         
         print("Action: Processing tools with limit 0...")
-        with patch('kiro_gateway.converters.TOOL_DESCRIPTION_MAX_LENGTH', 0):
+        with patch('kiro.converters.TOOL_DESCRIPTION_MAX_LENGTH', 0):
             processed, doc = process_tools_with_long_descriptions(tools)
         
         print(f"Checking that description is unchanged...")
@@ -901,7 +901,7 @@ class TestProcessToolsWithLongDescriptions:
         )]
         
         print("Action: Processing tools...")
-        with patch('kiro_gateway.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
+        with patch('kiro.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
             processed, doc = process_tools_with_long_descriptions(tools)
         
         print(f"Checking that tool is unchanged...")
@@ -922,7 +922,7 @@ class TestProcessToolsWithLongDescriptions:
         ]
         
         print("Action: Processing tools...")
-        with patch('kiro_gateway.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
+        with patch('kiro.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
             processed, doc = process_tools_with_long_descriptions(tools)
         
         print(f"Checking all three tools...")
@@ -951,7 +951,7 @@ class TestProcessToolsWithLongDescriptions:
         )]
         
         print("Action: Processing tools...")
-        with patch('kiro_gateway.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
+        with patch('kiro.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
             processed, doc = process_tools_with_long_descriptions(tools)
         
         print(f"Checking that empty description remains empty...")
@@ -974,7 +974,7 @@ class TestProcessToolsWithLongDescriptions:
         )]
         
         print("Action: Processing tools...")
-        with patch('kiro_gateway.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
+        with patch('kiro.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
             processed, doc = process_tools_with_long_descriptions(tools)
         
         print(f"Checking that None description is handled correctly...")
@@ -1497,7 +1497,7 @@ class TestInjectThinkingTags:
         content = "Hello, world!"
         
         print("Action: Inject thinking tags with FAKE_REASONING_ENABLED=False...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', False):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', False):
             result = inject_thinking_tags(content)
         
         print(f"Comparing result: Expected 'Hello, world!', Got '{result}'")
@@ -1512,8 +1512,8 @@ class TestInjectThinkingTags:
         content = "What is 2+2?"
         
         print("Action: Inject thinking tags with FAKE_REASONING_ENABLED=True...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags(content)
         
         print(f"Result: {result[:200]}...")
@@ -1535,8 +1535,8 @@ class TestInjectThinkingTags:
         content = "Analyze this code"
         
         print("Action: Inject thinking tags...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 8000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 8000):
                 result = inject_thinking_tags(content)
         
         print(f"Result length: {len(result)} chars")
@@ -1553,8 +1553,8 @@ class TestInjectThinkingTags:
         content = "Test"
         
         print("Action: Inject thinking tags...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags(content)
         
         print("Checking for English directive...")
@@ -1569,8 +1569,8 @@ class TestInjectThinkingTags:
         content = "Test"
         
         print("Action: Inject thinking tags...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags(content)
         
         print("Checking for systematic approach keywords...")
@@ -1585,8 +1585,8 @@ class TestInjectThinkingTags:
         content = "Test"
         
         print("Action: Inject thinking tags...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags(content)
         
         print("Checking for understanding step...")
@@ -1601,8 +1601,8 @@ class TestInjectThinkingTags:
         content = "Test"
         
         print("Action: Inject thinking tags...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags(content)
         
         print("Checking for alternatives consideration...")
@@ -1617,8 +1617,8 @@ class TestInjectThinkingTags:
         content = "Test"
         
         print("Action: Inject thinking tags...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags(content)
         
         print("Checking for edge cases consideration...")
@@ -1633,8 +1633,8 @@ class TestInjectThinkingTags:
         content = "Test"
         
         print("Action: Inject thinking tags...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags(content)
         
         print("Checking for verification step...")
@@ -1649,8 +1649,8 @@ class TestInjectThinkingTags:
         content = "Test"
         
         print("Action: Inject thinking tags...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags(content)
         
         print("Checking for assumptions challenge...")
@@ -1665,8 +1665,8 @@ class TestInjectThinkingTags:
         content = "Test"
         
         print("Action: Inject thinking tags...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags(content)
         
         print("Checking for quality over speed emphasis...")
@@ -1681,8 +1681,8 @@ class TestInjectThinkingTags:
         content = "Test"
         
         print("Action: Inject thinking tags with FAKE_REASONING_MAX_TOKENS=16000...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 16000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 16000):
                 result = inject_thinking_tags(content)
         
         print(f"Result: {result[:300]}...")
@@ -1698,8 +1698,8 @@ class TestInjectThinkingTags:
         content = ""
         
         print("Action: Inject thinking tags...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags(content)
         
         print(f"Result length: {len(result)} chars")
@@ -1716,8 +1716,8 @@ class TestInjectThinkingTags:
         content = "Line 1\nLine 2\nLine 3"
         
         print("Action: Inject thinking tags...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags(content)
         
         print("Checking that multiline content is preserved...")
@@ -1732,8 +1732,8 @@ class TestInjectThinkingTags:
         content = "Check this <code>example</code> and {json: 'value'}"
         
         print("Action: Inject thinking tags...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags(content)
         
         print("Checking that special characters are preserved...")
@@ -1749,8 +1749,8 @@ class TestInjectThinkingTags:
         content = "USER_CONTENT_HERE"
         
         print("Action: Inject thinking tags...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags(content)
         
         print("Checking tag order...")
@@ -1982,7 +1982,7 @@ class TestBuildKiroPayload:
         )
 
         print("Action: Building payload (with fake reasoning disabled)...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', False):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', False):
             result = build_kiro_payload(request, "conv-123", "")
 
         print(f"Result: {result}")
@@ -2032,7 +2032,7 @@ class TestBuildKiroPayload:
         )
         
         print("Action: Building payload...")
-        with patch('kiro_gateway.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
+        with patch('kiro.converters.TOOL_DESCRIPTION_MAX_LENGTH', 10000):
             result = build_kiro_payload(request, "conv-123", "")
         
         print(f"Checking that system prompt contains tool documentation...")
@@ -2074,8 +2074,8 @@ class TestBuildKiroPayload:
         )
         
         print("Action: Building payload with FAKE_REASONING_ENABLED=True...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = build_kiro_payload(request, "conv-123", "")
         
         current_msg = result["conversationState"]["currentMessage"]["userInputMessage"]
@@ -2101,8 +2101,8 @@ class TestBuildKiroPayload:
         )
         
         print("Action: Building payload with FAKE_REASONING_ENABLED=True...")
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = build_kiro_payload(request, "conv-123", "")
         
         current_msg = result["conversationState"]["currentMessage"]["userInputMessage"]

tests/unit/test_debug_logger.py

@@ -20,10 +20,10 @@ class TestDebugLoggerModeOff:
         Цель: Убедиться, что в режиме off директория не создаётся.
         """
         print("Настройка: Режим off...")
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'off'):
-            with patch('kiro_gateway.debug_logger.DEBUG_DIR', str(tmp_path / "debug_logs")):
+        with patch('kiro.debug_logger.DEBUG_MODE', 'off'):
+            with patch('kiro.debug_logger.DEBUG_DIR', str(tmp_path / "debug_logs")):
                 # Пересоздаём экземпляр с новыми настройками
-                from kiro_gateway.debug_logger import DebugLogger
+                from kiro.debug_logger import DebugLogger
                 logger = DebugLogger.__new__(DebugLogger)
                 logger._initialized = False
                 logger.__init__()
@@ -41,8 +41,8 @@ class TestDebugLoggerModeOff:
         Цель: Убедиться, что данные не записываются.
         """
         print("Настройка: Режим off...")
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'off'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'off'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -69,8 +69,8 @@ class TestDebugLoggerModeAll:
         old_file = debug_dir / "old_file.txt"
         old_file.write_text("old content")
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'all'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'all'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -93,8 +93,8 @@ class TestDebugLoggerModeAll:
         debug_dir = tmp_path / "debug_logs"
         debug_dir.mkdir()
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'all'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'all'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -121,8 +121,8 @@ class TestDebugLoggerModeAll:
         debug_dir = tmp_path / "debug_logs"
         debug_dir.mkdir()
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'all'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'all'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -145,8 +145,8 @@ class TestDebugLoggerModeAll:
         debug_dir = tmp_path / "debug_logs"
         debug_dir.mkdir()
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'all'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'all'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -173,8 +173,8 @@ class TestDebugLoggerModeErrors:
         print("Настройка: Режим errors...")
         debug_dir = tmp_path / "debug_logs"
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'errors'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'errors'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -198,8 +198,8 @@ class TestDebugLoggerModeErrors:
         print("Настройка: Режим errors, заполняем буферы...")
         debug_dir = tmp_path / "debug_logs"
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'errors'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'errors'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -234,8 +234,8 @@ class TestDebugLoggerModeErrors:
         print("Настройка: Режим errors...")
         debug_dir = tmp_path / "debug_logs"
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'errors'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'errors'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -260,8 +260,8 @@ class TestDebugLoggerModeErrors:
         print("Настройка: Режим errors, заполняем буферы...")
         debug_dir = tmp_path / "debug_logs"
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'errors'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'errors'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -288,8 +288,8 @@ class TestDebugLoggerModeErrors:
         print("Настройка: Режим all...")
         debug_dir = tmp_path / "debug_logs"
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'all'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'all'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -318,8 +318,8 @@ class TestDebugLoggerLogErrorInfo:
         print("Настройка: Режим all...")
         debug_dir = tmp_path / "debug_logs"
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'all'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'all'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -345,8 +345,8 @@ class TestDebugLoggerLogErrorInfo:
         print("Настройка: Режим errors...")
         debug_dir = tmp_path / "debug_logs"
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'errors'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'errors'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -367,8 +367,8 @@ class TestDebugLoggerLogErrorInfo:
         print("Настройка: Режим off...")
         debug_dir = tmp_path / "debug_logs"
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'off'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'off'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -390,8 +390,8 @@ class TestDebugLoggerHelperMethods:
         Цель: Убедиться, что режим errors считается включённым.
         """
         print("Настройка: Режим errors...")
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'errors'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'errors'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -405,8 +405,8 @@ class TestDebugLoggerHelperMethods:
         Цель: Убедиться, что режим all считается включённым.
         """
         print("Настройка: Режим all...")
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'all'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'all'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -420,8 +420,8 @@ class TestDebugLoggerHelperMethods:
         Цель: Убедиться, что режим off считается выключенным.
         """
         print("Настройка: Режим off...")
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'off'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'off'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -435,8 +435,8 @@ class TestDebugLoggerHelperMethods:
         Цель: Убедиться, что режим all пишет сразу.
         """
         print("Настройка: Режим all...")
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'all'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'all'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -450,8 +450,8 @@ class TestDebugLoggerHelperMethods:
         Цель: Убедиться, что режим errors буферизует.
         """
         print("Настройка: Режим errors...")
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'errors'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'errors'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -472,8 +472,8 @@ class TestDebugLoggerJsonHandling:
         debug_dir = tmp_path / "debug_logs"
         debug_dir.mkdir()
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'all'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'all'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -496,8 +496,8 @@ class TestDebugLoggerJsonHandling:
         debug_dir = tmp_path / "debug_logs"
         debug_dir.mkdir()
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'all'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'all'):
+            from kiro.debug_logger import DebugLogger
             logger = DebugLogger.__new__(DebugLogger)
             logger._initialized = False
             logger.__init__()
@@ -523,8 +523,8 @@ class TestDebugLoggerAppLogsCapture:
         print("Настройка: Режим all...")
         debug_dir = tmp_path / "debug_logs"
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'all'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'all'):
+            from kiro.debug_logger import DebugLogger
             dbg_logger = DebugLogger.__new__(DebugLogger)
             dbg_logger._initialized = False
             dbg_logger.__init__()
@@ -547,8 +547,8 @@ class TestDebugLoggerAppLogsCapture:
         print("Настройка: Режим errors...")
         debug_dir = tmp_path / "debug_logs"
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'errors'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'errors'):
+            from kiro.debug_logger import DebugLogger
             from loguru import logger as loguru_logger
             
             dbg_logger = DebugLogger.__new__(DebugLogger)
@@ -585,8 +585,8 @@ class TestDebugLoggerAppLogsCapture:
         debug_dir = tmp_path / "debug_logs"
         debug_dir.mkdir()
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'all'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'all'):
+            from kiro.debug_logger import DebugLogger
             
             dbg_logger = DebugLogger.__new__(DebugLogger)
             dbg_logger._initialized = False
@@ -618,8 +618,8 @@ class TestDebugLoggerAppLogsCapture:
         print("Настройка: Режим errors...")
         debug_dir = tmp_path / "debug_logs"
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'errors'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'errors'):
+            from kiro.debug_logger import DebugLogger
             
             dbg_logger = DebugLogger.__new__(DebugLogger)
             dbg_logger._initialized = False
@@ -644,8 +644,8 @@ class TestDebugLoggerAppLogsCapture:
         Цель: Убедиться, что sink корректно удаляется.
         """
         print("Настройка: Режим all...")
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'all'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'all'):
+            from kiro.debug_logger import DebugLogger
             
             dbg_logger = DebugLogger.__new__(DebugLogger)
             dbg_logger._initialized = False
@@ -672,8 +672,8 @@ class TestDebugLoggerAppLogsCapture:
         debug_dir = tmp_path / "debug_logs"
         debug_dir.mkdir()
         
-        with patch('kiro_gateway.debug_logger.DEBUG_MODE', 'all'):
-            from kiro_gateway.debug_logger import DebugLogger
+        with patch('kiro.debug_logger.DEBUG_MODE', 'all'):
+            from kiro.debug_logger import DebugLogger
             
             dbg_logger = DebugLogger.__new__(DebugLogger)
             dbg_logger._initialized = False

tests/unit/test_http_client.py

@@ -13,9 +13,9 @@ from datetime import datetime, timezone, timedelta
 import httpx
 from fastapi import HTTPException
 
-from kiro_gateway.http_client import KiroHttpClient
-from kiro_gateway.auth import KiroAuthManager
-from kiro_gateway.config import MAX_RETRIES, BASE_RETRY_DELAY, FIRST_TOKEN_MAX_RETRIES, STREAMING_READ_TIMEOUT
+from kiro.http_client import KiroHttpClient
+from kiro.auth import KiroAuthManager
+from kiro.config import MAX_RETRIES, BASE_RETRY_DELAY, FIRST_TOKEN_MAX_RETRIES, STREAMING_READ_TIMEOUT
 
 
 @pytest.fixture
@@ -68,7 +68,7 @@ class TestKiroHttpClientGetClient:
         http_client = KiroHttpClient(mock_auth_manager_for_http)
         
         print("Action: Getting client...")
-        with patch('kiro_gateway.http_client.httpx.AsyncClient') as mock_async_client:
+        with patch('kiro.http_client.httpx.AsyncClient') as mock_async_client:
             mock_instance = AsyncMock()
             mock_instance.is_closed = False
             mock_async_client.return_value = mock_instance
@@ -112,7 +112,7 @@ class TestKiroHttpClientGetClient:
         http_client.client = mock_closed
         
         print("Action: Getting client...")
-        with patch('kiro_gateway.http_client.httpx.AsyncClient') as mock_async_client:
+        with patch('kiro.http_client.httpx.AsyncClient') as mock_async_client:
             mock_new = AsyncMock()
             mock_new.is_closed = False
             mock_async_client.return_value = mock_new
@@ -202,7 +202,7 @@ class TestKiroHttpClientRequestWithRetry:
         
         print("Action: Executing request...")
         with patch.object(http_client, '_get_client', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
                 response = await http_client.request_with_retry(
                     "POST",
                     "https://api.example.com/test",
@@ -234,7 +234,7 @@ class TestKiroHttpClientRequestWithRetry:
         
         print("Action: Executing request...")
         with patch.object(http_client, '_get_client', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
                 response = await http_client.request_with_retry(
                     "POST",
                     "https://api.example.com/test",
@@ -266,8 +266,8 @@ class TestKiroHttpClientRequestWithRetry:
         
         print("Action: Executing request...")
         with patch.object(http_client, '_get_client', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
-                with patch('kiro_gateway.http_client.asyncio.sleep', new_callable=AsyncMock) as mock_sleep:
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
+                with patch('kiro.http_client.asyncio.sleep', new_callable=AsyncMock) as mock_sleep:
                     response = await http_client.request_with_retry(
                         "POST",
                         "https://api.example.com/test",
@@ -299,8 +299,8 @@ class TestKiroHttpClientRequestWithRetry:
         
         print("Action: Executing request...")
         with patch.object(http_client, '_get_client', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
-                with patch('kiro_gateway.http_client.asyncio.sleep', new_callable=AsyncMock) as mock_sleep:
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
+                with patch('kiro.http_client.asyncio.sleep', new_callable=AsyncMock) as mock_sleep:
                     response = await http_client.request_with_retry(
                         "POST",
                         "https://api.example.com/test",
@@ -332,8 +332,8 @@ class TestKiroHttpClientRequestWithRetry:
         
         print("Action: Executing request...")
         with patch.object(http_client, '_get_client', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
-                with patch('kiro_gateway.http_client.asyncio.sleep', new_callable=AsyncMock) as mock_sleep:
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
+                with patch('kiro.http_client.asyncio.sleep', new_callable=AsyncMock) as mock_sleep:
                     response = await http_client.request_with_retry(
                         "POST",
                         "https://api.example.com/test",
@@ -365,8 +365,8 @@ class TestKiroHttpClientRequestWithRetry:
         
         print("Action: Executing request...")
         with patch.object(http_client, '_get_client', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
-                with patch('kiro_gateway.http_client.asyncio.sleep', new_callable=AsyncMock) as mock_sleep:
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
+                with patch('kiro.http_client.asyncio.sleep', new_callable=AsyncMock) as mock_sleep:
                     response = await http_client.request_with_retry(
                         "POST",
                         "https://api.example.com/test",
@@ -392,8 +392,8 @@ class TestKiroHttpClientRequestWithRetry:
         
         print("Action: Executing request...")
         with patch.object(http_client, '_get_client', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
-                with patch('kiro_gateway.http_client.asyncio.sleep', new_callable=AsyncMock):
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
+                with patch('kiro.http_client.asyncio.sleep', new_callable=AsyncMock):
                     with pytest.raises(HTTPException) as exc_info:
                         await http_client.request_with_retry(
                             "POST",
@@ -423,7 +423,7 @@ class TestKiroHttpClientRequestWithRetry:
         
         print("Action: Executing request...")
         with patch.object(http_client, '_get_client', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
                 response = await http_client.request_with_retry(
                     "POST",
                     "https://api.example.com/test",
@@ -455,7 +455,7 @@ class TestKiroHttpClientRequestWithRetry:
         
         print("Action: Executing streaming request...")
         with patch.object(http_client, '_get_client', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
                 response = await http_client.request_with_retry(
                     "POST",
                     "https://api.example.com/test",
@@ -542,8 +542,8 @@ class TestKiroHttpClientExponentialBackoff:
         
         print("Action: Executing request with multiple retries...")
         with patch.object(http_client, '_get_client', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
-                with patch('kiro_gateway.http_client.asyncio.sleep', side_effect=capture_sleep):
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
+                with patch('kiro.http_client.asyncio.sleep', side_effect=capture_sleep):
                     response = await http_client.request_with_retry(
                         "POST",
                         "https://api.example.com/test",
@@ -580,10 +580,10 @@ class TestKiroHttpClientStreamingTimeout:
         mock_client.send = AsyncMock(return_value=mock_response)
         
         print("Action: Executing streaming request...")
-        with patch('kiro_gateway.http_client.httpx.AsyncClient') as mock_async_client:
+        with patch('kiro.http_client.httpx.AsyncClient') as mock_async_client:
             mock_async_client.return_value = mock_client
             
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
                 response = await http_client.request_with_retry(
                     "POST",
                     "https://api.example.com/test",
@@ -619,8 +619,8 @@ class TestKiroHttpClientStreamingTimeout:
         mock_client.send = AsyncMock(side_effect=httpx.TimeoutException("Timeout"))
         
         print("Action: Executing streaming request with timeouts...")
-        with patch('kiro_gateway.http_client.httpx.AsyncClient', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
+        with patch('kiro.http_client.httpx.AsyncClient', return_value=mock_client):
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
                 with pytest.raises(HTTPException) as exc_info:
                     await http_client.request_with_retry(
                         "POST",
@@ -666,9 +666,9 @@ class TestKiroHttpClientStreamingTimeout:
             sleep_called = True
         
         print("Action: Executing streaming request with one timeout...")
-        with patch('kiro_gateway.http_client.httpx.AsyncClient', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
-                with patch('kiro_gateway.http_client.asyncio.sleep', side_effect=capture_sleep):
+        with patch('kiro.http_client.httpx.AsyncClient', return_value=mock_client):
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
+                with patch('kiro.http_client.asyncio.sleep', side_effect=capture_sleep):
                     response = await http_client.request_with_retry(
                         "POST",
                         "https://api.example.com/test",
@@ -697,10 +697,10 @@ class TestKiroHttpClientStreamingTimeout:
         mock_client.request = AsyncMock(return_value=mock_response)
         
         print("Action: Executing non-streaming request...")
-        with patch('kiro_gateway.http_client.httpx.AsyncClient') as mock_async_client:
+        with patch('kiro.http_client.httpx.AsyncClient') as mock_async_client:
             mock_async_client.return_value = mock_client
             
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
                 response = await http_client.request_with_retry(
                     "POST",
                     "https://api.example.com/test",
@@ -742,9 +742,9 @@ class TestKiroHttpClientStreamingTimeout:
         ])
         
         print("Action: Executing streaming request with ConnectTimeout...")
-        with patch('kiro_gateway.http_client.httpx.AsyncClient', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
-                with patch('kiro_gateway.http_client.logger') as mock_logger:
+        with patch('kiro.http_client.httpx.AsyncClient', return_value=mock_client):
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
+                with patch('kiro.http_client.logger') as mock_logger:
                     response = await http_client.request_with_retry(
                         "POST",
                         "https://api.example.com/test",
@@ -781,9 +781,9 @@ class TestKiroHttpClientStreamingTimeout:
         ])
         
         print("Action: Executing streaming request with ReadTimeout...")
-        with patch('kiro_gateway.http_client.httpx.AsyncClient', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
-                with patch('kiro_gateway.http_client.logger') as mock_logger:
+        with patch('kiro.http_client.httpx.AsyncClient', return_value=mock_client):
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
+                with patch('kiro.http_client.logger') as mock_logger:
                     response = await http_client.request_with_retry(
                         "POST",
                         "https://api.example.com/test",
@@ -814,8 +814,8 @@ class TestKiroHttpClientStreamingTimeout:
         mock_client.send = AsyncMock(side_effect=httpx.ReadTimeout("Timeout"))
         
         print("Action: Executing streaming request with persistent timeouts...")
-        with patch('kiro_gateway.http_client.httpx.AsyncClient', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
+        with patch('kiro.http_client.httpx.AsyncClient', return_value=mock_client):
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
                 with pytest.raises(HTTPException) as exc_info:
                     await http_client.request_with_retry(
                         "POST",
@@ -845,9 +845,9 @@ class TestKiroHttpClientStreamingTimeout:
         mock_client.request = AsyncMock(side_effect=httpx.TimeoutException("Timeout"))
         
         print("Action: Executing non-streaming request with persistent timeouts...")
-        with patch('kiro_gateway.http_client.httpx.AsyncClient', return_value=mock_client):
-            with patch('kiro_gateway.http_client.get_kiro_headers', return_value={}):
-                with patch('kiro_gateway.http_client.asyncio.sleep', new_callable=AsyncMock):
+        with patch('kiro.http_client.httpx.AsyncClient', return_value=mock_client):
+            with patch('kiro.http_client.get_kiro_headers', return_value={}):
+                with patch('kiro.http_client.asyncio.sleep', new_callable=AsyncMock):
                     with pytest.raises(HTTPException) as exc_info:
                         await http_client.request_with_retry(
                             "POST",

tests/unit/test_main_cli.py

@@ -395,7 +395,7 @@ class TestCliVersion:
         """
         print("Setup: Importing parse_cli_args and APP_VERSION...")
         from main import parse_cli_args
-        from kiro_gateway.config import APP_VERSION
+        from kiro.config import APP_VERSION
         
         print("Action: Calling parse_cli_args with --version...")
         with patch.object(sys, 'argv', ['main.py', '--version']):

tests/unit/test_parsers.py

@@ -7,7 +7,7 @@ Unit-тесты для AwsEventStreamParser и вспомогательных ф
 
 import pytest
 
-from kiro_gateway.parsers import (
+from kiro.parsers import (
     AwsEventStreamParser,
     find_matching_brace,
     parse_bracket_tool_calls,

tests/unit/test_routes.py

@@ -12,8 +12,8 @@ from datetime import datetime, timezone
 from fastapi import HTTPException
 from fastapi.testclient import TestClient
 
-from kiro_gateway.routes import verify_api_key, router
-from kiro_gateway.config import PROXY_API_KEY, APP_VERSION, AVAILABLE_MODELS
+from kiro.routes import verify_api_key, router
+from kiro.config import PROXY_API_KEY, APP_VERSION, AVAILABLE_MODELS
 
 
 class TestVerifyApiKey:

tests/unit/test_streaming.py

@@ -10,7 +10,7 @@ import pytest
 import json
 from unittest.mock import AsyncMock, MagicMock, patch
 
-from kiro_gateway.streaming import (
+from kiro.streaming import (
     stream_kiro_to_openai,
     collect_stream_response
 )
@@ -77,8 +77,8 @@ class TestStreamingToolCallsIndex:
         print("Action: Collecting streaming chunks...")
         chunks = []
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
                 async for chunk in stream_kiro_to_openai(
                     mock_http_client, mock_response, "test-model", 
                     mock_model_cache, mock_auth_manager
@@ -137,8 +137,8 @@ class TestStreamingToolCallsIndex:
         print("Action: Collecting streaming chunks...")
         chunks = []
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
                 async for chunk in stream_kiro_to_openai(
                     mock_http_client, mock_response, "test-model",
                     mock_model_cache, mock_auth_manager
@@ -197,8 +197,8 @@ class TestStreamingToolCallsNoneProtection:
         print("Action: Collecting streaming chunks...")
         chunks = []
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
                 async for chunk in stream_kiro_to_openai(
                     mock_http_client, mock_response, "test-model",
                     mock_model_cache, mock_auth_manager
@@ -256,8 +256,8 @@ class TestStreamingToolCallsNoneProtection:
         print("Action: Collecting streaming chunks...")
         chunks = []
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
                 async for chunk in stream_kiro_to_openai(
                     mock_http_client, mock_response, "test-model",
                     mock_model_cache, mock_auth_manager
@@ -312,8 +312,8 @@ class TestStreamingToolCallsNoneProtection:
         print("Action: Collecting streaming chunks...")
         chunks = []
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
                 async for chunk in stream_kiro_to_openai(
                     mock_http_client, mock_response, "test-model",
                     mock_model_cache, mock_auth_manager
@@ -357,8 +357,8 @@ class TestCollectStreamResponseToolCalls:
         
         print("Action: Collecting full response...")
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
                 result = await collect_stream_response(
                     mock_http_client, mock_response, "test-model",
                     mock_model_cache, mock_auth_manager
@@ -403,8 +403,8 @@ class TestCollectStreamResponseToolCalls:
         
         print("Action: Collecting full response...")
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
                 result = await collect_stream_response(
                     mock_http_client, mock_response, "test-model",
                     mock_model_cache, mock_auth_manager
@@ -453,8 +453,8 @@ class TestCollectStreamResponseToolCalls:
         
         print("Action: Collecting full response...")
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
                 result = await collect_stream_response(
                     mock_http_client, mock_response, "test-model",
                     mock_model_cache, mock_auth_manager
@@ -497,8 +497,8 @@ class TestStreamingErrorHandling:
         chunks_received = []
         generator_exit_caught = False
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
                 try:
                     async for chunk in stream_kiro_to_openai(
                         mock_http_client, mock_response, "test-model",
@@ -546,9 +546,9 @@ class TestStreamingErrorHandling:
         
         print("Action: Running streaming with EmptyMessageError...")
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
-                with patch('kiro_gateway.streaming.logger') as mock_logger:
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
+                with patch('kiro.streaming.logger') as mock_logger:
                     exception_raised = False
                     try:
                         async for chunk in stream_kiro_to_openai(
@@ -599,8 +599,8 @@ class TestStreamingErrorHandling:
         
         print("Action: Running streaming with RuntimeError...")
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
                 with pytest.raises(RuntimeError) as exc_info:
                     async for chunk in stream_kiro_to_openai(
                         mock_http_client, mock_response, "test-model",
@@ -636,8 +636,8 @@ class TestStreamingErrorHandling:
         
         print("Action: Running streaming with ValueError...")
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
                 try:
                     async for chunk in stream_kiro_to_openai(
                         mock_http_client, mock_response, "test-model",
@@ -675,8 +675,8 @@ class TestStreamingErrorHandling:
         print("Action: Running successful streaming...")
         chunks = []
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
                 async for chunk in stream_kiro_to_openai(
                     mock_http_client, mock_response, "test-model",
                     mock_model_cache, mock_auth_manager
@@ -712,8 +712,8 @@ class TestStreamingErrorHandling:
         
         print("Action: Running streaming with error and error in aclose()...")
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
                 with pytest.raises(RuntimeError) as exc_info:
                     async for chunk in stream_kiro_to_openai(
                         mock_http_client, mock_response, "test-model",
@@ -737,7 +737,7 @@ class TestFirstTokenTimeoutError:
         Goal: Ensure first token timeout is not handled as regular error.
         """
         import asyncio
-        from kiro_gateway.streaming import FirstTokenTimeoutError, stream_kiro_to_openai_internal
+        from kiro.streaming import FirstTokenTimeoutError, stream_kiro_to_openai_internal
         
         print("Setup: Mock response with timeout...")
         
@@ -757,7 +757,7 @@ class TestFirstTokenTimeoutError:
         async def mock_wait_for_timeout(*args, **kwargs):
             raise asyncio.TimeoutError()
         
-        with patch('kiro_gateway.streaming.asyncio.wait_for', side_effect=mock_wait_for_timeout):
+        with patch('kiro.streaming.asyncio.wait_for', side_effect=mock_wait_for_timeout):
             with pytest.raises(FirstTokenTimeoutError) as exc_info:
                 async for chunk in stream_kiro_to_openai_internal(
                     mock_http_client, mock_response, "test-model",
@@ -780,7 +780,7 @@ class TestFirstTokenTimeoutError:
         Goal: Ensure consistent logging format for first token timeout.
         """
         import asyncio
-        from kiro_gateway.streaming import FirstTokenTimeoutError, stream_kiro_to_openai_internal
+        from kiro.streaming import FirstTokenTimeoutError, stream_kiro_to_openai_internal
         
         print("Setup: Mock response with timeout...")
         
@@ -798,8 +798,8 @@ class TestFirstTokenTimeoutError:
         
         print("Action: Running streaming with timeout and checking logs...")
         
-        with patch('kiro_gateway.streaming.asyncio.wait_for', side_effect=mock_wait_for_timeout):
-            with patch('kiro_gateway.streaming.logger') as mock_logger:
+        with patch('kiro.streaming.asyncio.wait_for', side_effect=mock_wait_for_timeout):
+            with patch('kiro.streaming.logger') as mock_logger:
                 try:
                     async for chunk in stream_kiro_to_openai_internal(
                         mock_http_client, mock_response, "test-model",
@@ -825,7 +825,7 @@ class TestFirstTokenTimeoutError:
         Goal: Ensure timeout value is visible in logs for debugging.
         """
         import asyncio
-        from kiro_gateway.streaming import FirstTokenTimeoutError, stream_kiro_to_openai_internal
+        from kiro.streaming import FirstTokenTimeoutError, stream_kiro_to_openai_internal
         
         print("Setup: Mock response with timeout...")
         
@@ -845,8 +845,8 @@ class TestFirstTokenTimeoutError:
         
         print(f"Action: Running streaming with custom timeout={custom_timeout}...")
         
-        with patch('kiro_gateway.streaming.asyncio.wait_for', side_effect=mock_wait_for_timeout):
-            with patch('kiro_gateway.streaming.logger') as mock_logger:
+        with patch('kiro.streaming.asyncio.wait_for', side_effect=mock_wait_for_timeout):
+            with patch('kiro.streaming.logger') as mock_logger:
                 try:
                     async for chunk in stream_kiro_to_openai_internal(
                         mock_http_client, mock_response, "test-model",
@@ -871,7 +871,7 @@ class TestFirstTokenTimeoutError:
         What it does: Verifies that successful first token receipt is logged.
         Goal: Ensure debug log shows when first token is received.
         """
-        from kiro_gateway.streaming import stream_kiro_to_openai_internal
+        from kiro.streaming import stream_kiro_to_openai_internal
         
         print("Setup: Mock response with successful first token...")
         
@@ -890,9 +890,9 @@ class TestFirstTokenTimeoutError:
         
         print("Action: Running streaming and checking debug logs...")
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
-                with patch('kiro_gateway.streaming.logger') as mock_logger:
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
+                with patch('kiro.streaming.logger') as mock_logger:
                     chunks = []
                     async for chunk in stream_kiro_to_openai_internal(
                         mock_http_client, mock_response, "test-model",
@@ -921,7 +921,7 @@ class TestStreamWithFirstTokenRetry:
         Goal: Ensure retry logic works for first token timeout.
         """
         import asyncio
-        from kiro_gateway.streaming import stream_with_first_token_retry, FirstTokenTimeoutError
+        from kiro.streaming import stream_with_first_token_retry, FirstTokenTimeoutError
         
         print("Setup: Mock make_request that succeeds on second attempt...")
         
@@ -958,9 +958,9 @@ class TestStreamWithFirstTokenRetry:
         
         print("Action: Running stream_with_first_token_retry...")
         
-        with patch('kiro_gateway.streaming.AwsEventStreamParser', return_value=mock_parser):
-            with patch('kiro_gateway.streaming.parse_bracket_tool_calls', return_value=[]):
-                with patch('kiro_gateway.streaming.asyncio.wait_for', side_effect=mock_wait_for_with_retry):
+        with patch('kiro.streaming.AwsEventStreamParser', return_value=mock_parser):
+            with patch('kiro.streaming.parse_bracket_tool_calls', return_value=[]):
+                with patch('kiro.streaming.asyncio.wait_for', side_effect=mock_wait_for_with_retry):
                     chunks = []
                     async for chunk in stream_with_first_token_retry(
                         mock_make_request,
@@ -988,7 +988,7 @@ class TestStreamWithFirstTokenRetry:
         """
         import asyncio
         from fastapi import HTTPException
-        from kiro_gateway.streaming import stream_with_first_token_retry
+        from kiro.streaming import stream_with_first_token_retry
         
         print("Setup: Mock make_request that always times out...")
         
@@ -1016,7 +1016,7 @@ class TestStreamWithFirstTokenRetry:
         
         print(f"Action: Running stream_with_first_token_retry with max_retries={max_retries}...")
         
-        with patch('kiro_gateway.streaming.asyncio.wait_for', side_effect=mock_wait_for_always_timeout):
+        with patch('kiro.streaming.asyncio.wait_for', side_effect=mock_wait_for_always_timeout):
             with pytest.raises(HTTPException) as exc_info:
                 async for chunk in stream_with_first_token_retry(
                     mock_make_request,
@@ -1047,7 +1047,7 @@ class TestStreamWithFirstTokenRetry:
         """
         import asyncio
         from fastapi import HTTPException
-        from kiro_gateway.streaming import stream_with_first_token_retry
+        from kiro.streaming import stream_with_first_token_retry
         
         print("Setup: Mock make_request that always times out...")
         
@@ -1068,8 +1068,8 @@ class TestStreamWithFirstTokenRetry:
         
         print("Action: Running stream_with_first_token_retry and checking logs...")
         
-        with patch('kiro_gateway.streaming.asyncio.wait_for', side_effect=mock_wait_for_always_timeout):
-            with patch('kiro_gateway.streaming.logger') as mock_logger:
+        with patch('kiro.streaming.asyncio.wait_for', side_effect=mock_wait_for_always_timeout):
+            with patch('kiro.streaming.logger') as mock_logger:
                 try:
                     async for chunk in stream_with_first_token_retry(
                         mock_make_request,

tests/unit/test_thinking_parser.py

@@ -14,7 +14,7 @@ Tests cover:
 import pytest
 from unittest.mock import patch
 
-from kiro_gateway.thinking_parser import (
+from kiro.thinking_parser import (
     ThinkingParser,
     ThinkingParseResult,
     ParserState,
@@ -900,7 +900,7 @@ class TestThinkingParserConfigIntegration:
         Purpose: Ensure config integration works.
         """
         print("Testing config handling mode...")
-        with patch('kiro_gateway.thinking_parser.FAKE_REASONING_HANDLING', 'remove'):
+        with patch('kiro.thinking_parser.FAKE_REASONING_HANDLING', 'remove'):
             parser = ThinkingParser()
             
             print(f"Handling mode: {parser.handling_mode}")
@@ -913,7 +913,7 @@ class TestThinkingParserConfigIntegration:
         """
         print("Testing config open tags...")
         custom_tags = ["<custom>"]
-        with patch('kiro_gateway.thinking_parser.FAKE_REASONING_OPEN_TAGS', custom_tags):
+        with patch('kiro.thinking_parser.FAKE_REASONING_OPEN_TAGS', custom_tags):
             parser = ThinkingParser()
             
             print(f"Open tags: {parser.open_tags}")
@@ -929,7 +929,7 @@ class TestThinkingParserConfigIntegration:
         TestThinkingParserInitialization.test_custom_initial_buffer_size.
         """
         print("Testing default initial buffer size from config...")
-        from kiro_gateway.config import FAKE_REASONING_INITIAL_BUFFER_SIZE
+        from kiro.config import FAKE_REASONING_INITIAL_BUFFER_SIZE
         
         parser = ThinkingParser()
         
@@ -947,10 +947,10 @@ class TestInjectThinkingTags:
         Purpose: Ensure tags are added to content.
         """
         print("Testing tag injection when enabled...")
-        from kiro_gateway.converters import inject_thinking_tags
+        from kiro.converters import inject_thinking_tags
         
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags("Hello")
         
         print(f"Result: '{result}'")
@@ -964,9 +964,9 @@ class TestInjectThinkingTags:
         Purpose: Ensure tags are not added when disabled.
         """
         print("Testing no tag injection when disabled...")
-        from kiro_gateway.converters import inject_thinking_tags
+        from kiro.converters import inject_thinking_tags
         
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', False):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', False):
             result = inject_thinking_tags("Hello")
         
         print(f"Result: '{result}'")
@@ -979,12 +979,12 @@ class TestInjectThinkingTags:
         Purpose: Ensure content is not modified.
         """
         print("Testing content preservation...")
-        from kiro_gateway.converters import inject_thinking_tags
+        from kiro.converters import inject_thinking_tags
         
         original = "This is my original content with special chars: <>&"
         
-        with patch('kiro_gateway.converters.FAKE_REASONING_ENABLED', True):
-            with patch('kiro_gateway.converters.FAKE_REASONING_MAX_TOKENS', 4000):
+        with patch('kiro.converters.FAKE_REASONING_ENABLED', True):
+            with patch('kiro.converters.FAKE_REASONING_MAX_TOKENS', 4000):
                 result = inject_thinking_tags(original)
         
         print(f"Result ends with original: {result.endswith(original)}")

tests/unit/test_tokenizer.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-Unit-тесты для модуля токенизатора (kiro_gateway/tokenizer.py).
+Unit-тесты для модуля токенизатора (kiro/tokenizer.py).
 
 Проверяет:
 - Подсчёт токенов в тексте (count_tokens)
@@ -15,7 +15,7 @@ Unit-тесты для модуля токенизатора (kiro_gateway/token
 import pytest
 from unittest.mock import patch, MagicMock
 
-from kiro_gateway.tokenizer import (
+from kiro.tokenizer import (
     count_tokens,
     count_message_tokens,
     count_tools_tokens,
@@ -163,7 +163,7 @@ class TestCountTokensFallback:
         print("Тест: Fallback без tiktoken...")
         
         # Мокируем _get_encoding чтобы вернуть None
-        with patch('kiro_gateway.tokenizer._get_encoding', return_value=None):
+        with patch('kiro.tokenizer._get_encoding', return_value=None):
             result = count_tokens("Hello world test")
             print(f"Результат: {result}")
             
@@ -180,7 +180,7 @@ class TestCountTokensFallback:
         """
         print("Тест: Fallback без коррекции...")
         
-        with patch('kiro_gateway.tokenizer._get_encoding', return_value=None):
+        with patch('kiro.tokenizer._get_encoding', return_value=None):
             result = count_tokens("Test", apply_claude_correction=False)
             print(f"Результат: {result}")
             
@@ -724,7 +724,7 @@ class TestGetEncoding:
         print("Тест: tiktoken доступен...")
         
         # Сбрасываем глобальную переменную для чистого теста
-        import kiro_gateway.tokenizer as tokenizer_module
+        import kiro.tokenizer as tokenizer_module
         original_encoding = tokenizer_module._encoding
         tokenizer_module._encoding = None
         
@@ -762,7 +762,7 @@ class TestGetEncoding:
         """
         print("Тест: ImportError...")
         
-        import kiro_gateway.tokenizer as tokenizer_module
+        import kiro.tokenizer as tokenizer_module
         original_encoding = tokenizer_module._encoding
         tokenizer_module._encoding = None