fix: resolve rebase conflicts and update plugin API calls

- Fix imports: mcpgateway.models -> mcpgateway.common.models
- Add missing ToolHookType import
- Update plugin manager API: tool_pre_invoke -> invoke_hook with ToolHookType
- Update plugin manager API: tool_post_invoke -> invoke_hook with ToolHookType
- Update HttpHeaderPayload: headers -> root parameter
- Create alembic merge migration for CA cert and observability heads
- Apply pre-commit formatting fixes (trailing whitespace, tabs, encoding pragma)

Signed-off-by: Mihai Criveti <[email protected]>

Author: crivetimihai

CHANGELOG.md

@@ -40,7 +40,7 @@ The default PostgreSQL image has been upgraded from version 17 to 18. This is a
    ```bash
    make compose-upgrade-pg18
    ```
-   
+
    This will:
    - Prompt for confirmation (⚠️ **backup recommended**)
    - Run `pg_upgrade` to migrate data from Postgres 17 → 18

charts/mcp-stack/README.md

@@ -336,13 +336,13 @@ mcpContextForge:
   secret:
     # Enable Ed25519 signing
     ENABLE_ED25519_SIGNING: "true"
-    
+
     # Current signing key (PEM format)
     ED25519_PRIVATE_KEY: |
       -----BEGIN PRIVATE KEY-----
       MC4CAQAwBQYDK2VwBCIEIJ5pW... (your key here)
       -----END PRIVATE KEY-----
-    
+
     # Previous key for rotation (optional)
     PREV_ED25519_PRIVATE_KEY: |
       -----BEGIN PRIVATE KEY-----

mcp-servers/go/fast-time-server/go.mod

@@ -7,7 +7,7 @@ toolchain go1.23.10
 require github.com/mark3labs/mcp-go v0.32.0 // MCP server/runtime
 
 require (
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/spf13/cast v1.7.1 // indirect
-	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
+    github.com/google/uuid v1.6.0 // indirect
+    github.com/spf13/cast v1.7.1 // indirect
+    github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
 )

mcpgateway/alembic/versions/aac21d6f9522_merge_ca_cert_and_observability_heads.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+"""merge ca cert and observability heads
+
+Revision ID: aac21d6f9522
+Revises: f9101f3b00e3, j4d5e6f7g8h9
+Create Date: 2025-11-08 21:43:56.381588
+
+"""
+from typing import Sequence, Union
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'aac21d6f9522'
+down_revision: Union[str, Sequence[str], None] = ('f9101f3b00e3', 'j4d5e6f7g8h9')
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    pass
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    pass

mcpgateway/alembic/versions/f9101f3b00e3_store_ca_certs_for_gateways.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """store ca-certs for gateways
 
 Revision ID: f9101f3b00e3

mcpgateway/services/tool_service.py

@@ -46,12 +46,12 @@
 from mcpgateway.db import server_tool_association
 from mcpgateway.db import Tool as DbTool
 from mcpgateway.db import ToolMetric
-from mcpgateway.models import Gateway as PydanticGateway
-from mcpgateway.models import TextContent
-from mcpgateway.models import Tool as PydanticTool
-from mcpgateway.models import ToolResult
+from mcpgateway.common.models import Gateway as PydanticGateway
+from mcpgateway.common.models import TextContent
+from mcpgateway.common.models import Tool as PydanticTool
+from mcpgateway.common.models import ToolResult
 from mcpgateway.observability import create_span
-from mcpgateway.plugins.framework import GlobalContext, HttpHeaderPayload, PluginError, PluginManager, PluginViolationError, ToolPostInvokePayload, ToolPreInvokePayload
+from mcpgateway.plugins.framework import GlobalContext, HttpHeaderPayload, PluginError, PluginManager, PluginViolationError, ToolHookType, ToolPostInvokePayload, ToolPreInvokePayload
 from mcpgateway.plugins.framework.constants import GATEWAY_METADATA, TOOL_METADATA
 from mcpgateway.schemas import ToolCreate, ToolRead, ToolUpdate, TopPerformer
 from mcpgateway.services.logging_service import LoggingService

mcpgateway/templates/admin.html

@@ -5054,7 +5054,7 @@ <h3 class="text-lg font-bold mb-4 dark:text-gray-200">
                 </div>
               </div>
               <div id="ca-certificate-feedback" class="mt-2 text-sm"></div>
-            </div>            
+            </div>
             <div class="mt-6">
               <button
                 type="submit"