[FIX] Add generic title+subtitle+edit pattern to ToolNavBar

frontend/src/components/custom-tools/header/Header.css

@@ -1,12 +1,5 @@
 /* Styles for Header */
 
-.custom-tools-header-layout {
-  padding: 8px;
-  background-color: #f5f7f9;
-  display: flex;
-  align-items: center;
-}
-
 .custom-tools-header-btns {
   display: flex;
   justify-content: space-between;
@@ -17,14 +10,6 @@
   padding: 0px 5px;
 }
 
-.custom-tools-name {
-  padding: 0px 8px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  font-size: 16px;
-}
-
 .custom-tools-header-v-divider {
   border-right: 1px #d9d9d9 solid;
   padding: 0;

frontend/src/components/custom-tools/header/Header.jsx

@@ -1,7 +1,7 @@
 import { SettingOutlined } from "@ant-design/icons";
-import { Button, Dropdown, Modal, Tooltip, Typography } from "antd";
+import { Button, Dropdown, Form, Input, Modal, Tooltip } from "antd";
 import PropTypes from "prop-types";
-import { useCallback, useState } from "react";
+import { useCallback, useMemo, useState } from "react";
 import { ExportToolIcon } from "../../../assets";
 import { useAxiosPrivate } from "../../../hooks/useAxiosPrivate";
 import { useExceptionHandler } from "../../../hooks/useExceptionHandler";
@@ -10,9 +10,9 @@ import { useAlertStore } from "../../../store/alert-store";
 import { useCustomToolStore } from "../../../store/custom-tool-store";
 import { useSessionStore } from "../../../store/session-store";
 import { CreateApiDeploymentFromPromptStudio } from "../../deployments/create-api-deployment-from-prompt-studio/CreateApiDeploymentFromPromptStudio.jsx";
+import { ToolNavBar } from "../../navigations/tool-nav-bar/ToolNavBar";
 import { CustomButton } from "../../widgets/custom-button/CustomButton";
 import { ExportTool } from "../export-tool/ExportTool";
-import { HeaderTitle } from "../header-title/HeaderTitle.jsx";
 import "./Header.css";
 
 let SinglePassToggleSwitch;
@@ -70,6 +70,8 @@ function Header({
   ] = useState(false);
   const [existingApiDeployments, setExistingApiDeployments] = useState([]);
   const [isApiDeploymentLoading, setIsApiDeploymentLoading] = useState(false);
+  const [editModalOpen, setEditModalOpen] = useState(false);
+  const [editForm] = Form.useForm();
 
   const handleExport = (
     selectedUsers,
@@ -294,17 +296,32 @@ function Header({
     setOpenCreateApiDeploymentModal(true);
   }, []);
 
-  return (
-    <div className="custom-tools-header-layout">
-      {isPublicSource ? (
-        <div>
-          <Typography.Text className="custom-tools-name" strong>
-            {details?.tool_name}
-          </Typography.Text>
-        </div>
-      ) : (
-        <HeaderTitle />
-      )}
+  const handleOpenEditModal = useCallback(() => {
+    editForm.setFieldsValue({
+      tool_name: details?.tool_name || "",
+      description: details?.description || "",
+    });
+    setEditModalOpen(true);
+  }, [details, editForm]);
+
+  const handleEditSubmit = useCallback(async () => {
+    try {
+      const values = await editForm.validateFields();
+      const res = await handleUpdateTool(values);
+      const updatedData = res?.data;
+      if (updatedData) {
+        useCustomToolStore.setState({ details: updatedData });
+      }
+      setEditModalOpen(false);
+      setAlertDetails({ type: "success", content: "Updated successfully" });
+    } catch (err) {
+      if (err?.errorFields) return;
+      setAlertDetails(handleException(err, "Failed to update"));
+    }
+  }, [editForm, handleUpdateTool, setAlertDetails, handleException]);
+
+  const actionButtons = useMemo(
+    () => (
       <div className="custom-tools-header-btns">
         {SinglePassToggleSwitch && (
           <SinglePassToggleSwitch handleUpdateTool={handleUpdateTool} />
@@ -384,6 +401,60 @@ function Header({
           />
         )}
       </div>
+    ),
+    [
+      handleUpdateTool,
+      setOpenSettings,
+      setOpenCloneModal,
+      setOpenShareModal,
+      isPublicSource,
+      isExportLoading,
+      isApiDeploymentLoading,
+      userList,
+      openExportToolModal,
+      toolDetails,
+      details,
+      openCreateApiDeploymentModal,
+    ],
+  );
+
+  return (
+    <>
+      <ToolNavBar
+        title={details?.tool_name || ""}
+        subtitle={isPublicSource ? undefined : details?.description}
+        previousRoute={
+          isPublicSource || !sessionDetails?.orgName
+            ? undefined
+            : `/${sessionDetails.orgName}/tools`
+        }
+        onEditTitle={
+          isPublicSource || !details?.tool_id ? undefined : handleOpenEditModal
+        }
+        customButtons={actionButtons}
+      />
+      <Modal
+        title="Edit Project"
+        open={editModalOpen}
+        onOk={handleEditSubmit}
+        onCancel={() => setEditModalOpen(false)}
+        okText="Save"
+        centered
+        destroyOnClose
+      >
+        <Form form={editForm} layout="vertical">
+          <Form.Item
+            name="tool_name"
+            label="Project Name"
+            rules={[{ required: true, message: "Name is required" }]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item name="description" label="Description">
+            <Input.TextArea rows={3} />
+          </Form.Item>
+        </Form>
+      </Modal>
       <Modal
         onOk={handleConfirmForceExport} // Pass the confirm action
         onCancel={() => setConfirmModalVisible(false)} // Close the modal on cancel
@@ -445,7 +516,7 @@ function Header({
         )}
         <p>Do you want to proceed with creating the API deployment?</p>
       </Modal>
-    </div>
+    </>
   );
 }
 

frontend/src/components/custom-tools/list-of-tools/ListOfTools.jsx

@@ -1,7 +1,7 @@
 import { ArrowDownOutlined, PlusOutlined } from "@ant-design/icons";
 import { Space } from "antd";
 import PropTypes from "prop-types";
-import { useCallback, useEffect, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 
 import { useAxiosPrivate } from "../../../hooks/useAxiosPrivate";
 import { useAlertStore } from "../../../store/alert-store";
@@ -359,7 +359,7 @@ function ListOfTools() {
     </div>
   );
 
-  const CustomButtonsComponent = useCallback(
+  const customButtonsElement = useMemo(
     () => (
       <DefaultCustomButtons
         setOpenImportTool={setOpenImportTool}
@@ -378,7 +378,7 @@ function ListOfTools() {
         onSearch={onSearch}
         searchList={listOfTools}
         setSearchList={setFilteredListOfTools}
-        CustomButtons={CustomButtonsComponent}
+        customButtons={customButtonsElement}
       />
       <div className="list-of-tools-layout">
         <div className="list-of-tools-island">{defaultContent}</div>

frontend/src/components/custom-tools/tool-ide/ToolIde.jsx

@@ -355,14 +355,12 @@ function ToolIde() {
           isExporting={isExporting}
         />
       )}
-      <div>
-        <Header
-          handleUpdateTool={handleUpdateTool}
-          setOpenSettings={setOpenSettings}
-          setOpenShareModal={setOpenShareModal}
-          setOpenCloneModal={setOpenCloneModal}
-        />
-      </div>
+      <Header
+        handleUpdateTool={handleUpdateTool}
+        setOpenSettings={setOpenSettings}
+        setOpenShareModal={setOpenShareModal}
+        setOpenCloneModal={setOpenCloneModal}
+      />
       <div
         className={isPublicSource ? "public-tool-ide-body" : "tool-ide-body"}
       >

frontend/src/components/deployments/header/Header.jsx

@@ -21,21 +21,20 @@ function Header({ type, openAddModal, enableSearch, onSearch, setSearchList }) {
     }
   };
 
-  const customButtons = () => {
-    return (
-      <CustomButton
-        type="primary"
-        icon={<PlusOutlined />}
-        onClick={handleOnClick}
-      >
-        {deploymentsStaticContent[type].addBtn}
-      </CustomButton>
-    );
-  };
+  const addButton = (
+    <CustomButton
+      type="primary"
+      icon={<PlusOutlined />}
+      onClick={handleOnClick}
+    >
+      {deploymentsStaticContent[type].addBtn}
+    </CustomButton>
+  );
+
   return (
     <ToolNavBar
       title={deploymentsStaticContent[type].title}
-      CustomButtons={customButtons}
+      customButtons={addButton}
       enableSearch={enableSearch}
       onSearch={onSearch}
       setSearchList={setSearchList}

frontend/src/components/logging/execution-logs/ExecutionLogs.jsx

@@ -164,16 +164,14 @@ function ExecutionLogs() {
     }
   };
 
-  const customButtons = () => {
-    return (
-      <Tabs
-        activeKey={activeTab}
-        items={items}
-        onChange={onChange}
-        className="log-tab"
-      />
-    );
-  };
+  const logTabs = (
+    <Tabs
+      activeKey={activeTab}
+      items={items}
+      onChange={onChange}
+      className="log-tab"
+    />
+  );
 
   useEffect(() => {
     if (!currentPath) {
@@ -220,7 +218,7 @@ function ExecutionLogs() {
     <>
       <ToolNavBar
         title={"Execution Logs"}
-        CustomButtons={customButtons}
+        customButtons={logTabs}
         enableSearch={false}
         previousRoute={backRoute}
         previousRouteState={backRouteState}

frontend/src/components/navigations/tool-nav-bar/ToolNavBar.css

@@ -1,31 +1,86 @@
-/* Styles for ToolNavBar */
+/* ToolNavBar — top navigation bar for pages and detail views */
 
-.search-navbar-dp {
-  height: 25px;
-  width: 25px;
+.tool-nav-bar {
   display: flex;
   align-items: center;
-  justify-content: center;
-  background-color: #184772;
-  border-radius: 5px;
-  cursor: pointer;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 8px 12px 8px 20px;
+  background-color: var(--page-bg-1, #f5f7f9);
+  box-shadow: 0 1px 3px 0 rgba(24, 50, 71, 0.08);
+  border-bottom: 1px solid var(--border-color-1, #dce4e4);
+}
+
+.tool-nav-bar__left {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  min-width: 0;
+  flex: 1;
 }
 
-.api-search-input {
+.tool-nav-bar__right {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  flex-shrink: 0;
+}
+
+.tool-nav-bar__search {
   width: 250px;
-  margin-right: 10px;
 }
 
-.searchNav {
-  background-color: #f5f7f9;
-  padding-block: 12px;
-  padding-inline-start: 20px;
-  padding-inline-end: 12px;
-  height: 56px;
-  box-shadow: 0px 1px 3px 0px #18324714;
-  border: 1px solid #dce4e4;
+.tool-nav-bar__segment {
+  background-color: rgba(0, 0, 0, 0.06);
+}
+
+/* Title area: hover reveals edit icon */
+.tool-nav-bar__title-area {
+  display: flex;
+  align-items: center;
+  min-width: 0;
+  flex: 1;
+}
+
+.tool-nav-bar__title-area:hover .tool-nav-bar__edit-icon {
+  opacity: 1;
+}
+
+/* Title + subtitle stacked, centered vertically within available height */
+.tool-nav-bar__title-group {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  min-width: 0;
+}
+
+/* Title text + edit icon inline */
+.tool-nav-bar__title-row {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.tool-nav-bar__title {
+  font-size: var(--font-size-16, 16px);
+}
+
+.tool-nav-bar .tool-nav-bar__subtitle {
+  font-size: var(--font-size-12, 12px);
+  line-height: 18px;
+  margin-bottom: 0;
+  max-width: min(600px, 45vw);
+}
+
+/* Edit button: hidden by default, appears on title-area hover */
+.tool-nav-bar__edit-icon.ant-btn {
+  opacity: 0;
+  color: var(--ant-color-text-secondary, #8c8c8c);
+  transition:
+    opacity 0.15s,
+    color 0.15s;
 }
 
-.tool-bar-segment {
-  background-color: #0000000f;
+.tool-nav-bar__edit-icon.ant-btn:hover {
+  color: var(--ant-color-primary, #1677ff);
 }