Fix/preserve model metadata

.github/ISSUE_TEMPLATE/mcp_library_submission.yml

@@ -0,0 +1,135 @@
+name: "Add MCP Server to Library"
+description: "Propose a new MCP server for the Bifrost community library"
+title: "[MCP Library] Add: "
+labels: ["community", "mcp-library"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for contributing to the Bifrost MCP Library. Please fill out the details below, then open a PR editing `community/mcp-library/servers.json`.
+
+        Do not include secrets, tokens, API keys, private URLs, or personal data.
+
+  - type: input
+    id: name
+    attributes:
+      label: Server name
+      description: "Human-readable display name. Bifrost derives the internal slug from this name."
+      placeholder: "My Server"
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: "What does this MCP server do? Keep it concise and factual."
+    validations:
+      required: true
+
+  - type: input
+    id: category
+    attributes:
+      label: Category
+      description: "Reuse an existing category from community/mcp-library/README.md when possible."
+      placeholder: "Developer Tools"
+    validations:
+      required: true
+
+  - type: dropdown
+    id: connection_type
+    attributes:
+      label: Connection type
+      options:
+        - http
+        - stdio
+        - sse
+        - inprocess
+    validations:
+      required: true
+
+  - type: input
+    id: connection_url
+    attributes:
+      label: Connection URL
+      description: "Required for http or sse servers. Leave blank for stdio servers."
+      placeholder: "https://api.example.com/mcp"
+
+  - type: textarea
+    id: stdio_config
+    attributes:
+      label: STDIO config
+      description: "Required for stdio servers. Include command, args, and environment variable names only."
+      value: |
+        command:
+        args:
+        envs:
+
+  - type: dropdown
+    id: auth_type
+    attributes:
+      label: Auth type
+      options:
+        - none
+        - headers
+        - oauth
+        - per_user_oauth
+        - per_user_headers
+    validations:
+      required: true
+
+  - type: input
+    id: required_header_keys
+    attributes:
+      label: Required header keys
+      description: "Header names only, comma-separated. Never include values."
+      placeholder: "Authorization, x-api-key"
+
+  - type: input
+    id: docs_url
+    attributes:
+      label: Documentation URL
+      description: "Link to the server's docs, repo, or homepage."
+      placeholder: "https://github.com/example/mcp-server"
+    validations:
+      required: true
+
+  - type: input
+    id: publisher
+    attributes:
+      label: Publisher
+      description: "Person or organization that maintains this server."
+    validations:
+      required: true
+
+  - type: input
+    id: icon_url
+    attributes:
+      label: Icon URL or path
+      description: "Optional square PNG or SVG icon URL/path."
+      placeholder: "/images/mcp-servers/example.svg"
+
+  - type: input
+    id: tags
+    attributes:
+      label: Tags
+      description: "Short tags, comma-separated."
+      placeholder: "api, docs, developer-tools"
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Checklist
+      options:
+        - label: "I searched `servers.json` and this is not a duplicate."
+          required: true
+        - label: "I did not include secrets, tokens, API keys, private URLs, or personal data."
+          required: true
+        - label: "I did not add `slug` or `version` fields."
+          required: true
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional context
+      description: "Anything else maintainers should know?"

.github/dependabot.yml

@@ -314,3 +314,8 @@ updates:
     directory: /tests/cmd/seedvks
     schedule:
       interval: weekly
+
+  - package-ecosystem: gomod
+    directory: /plugins/modelcatalogresolver
+    schedule:
+      interval: weekly

.github/workflows/scripts/run-migration-tests.sh

@@ -1801,6 +1801,62 @@ append_dynamic_columns_postgres() {
     echo "UPDATE logs SET inc_number = NULL WHERE id = 'log-migration-test-002';" >> "$output_file"
     echo "UPDATE logs SET inc_number = NULL WHERE id = 'log-migration-test-003';" >> "$output_file"
   fi
+
+  # -------------------------------------------------------------------------
+  # v1.5.9 columns - config store tables
+  # -------------------------------------------------------------------------
+
+  # governance_budgets.model_config_id (added in v1.5.9 via add_budget_model_config_id_column)
+  if column_exists_postgres "governance_budgets" "model_config_id"; then
+    echo "UPDATE governance_budgets SET model_config_id = NULL WHERE id = 'budget-migration-test-1';" >> "$output_file"
+    echo "UPDATE governance_budgets SET model_config_id = NULL WHERE id = 'budget-migration-test-2';" >> "$output_file"
+    echo "UPDATE governance_budgets SET model_config_id = NULL WHERE id = 'budget-migration-test-3';" >> "$output_file"
+  fi
+
+  # governance_budgets.customer_id (added in v1.5.9 via add_customer_budgets_to_budgets_table)
+  if column_exists_postgres "governance_budgets" "customer_id"; then
+    echo "UPDATE governance_budgets SET customer_id = NULL WHERE id = 'budget-migration-test-1';" >> "$output_file"
+    echo "UPDATE governance_budgets SET customer_id = NULL WHERE id = 'budget-migration-test-2';" >> "$output_file"
+    echo "UPDATE governance_budgets SET customer_id = NULL WHERE id = 'budget-migration-test-3';" >> "$output_file"
+  fi
+
+  # governance_customers.calendar_aligned (added in v1.5.9 via add_customer_calendar_aligned_column)
+  if column_exists_postgres "governance_customers" "calendar_aligned"; then
+    echo "UPDATE governance_customers SET calendar_aligned = false WHERE id = 'customer-migration-test-1';" >> "$output_file"
+    echo "UPDATE governance_customers SET calendar_aligned = false WHERE id = 'customer-migration-test-2';" >> "$output_file"
+  fi
+
+  # governance_model_configs.scope / scope_id (added in v1.5.9 via add_model_config_scope_columns)
+  # scope is set to the column default 'global'; scope_id stays NULL so the seeded rows keep
+  # satisfying the idx_model_scope_provider unique index
+  if column_exists_postgres "governance_model_configs" "scope"; then
+    echo "UPDATE governance_model_configs SET scope = 'global' WHERE id = 'model-config-migration-test-1';" >> "$output_file"
+    echo "UPDATE governance_model_configs SET scope = 'global' WHERE id = 'model-config-migration-test-2';" >> "$output_file"
+  fi
+  if column_exists_postgres "governance_model_configs" "scope_id"; then
+    echo "UPDATE governance_model_configs SET scope_id = NULL WHERE id = 'model-config-migration-test-1';" >> "$output_file"
+    echo "UPDATE governance_model_configs SET scope_id = NULL WHERE id = 'model-config-migration-test-2';" >> "$output_file"
+  fi
+
+  # governance_model_configs.calendar_aligned (added in v1.5.9 via add_model_config_calendar_aligned_column)
+  if column_exists_postgres "governance_model_configs" "calendar_aligned"; then
+    echo "UPDATE governance_model_configs SET calendar_aligned = false WHERE id = 'model-config-migration-test-1';" >> "$output_file"
+    echo "UPDATE governance_model_configs SET calendar_aligned = false WHERE id = 'model-config-migration-test-2';" >> "$output_file"
+  fi
+
+  # -------------------------------------------------------------------------
+  # v1.5.9 columns - log store tables
+  # -------------------------------------------------------------------------
+
+  # logs multi-team/BU/customer JSON-array columns (added in v1.5.9 via
+  # logs_add_multi_team_business_unit_columns and logs_add_customer_array_columns)
+  for arr_col in team_ids team_names customer_ids customer_names business_unit_ids business_unit_names; do
+    if column_exists_postgres "logs" "$arr_col"; then
+      echo "UPDATE logs SET $arr_col = NULL WHERE id = 'log-migration-test-001';" >> "$output_file"
+      echo "UPDATE logs SET $arr_col = NULL WHERE id = 'log-migration-test-002';" >> "$output_file"
+      echo "UPDATE logs SET $arr_col = NULL WHERE id = 'log-migration-test-003';" >> "$output_file"
+    fi
+  done
 }
 
 # Append dynamic column UPDATEs for columns that may not exist in older schemas (SQLite)
@@ -2792,6 +2848,59 @@ append_dynamic_columns_sqlite() {
   echo "UPDATE logs SET inc_number = NULL WHERE id = 'log-migration-test-001';" >> "$output_file"
   echo "UPDATE logs SET inc_number = NULL WHERE id = 'log-migration-test-002';" >> "$output_file"
   echo "UPDATE logs SET inc_number = NULL WHERE id = 'log-migration-test-003';" >> "$output_file"
+
+  # -------------------------------------------------------------------------
+  # v1.5.9 columns
+  # -------------------------------------------------------------------------
+
+  if [ -f "$config_db" ]; then
+    # governance_budgets.model_config_id (added in v1.5.9 via add_budget_model_config_id_column)
+    if column_exists_sqlite "$config_db" "governance_budgets" "model_config_id"; then
+      echo "UPDATE governance_budgets SET model_config_id = NULL WHERE id = 'budget-migration-test-1';" >> "$output_file"
+      echo "UPDATE governance_budgets SET model_config_id = NULL WHERE id = 'budget-migration-test-2';" >> "$output_file"
+      echo "UPDATE governance_budgets SET model_config_id = NULL WHERE id = 'budget-migration-test-3';" >> "$output_file"
+    fi
+
+    # governance_budgets.customer_id (added in v1.5.9 via add_customer_budgets_to_budgets_table)
+    if column_exists_sqlite "$config_db" "governance_budgets" "customer_id"; then
+      echo "UPDATE governance_budgets SET customer_id = NULL WHERE id = 'budget-migration-test-1';" >> "$output_file"
+      echo "UPDATE governance_budgets SET customer_id = NULL WHERE id = 'budget-migration-test-2';" >> "$output_file"
+      echo "UPDATE governance_budgets SET customer_id = NULL WHERE id = 'budget-migration-test-3';" >> "$output_file"
+    fi
+
+    # governance_customers.calendar_aligned (added in v1.5.9 via add_customer_calendar_aligned_column)
+    if column_exists_sqlite "$config_db" "governance_customers" "calendar_aligned"; then
+      echo "UPDATE governance_customers SET calendar_aligned = 0 WHERE id = 'customer-migration-test-1';" >> "$output_file"
+      echo "UPDATE governance_customers SET calendar_aligned = 0 WHERE id = 'customer-migration-test-2';" >> "$output_file"
+    fi
+
+    # governance_model_configs.scope / scope_id (added in v1.5.9 via add_model_config_scope_columns)
+    # scope is set to the column default 'global'; scope_id stays NULL so the seeded rows keep
+    # satisfying the idx_model_scope_provider unique index
+    if column_exists_sqlite "$config_db" "governance_model_configs" "scope"; then
+      echo "UPDATE governance_model_configs SET scope = 'global' WHERE id = 'model-config-migration-test-1';" >> "$output_file"
+      echo "UPDATE governance_model_configs SET scope = 'global' WHERE id = 'model-config-migration-test-2';" >> "$output_file"
+    fi
+    if column_exists_sqlite "$config_db" "governance_model_configs" "scope_id"; then
+      echo "UPDATE governance_model_configs SET scope_id = NULL WHERE id = 'model-config-migration-test-1';" >> "$output_file"
+      echo "UPDATE governance_model_configs SET scope_id = NULL WHERE id = 'model-config-migration-test-2';" >> "$output_file"
+    fi
+
+    # governance_model_configs.calendar_aligned (added in v1.5.9 via add_model_config_calendar_aligned_column)
+    if column_exists_sqlite "$config_db" "governance_model_configs" "calendar_aligned"; then
+      echo "UPDATE governance_model_configs SET calendar_aligned = 0 WHERE id = 'model-config-migration-test-1';" >> "$output_file"
+      echo "UPDATE governance_model_configs SET calendar_aligned = 0 WHERE id = 'model-config-migration-test-2';" >> "$output_file"
+    fi
+  fi
+
+  # logs multi-team/BU/customer JSON-array columns (added in v1.5.9 via
+  # logs_add_multi_team_business_unit_columns and logs_add_customer_array_columns)
+  # Emitted unconditionally - logs table is in logs_db; fails silently on config_db
+  for arr_col in team_ids team_names customer_ids customer_names business_unit_ids business_unit_names; do
+    echo "UPDATE logs SET $arr_col = NULL WHERE id = 'log-migration-test-001';" >> "$output_file"
+    echo "UPDATE logs SET $arr_col = NULL WHERE id = 'log-migration-test-002';" >> "$output_file"
+    echo "UPDATE logs SET $arr_col = NULL WHERE id = 'log-migration-test-003';" >> "$output_file"
+  done
 }
 
 # ============================================================================

.github/workflows/scripts/validate-helm-config-fields.sh

@@ -555,7 +555,6 @@ assert_field_value 'governance.providers[0].rate_limit_id' '.governance.provider
 assert_field_value 'governance.auth_config.admin_username' '.governance.auth_config.admin_username' '"admin"'
 assert_field_value 'governance.auth_config.admin_password' '.governance.auth_config.admin_password' '"secret"'
 assert_field_value 'governance.auth_config.is_enabled' '.governance.auth_config.is_enabled' 'true'
-assert_field_value 'governance.auth_config.disable_auth_on_inference' '.governance.auth_config.disable_auth_on_inference' 'true'
 
 ###############################################################################
 # 5. Top-level Auth Config
@@ -579,7 +578,6 @@ render_config "$TMPDIR/values-auth.yaml"
 assert_field_value 'auth_config.admin_username' '.auth_config.admin_username' '"root"'
 assert_field_value 'auth_config.admin_password' '.auth_config.admin_password' '"rootpass"'
 assert_field_value 'auth_config.is_enabled' '.auth_config.is_enabled' 'true'
-assert_field_value 'auth_config.disable_auth_on_inference' '.auth_config.disable_auth_on_inference' 'false'
 
 ###############################################################################
 # 6. Plugins (telemetry, logging, governance, maxim, semantic_cache, otel, datadog, custom)
@@ -656,12 +654,22 @@ bifrost:
       enabled: true
       config:
         service_name: "bifrost-dd"
+        ml_app: "bifrost-ml"
         agent_addr: "dd-agent:8126"
+        dogstatsd_addr: "dd-agent:8125"
         env: "staging"
         version: "1.0.0"
         custom_tags:
           team: "platform"
+        enable_metrics: true
         enable_traces: true
+        enable_llm_obs: true
+        disable_content_logging: false
+        agentless: true
+        api_key: "env.DD_API_KEY"
+        site: "datadoghq.com"
+        request_headers:
+          - "x-bf-session-id"
     custom:
       - name: "my-plugin"
         enabled: true
@@ -727,11 +735,20 @@ assert_field_value 'plugins: otel insecure' '.plugins.[5].config.insecure' 'true
 # Datadog plugin
 assert_field_value 'plugins: datadog name' '.plugins.[6].name' '"datadog"'
 assert_field_value 'plugins: datadog service_name' '.plugins.[6].config.service_name' '"bifrost-dd"'
+assert_field_value 'plugins: datadog ml_app' '.plugins.[6].config.ml_app' '"bifrost-ml"'
 assert_field_value 'plugins: datadog agent_addr' '.plugins.[6].config.agent_addr' '"dd-agent:8126"'
+assert_field_value 'plugins: datadog dogstatsd_addr' '.plugins.[6].config.dogstatsd_addr' '"dd-agent:8125"'
 assert_field_value 'plugins: datadog env' '.plugins.[6].config.env' '"staging"'
 assert_field_value 'plugins: datadog version' '.plugins.[6].config.version' '"1.0.0"'
 assert_field 'plugins: datadog custom_tags' '.plugins.[6].config.custom_tags'
+assert_field_value 'plugins: datadog enable_metrics' '.plugins.[6].config.enable_metrics' 'true'
 assert_field_value 'plugins: datadog enable_traces' '.plugins.[6].config.enable_traces' 'true'
+assert_field_value 'plugins: datadog enable_llm_obs' '.plugins.[6].config.enable_llm_obs' 'true'
+assert_field_value 'plugins: datadog disable_content_logging' '.plugins.[6].config.disable_content_logging' 'false'
+assert_field_value 'plugins: datadog agentless' '.plugins.[6].config.agentless' 'true'
+assert_field_value 'plugins: datadog api_key' '.plugins.[6].config.api_key' '"env.DD_API_KEY"'
+assert_field_value 'plugins: datadog site' '.plugins.[6].config.site' '"datadoghq.com"'
+assert_field 'plugins: datadog request_headers' '.plugins.[6].config.request_headers'
 
 # Custom plugin
 assert_field_value 'plugins: custom name' '.plugins.[7].name' '"my-plugin"'

.gitignore

@@ -183,4 +183,7 @@ examples/mcps/oauth-demo-server/oauth-demo-server
 
 # binaries
 tests/cmd/e2eseed/e2eseed
-tests/cmd/seedvks/seedvks
+tests/cmd/seedvks/seedvks
+
+# routing harness ledgers (local run journals, never committed)
+tests/e2e/api/routing/ledger-*