From 6710a39621b8f7c1d24af89441741a661c4ce672 Mon Sep 17 00:00:00 2001
From: "sp.wack" <83104063+amanape@users.noreply.github.com>
Date: Wed, 29 Oct 2025 17:26:37 +0400
Subject: [PATCH] hotfix(frontend): add unified conversation config hook with
 V1 support (#11547)

---
 .../conversation-service.api.ts               |  2 +-
 .../v1-conversation-service.api.ts            | 13 +++
 .../hooks/query/use-conversation-config.ts    | 87 ++++++++++++++++++-
 3 files changed, 99 insertions(+), 3 deletions(-)

diff --git a/frontend/src/api/conversation-service/conversation-service.api.ts b/frontend/src/api/conversation-service/conversation-service.api.ts
index 9f4f12081d..ed0ce8b678 100644
--- a/frontend/src/api/conversation-service/conversation-service.api.ts
+++ b/frontend/src/api/conversation-service/conversation-service.api.ts
@@ -187,7 +187,7 @@ class ConversationService {
   static async getRuntimeId(
     conversationId: string,
   ): Promise<{ runtime_id: string }> {
-    const url = `/api/conversations/${conversationId}/config`;
+    const url = `${this.getConversationUrl(conversationId)}/config`;
     const { data } = await openHands.get<{ runtime_id: string }>(url, {
       headers: this.getConversationHeaders(),
     });
diff --git a/frontend/src/api/conversation-service/v1-conversation-service.api.ts b/frontend/src/api/conversation-service/v1-conversation-service.api.ts
index def026ba6c..e638b14ba5 100644
--- a/frontend/src/api/conversation-service/v1-conversation-service.api.ts
+++ b/frontend/src/api/conversation-service/v1-conversation-service.api.ts
@@ -319,6 +319,19 @@ class V1ConversationService {
       },
     });
   }
+
+  /**
+   * Get the conversation config (runtime_id) for a V1 conversation
+   * @param conversationId The conversation ID
+   * @returns Object containing runtime_id
+   */
+  static async getConversationConfig(
+    conversationId: string,
+  ): Promise<{ runtime_id: string }> {
+    const url = `/api/conversations/${conversationId}/config`;
+    const { data } = await openHands.get<{ runtime_id: string }>(url);
+    return data;
+  }
 }
 
 export default V1ConversationService;
diff --git a/frontend/src/hooks/query/use-conversation-config.ts b/frontend/src/hooks/query/use-conversation-config.ts
index 7f851f78e2..705fb02791 100644
--- a/frontend/src/hooks/query/use-conversation-config.ts
+++ b/frontend/src/hooks/query/use-conversation-config.ts
@@ -2,14 +2,20 @@ import { useQuery } from "@tanstack/react-query";
 import React from "react";
 import { useConversationId } from "#/hooks/use-conversation-id";
 import ConversationService from "#/api/conversation-service/conversation-service.api";
+import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
 import { useRuntimeIsReady } from "../use-runtime-is-ready";
+import { useActiveConversation } from "./use-active-conversation";
 
-export const useConversationConfig = () => {
+/**
+ * @deprecated This hook is for V0 conversations only. Use useUnifiedConversationConfig instead,
+ * or useV1ConversationConfig once we fully migrate to V1.
+ */
+export const useV0ConversationConfig = () => {
   const { conversationId } = useConversationId();
   const runtimeIsReady = useRuntimeIsReady();
 
   const query = useQuery({
-    queryKey: ["conversation_config", conversationId],
+    queryKey: ["v0_conversation_config", conversationId],
     queryFn: () => {
       if (!conversationId) throw new Error("No conversation ID");
       return ConversationService.getRuntimeId(conversationId);
@@ -34,3 +40,80 @@ export const useConversationConfig = () => {
 
   return query;
 };
+
+export const useV1ConversationConfig = () => {
+  const { conversationId } = useConversationId();
+  const runtimeIsReady = useRuntimeIsReady();
+
+  const query = useQuery({
+    queryKey: ["v1_conversation_config", conversationId],
+    queryFn: () => {
+      if (!conversationId) throw new Error("No conversation ID");
+      return V1ConversationService.getConversationConfig(conversationId);
+    },
+    enabled: runtimeIsReady && !!conversationId,
+    staleTime: 1000 * 60 * 5, // 5 minutes
+    gcTime: 1000 * 60 * 15, // 15 minutes
+  });
+
+  React.useEffect(() => {
+    if (query.data) {
+      const { runtime_id: runtimeId } = query.data;
+
+      // eslint-disable-next-line no-console
+      console.log(
+        "Runtime ID: %c%s",
+        "background: #444; color: #ffeb3b; font-weight: bold; padding: 2px 4px; border-radius: 4px;",
+        runtimeId,
+      );
+    }
+  }, [query.data]);
+
+  return query;
+};
+
+/**
+ * Unified hook that switches between V0 and V1 conversation config endpoints based on conversation version.
+ *
+ * @temporary This hook is temporary during the V0 to V1 migration period.
+ * Once we fully migrate to V1, all code should use useV1ConversationConfig directly.
+ */
+export const useUnifiedConversationConfig = () => {
+  const { conversationId } = useConversationId();
+  const { data: conversation } = useActiveConversation();
+  const runtimeIsReady = useRuntimeIsReady();
+  const isV1Conversation = conversation?.conversation_version === "V1";
+
+  const query = useQuery({
+    queryKey: ["conversation_config", conversationId, isV1Conversation],
+    queryFn: () => {
+      if (!conversationId) throw new Error("No conversation ID");
+
+      if (isV1Conversation) {
+        return V1ConversationService.getConversationConfig(conversationId);
+      }
+      return ConversationService.getRuntimeId(conversationId);
+    },
+    enabled: runtimeIsReady && !!conversationId && conversation !== undefined,
+    staleTime: 1000 * 60 * 5, // 5 minutes
+    gcTime: 1000 * 60 * 15, // 15 minutes
+  });
+
+  React.useEffect(() => {
+    if (query.data) {
+      const { runtime_id: runtimeId } = query.data;
+
+      // eslint-disable-next-line no-console
+      console.log(
+        "Runtime ID: %c%s",
+        "background: #444; color: #ffeb3b; font-weight: bold; padding: 2px 4px; border-radius: 4px;",
+        runtimeId,
+      );
+    }
+  }, [query.data]);
+
+  return query;
+};
+
+// Keep the old export name for backward compatibility (uses unified approach)
+export const useConversationConfig = useUnifiedConversationConfig;