fix(review): pass 2 — Bedrock reasoning-floor matches both dashed & dotted keys

_bedrock_reasoning_stale_floor only matched dashed floor-table keys (opus
'claude-opus-4-6'), so sonnet reasoning models keyed with a dotted version in the
shared table ('claude-sonnet-4.5'/'4.6') got no reasoning floor from the dashed
Bedrock inference-profile id — premature stale-abort if the base timeout is set
below 180s. Generate both version-separator forms (digit-dash-digit <-> digit-dot-
digit, via lookbehind/lookahead so only version numbers flip) and try all
candidates; matches the table however each model is keyed, no edit to the shared
table. Verified: opus->240 (unchanged), sonnet-4.5/4.6->180, haiku->None. New
TestBedrockReasoningStaleFloor (8 cases).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

agent/chat_completion_helpers.py

@@ -323,10 +323,16 @@ def _bedrock_reasoning_stale_floor(model_id: object) -> "float | None":
     trailing date-stamp / ``-v1:0`` version suffix, so no suffix stripping is
     needed. First non-None wins; returns None for unknown models.
 
-    Known limitation: floor keys that embed a dotted version (e.g.
-    ``claude-sonnet-4.5``) will NOT match the Bedrock dashed form
-    (``claude-sonnet-4-5-...``); only floor keys with dashed/base slugs
-    (``claude-opus-4``, ``deepseek-r1``) match the Bedrock id shape.
+    The floor table mixes version-separator conventions: some keys are
+    keyed with a dashed version (``claude-opus-4``) while others embed a
+    dotted version (``claude-sonnet-4.5``, ``claude-sonnet-4.6``). Bedrock
+    always dashes the version (``claude-sonnet-4-5-v1:0``), so for every
+    candidate slug we also try the alternate version-separator form —
+    digit-dash-digit rewritten to digit-dot-digit and vice-versa — so a
+    dashed Bedrock id matches a dotted floor key (and the reverse). The
+    rewrite only touches version-number separators (a dash/dot flanked by
+    digits), never other dashes in the slug, so ``claude-sonnet`` is left
+    intact while ``4-5`` becomes ``4.5``.
     """
     from agent.reasoning_timeouts import get_reasoning_stale_timeout_floor
 
@@ -337,10 +343,20 @@ def _bedrock_reasoning_stale_floor(model_id: object) -> "float | None":
         if name.startswith(prefix):
             name = name[len(prefix):]
             break
-    candidates = [name]
+    base_candidates = [name]
     if "." in name:
-        candidates.append(name.rsplit(".", 1)[1])   # claude-opus-4-6-v1:0
-        candidates.append(name.replace(".", "-", 1))  # deepseek-r1-v1:0
+        base_candidates.append(name.rsplit(".", 1)[1])   # claude-opus-4-6-v1:0
+        base_candidates.append(name.replace(".", "-", 1))  # deepseek-r1-v1:0
+    candidates: list[str] = []
+    for cand in base_candidates:
+        # Try the slug as-is plus both alternate version-separator forms.
+        # ``4-5`` <-> ``4.5`` only; a dash/dot not flanked by digits is
+        # left alone (e.g. ``claude-sonnet`` stays dashed).
+        dashed_to_dotted = re.sub(r"(?<=\d)-(?=\d)", ".", cand)
+        dotted_to_dashed = re.sub(r"(?<=\d)\.(?=\d)", "-", cand)
+        for form in (cand, dashed_to_dotted, dotted_to_dashed):
+            if form not in candidates:
+                candidates.append(form)
     for cand in candidates:
         floor = get_reasoning_stale_timeout_floor(cand)
         if floor is not None:

tests/run_agent/test_streaming.py

@@ -2134,3 +2134,46 @@ class TestBedrockStreamLivenessWatchdog:
 
         assert response.choices[0].message.content == "hi"
         assert agent._consecutive_stale_streams == 0
+
+
+class TestBedrockReasoningStaleFloor:
+    """The Bedrock inference-profile id -> reasoning stale-timeout floor
+    normalizer must match floor-table keys regardless of whether the model
+    is keyed with a dashed version (``claude-opus-4``) or a dotted version
+    (``claude-sonnet-4.5``). Bedrock always dashes the version, so the
+    normalizer has to try the alternate separator form."""
+
+    @pytest.mark.parametrize(
+        "model_id, expected",
+        [
+            # opus is keyed dashed/base (``claude-opus-4`` -> 240) and
+            # matches the Bedrock dashed id unchanged.
+            ("us.anthropic.claude-opus-4-6-v1:0", 240.0),
+            # sonnet is keyed DOTTED (``claude-sonnet-4.5`` /
+            # ``claude-sonnet-4.6`` -> 180). The Bedrock dashed id must
+            # now resolve via the alternate version-separator form.
+            ("us.anthropic.claude-sonnet-4-5-v1:0", 180.0),
+            ("us.anthropic.claude-sonnet-4-6-v1:0", 180.0),
+            # region prefix variations still strip correctly.
+            ("eu.anthropic.claude-sonnet-4-5-v1:0", 180.0),
+        ],
+    )
+    def test_bedrock_reasoning_models_resolve_floor(self, model_id, expected):
+        from agent.chat_completion_helpers import _bedrock_reasoning_stale_floor
+
+        assert _bedrock_reasoning_stale_floor(model_id) == expected
+
+    @pytest.mark.parametrize(
+        "model_id",
+        [
+            # Non-reasoning Bedrock model -> no floor.
+            "us.anthropic.claude-3-5-haiku-20241022-v1:0",
+            "us.amazon.nova-lite-v1:0",
+            "",
+            None,
+        ],
+    )
+    def test_non_reasoning_bedrock_models_return_none(self, model_id):
+        from agent.chat_completion_helpers import _bedrock_reasoning_stale_floor
+
+        assert _bedrock_reasoning_stale_floor(model_id) is None