Revert patch_models.py to commit c8c52c4 — keep openai/ prefix when routing to OpenRouter (vs stripping it)

patch_models.py

@@ -211,9 +211,9 @@ with open(AGENT_FILE, "w") as f:
     f.write(content)
 
 # === Step 2: Patch _resolve_llm_params for OpenRouter routing ===
-# IMPORTANT: Keep the "openai/" prefix for LiteLLM provider detection,
-# but STRIP it from the model field when sending to OpenRouter API.
-# OpenRouter expects model slugs like "openrouter/owl-alpha" NOT "openai/openrouter/owl-alpha"
+# IMPORTANT: Keep the "openai/" prefix when sending to OpenRouter!
+# OpenRouter accepts the full slug like "openai/openrouter/owl-alpha".
+# LiteLLM needs "openai/" for provider detection.
 with open(LLM_PARAMS_FILE) as f:
     llm_content = f.read()
 
@@ -230,13 +230,10 @@ new_block = """    hf_model = normalized_model
     api_key = _resolve_hf_router_token(session_hf_token)
 
     # === PATCH: Route ALL openai/-prefixed models to OpenRouter ===
-    # Keep the "openai/" prefix for LiteLLM provider routing,
-    # but strip it before sending to OpenRouter API.
-    # OpenRouter expects model slugs WITHOUT "openai/" prefix.
+    # Keep the "openai/" prefix — both LiteLLM and OpenRouter need it.
     if normalized_model.startswith("openai/"):
-        or_model = normalized_model[len("openai/"):]  # Strip openai/ prefix
         return {
-            "model": or_model,
+            "model": normalized_model,
             "api_base": "https://openrouter.ai/api/v1",
             "api_key": os.environ.get("OPENROUTER_API_KEY") or api_key or "",
         }
@@ -250,32 +247,37 @@ new_block = """    hf_model = normalized_model
 
 if old_block in llm_content:
     llm_content = llm_content.replace(old_block, new_block)
-    print("OK: Patched _resolve_llm_params (catch-all openai/ -> OR, strip openai/ prefix)")
+    print("OK: Patched _resolve_llm_params (catch-all openai/ -> OR, keep prefix)")
 elif "normalized_model[len" in llm_content or "actual_model" in llm_content:
-    # Find and fix any existing OpenRouter routing block
+    # Revert the strip approach — keep openai/ prefix
     idx = llm_content.find("if normalized_model.startswith(\"openai/\"):")
     if idx >= 0:
-        # Find the return block
-        ret_idx = llm_content.find("return {", idx)
-        if ret_idx > 0:
-            # Find the "model" line in the return block
-            model_line_start = llm_content.find('"model":', ret_idx)
+        or_start = llm_content.find("# === PATCH:", idx)
+        if or_start < 0:
+            or_start = idx
+        or_end = llm_content.find("# === END PATCH", or_start)
+        if or_end < 0:
+            or_end = llm_content.find("params = {", or_start)
+        
+        # Find the return block and fix it
+        ret_line = llm_content.find("return {", or_start, or_end)
+        if ret_line > 0:
+            model_line_start = llm_content.find('"model":', ret_line)
             if model_line_start > 0:
                 line_start = llm_content.rfind('\n', 0, model_line_start) + 1
                 line_end = llm_content.find('\n', line_start)
                 old_model_line = llm_content[line_start:line_end]
-                # Replace with stripped version
-                new_model_line = '            "model": normalized_model[len("openai/"):],  # Strip openai/ prefix for OpenRouter'
+                new_model_line = '            "model": normalized_model,'
                 llm_content = llm_content.replace(old_model_line, new_model_line)
-                print("OK: Fixed model line to strip openai/ prefix")
+                print("OK: Reverted to keep openai/ prefix for OpenRouter")
             else:
-                print("OK: Could not find model line in OpenRouter block")
+                print("OK: Could not find model line")
         else:
-            print("OK: Could not find return block in OpenRouter routing")
+            print("OK: Could not find return block")
     else:
-        print("OK: No existing OpenRouter block found")
+        print("OK: Already using correct routing")
 else:
-    print("OK: Routing block not found in expected form")
+    print("OK: Routing already correct")
 
 try:
     ast.parse(llm_content)
@@ -287,4 +289,4 @@ except SyntaxError as e:
 with open(LLM_PARAMS_FILE, "w") as f:
     f.write(llm_content)
 
-print("OK: Backend patched - 16 models, ALL openai/ -> OR (strip openai/ prefix), Owl Alpha default")
+print("OK: Backend patched - 16 models, ALL openai/ -> OR (keep prefix), GPT-5.5→gpt-oss-120b, Riverflow→north-mini-code:free")