Merge pull request #114 from MLAI-AUS-Inc/codex/domain-scan-routing-fix

bugfix

Author: drsamdonegan

roo-standalone/roo/content_factory_progress.py

@@ -2,6 +2,48 @@
 
 CONTENT_FACTORY_ARTICLE_COST_POINTS = 6
 CONTENT_FACTORY_REQUEST_SOURCE = "roo_slackbot"
+FREE_CONTENT_FACTORY_DOMAINS = {"mlai.au"}
+
+
+def normalize_content_factory_domain(domain: str | None) -> str:
+    if not domain:
+        return ""
+
+    normalized = domain.strip().lower()
+    if normalized.startswith("https://"):
+        normalized = normalized[8:]
+    elif normalized.startswith("http://"):
+        normalized = normalized[7:]
+
+    if normalized.startswith("www."):
+        normalized = normalized[4:]
+
+    if "/" in normalized:
+        normalized = normalized.split("/", 1)[0]
+
+    return normalized
+
+
+def get_content_factory_article_cost_points(domain: str | None) -> int:
+    normalized_domain = normalize_content_factory_domain(domain)
+    if normalized_domain in FREE_CONTENT_FACTORY_DOMAINS:
+        return 0
+    return CONTENT_FACTORY_ARTICLE_COST_POINTS
+
+
+def is_free_content_factory_domain(domain: str | None) -> bool:
+    return get_content_factory_article_cost_points(domain) == 0
+
+
+def build_content_factory_live_cost_text(domain: str | None) -> str:
+    if is_free_content_factory_domain(domain):
+        normalized_domain = normalize_content_factory_domain(domain) or "this domain"
+        return f"💳 Articles for {normalized_domain} are free. No Roo points will be deducted for this run."
+
+    return (
+        f"💳 This paid run costs {CONTENT_FACTORY_ARTICLE_COST_POINTS} Roo points. "
+        "They were deducted when the run started."
+    )
 
 
 def build_live_status_blocks(
@@ -56,10 +98,7 @@ def build_live_status_blocks(
             "elements": [
                 {
                     "type": "mrkdwn",
-                    "text": (
-                        f"💳 This paid run costs {CONTENT_FACTORY_ARTICLE_COST_POINTS} Roo points. "
-                        "They were deducted when the run started."
-                    ),
+                    "text": build_content_factory_live_cost_text(domain),
                 }
             ],
         },

roo-standalone/roo/main.py

@@ -19,7 +19,12 @@
 
 from .config import get_settings, Settings
 from .agent import RooAgent, get_agent
-from .content_factory_progress import CONTENT_FACTORY_REQUEST_SOURCE, build_live_status_blocks
+from .content_factory_progress import (
+    CONTENT_FACTORY_REQUEST_SOURCE,
+    build_live_status_blocks,
+    get_content_factory_article_cost_points,
+    normalize_content_factory_domain,
+)
 from .slack_client import post_message, send_dm
 
 # Pending intents for auto-continue after prerequisite steps complete.
@@ -2397,14 +2402,21 @@ async def slack_actions(request: Request):
         reply_channel = value_channel_id or msg_channel
         reply_thread_ts = value_thread_ts or payload.get("message", {}).get("thread_ts") or msg_ts
         is_dm = bool(reply_channel and reply_channel.startswith("D"))
+        normalized_domain = normalize_content_factory_domain(domain) or domain or "this domain"
+        article_cost_points = get_content_factory_article_cost_points(domain)
+        cost_guidance = (
+            f"Articles for {normalized_domain} are free."
+            if article_cost_points == 0
+            else f"Starting the article run deducts {article_cost_points} Roo points."
+        )
         guidance_text = (
             "✅ Reply here with the topic you want me to write about. "
             "I'll still research the best keywords, title, and talking points so it has the best chance to rank. "
-            "Starting the article run deducts 6 Roo points."
+            f"{cost_guidance}"
             if is_dm else
             "✅ Reply in this thread with something like `@Roo write about AI for clinic workflows`. "
             "I'll still research the best keywords, title, and talking points so it has the best chance to rank. "
-            "Starting the article run deducts 6 Roo points."
+            f"{cost_guidance}"
         )
 
         print(f"📝 User {user_id} will provide the article topic for {domain}")

roo-standalone/roo/skills/executor.py

@@ -20,6 +20,9 @@
     CONTENT_FACTORY_ARTICLE_COST_POINTS,
     CONTENT_FACTORY_REQUEST_SOURCE,
     build_live_status_blocks,
+    get_content_factory_article_cost_points,
+    is_free_content_factory_domain,
+    normalize_content_factory_domain,
 )
 from ..content_intent import is_explicit_scan_request
 from ..llm import chat, embed, get_llm_client
@@ -221,6 +224,13 @@ def _build_article_direction_blocks(
         client_request_id: str,
     ) -> list[dict]:
         """Build the preflight prompt for generic article requests."""
+        normalized_domain = normalize_content_factory_domain(domain) or domain
+        cost_points = get_content_factory_article_cost_points(domain)
+        cost_text = (
+            f"*Cost:* Articles for *{normalized_domain}* are free. No Roo points will be deducted for this run."
+            if cost_points == 0
+            else f"*Cost:* Starting the article run deducts {cost_points} Roo points."
+        )
         button_value = json.dumps(
             {
                 "domain": domain,
@@ -241,7 +251,7 @@ def _build_article_direction_blocks(
                         "If you do, send it through and I'll still research the best keywords, title, "
                         "and talking points so the article has the best chance to rank.\n\n"
                         "If you don't, I can research the strongest article opportunity for you.\n\n"
-                        f"*Cost:* Starting the article run deducts {CONTENT_FACTORY_ARTICLE_COST_POINTS} Roo points."
+                        f"{cost_text}"
                     ),
                 },
             },
@@ -1129,15 +1139,23 @@ async def _validate_content_factory_paid_access(
         self,
         api_client: Any,
         user_id: str,
+        domain: Optional[str],
     ) -> Optional[str]:
         from ..slack_client import get_user_info
 
+        normalized_domain = normalize_content_factory_domain(domain) or "this domain"
+        cost_points = get_content_factory_article_cost_points(domain)
         slack_info = get_user_info(user_id)
         email = str(slack_info.get("email") or "").strip().lower()
         if not email:
+            if cost_points == 0:
+                return (
+                    "I need access to your real Slack email before I can start Content Factory for you. "
+                    f"Once that's available, articles for {normalized_domain} are free."
+                )
             return (
                 "I need access to your real Slack email before I can start Content Factory for you. "
-                f"Once that's available, creating an article costs {CONTENT_FACTORY_ARTICLE_COST_POINTS} Roo points."
+                f"Once that's available, creating an article costs {cost_points} Roo points."
             )
 
         real_name = str(slack_info.get("real_name") or "").strip()
@@ -1161,6 +1179,9 @@ async def _validate_content_factory_paid_access(
                 "Please try again in a moment."
             )
 
+        if cost_points == 0:
+            return None
+
         try:
             balance_data = await api_client.get_balance(user_id)
         except Exception as exc:
@@ -1171,9 +1192,9 @@ async def _validate_content_factory_paid_access(
             )
 
         balance = int(balance_data.get("balance") or 0)
-        if balance < CONTENT_FACTORY_ARTICLE_COST_POINTS:
+        if balance < cost_points:
             return (
-                f"Creating an article costs {CONTENT_FACTORY_ARTICLE_COST_POINTS} Roo points, and you currently have "
+                f"Creating an article costs {cost_points} Roo points, and you currently have "
                 f"{balance}. Earn a few more Roo points first, then ask me again."
             )
 
@@ -1292,6 +1313,16 @@ async def _execute_content_factory(
                     "thread_ts": thread_ts,
                 }
             )
+            disclaimer_cost_text = (
+                f"*Cost:* Articles for **{normalize_content_factory_domain(domain) or domain or 'this domain'}** are free. "
+                "No Roo points will be deducted for this run.\n\n"
+                if is_free_content_factory_domain(domain)
+                else (
+                    f"*Cost:* Creating an article costs **{CONTENT_FACTORY_ARTICLE_COST_POINTS} Roo points**. "
+                    "Those points are deducted when article research/generation starts. "
+                    "If something goes wrong, message Dr Sam on Slack and he can help sort out a refund.\n\n"
+                )
+            )
 
             blocks = [
                 {
@@ -1309,9 +1340,7 @@ async def _execute_content_factory(
                         "text": (
                             "Before we start, a quick heads-up! This skill works best with **Next.js & Tailwind CSS** projects "
                             "and requires a connected **GitHub repository**.\n\n"
-                            f"*Cost:* Creating an article costs **{CONTENT_FACTORY_ARTICLE_COST_POINTS} Roo points**. "
-                            "Those points are deducted when article research/generation starts. "
-                            "If something goes wrong, message Dr Sam on Slack and he can help sort out a refund.\n\n"
+                            f"{disclaimer_cost_text}"
                             "*How it works:*\n"
                             "1. 🏗️ **Scans** your repo for blog structure (creates it if missing)\n"
                             "2. 🧩 **Checks** for reusable components (Hero, CTAs) or creates them\n"
@@ -1996,7 +2025,7 @@ async def _execute_content_factory(
                 history_str = "\n".join([f"{msg.get('user')}: {msg.get('text')}" for msg in thread_history[:-1]])
                 full_context = f"Context from Thread:\n{history_str}\n\nCurrent Request: {text}"
 
-            access_error = await self._validate_content_factory_paid_access(api_client, user_id)
+            access_error = await self._validate_content_factory_paid_access(api_client, user_id, domain)
             if access_error:
                 return access_error
 

roo-standalone/roo/tests/test_content_factory_article_flow.py

@@ -192,7 +192,19 @@ def _patch_content_factory(monkeypatch):
         ],
     }
     FakeContentFactoryClient.generic_integration = default_integration
-    FakeContentFactoryClient.domain_integrations = {"mlai.au": default_integration}
+    FakeContentFactoryClient.domain_integrations = {
+        "mlai.au": default_integration,
+        "woofya.com.au": {
+            **default_integration,
+            "connected_domains": [
+                {
+                    "domain": "woofya.com.au",
+                    "github_repo": "MLAI-AUS-Inc/mlai-au",
+                    "scanned": True,
+                }
+            ],
+        },
+    }
     FakeContentFactoryClient.auth_urls = {"default": "https://github.test/auth"}
     FakeContentFactoryClient.saved_intents = []
     FakeContentFactoryClient.balance_by_user = {}
@@ -616,6 +628,7 @@ async def test_explicit_research_request_starts_generation(monkeypatch):
     assert trigger_call["request_source"] == "roo_slackbot"
     assert trigger_call["client_request_id"].startswith("content-factory-")
     assert trigger_call["user_email"] == "sam@example.com"
+    assert FakeContentFactoryClient.last_instance.balance_checks == []
 
 
 @pytest.mark.asyncio
@@ -627,8 +640,8 @@ async def test_content_factory_blocks_when_user_has_insufficient_points(monkeypa
 
     result = await executor._execute_content_factory(
         skill=None,
-        text="research the best article for mlai.au",
-        params={"domain": "mlai.au"},
+        text="research the best article for woofya.com.au",
+        params={"domain": "woofya.com.au"},
         user_id="U999FREE",
         channel_id="C123",
         thread_ts="111.222",
@@ -662,7 +675,7 @@ async def test_content_factory_blocks_when_slack_email_missing(monkeypatch):
     )
 
     assert "real Slack email" in result
-    assert "6 Roo points" in result
+    assert "articles for mlai.au are free" in result.lower()
     assert FakeContentFactoryClient.last_instance.trigger_calls == []
     assert FakeContentFactoryClient.last_instance.user_registration_calls == []
 
@@ -851,7 +864,7 @@ async def form(self):
     updated_blocks = updated_messages[0]["blocks"]
     assert all(block.get("type") != "actions" for block in updated_blocks)
     assert "@Roo write about AI for clinic workflows" in updated_blocks[-1]["elements"][0]["text"]
-    assert "6 Roo points" in updated_blocks[-1]["elements"][0]["text"]
+    assert "free" in updated_blocks[-1]["elements"][0]["text"].lower()
 
 
 def test_prerequisite_scan_action_triggers_backend_from_repeat_scan_prompt(monkeypatch):