Classify tool failures and block identical blind retries in-turn.

Stamp failure_class for schema/timeout/runtime analytics, refuse same tool+args after a failure in the turn, and add a license short-intent recipe for WhatsApp ops.

Co-authored-by: Cursor <cursoragent@cursor.com>

tests/test_failure_class_and_retry_guard.py

@@ -0,0 +1,72 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+from runtime.application.gateway.ops_short_intent import detect_ops_short_intent
+from runtime.chat.tool_runtime import ToolExecutionContext, ToolExecutor, normalize_tool_result
+from runtime.tools.base import ToolRegistry, ToolSpec
+from runtime.tools.tool_error_hints import classify_tool_failure
+from svc.llm.chat_models import LLMToolCall
+from svc.persistence.sqlite_store import SqliteStore
+
+
+def test_classify_schema_and_timeout() -> None:
+    assert (
+        classify_tool_failure({"ok": False, "error_code": "tool_invalid_arguments", "error": "bad"})
+        == "schema_validation"
+    )
+    assert (
+        classify_tool_failure({"ok": False, "error_code": "tool_timeout_or_failed", "error": "timeout"})
+        == "timeout"
+    )
+
+
+def test_normalize_stamps_failure_class() -> None:
+    out = normalize_tool_result({"ok": False, "error_code": "tool_invalid_arguments", "error": "x"})
+    assert out["failure_class"] == "schema_validation"
+
+
+def test_license_short_intent() -> None:
+    assert detect_ops_short_intent("license expiry report") == "license"
+    assert detect_ops_short_intent("@bot licence check") == "license"
+
+
+def test_identical_failed_retry_blocked_across_rounds(tmp_path: Path) -> None:
+    store = SqliteStore(str(tmp_path / "retry.sqlite"))
+    sess = store.create_session("t")
+    calls = {"n": 0}
+
+    def _handler(_args):
+        calls["n"] += 1
+        return {"ok": False, "error_code": "tool_timeout_or_failed", "error": "timeout"}
+
+    reg = ToolRegistry(
+        [
+            ToolSpec(
+                name="mcp__netx__execManagedNe",
+                description="exec",
+                parameters={"type": "object", "properties": {"ne_id": {"type": "string"}}},
+                handler=_handler,
+                read_only=False,
+            )
+        ]
+    )
+    ctx = ToolExecutionContext(
+        store=store,
+        tools=reg,
+        session_id=sess.id,
+        turn_uuid="turn-retry-1",
+        lang="en",
+    )
+    uses = [LLMToolCall(id="c1", name="mcp__netx__execManagedNe", arguments={"ne_id": "ne-1", "commands": ["disp"]})]
+    ToolExecutor().execute_tool_uses(ctx=ctx, assistant_msg_id=1, tool_uses=uses, signature_budget=2)
+    assert calls["n"] == 1
+
+    uses2 = [LLMToolCall(id="c2", name="mcp__netx__execManagedNe", arguments={"ne_id": "ne-1", "commands": ["disp"]})]
+    _, results = ToolExecutor().execute_tool_uses(
+        ctx=ctx, assistant_msg_id=2, tool_uses=uses2, signature_budget=2
+    )
+    blocked, _ = results["c2"]
+    assert calls["n"] == 1
+    assert blocked.get("error_code") == "identical_retry_blocked"
+    assert blocked.get("failure_class") == "retry_guard"