chore: commit remaining workspace changes

backend/src/services/git_service.py

@@ -791,6 +791,28 @@ class GitService:
         }
     # [/DEF:_parse_remote_repo_identity:Function]
 
+    # [DEF:_derive_server_url_from_remote:Function]
+    # @PURPOSE: Build API base URL from remote repository URL without credentials.
+    # @PRE: remote_url may be any git URL.
+    # @POST: Returns normalized http(s) base URL or None when derivation is impossible.
+    # @RETURN: Optional[str]
+    def _derive_server_url_from_remote(self, remote_url: str) -> Optional[str]:
+        normalized = str(remote_url or "").strip()
+        if not normalized or normalized.startswith("git@"):
+            return None
+
+        parsed = urlparse(normalized)
+        if parsed.scheme not in {"http", "https"}:
+            return None
+        if not parsed.hostname:
+            return None
+
+        netloc = parsed.hostname
+        if parsed.port:
+            netloc = f"{netloc}:{parsed.port}"
+        return f"{parsed.scheme}://{netloc}".rstrip("/")
+    # [/DEF:_derive_server_url_from_remote:Function]
+
     # [DEF:promote_direct_merge:Function]
     # @PURPOSE: Perform direct merge between branches in local repo and push target branch.
     # @PRE: Repository exists and both branches are valid.
@@ -878,13 +900,32 @@ class GitService:
             "base": to_branch,
             "body": description or "",
         }
-        data = await self._gitea_request(
-            "POST",
-            server_url,
-            pat,
-            f"/repos/{identity['namespace']}/{identity['repo']}/pulls",
-            payload=payload,
-        )
+        endpoint = f"/repos/{identity['namespace']}/{identity['repo']}/pulls"
+        try:
+            data = await self._gitea_request(
+                "POST",
+                server_url,
+                pat,
+                endpoint,
+                payload=payload,
+            )
+        except HTTPException as exc:
+            fallback_url = self._derive_server_url_from_remote(remote_url)
+            normalized_primary = self._normalize_git_server_url(server_url)
+            if exc.status_code != 404 or not fallback_url or fallback_url == normalized_primary:
+                raise
+
+            logger.warning(
+                "[create_gitea_pull_request][Action] Primary Gitea URL not found, retrying with remote host: %s",
+                fallback_url,
+            )
+            data = await self._gitea_request(
+                "POST",
+                fallback_url,
+                pat,
+                endpoint,
+                payload=payload,
+            )
         return {
             "id": data.get("number") or data.get("id"),
             "url": data.get("html_url") or data.get("url"),