flare-kernel 1.1.2__tar.gz → 1.1.4__tar.gz

{flare_kernel-1.1.2 → flare_kernel-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flare-kernel
-Version: 1.1.2
+Version: 1.1.4
 Summary: FLARE kernel runtime package
 License: Proprietary
 Classifier: Development Status :: 3 - Alpha

{flare_kernel-1.1.2 → flare_kernel-1.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flare-kernel"
-version = "1.1.2"
+version = "1.1.4"
 description = "FLARE kernel runtime package"
 readme = "README.md"
 requires-python = ">=3.11"

{flare_kernel-1.1.2 → flare_kernel-1.1.4}/src/flare_kernel/contracts/context.py

@@ -8,9 +8,60 @@ validation and become reusable backend state.
 
 from __future__ import annotations
 
-from typing import Any
-
-from pydantic import BaseModel, Field, field_validator, model_validator
+from typing import Any, TypeAlias, TypedDict
+
+from pydantic import BaseModel, Field, JsonValue, field_validator, model_validator
+
+from flare_kernel.contracts.context_field_state import ContextClaimItem, ContextFieldState
+
+
+JsonObject: TypeAlias = dict[str, JsonValue]
+
+
+class ContextSnapshot(TypedDict):
+    context_revision_id: str
+    session_summary: str
+    user_focus: list[str]
+    response_priorities: list[str]
+    field_state: JsonObject
+    confirmed_fields: dict[str, JsonValue]
+    missing_fields: list[str]
+    notes: list[str]
+    turns: list[JsonObject]
+    evidence: list[JsonObject]
+    facts: list[JsonObject]
+    inferences: list[JsonObject]
+    unknowns: list[JsonObject]
+    source_attributions: list[JsonObject]
+    artifact_context: list[JsonObject]
+    track: JsonObject
+    sourcing_results: list[JsonObject]
+    analysis_results: list[JsonObject]
+    rank_profile: JsonObject
+    rank_feedback_log: list[JsonObject]
+    archive_summary: JsonObject
+    context_checkpoint: JsonObject
+    updated_at: str
+
+
+class ContextPatch(TypedDict, total=False):
+    session_summary: str
+    user_focus: list[str]
+    response_priorities: list[str]
+    confirmed_fields: dict[str, JsonValue]
+    missing_fields: list[str]
+    notes: list[str]
+    evidence: list[JsonObject]
+    facts: list[JsonObject]
+    inferences: list[JsonObject]
+    unknowns: list[JsonObject]
+    source_attributions: list[JsonObject]
+    artifact_context: list[JsonObject]
+    track: JsonObject
+    sourcing_results: list[JsonObject]
+    analysis_results: list[JsonObject]
+    rank_profile: JsonObject
+    rank_feedback_log: list[JsonObject]
 
 
 class ContextEvidenceItem(BaseModel):
@@ -21,15 +72,6 @@ class ContextEvidenceItem(BaseModel):
     meta: dict[str, Any] = Field(default_factory=dict)
 
 
-class ContextClaimItem(BaseModel):
-    id: str
-    text: str
-    source_id: str = ""
-    evidence_ids: list[str] = Field(default_factory=list)
-    confidence: float | None = None
-    meta: dict[str, Any] = Field(default_factory=dict)
-
-
 class ContextTurnItem(BaseModel):
     turn_id: str
     user_message: str = ""
@@ -82,7 +124,8 @@ class ContextContract(BaseModel):
     session_summary: str = ""
     user_focus: list[str] = Field(default_factory=list)
     response_priorities: list[str] = Field(default_factory=list)
-    confirmed_fields: dict[str, Any] = Field(default_factory=dict)
+    field_state: ContextFieldState = Field(default_factory=ContextFieldState)
+    confirmed_fields: dict[str, JsonValue] = Field(default_factory=dict)
     missing_fields: list[str] = Field(default_factory=list)
     notes: list[str] = Field(default_factory=list)
     turns: list[ContextTurnItem] = Field(default_factory=list)
@@ -101,6 +144,16 @@ class ContextContract(BaseModel):
     context_checkpoint: dict[str, Any] = Field(default_factory=dict)
     updated_at: str = ""
 
+    @model_validator(mode="after")
+    def project_canonical_field_state(self) -> "ContextContract":
+        if self.field_state.state_revision <= 0:
+            return self
+        self.confirmed_fields = dict(self.field_state.confirmed_fields)
+        self.missing_fields = list(self.field_state.missing_fields)
+        self.facts = list(self.field_state.facts)
+        self.unknowns = list(self.field_state.unknowns)
+        return self
+
 
 def create_empty_context() -> ContextContract:
     return ContextContract()

flare_kernel-1.1.4/src/flare_kernel/contracts/context_field_state.py

@@ -0,0 +1,122 @@
+"""Canonical session field-state contracts."""
+
+from __future__ import annotations
+
+from pydantic import BaseModel, ConfigDict, Field, JsonValue, field_validator, model_validator
+
+
+class ContextClaimItem(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    id: str
+    text: str
+    source_id: str = ""
+    evidence_ids: list[str] = Field(default_factory=list)
+    confidence: float | None = None
+    meta: dict[str, JsonValue] = Field(default_factory=dict)
+
+    @model_validator(mode="before")
+    @classmethod
+    def _admit_legacy_source(cls, value: object) -> object:
+        if not isinstance(value, dict) or not _text(str(value.get("source") or "")):
+            return value
+        payload = dict(value)
+        meta = dict(payload.get("meta") or {})
+        meta.setdefault("source", payload.pop("source"))
+        payload["meta"] = meta
+        return payload
+
+
+class ContextFieldProjection(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    confirmed_fields: dict[str, JsonValue] = Field(default_factory=dict)
+    missing_fields: list[str] = Field(default_factory=list)
+    facts: list[ContextClaimItem] = Field(default_factory=list)
+    unknowns: list[ContextClaimItem] = Field(default_factory=list)
+
+
+class ContextFieldState(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    state_revision: int = Field(default=0, ge=0)
+    confirmed_fields: dict[str, JsonValue] = Field(default_factory=dict)
+    missing_fields: list[str] = Field(default_factory=list)
+    facts: list[ContextClaimItem] = Field(default_factory=list)
+    unknowns: list[ContextClaimItem] = Field(default_factory=list)
+
+
+class ContextFieldPatch(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    source: str
+    confirmed_fields: dict[str, JsonValue] = Field(default_factory=dict)
+    missing_fields: list[str] = Field(default_factory=list)
+    facts: list[ContextClaimItem] = Field(default_factory=list)
+    unknowns: list[ContextClaimItem] = Field(default_factory=list)
+    replace_claim_sources: list[str] = Field(default_factory=list)
+
+    @field_validator("source")
+    @classmethod
+    def require_source(cls, value: str) -> str:
+        source = _text(value)
+        if not source:
+            raise ValueError("field patch source is required")
+        return source
+
+    @field_validator("confirmed_fields")
+    @classmethod
+    def _validate_confirmed_fields(
+        cls,
+        value: dict[str, JsonValue],
+    ) -> dict[str, JsonValue]:
+        normalized = {_text(key): item for key, item in value.items() if _text(key)}
+        if len(normalized) != len(value) or any(not _has_value(item) for item in normalized.values()):
+            raise ValueError("confirmed fields require non-empty keys and values")
+        return normalized
+
+    @field_validator("missing_fields", "replace_claim_sources")
+    @classmethod
+    def _normalize_texts(cls, value: list[str]) -> list[str]:
+        return list(dict.fromkeys(text for item in value if (text := _text(item))))
+
+
+class ContextFieldTransitionRequest(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    current_state: ContextFieldState | None = None
+    legacy_projection: ContextFieldProjection = Field(default_factory=ContextFieldProjection)
+    patches: list[ContextFieldPatch] = Field(default_factory=list)
+
+
+class ContextFieldTransitionResult(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    state: ContextFieldState
+    projection: ContextFieldProjection
+    changed_field_keys: list[str] = Field(default_factory=list)
+    reason_codes: list[str] = Field(default_factory=list)
+
+
+def _text(value: str) -> str:
+    return " ".join(value.split()).strip()
+
+
+def _has_value(value: JsonValue) -> bool:
+    if value is None:
+        return False
+    if isinstance(value, str):
+        return bool(_text(value))
+    if isinstance(value, (list, dict)):
+        return bool(value)
+    return True
+
+
+__all__ = [
+    "ContextClaimItem",
+    "ContextFieldPatch",
+    "ContextFieldProjection",
+    "ContextFieldState",
+    "ContextFieldTransitionRequest",
+    "ContextFieldTransitionResult",
+]

flare_kernel-1.1.4/src/flare_kernel/router/intake/guided/contracts.py

@@ -0,0 +1,15 @@
+"""Contracts for guided intake status projections."""
+
+from __future__ import annotations
+
+from typing import TypedDict
+
+
+class GuidedSessionFlags(TypedDict):
+    ready_for_submit: bool
+    decision_point_active: bool
+    has_active_question: bool
+    active_collecting: bool
+
+
+__all__ = ["GuidedSessionFlags"]

{flare_kernel-1.1.2 → flare_kernel-1.1.4}/src/flare_kernel/router/intake/guided/flags.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from flare_kernel.router.intake.guided.contracts import GuidedSessionFlags
+
 
 def resolve_guided_session_flags(
     *,
@@ -9,12 +11,13 @@ def resolve_guided_session_flags(
     required_missing: list[str],
     current_question: dict[str, object] | None,
     command: str,
-) -> dict[str, bool]:
+) -> GuidedSessionFlags:
     normalized_stage = str(current_stage or "").strip()
     missing_count = len([item for item in required_missing if str(item).strip()])
-    has_active_question = isinstance(current_question, dict)
+    has_active_question = bool(current_question)
     ready_for_submit = bool(
         normalized_stage == "requirement_intake.ready_for_submit"
+        and not has_active_question
     )
     decision_point_active = bool(
         ready_for_submit

{flare_kernel-1.1.2 → flare_kernel-1.1.4}/src/flare_kernel/router/kernel.py

@@ -11,6 +11,7 @@ from flare_kernel.contracts import (
     KernelResponse,
 )
 from flare_kernel.contracts.operation import ExternalOperationRequest, ExternalOperationResponse
+from flare_kernel.router.api.errors import ApiError
 from flare_kernel.router.api.auth_guard import require_route_scope, resolve_route_auth_context
 from flare_kernel.router.payload.action import (
     build_action_payload as build_action_payload_from_router,
@@ -40,77 +41,32 @@ from flare_kernel.router.kernel_facade.utils import _safe_session_id
 from flare_kernel.router.kernel_request_pipeline.action import (
     _build_mode_switch_reason,
     _resolve_command,
-    _resolve_current_mode,
-    _resolve_intent_override,
-    _resolve_manual_mode,
-    _resolve_request_mode,
 )
 from flare_kernel.router.kernel_request_pipeline.intake import (
-    _build_confirmed_fields_schema,
-    _build_missing_fields_schema,
-    _coerce_intent_escalation_policy,
-    _is_requirement_mode_explicit,
     _merge_intent_and_escalation_signal,
-    _normalize_stage_status,
-    _resolve_intent_escalation_policy,
     _resolve_intent_escalation_policy_with_source,
-    _resolve_requirement_intake_entry_recommendation,
-    _resolve_session_intent_stage,
-    _resolve_small_talk_intro_reply,
     _sync_session_intent_stage,
 )
 from flare_kernel.router.kernel_request_pipeline.intent_query import (
-    _build_retrieval_queries,
-    _resolve_intent_suggestion,
-    _resolve_request_intent,
-    _resolve_request_intent_with_ai,
     _should_force_requirement_clarification,
 )
 from flare_kernel.router.kernel_request_pipeline.intent_signal import (
-    _apply_escalation_mode_override,
     _build_intent_and_escalation_signal,
 )
-from flare_kernel.router.kernel_request_pipeline.session_binding import apply_session_binding_to_request
+from flare_kernel.router.kernel_request_pipeline.session_binding import (
+    SessionScopeBindingConflict,
+    apply_session_binding_to_request,
+)
 from flare_kernel.router.streaming.response.builder_transport import (
     fail_reserved_stream_run,
     reserve_stream_run,
 )
 from flare_kernel.router.intake.clarification import (
     build_requirement_clarification_message as _build_requirement_clarification_message,
-    build_requirement_collection_status as _build_requirement_collection_status,
-)
-from flare_kernel.router.intake.answer import (
-    normalize_field_value_payload as _normalize_field_value_payload,
-)
-from flare_kernel.router.intake.authority.core import (
-    hydrate_payload_from_authoritative_checkpoint as hydrate_payload_from_authoritative_checkpoint_state,
-    hydrate_payload_from_authoritative_intake_session as hydrate_payload_from_authoritative_intake_state,
-    normalize_intake_session_id as normalize_intake_session_id_from_authority,
-    resolve_intake_session_id as resolve_intake_session_id_from_authority,
-)
-from flare_kernel.router.intake.canonicalization import (
-    canonicalize_budget_value as _canonicalize_budget_value,
-    canonicalize_payload_fields as _canonicalize_payload_fields,
-    is_field_entity_confirmed as _is_field_entity_confirmed,
-)
-from flare_kernel.router.intake.extraction.core import (
-    extract_intake_fields_from_message as _extract_intake_fields_from_message,
-    merge_inferred_requirements as _merge_inferred_requirements,
-    merge_into_confirmed_fields as _merge_into_confirmed_fields,
-    merge_supplementary_fields as _merge_supplementary_fields,
-    normalize_extracted_field_values as _normalize_extracted_field_values,
-)
-from flare_kernel.router.intake.field_scope import (
-    resolve_intake_allowed_fields as resolve_intake_allowed_fields_from_router,
 )
 from flare_kernel.router.intake.payload_updates import (
-    apply_question_answer_payload as _apply_question_answer_payload,
-    apply_workspace_patch_payload as _apply_workspace_patch_payload,
     extract_quoted_terms as _extract_quoted_terms,
 )
-from flare_kernel.router.intake.status.core import (
-    build_structured_search_results as build_structured_search_results_from_intake_status,
-)
 from flare_kernel.router.kernel_route.execution import (
     build_kernel_action_response as build_kernel_action_response_from_router,
     build_kernel_run_response as build_kernel_run_response_from_router,
@@ -118,36 +74,13 @@ from flare_kernel.router.kernel_route.execution import (
 )
 from flare_kernel.router.kernel_stream_session import ensure_kernel_stream_session_id
 from flare_kernel.router.patch_contract import build_patch_event as _build_patch_event
-from flare_kernel.router.prompting import resolve_effective_command as _resolve_effective_command
-from flare_kernel.router.request.identity import (
-    resolve_project_id as resolve_project_id_from_router,
-    resolve_user_id as resolve_user_id_from_router,
-)
-from flare_kernel.router.retrieval.projection import (
-    resolve_retrieval_config as resolve_retrieval_config_from_router,
-)
-from flare_kernel.router.retrieval.search import (
-    search_knowledge_by_queries as _search_knowledge_by_queries,
-)
-from flare_kernel.router.text_safety import sanitize_customer_visible_text as _sanitize_customer_visible_text
 from flare_kernel.router.text_safety import (
     extract_user_message as _extract_user_message,
-    normalize_message_text as _normalize_message_text,
-    sanitize_product_name_for_prompt as _sanitize_product_name_for_prompt,
-)
-from flare_kernel.runtime.orchestration.analysis.router_runtime import (
-    resolve_analysis_route as resolve_analysis_route_from_runtime,
 )
 from flare_kernel.runtime import (
     build_kernel_runtime,
-    generate_llm_completion,
     get_logger,
-    load_intake_checkpoint,
-    load_intake_session_snapshot,
-    load_latest_intake_session_id,
     load_instance_profile,
-    persist_intake_checkpoint,
-    persist_intake_session_state,
     resolve_trace_id,
 )
 from flare_kernel.session_store import ensure_session, get_session
@@ -170,13 +103,30 @@ def _ensure_kernel_stream_session_id(req: KernelRequest) -> str:
     return ensure_kernel_stream_session_id(req, ensure_session_fn=ensure_session)
 
 
+def _apply_canonical_session_scope(req: KernelRequest) -> KernelRequest:
+    try:
+        return apply_session_binding_to_request(req, load_session_fn=get_session)
+    except SessionScopeBindingConflict as exc:
+        raise ApiError(
+            code="SESSION_SCOPE_CONFLICT",
+            http_status=409,
+            message="session scope conflict",
+            description=str(exc),
+            context_fields=[exc.field_name],
+            retryable=False,
+            details={
+                "reason_codes": [f"{exc.field_name}_scope_conflict"],
+            },
+        ) from exc
+
+
 @router.post("/run", response_model=KernelResponse)
 async def kernel_run(
     req: KernelRequest,
     auth_context: AuthContext | None = Depends(resolve_route_auth_context),
 ) -> KernelResponse:
+    req = _apply_canonical_session_scope(req)
     _require_kernel_scope(auth_context, req, "kernel:run")
-    req = apply_session_binding_to_request(req, load_session_fn=get_session)
     return await handle_kernel_run_from_router(
         req,
         prepare_kernel_turn_context_fn=_prepare_kernel_turn_context,
@@ -198,8 +148,8 @@ async def kernel_action(
     req: KernelRequest,
     auth_context: AuthContext | None = Depends(resolve_route_auth_context),
 ) -> KernelResponse:
+    req = _apply_canonical_session_scope(req)
     _require_kernel_scope(auth_context, req, "kernel:action")
-    req = apply_session_binding_to_request(req, load_session_fn=get_session)
     return await handle_kernel_action_from_router(
         req,
         prepare_action_turn_context_fn=prepare_action_turn_context_from_router,
@@ -236,8 +186,8 @@ async def kernel_stream(
     req: KernelRequest,
     auth_context: AuthContext | None = Depends(resolve_route_auth_context),
 ) -> StreamingResponse:
+    req = _apply_canonical_session_scope(req)
     _require_kernel_scope(auth_context, req, "kernel:stream")
-    req = apply_session_binding_to_request(req, load_session_fn=get_session)
     req = req.model_copy(update={"trace_id": resolve_trace_id(req.trace_id)})
     return await handle_kernel_stream_from_router(
         req,

{flare_kernel-1.1.2 → flare_kernel-1.1.4}/src/flare_kernel/router/kernel_facade/canonical_state.py

@@ -24,8 +24,6 @@ from flare_kernel.router.intake.canonicalization import (
 from flare_kernel.router.intake.status.schema import (
     build_confirmed_fields_schema as _build_confirmed_fields_schema_from_router,
     build_missing_fields_schema as _build_missing_fields_schema_from_router,
-    coerce_intent_escalation_policy as _coerce_intent_escalation_policy_from_router,
-    normalize_stage_status as _normalize_stage_status_from_router,
 )
 from flare_kernel.router.kernel_facade.dependency_resolution import (
     resolve_canonical_state_dependencies,
@@ -35,8 +33,12 @@ from flare_kernel.router.kernel_facade.utils import (
     _map_external_mode,
     _safe_session_id,
 )
-from flare_kernel.router.kernel_flow_bindings.session_intent import (
-    resolve_session_intent_stage as _resolve_session_intent_stage_in_kernel_session_intent_flow,
+from flare_kernel.router.kernel_request_pipeline.intake_session_intent_bridge import (
+    _resolve_session_intent_stage as _resolve_session_intent_stage_from_request_pipeline,
+)
+from flare_kernel.router.kernel_request_pipeline.intake import (
+    _coerce_intent_escalation_policy,
+    _normalize_stage_status,
 )
 from flare_kernel.router.text_safety import (
     extract_user_message as _extract_user_message,
@@ -147,9 +149,9 @@ def _build_canonical_state(
         kernel_attr_fn=_kernel_attr,
         defaults={
             "map_external_mode_fn": _map_external_mode,
-            "resolve_session_intent_stage_fn": _resolve_session_intent_stage_in_kernel_session_intent_flow,
-            "coerce_intent_escalation_policy_fn": _coerce_intent_escalation_policy_from_router,
-            "normalize_stage_status_fn": _normalize_stage_status_from_router,
+            "resolve_session_intent_stage_fn": _resolve_session_intent_stage_from_request_pipeline,
+            "coerce_intent_escalation_policy_fn": _coerce_intent_escalation_policy,
+            "normalize_stage_status_fn": _normalize_stage_status,
             "build_confirmed_fields_schema_fn": _build_confirmed_fields_schema_from_router,
             "build_missing_fields_schema_fn": _build_missing_fields_schema_from_router,
             "is_field_entity_confirmed_fn": _is_field_entity_confirmed,

{flare_kernel-1.1.2 → flare_kernel-1.1.4}/src/flare_kernel/router/kernel_facade/flow_enrichment.py

@@ -87,9 +87,7 @@ def _turn_act(payload: dict[str, Any]) -> dict[str, Any]:
 
 
 def _explicit_turn_fields(payload: dict[str, Any]) -> dict[str, Any]:
-    confirmed_fields = _mapping(payload.get("confirmed_fields"))
-    turn_delta_fields = _mapping(payload.get("turn_delta_fields"))
-    return {**confirmed_fields, **turn_delta_fields}
+    return dict(_mapping(payload.get("turn_delta_fields")))
 
 
 def _attach_domain_pack(

{flare_kernel-1.1.2 → flare_kernel-1.1.4}/src/flare_kernel/router/kernel_facade/orchestration.py

@@ -6,15 +6,9 @@ from typing import Any, Callable
 
 from flare_kernel.contracts import KernelRequest
 from flare_kernel.runtime import persist_intake_checkpoint, persist_intake_session_state
-from flare_kernel.router.intake.entry_policy import (
-    resolve_requirement_intake_entry_recommendation as _resolve_requirement_intake_entry_recommendation_from_router,
-)
 from flare_kernel.router.intake.payload_updates import (
     extract_quoted_terms as _extract_quoted_terms,
 )
-from flare_kernel.router.intake.status.schema import (
-    coerce_intent_escalation_policy as _coerce_intent_escalation_policy_from_router,
-)
 from flare_kernel.router.intake.state_persistence import (
     persist_authoritative_intake_state as persist_authoritative_intake_state_from_router,
 )
@@ -24,12 +18,13 @@ from flare_kernel.router.kernel_facade.dependency_resolution import (
     resolve_prompt_dependencies,
 )
 from flare_kernel.router.kernel_facade.utils import _kernel_attr
-from flare_kernel.router.kernel_flow_bindings.session_intent import (
-    resolve_session_intent_stage as _resolve_session_intent_stage_in_kernel_session_intent_flow,
-)
 from flare_kernel.router.kernel_request_pipeline.action import _resolve_command
 from flare_kernel.router.kernel_request_pipeline.intake import (
-    _merge_intent_and_escalation_signal,
+    _coerce_intent_escalation_policy,
+    _resolve_requirement_intake_entry_recommendation,
+)
+from flare_kernel.router.kernel_request_pipeline.intake_session_intent_bridge import (
+    _resolve_session_intent_stage,
 )
 from flare_kernel.router.orchestration.status.builder import (
     build_orchestration_status as build_orchestration_status_from_router,
@@ -170,9 +165,9 @@ def _build_orchestration_status(
         extract_user_message_fn=extract_user_message_fn,
         kernel_attr_fn=_kernel_attr,
         defaults={
-            "resolve_requirement_intake_entry_recommendation_fn": _resolve_requirement_intake_entry_recommendation_from_router,
-            "resolve_session_intent_stage_fn": _resolve_session_intent_stage_in_kernel_session_intent_flow,
-            "coerce_intent_escalation_policy_fn": _coerce_intent_escalation_policy_from_router,
+            "resolve_requirement_intake_entry_recommendation_fn": _resolve_requirement_intake_entry_recommendation,
+            "resolve_session_intent_stage_fn": _resolve_session_intent_stage,
+            "coerce_intent_escalation_policy_fn": _coerce_intent_escalation_policy,
             "extract_user_message_fn": _extract_user_message,
         },
     )

{flare_kernel-1.1.2 → flare_kernel-1.1.4}/src/flare_kernel/router/kernel_facade/payload_enrichment.py

@@ -56,13 +56,11 @@ from flare_kernel.router.kernel_facade.source_ref_hydration import (
 from flare_kernel.router.payload.enrichment import (
     enrich_payload as enrich_payload_from_router,
 )
-from flare_kernel.router.kernel_request_pipeline.action import _resolve_command
-from flare_kernel.router.mode.resolution import (
-    resolve_current_mode as _resolve_current_mode_from_router,
-    resolve_manual_mode as _resolve_manual_mode_from_router,
-)
-from flare_kernel.router.request.intent_resolution import (
-    resolve_intent_override as _resolve_intent_override_from_router,
+from flare_kernel.router.kernel_request_pipeline.action import (
+    _resolve_command,
+    _resolve_current_mode,
+    _resolve_intent_override,
+    _resolve_manual_mode,
 )
 from flare_kernel.router.text_safety import extract_user_message as _extract_user_message
 
@@ -215,9 +213,9 @@ def _enrich_payload(
             "merge_supplementary_fields_fn": _merge_supplementary_fields,
             "merge_inferred_requirements_fn": _merge_inferred_requirements,
             "canonicalize_payload_fields_fn": _canonicalize_payload_fields,
-            "resolve_intent_override_fn": _resolve_intent_override_from_router,
-            "resolve_manual_mode_fn": _resolve_manual_mode_from_router,
-            "resolve_current_mode_fn": _resolve_current_mode_from_router,
+            "resolve_intent_override_fn": _resolve_intent_override,
+            "resolve_manual_mode_fn": _resolve_manual_mode,
+            "resolve_current_mode_fn": _resolve_current_mode,
         },
     )
     return enrich_kernel_payload_flow(