diff --git a/backend/apps/agent_app.py b/backend/apps/agent_app.py
index 89390b2997..7625aa46fb 100644
--- a/backend/apps/agent_app.py
+++ b/backend/apps/agent_app.py
@@ -837,6 +837,9 @@ async def list_agent_page_api(
     search_tag_predicates: Optional[str] = Query(None, description="Text-search tag predicates as JSON"),
     page: int = Query(1, ge=1, description="Page number starting from 1"),
     page_size: int = Query(20, ge=1, le=100, description="Items per page"),
+    include_repository_info: bool = Query(
+        False, description="Include repository listings for agents on this page"
+    ),
     authorization: Optional[str] = Header(None),
     request: Request = None,
 ):
@@ -852,11 +855,13 @@ async def list_agent_page_api(
         kwargs = {
             "tenant_id": resolved_tenant_id,
             "user_id": user_id,
+            "caller_tenant_id": auth_tenant_id,
             "permission": permission,
             "tag": tag,
             "search": search,
             "page": page,
             "page_size": page_size,
+            "include_repository_info": include_repository_info,
         }
         if created_by:
             kwargs["created_by"] = created_by
diff --git a/backend/database/agent_repository_db.py b/backend/database/agent_repository_db.py
index 053a11407d..e8da664569 100644
--- a/backend/database/agent_repository_db.py
+++ b/backend/database/agent_repository_db.py
@@ -354,6 +354,7 @@ def list_agent_repository_by_agent_ids(
     *,
     statuses: Collection[str],
     publisher_tenant_id: str,
+    publisher_user_id: Optional[str] = None,
 ) -> List[dict]:
     """List repository rows for the given agents, scoped to publisher tenant and statuses."""
     if not agent_ids:
@@ -361,7 +362,7 @@ def list_agent_repository_by_agent_ids(
 
     status_list = list(statuses)
     with get_db_session() as session:
-        rows = (
+        query = (
             session.query(
                 AgentRepository.agent_repository_id,
                 AgentRepository.agent_id,
@@ -377,7 +378,11 @@ def list_agent_repository_by_agent_ids(
                 AgentRepository.agent_id.in_(agent_ids),
                 AgentRepository.status.in_(status_list),
             )
-            .order_by(
+        )
+        if publisher_user_id is not None:
+            query = query.filter(AgentRepository.publisher_user_id == publisher_user_id)
+        rows = (
+            query.order_by(
                 AgentRepository.agent_id,
                 AgentRepository.create_time.desc(),
             )
diff --git a/backend/management/services/agent/management.py b/backend/management/services/agent/management.py
index 2e12564abd..8301042879 100644
--- a/backend/management/services/agent/management.py
+++ b/backend/management/services/agent/management.py
@@ -14,6 +14,7 @@
 from agents.create_agent_info import create_tool_config_list
 from utils.agent_transfer_utils import portable_tool_params, validate_import_tool_params
 from services.agent_version_service import publish_version_impl
+from consts.agent_repository import STATUS_PENDING_REVIEW, STATUS_REJECTED, STATUS_SHARED
 from consts.const import TOOL_TYPE_MAPPING, \
     MODEL_CONFIG_MAPPING, CAN_EDIT_ALL_USER_ROLES, PERMISSION_PRIVATE
 from consts.exceptions import (
@@ -67,6 +68,7 @@
 )
 from database import skill_db
 from management.services.skill.service import SkillService
+from database.agent_repository_db import list_agent_repository_by_agent_ids
 from database.agent_version_db import batch_search_version_names, query_version_list
 from database.group_db import query_group_ids_by_user
 from database.user_tenant_db import get_user_tenant_by_user_id
@@ -922,6 +924,7 @@ async def list_all_agent_info_impl(
 async def list_agent_page_impl(
     tenant_id: str,
     user_id: str,
+    caller_tenant_id: Optional[str] = None,
     permission: Optional[str] = None,
     tag: Optional[str] = None,
     search: Optional[str] = None,
@@ -932,6 +935,7 @@ async def list_agent_page_impl(
     created_by_not: Optional[str] = None,
     tag_predicates: Optional[list] = None,
     search_tag_predicates: Optional[list] = None,
+    include_repository_info: bool = False,
 ) -> Dict[str, Any]:
     """List visible agents with server-side filters and pagination."""
     if created_by and created_by_not:
@@ -1127,6 +1131,72 @@ async def list_agent_page_impl(
             )
             agent["version_label"] = version.get("version_name")
             agent["version_create_time"] = version.get("create_time")
+    if include_repository_info:
+        for scope_tenant_id in tenant_ids:
+            scoped_agents = [
+                agent for scope, agent in paged_scoped_agents
+                if scope == scope_tenant_id
+            ]
+            if not scoped_agents:
+                continue
+            scoped_agent_ids = [int(agent["agent_id"]) for agent in scoped_agents]
+            shared_records = list_agent_repository_by_agent_ids(
+                scoped_agent_ids,
+                statuses=(STATUS_SHARED,),
+                publisher_tenant_id=scope_tenant_id,
+            )
+            publisher_records = []
+            if scope_tenant_id == caller_tenant_id and user_role == "ADMIN":
+                publisher_records = list_agent_repository_by_agent_ids(
+                    scoped_agent_ids,
+                    statuses=(STATUS_PENDING_REVIEW, STATUS_REJECTED, STATUS_SHARED),
+                    publisher_tenant_id=scope_tenant_id,
+                )
+            elif scope_tenant_id == caller_tenant_id and user_role == "DEV":
+                publisher_records = list_agent_repository_by_agent_ids(
+                    scoped_agent_ids,
+                    statuses=(STATUS_PENDING_REVIEW, STATUS_REJECTED, STATUS_SHARED),
+                    publisher_tenant_id=scope_tenant_id,
+                    publisher_user_id=user_id,
+                )
+            records_by_id = {
+                int(record["agent_repository_id"]): (record, False)
+                for record in shared_records
+                if record["status"] == STATUS_SHARED
+            }
+            records_by_id.update({
+                int(record["agent_repository_id"]): (record, True)
+                for record in publisher_records
+            })
+            repository_by_agent_id: dict[int, list[dict]] = {}
+            for record, is_publisher in records_by_id.values():
+                created_at = record.get("create_time")
+                repository_by_agent_id.setdefault(int(record["agent_id"]), []).append(
+                    {
+                        "agent_repository_id": record["agent_repository_id"],
+                        "status": record["status"],
+                        "version_no": record["version_no"],
+                        "version_label": record.get("version_name"),
+                        "create_time": (
+                            created_at.isoformat()
+                            if hasattr(created_at, "isoformat")
+                            else created_at
+                        ),
+                        "content": record.get("content") if is_publisher else None,
+                    }
+                )
+            for records in repository_by_agent_id.values():
+                records.sort(
+                    key=lambda item: (
+                        str(item["create_time"] or ""),
+                        int(item["agent_repository_id"]),
+                    ),
+                    reverse=True,
+                )
+            for agent in scoped_agents:
+                agent["repository_info"] = repository_by_agent_id.get(
+                    int(agent["agent_id"]), []
+                )
     paged_agents = [agent for _, agent in paged_scoped_agents]
     return {
         "items": paged_agents,
diff --git a/frontend/app/[locale]/agent-space/components/MyAgentCard.tsx b/frontend/app/[locale]/agent-space/components/MyAgentCard.tsx
index c997191b2b..7d8b8d64fc 100644
--- a/frontend/app/[locale]/agent-space/components/MyAgentCard.tsx
+++ b/frontend/app/[locale]/agent-space/components/MyAgentCard.tsx
@@ -1,9 +1,7 @@
 "use client";
 
-import { Button, Dropdown, Spin, Tooltip } from "antd";
+import { Button, Dropdown, Tooltip } from "antd";
 import type { MenuProps } from "antd";
-import { useState } from "react";
-import { useAgentRepositoryListings } from "@/hooks/agentRepository/useAgentRepositoryListings";
 import {
   ClipboardCheck,
   Clock,
@@ -21,7 +19,7 @@ import { getUnavailableReasonLabels } from "@/lib/agentLabelMapper";
 import {
   formatMineDate,
   getMineCardMenuActions,
-  toMineRepositoryInfo,
+  getMineCardRepositoryStatusBadge,
   type MineCardMenuAction,
 } from "@/lib/agentRepositoryMine";
 import type { MyEditableAgentItem } from "@/types/agentRepository";
@@ -69,16 +67,6 @@ export function MyAgentCard({
   isDeleting = false,
 }: MyAgentCardProps) {
   const { t } = useTranslation("common");
-  const [menuOpen, setMenuOpen] = useState(false);
-  const {
-    data: listingData,
-    isLoading: isListingLoading,
-    isError: isListingError,
-    refetch,
-  } = useAgentRepositoryListings(
-    { agent_id: agent.agent_id, page: 1, page_size: 100 },
-    menuOpen || guideMenuOpen === true
-  );
 
   const title = agent.name?.trim() || t("agentRepository.card.untitled");
   const description =
@@ -88,8 +76,6 @@ export function MyAgentCard({
     agent.unavailable_reasons ?? [],
     t
   );
-  const repositoryInfo = toMineRepositoryInfo(listingData?.items ?? []);
-  const agentWithRepository = { ...agent, repository_info: repositoryInfo };
   const { canOpen: published } = getAgentUsageGuideAccess({
     currentVersionNo: agent.current_version_no,
     permission: agent.permission,
@@ -99,9 +85,10 @@ export function MyAgentCard({
   const canEdit = agent.permission !== "READ_ONLY";
   const canView = (agent.current_version_no ?? 0) > 0;
   const canEvaluate = canView;
-  const menuActions = listingData
-    ? getMineCardMenuActions(agentWithRepository)
-    : [];
+  const menuActions = getMineCardMenuActions(agent);
+  const repositoryBadge = getMineCardRepositoryStatusBadge(
+    agent.repository_info
+  );
 
   const menuItems: MenuProps["items"] = menuActions.map((action) => {
     const icon =
@@ -122,29 +109,13 @@ export function MyAgentCard({
           return;
         }
         onViewReview(
-          agentWithRepository,
+          agent,
           action === "reviewUpdate" ? "reviewUpdate" : "review"
         );
       },
     };
   });
 
-  if (isListingLoading) {
-    menuItems.unshift({
-      key: "loading",
-      label: <Spin size="small" />,
-      disabled: true,
-    });
-  } else if (isListingError) {
-    menuItems.unshift({
-      key: "retry",
-      label: t("repository.common.retry"),
-      onClick: () => {
-        void refetch();
-      },
-    });
-  }
-
   if (canEvaluate) {
     menuItems.push({
       key: "evaluate",
@@ -223,7 +194,7 @@ export function MyAgentCard({
             <Dropdown
               menu={{ items: menuItems }}
               open={guideMenuOpen}
-              onOpenChange={onGuideMenuOpenChange ?? setMenuOpen}
+              onOpenChange={onGuideMenuOpenChange}
               trigger={["click"]}
             >
               <Button
@@ -236,7 +207,23 @@ export function MyAgentCard({
               />
             </Dropdown>
           ) : null}
-          <div className="flex items-center gap-1.5">
+          <div className="flex flex-wrap items-center justify-end gap-1.5">
+            {repositoryBadge ? (
+              <span
+                className={`rounded-md px-1.5 py-0.5 text-[11px] font-medium ${
+                  repositoryBadge.variant === "pending"
+                    ? "bg-amber-50 text-amber-700 dark:bg-amber-500/10 dark:text-amber-300"
+                    : repositoryBadge.variant === "rejected"
+                      ? "bg-rose-50 text-rose-700 dark:bg-rose-500/10 dark:text-rose-300"
+                      : "bg-blue-50 text-blue-700 dark:bg-blue-500/10 dark:text-blue-300"
+                }`}
+              >
+                {t(repositoryBadge.labelKey)}
+                {repositoryBadge.versionLabel
+                  ? ` · ${repositoryBadge.versionLabel}`
+                  : null}
+              </span>
+            ) : null}
             {agent.is_available === false ? (
               <Tooltip
                 title={
diff --git a/frontend/app/[locale]/agent-space/my-agent.tsx b/frontend/app/[locale]/agent-space/my-agent.tsx
index 549870b68a..2d7a29571c 100644
--- a/frontend/app/[locale]/agent-space/my-agent.tsx
+++ b/frontend/app/[locale]/agent-space/my-agent.tsx
@@ -158,6 +158,7 @@ export function MyAgent({
     (): AgentListFilters => ({
       tenantId: user?.tenantId ?? null,
       enabled: active,
+      includeRepositoryInfo: true,
       page,
       pageSize,
       search: searchQuery.trim() || undefined,
@@ -697,15 +698,7 @@ export function MyAgent({
             }`}
           >
             {t(ownershipLabelKey[filter])}
-            <span
-              className={`rounded px-1.5 text-xs ${
-                ownership === filter
-                  ? "bg-white/20"
-                  : "bg-white/70 text-slate-500 dark:bg-slate-900/50 dark:text-slate-400"
-              }`}
-            >
-              {counts[filter]}
-            </span>
+            <span className="text-xs opacity-80">{counts[filter]}</span>
           </button>
         ))}
       </div>
@@ -888,7 +881,7 @@ function toMyAgentItem(agent: Agent): MyEditableAgentItem {
     version_create_time: agent.version_create_time ?? null,
     permission: agent.permission,
     tags: agent.tags,
-    repository_info: [],
+    repository_info: agent.repository_info ?? [],
   };
 }
 
diff --git a/frontend/app/[locale]/mcp-space/components/McpToolsSearchFilterBar.tsx b/frontend/app/[locale]/mcp-space/components/McpToolsSearchFilterBar.tsx
index 83e9a04223..29b13a732c 100644
--- a/frontend/app/[locale]/mcp-space/components/McpToolsSearchFilterBar.tsx
+++ b/frontend/app/[locale]/mcp-space/components/McpToolsSearchFilterBar.tsx
@@ -72,13 +72,7 @@ export default function McpToolsSearchFilterBar({
       }`}
     >
       <span>{item.label}</span>
-      <span
-        className={`ml-1.5 rounded-full px-1.5 text-xs ${
-          selected ? "bg-white/20 text-white" : "bg-white text-slate-500"
-        }`}
-      >
-        {item.count}
-      </span>
+      <span className="ml-1 text-xs opacity-80">{item.count}</span>
     </button>
   );
 
diff --git a/frontend/app/[locale]/mcp-space/components/MineMcpServiceCard.tsx b/frontend/app/[locale]/mcp-space/components/MineMcpServiceCard.tsx
index 23c316872b..3e74165e36 100644
--- a/frontend/app/[locale]/mcp-space/components/MineMcpServiceCard.tsx
+++ b/frontend/app/[locale]/mcp-space/components/MineMcpServiceCard.tsx
@@ -304,7 +304,11 @@ export default function MineMcpServiceCard({
           <Button
             type="text"
             size="small"
-            className="!text-slate-600 hover:!bg-transparent hover:!text-blue-500"
+            className={
+              isEnabled
+                ? "!bg-emerald-50 !text-emerald-700 hover:!bg-emerald-100 hover:!text-emerald-800 dark:!bg-emerald-900/30 dark:!text-emerald-300 dark:hover:!bg-emerald-900/50"
+                : "!text-slate-600 hover:!bg-transparent hover:!text-blue-500"
+            }
             loading={toggling}
             icon={<Power className="size-3.5" />}
             onClick={() => onToggle(localService)}
diff --git a/frontend/app/[locale]/newchat/assistant-ui/thread-list.tsx b/frontend/app/[locale]/newchat/assistant-ui/thread-list.tsx
index 3a218ed69e..8c2233e4d4 100644
--- a/frontend/app/[locale]/newchat/assistant-ui/thread-list.tsx
+++ b/frontend/app/[locale]/newchat/assistant-ui/thread-list.tsx
@@ -39,6 +39,7 @@ import log from "@/lib/logger";
 import { conversationService } from "@/services/conversationService";
 import type { FC } from "react";
 import { setPendingThreadOperationId } from "../adapter/conversation-thread-list-adapter";
+import { getVisibleThreadIds } from "./visible-thread-ids";
 
 // Conversation status indicator component
 const ConversationStatusIndicator: FC<{
@@ -89,7 +90,8 @@ const useBatchSelection = (): BatchSelectionValue | null =>
 export const BatchSelectionProvider: FC<{
   children: ReactNode;
   onNewConversation?: () => void | Promise<void>;
-}> = ({ children, onNewConversation }) => {
+  serverConversationIds?: ReadonlyMap<string, string>;
+}> = ({ children, onNewConversation, serverConversationIds }) => {
   const { t } = useTranslation();
   const aui = useAui();
   const { confirm } = useConfirmModal();
@@ -109,8 +111,13 @@ export const BatchSelectionProvider: FC<{
   }, []);
 
   const selectAllVisible = useCallback(() => {
-    setSelectedIds(() => new Set(threadIds));
-  }, [threadIds]);
+    setSelectedIds(
+      () =>
+        new Set(
+          getVisibleThreadIds(threadIds, threadItems, serverConversationIds)
+        )
+    );
+  }, [threadIds, threadItems, serverConversationIds]);
 
   const clear = useCallback(() => setSelectedIds(new Set()), []);
 
@@ -132,9 +139,10 @@ export const BatchSelectionProvider: FC<{
     );
     const conversationIds: number[] = [];
     for (const id of selectedIds) {
-      const remoteId = itemsById.get(id)?.remoteId;
-      const num = Number(remoteId);
-      if (remoteId && Number.isInteger(num) && num > 0) {
+      const conversationId =
+        serverConversationIds?.get(id) || itemsById.get(id)?.remoteId;
+      const num = Number(conversationId);
+      if (conversationId && Number.isInteger(num) && num > 0) {
         conversationIds.push(num);
       }
     }
@@ -144,7 +152,8 @@ export const BatchSelectionProvider: FC<{
     // If so, the main panel must switch to a fresh thread after reload,
     // otherwise it would keep pointing at a now-deleted conversation.
     const activeRemoteId = mainThreadId
-      ? itemsById.get(mainThreadId)?.remoteId
+      ? serverConversationIds?.get(mainThreadId) ||
+        itemsById.get(mainThreadId)?.remoteId
       : undefined;
     const activeConversationId = Number(activeRemoteId);
     const activeDeleted =
@@ -184,6 +193,7 @@ export const BatchSelectionProvider: FC<{
     selectedIds,
     threadItems,
     mainThreadId,
+    serverConversationIds,
     confirm,
     t,
     aui,
@@ -295,39 +305,39 @@ export const BatchSidebarFooter: FC<{ onSwitchToLegacy?: () => void }> = ({
 
 interface ThreadListProps {
   generatedTitles?: ReadonlyMap<string, string>;
+  serverConversationIds?: ReadonlyMap<string, string>;
 }
 
 export const ThreadList: FC<ThreadListProps> = ({
   generatedTitles,
+  serverConversationIds,
 }) => {
   const { t } = useTranslation();
   const completedConversations = useMemo(() => new Set<string>(), []);
   const isLoading = useAuiState((s) => s.threads.isLoading);
   const isLoadingMore = useAuiState((s) => s.threads.isLoadingMore);
   const hasMore = useAuiState((s) => s.threads.hasMore);
+  const threadIds = useAuiState((s) => s.threads.threadIds);
+  const threadItems = useAuiState((s) => s.threads.threadItems);
+  const visibleThreadIds = getVisibleThreadIds(
+    threadIds,
+    threadItems,
+    serverConversationIds
+  );
 
   return (
     <div className="flex flex-col p-2">
       <AuiIf condition={(s) => s.threads.isLoading}>
         <ThreadListSkeleton />
       </AuiIf>
-      <AuiIf
-        condition={(s) =>
-          !s.threads.isLoading && s.threads.threadIds.length === 0
-        }
-      >
-        <ThreadListEmpty />
-      </AuiIf>
-      <AuiIf
-        condition={(s) =>
-          !s.threads.isLoading && s.threads.threadIds.length > 0
-        }
-      >
+      {!isLoading && visibleThreadIds.length === 0 && <ThreadListEmpty />}
+      {!isLoading && visibleThreadIds.length > 0 && (
         <ThreadListItems
           completedConversations={completedConversations}
           generatedTitles={generatedTitles}
+          visibleThreadIds={visibleThreadIds}
         />
-      </AuiIf>
+      )}
       <ThreadListPrimitive.LoadMore
         disabled={!hasMore || isLoading || isLoadingMore}
         className="mt-1 flex h-8 w-full items-center justify-center gap-2 rounded-lg px-3 text-xs text-muted-foreground hover:bg-white disabled:cursor-not-allowed disabled:opacity-50"
@@ -363,38 +373,30 @@ const ThreadListEmpty: FC = () => {
 interface ThreadListItemsProps {
   completedConversations: Set<string>;
   generatedTitles?: ReadonlyMap<string, string>;
+  visibleThreadIds: string[];
 }
 
 const ThreadListItems: FC<ThreadListItemsProps> = ({
   completedConversations,
   generatedTitles,
+  visibleThreadIds,
 }) => {
   const { t } = useTranslation();
 
-  const groups = useThreadListGroups();
+  const groups = useThreadListGroups(visibleThreadIds);
 
   const GroupedThreadListItem = useMemo<FC>(
-    () => () => (
-      <ThreadListItem
-        completedConversations={completedConversations}
-        generatedTitles={generatedTitles}
-      />
-    ),
-    [completedConversations, generatedTitles]
-  );
-
-  if (!groups) {
-    return (
-      <ThreadListPrimitive.Items>
-        {() => (
+    () =>
+      function GroupedThreadListItem() {
+        return (
           <ThreadListItem
             completedConversations={completedConversations}
             generatedTitles={generatedTitles}
           />
-        )}
-      </ThreadListPrimitive.Items>
-    );
-  }
+        );
+      },
+    [completedConversations, generatedTitles]
+  );
 
   // Render each thread by index so we can interleave group labels between
   // recency buckets without giving up the runtime's per-item context.
@@ -402,12 +404,14 @@ const ThreadListItems: FC<ThreadListItemsProps> = ({
     <div className="flex flex-col">
       {groups.map((group) => (
         <Fragment key={group.label}>
-          <div
-            data-slot="aui_thread-list-group-label"
-            className="px-3 pt-3 pb-1 text-xs font-medium text-[#4379EE]"
-          >
-            {t(group.label)}
-          </div>
+          {group.label && (
+            <div
+              data-slot="aui_thread-list-group-label"
+              className="px-3 pt-3 pb-1 text-xs font-medium text-[#4379EE]"
+            >
+              {t(group.label)}
+            </div>
+          )}
           {group.entries.map(({ id, index }) => (
             <ThreadListPrimitive.ItemByIndex
               key={id}
@@ -443,13 +447,12 @@ const dateGroupLabel = (
   return "chat.threadList.older";
 };
 
-// Build ordered recency groups for the current thread list. Returns null when
-// no thread has a usable timestamp so the caller can render a flat list.
-const useThreadListGroups = (): ThreadListGroup[] | null => {
+// Build ordered recency groups for the visible thread list.
+const useThreadListGroups = (visibleThreadIds: string[]): ThreadListGroup[] => {
   const threadIds = useAuiState((s) => s.threads.threadIds);
   const threadItems = useAuiState((s) => s.threads.threadItems);
 
-  return useMemo<ThreadListGroup[] | null>(() => {
+  return useMemo<ThreadListGroup[]>(() => {
     const itemsById = new Map(
       (
         threadItems as ReadonlyArray<{
@@ -462,8 +465,6 @@ const useThreadListGroups = (): ThreadListGroup[] | null => {
       const raw = itemsById.get(id)?.custom?.lastMessageAt;
       return raw ? new Date(raw) : undefined;
     });
-    if (!dates.some(Boolean)) return null;
-
     const now = new Date();
     const startOfToday = new Date(
       now.getFullYear(),
@@ -475,8 +476,18 @@ const useThreadListGroups = (): ThreadListGroup[] | null => {
       dates[index]?.getTime() ?? Number.MAX_SAFE_INTEGER;
     const indices = threadIds
       .map((_, index) => index)
+      .filter((index) => visibleThreadIds.includes(threadIds[index]))
       .sort((a, b) => time(b) - time(a));
 
+    if (!indices.some((index) => dates[index])) {
+      return [
+        {
+          label: "",
+          entries: indices.map((index) => ({ id: threadIds[index], index })),
+        },
+      ];
+    }
+
     const result: ThreadListGroup[] = [];
     for (const index of indices) {
       const label = dateGroupLabel(dates[index], startOfToday);
@@ -489,7 +500,7 @@ const useThreadListGroups = (): ThreadListGroup[] | null => {
       }
     }
     return result;
-  }, [threadIds, threadItems]);
+  }, [threadIds, threadItems, visibleThreadIds]);
 };
 
 const ThreadListSkeleton: FC = () => {
@@ -554,7 +565,10 @@ const ThreadListItemContent: FC<ThreadListItemContentProps> = ({
   const threadListItem = aui.threadListItem;
   const thread = threadListItem.getState();
   const title =
-    generatedTitles?.get(thread.id) ?? thread.title ?? t("chat.thread.newChat");
+    generatedTitles?.get(thread.id) ??
+    (thread.remoteId ? generatedTitles?.get(thread.remoteId) : undefined) ??
+    thread.title ??
+    t("chat.thread.newChat");
 
   const handleRename = useCallback(
     async (newTitle: string) => {
@@ -633,9 +647,7 @@ const ThreadListItemContent: FC<ThreadListItemContentProps> = ({
           />
           <Tooltip>
             <TooltipTrigger asChild>
-              <span className="min-w-0 flex-1 truncate text-left">
-                {title}
-              </span>
+              <span className="min-w-0 flex-1 truncate text-left">{title}</span>
             </TooltipTrigger>
             <TooltipContent side="top" className="max-w-80 break-words">
               {title}
diff --git a/frontend/app/[locale]/newchat/assistant-ui/threadlist-sidebar.tsx b/frontend/app/[locale]/newchat/assistant-ui/threadlist-sidebar.tsx
index a98cf1b117..3731bc5e6d 100644
--- a/frontend/app/[locale]/newchat/assistant-ui/threadlist-sidebar.tsx
+++ b/frontend/app/[locale]/newchat/assistant-ui/threadlist-sidebar.tsx
@@ -27,6 +27,7 @@ import { useTranslation } from "react-i18next";
 interface ThreadListSidebarProps extends SidebarProps {
   className?: string;
   generatedTitles?: ReadonlyMap<string, string>;
+  serverConversationIds?: ReadonlyMap<string, string>;
   onPrepareNewConversation?: () => void;
   onNewConversation?: () => void | Promise<void>;
   showLegacySwitch?: boolean;
@@ -34,6 +35,7 @@ interface ThreadListSidebarProps extends SidebarProps {
 
 export function ThreadListSidebar({
   generatedTitles,
+  serverConversationIds,
   onPrepareNewConversation,
   onNewConversation,
   showLegacySwitch = true,
@@ -104,7 +106,10 @@ export function ThreadListSidebar({
         className="h-full w-64 min-w-64 max-w-64 p-2"
         style={{ backgroundColor: "#F2F8FF" }}
       >
-        <BatchSelectionProvider onNewConversation={onNewConversation}>
+        <BatchSelectionProvider
+          onNewConversation={onNewConversation}
+          serverConversationIds={serverConversationIds}
+        >
           <Sidebar
             {...props}
             collapsible="none"
@@ -114,18 +119,32 @@ export function ThreadListSidebar({
           >
             <SidebarHeader>
               <div className="flex items-center gap-2 px-1">
-                <ThreadListPrimitive.New
-                  className="flex h-9 flex-1 items-center gap-2 rounded-lg border px-3 text-sm hover:bg-muted truncate bg-white"
-                  onClick={onPrepareNewConversation}
-                >
-                  <PlusIcon className="size-4 shrink-0" />
-                  {t("chat.sidebar.newConversation")}
-                </ThreadListPrimitive.New>
+                {onNewConversation ? (
+                  <button
+                    type="button"
+                    className="flex h-9 flex-1 items-center gap-2 rounded-lg border px-3 text-sm hover:bg-muted truncate bg-white"
+                    onClick={onNewConversation}
+                  >
+                    <PlusIcon className="size-4 shrink-0" />
+                    {t("chat.sidebar.newConversation")}
+                  </button>
+                ) : (
+                  <ThreadListPrimitive.New
+                    className="flex h-9 flex-1 items-center gap-2 rounded-lg border px-3 text-sm hover:bg-muted truncate bg-white"
+                    onClick={onPrepareNewConversation}
+                  >
+                    <PlusIcon className="size-4 shrink-0" />
+                    {t("chat.sidebar.newConversation")}
+                  </ThreadListPrimitive.New>
+                )}
                 <SidebarTrigger className="size-8 shrink-0" />
               </div>
             </SidebarHeader>
             <SidebarContent className="focus:outline-none">
-              <ThreadList generatedTitles={generatedTitles} />
+              <ThreadList
+                generatedTitles={generatedTitles}
+                serverConversationIds={serverConversationIds}
+              />
             </SidebarContent>
             <SidebarFooter>
               <BatchSidebarFooter
diff --git a/frontend/app/[locale]/newchat/assistant-ui/visible-thread-ids.ts b/frontend/app/[locale]/newchat/assistant-ui/visible-thread-ids.ts
new file mode 100644
index 0000000000..cd07afb2f6
--- /dev/null
+++ b/frontend/app/[locale]/newchat/assistant-ui/visible-thread-ids.ts
@@ -0,0 +1,15 @@
+export const getVisibleThreadIds = (
+  threadIds: readonly string[],
+  threadItems: ReadonlyArray<{ id: string; remoteId?: string }>,
+  serverConversationIds?: ReadonlyMap<string, string>
+): string[] => {
+  const remoteIds = new Map(
+    threadItems.map((item) => [item.id, item.remoteId])
+  );
+  return threadIds.filter((id) => {
+    const conversationId = Number(
+      serverConversationIds?.get(id) || remoteIds.get(id)
+    );
+    return Number.isInteger(conversationId) && conversationId > 0;
+  });
+};
diff --git a/frontend/app/[locale]/newchat/page.tsx b/frontend/app/[locale]/newchat/page.tsx
index 5d705c7027..c5698da367 100644
--- a/frontend/app/[locale]/newchat/page.tsx
+++ b/frontend/app/[locale]/newchat/page.tsx
@@ -160,7 +160,6 @@ const PersistentChatHome: FC = () => {
           setSelectedAgent={setSelectedAgent}
           isLoadingAgents={isLoadingAgents}
           agents={agents}
-          onAgentSelected={handleAgentSelected}
           onBack={handleBack}
           isDictationConfigured={isDictationConfigured(modelConfig?.stt)}
         />
@@ -179,7 +178,6 @@ const HomeContent: FC<{
   setSelectedAgent: (agent: Agent | null) => void;
   isLoadingAgents: boolean;
   agents: Agent[];
-  onAgentSelected: (agent: Agent) => void;
   onBack: () => void;
   isDictationConfigured: boolean;
 }> = ({
@@ -188,7 +186,6 @@ const HomeContent: FC<{
   setSelectedAgent,
   isLoadingAgents,
   agents,
-  onAgentSelected,
   onBack,
   isDictationConfigured,
 }) => {
@@ -247,7 +244,9 @@ const HomeContent: FC<{
   const [generatedTitles, setGeneratedTitles] = useState<Map<string, string>>(
     new Map()
   );
-  const [, forceServerIdTick] = useState(0);
+  const [serverConversationIds, setServerConversationIds] = useState<
+    Map<string, string>
+  >(new Map());
 
   const handleServerConversationId = useCallback(
     (threadId: string, serverId: string, initialQuestion?: string) => {
@@ -257,10 +256,8 @@ const HomeContent: FC<{
       if (previous !== numericId) {
         map.set(threadId, numericId);
         cacheHistoricalChatMode(numericId, chatMode);
-        // Trigger a re-render so the `setRunConfig` effect below picks up the
-        // new id. We don't store the map in state because we never need to
-        // diff/render it directly — only react when an entry changes.
-        forceServerIdTick((tick) => tick + 1);
+        // Keep the sidebar and run configuration in sync with the server id.
+        setServerConversationIds(new Map(map));
       }
 
       if (initialQuestion && previous !== numericId) {
@@ -269,6 +266,7 @@ const HomeContent: FC<{
             setGeneratedTitles((titles) => {
               const next = new Map(titles);
               next.set(threadId, title);
+              next.set(numericId, title);
               return next;
             });
           })
@@ -726,8 +724,14 @@ const HomeContent: FC<{
 
   const handleThreadBack = useCallback(async () => {
     shouldRestoreAgentRef.current = false;
-    await runtime.threads.switchToNewThread();
-    onBack();
+    try {
+      await runtime.threads.switchToNewThread();
+      await runtime.threads.reload();
+    } catch (error) {
+      log.error("[HomeContent] Failed to return to agent list:", error);
+    } finally {
+      onBack();
+    }
   }, [onBack, runtime]);
 
   const handlePrepareNewConversation = useCallback(() => {
@@ -737,22 +741,28 @@ const HomeContent: FC<{
   }, [onBack]);
 
   const handleNewConversation = useCallback(async () => {
-    handlePrepareNewConversation();
-    await runtime.threads.switchToNewThread();
-  }, [handlePrepareNewConversation, runtime]);
+    shouldRestoreAgentRef.current = false;
+    try {
+      await runtime.threads.switchToNewThread();
+      await runtime.threads.reload();
+    } catch (error) {
+      log.error("[HomeContent] Failed to start a new conversation:", error);
+    } finally {
+      onBack();
+    }
+  }, [onBack, runtime]);
 
   const handleAgentSelectedFromLanding = useCallback(
     async (agent: Agent) => {
       shouldRestoreAgentRef.current = true;
-      await runtime.threads.switchToNewThread();
       const thread = runtime.threads.getItemById(
         runtime.threads.getState().mainThreadId
       );
       await thread.initialize();
       await thread.updateCustom({ agentId: agent.id });
-      onAgentSelected(agent);
+      setSelectedAgent(agent);
     },
-    [onAgentSelected, runtime]
+    [runtime, setSelectedAgent]
   );
 
   // Conditional rendering must happen after all hooks
@@ -770,6 +780,7 @@ const HomeContent: FC<{
         <SidebarProvider className="w-auto h-full">
           <ThreadListSidebar
             generatedTitles={generatedTitles}
+            serverConversationIds={serverConversationIds}
             onPrepareNewConversation={handlePrepareNewConversation}
             onNewConversation={handleNewConversation}
           />
diff --git a/frontend/app/[locale]/skill-space/components/MineSkillsView.tsx b/frontend/app/[locale]/skill-space/components/MineSkillsView.tsx
index b7e195e8dd..6539820da7 100644
--- a/frontend/app/[locale]/skill-space/components/MineSkillsView.tsx
+++ b/frontend/app/[locale]/skill-space/components/MineSkillsView.tsx
@@ -418,6 +418,8 @@ const MINE_SKILL_STATUS_CLASS: Record<SkillRepositoryListingStatus, string> = {
 };
 
 function getMineSkillMenuItems({
+  canApplyListing,
+  canEdit,
   canPublish,
   hasRepositoryInfo,
   t,
@@ -425,6 +427,8 @@ function getMineSkillMenuItems({
   onViewReview,
   onDelete,
 }: {
+  canApplyListing: boolean;
+  canEdit: boolean;
   canPublish: boolean;
   hasRepositoryInfo: boolean;
   t: (key: string) => string;
@@ -433,7 +437,7 @@ function getMineSkillMenuItems({
   onDelete: () => void;
 }): MenuProps["items"] {
   const items: MenuProps["items"] = [];
-  if (canPublish && !hasRepositoryInfo) {
+  if (canApplyListing) {
     items.push({
       key: "apply-listing",
       label: t("skillRepository.mine.button.apply"),
@@ -449,13 +453,15 @@ function getMineSkillMenuItems({
       onClick: onViewReview,
     });
   }
-  items.push({
-    key: "delete",
-    label: t("common.delete"),
-    icon: <Trash2 className="size-3.5" aria-hidden />,
-    danger: true,
-    onClick: onDelete,
-  });
+  if (canEdit) {
+    items.push({
+      key: "delete",
+      label: t("common.delete"),
+      icon: <Trash2 className="size-3.5" aria-hidden />,
+      danger: true,
+      onClick: onDelete,
+    });
+  }
   return items;
 }
 
@@ -485,7 +491,10 @@ function MineSkillCard({
   const canPublish = skill.can_publish === true;
   const updatedAt = formatRepositoryDate(skill.updated_at ?? skill.update_time);
   const tags = skill.tags?.filter((tag) => tag.trim()) ?? [];
+  const canApplyListing = canPublish && !hasRepositoryInfo;
   const menuItems = getMineSkillMenuItems({
+    canApplyListing,
+    canEdit,
     canPublish,
     hasRepositoryInfo,
     t,
@@ -498,6 +507,7 @@ function MineSkillCard({
     <ResourceCard
       title={skill.name || t("skillRepository.common.untitled")}
       className="h-full min-h-[200px] p-4"
+      onClick={onView}
       icon={
         <div className="flex size-11 shrink-0 items-center justify-center rounded-xl bg-primary/10 text-primary">
           <Bot className="size-5" aria-hidden />
@@ -531,7 +541,7 @@ function MineSkillCard({
       footerLayout="inline"
       headerActions={
         <div className="flex flex-col items-end gap-1">
-          {canEdit ? (
+          {canEdit || canApplyListing ? (
             <Dropdown menu={{ items: menuItems }} trigger={["click"]}>
               <Button
                 type="text"
diff --git a/frontend/features/workbench/WorkbenchPage.tsx b/frontend/features/workbench/WorkbenchPage.tsx
index 9e66858443..ee0d3b6c00 100644
--- a/frontend/features/workbench/WorkbenchPage.tsx
+++ b/frontend/features/workbench/WorkbenchPage.tsx
@@ -195,7 +195,9 @@ const HomeContent: FC = () => {
   const [generatedTitles, setGeneratedTitles] = useState<Map<string, string>>(
     new Map()
   );
-  const [, forceServerIdTick] = useState(0);
+  const [serverConversationIds, setServerConversationIds] = useState<
+    Map<string, string>
+  >(new Map());
 
   const handleServerConversationId = useCallback(
     (threadId: string, serverId: string, initialQuestion?: string) => {
@@ -205,10 +207,8 @@ const HomeContent: FC = () => {
       if (previous !== numericId) {
         map.set(threadId, numericId);
         cacheHistoricalChatMode(numericId, chatMode);
-        // Trigger a re-render so the `setRunConfig` effect below picks up the
-        // new id. We don't store the map in state because we never need to
-        // diff/render it directly — only react when an entry changes.
-        forceServerIdTick((tick) => tick + 1);
+        // Keep the sidebar and run configuration in sync with the server id.
+        setServerConversationIds(new Map(map));
         if (workbenchState.configVersion === 0) {
           dispatchWorkbench({ type: "set-version", version: 1 });
         }
@@ -1167,6 +1167,7 @@ const HomeContent: FC = () => {
           <ThreadListSidebar
             showLegacySwitch={false}
             generatedTitles={generatedTitles}
+            serverConversationIds={serverConversationIds}
             onPrepareNewConversation={handlePrepareNewConversation}
             onNewConversation={handleNewConversation}
           />
diff --git a/frontend/hooks/agentRepository/useAgentRepositoryListings.ts b/frontend/hooks/agentRepository/useAgentRepositoryListings.ts
index 472afc95e4..518981d3ea 100644
--- a/frontend/hooks/agentRepository/useAgentRepositoryListings.ts
+++ b/frontend/hooks/agentRepository/useAgentRepositoryListings.ts
@@ -26,6 +26,7 @@ export async function invalidateAgentRepositoryCaches(
     [AGENT_REPOSITORY_LISTINGS_QUERY_KEY],
     [MY_EDITABLE_AGENTS_QUERY_KEY],
     [AGENT_REPOSITORY_DETAIL_QUERY_KEY],
+    [AGENTS_LIST_QUERY_KEY],
   ] as const;
 
   await Promise.all(
diff --git a/frontend/services/agentConfigService.ts b/frontend/services/agentConfigService.ts
index 384402dd86..811ace68a7 100644
--- a/frontend/services/agentConfigService.ts
+++ b/frontend/services/agentConfigService.ts
@@ -182,6 +182,7 @@ type AgentListApiItem = {
   enable_protocol_repair_retry?: boolean;
   model_params_override?: Agent["model_params_override"];
   icon_url?: string;
+  repository_info?: Agent["repository_info"];
 };
 
 const formatAgentListItem = (agent: AgentListApiItem): Agent =>
@@ -211,11 +212,13 @@ const formatAgentListItem = (agent: AgentListApiItem): Agent =>
     enable_protocol_repair_retry: agent.enable_protocol_repair_retry ?? false,
     model_params_override: agent.model_params_override ?? null,
     icon_url: agent.icon_url,
+    repository_info: agent.repository_info,
   }) as unknown as Agent;
 
 export type AgentListFilters = {
   tenantId?: string | null;
   enabled?: boolean;
+  includeRepositoryInfo?: boolean;
   permission?: "EDIT" | "READ_ONLY";
   tag?: string;
   tagPredicates?: TagResourcePredicate[];
@@ -293,6 +296,8 @@ export const fetchPagedAgentList = async (
     if (filters.tag?.trim()) queryParams.set("tag", filters.tag.trim());
     if (filters.search?.trim())
       queryParams.set("search", filters.search.trim());
+    if (filters.includeRepositoryInfo)
+      queryParams.set("include_repository_info", "true");
     queryParams.set("page", String(filters.page ?? 1));
     queryParams.set("page_size", String(filters.pageSize ?? 20));
 
diff --git a/frontend/tests/component/agentChatPageDeepLink.test.tsx b/frontend/tests/component/agentChatPageDeepLink.test.tsx
index 3e8e53d578..cab7c694dc 100644
--- a/frontend/tests/component/agentChatPageDeepLink.test.tsx
+++ b/frontend/tests/component/agentChatPageDeepLink.test.tsx
@@ -7,13 +7,17 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import Home from "../../app/[locale]/newchat/page";
 
 const switchToNewThread = vi.fn();
+const reloadThreads = vi.fn();
+const initializeThread = vi.fn().mockResolvedValue(undefined);
+const updateThreadCustom = vi.fn().mockResolvedValue(undefined);
 
 const runtimeMock = {
   threads: {
     switchToNewThread,
+    reload: reloadThreads,
     getItemById: vi.fn(() => ({
-      initialize: vi.fn().mockResolvedValue(undefined),
-      updateCustom: vi.fn().mockResolvedValue(undefined),
+      initialize: initializeThread,
+      updateCustom: updateThreadCustom,
     })),
     getState: vi.fn(() => ({ mainThreadId: "main-thread" })),
   },
@@ -130,6 +134,9 @@ vi.mock("react-i18next", () => ({
 describe("newchat Agent deep-link page wiring", () => {
   beforeEach(() => {
     switchToNewThread.mockReset();
+    reloadThreads.mockReset().mockResolvedValue(undefined);
+    initializeThread.mockClear();
+    updateThreadCustom.mockClear();
     window.history.replaceState({}, "", "/zh/newchat?agent_id=41");
   });
 
@@ -161,6 +168,30 @@ describe("newchat Agent deep-link page wiring", () => {
     expect(
       await screen.findByText("Agent chat: Fixed Agent")
     ).toBeInTheDocument();
-    expect(switchToNewThread.mock.calls.length).toBe(callsAfterDeepLink + 3);
+    expect(switchToNewThread.mock.calls.length).toBe(callsAfterDeepLink + 1);
+    expect(reloadThreads).toHaveBeenCalledTimes(1);
+    expect(initializeThread).toHaveBeenCalledTimes(1);
+    expect(updateThreadCustom).toHaveBeenCalledWith({ agentId: agent.id });
+  });
+
+  it("reloads the saved conversation before returning to the Agent list", async () => {
+    switchToNewThread.mockResolvedValue(undefined);
+    let finishReload!: () => void;
+    reloadThreads.mockImplementation(
+      () =>
+        new Promise<void>((resolve) => {
+          finishReload = resolve;
+        })
+    );
+    const user = userEvent.setup();
+    render(<Home />);
+    await screen.findByText("Agent chat: Fixed Agent");
+
+    await user.click(screen.getByRole("button", { name: "back to list" }));
+    expect(reloadThreads).toHaveBeenCalledTimes(1);
+    expect(screen.getByText("Agent chat: Fixed Agent")).toBeInTheDocument();
+
+    finishReload();
+    expect(await screen.findByText("Agent list")).toBeInTheDocument();
   });
 });
diff --git a/frontend/tests/component/agentUsageGuide.test.tsx b/frontend/tests/component/agentUsageGuide.test.tsx
index 086c47f2a7..b3cb31d45d 100644
--- a/frontend/tests/component/agentUsageGuide.test.tsx
+++ b/frontend/tests/component/agentUsageGuide.test.tsx
@@ -11,6 +11,7 @@ import { MyAgentCard } from "../../app/[locale]/agent-space/components/MyAgentCa
 import { a2aClientService } from "@/services/a2aService";
 import { fetchPublishedAgentList } from "@/services/agentConfigService";
 import { configService } from "@/services/configService";
+import agentRepositoryService from "@/services/agentRepositoryService";
 import type { MyEditableAgentItem } from "@/types/agentRepository";
 
 vi.mock("react-i18next", () => ({
@@ -107,6 +108,123 @@ beforeEach(() => {
 });
 
 describe("Agent usage guide component coverage", () => {
+  it("shows apply listing from the paged agent data without another request", async () => {
+    const fetchListings = vi
+      .spyOn(agentRepositoryService, "fetchAgentRepositoryListings")
+      .mockResolvedValue({ items: [] });
+    const onApplyListing = vi.fn();
+    const onGuideMenuOpenChange = vi.fn();
+    renderWithProviders(
+      <MyAgentCard
+        agent={editableAgent}
+        onEdit={vi.fn()}
+        onView={vi.fn()}
+        onApplyListing={onApplyListing}
+        onViewReview={vi.fn()}
+        onDelete={vi.fn()}
+        onEvaluate={vi.fn()}
+        onUsageGuide={vi.fn()}
+        onGuideMenuOpenChange={onGuideMenuOpenChange}
+      />
+    );
+
+    await userEvent
+      .setup()
+      .click(
+        screen.getByRole("button", { name: "agentRepository.mine.menu.more" })
+      );
+    const applyItem = await screen.findByRole("menuitem", {
+      name: "agentRepository.mine.menu.apply",
+    });
+    expect(fetchListings).not.toHaveBeenCalled();
+    expect(onGuideMenuOpenChange.mock.calls[0]?.[0]).toBe(true);
+    await userEvent.setup().click(applyItem);
+    expect(onApplyListing).toHaveBeenCalledOnce();
+    fetchListings.mockRestore();
+  });
+
+  it("shows review status from the paged agent data", async () => {
+    const fetchListings = vi
+      .spyOn(agentRepositoryService, "fetchAgentRepositoryListings")
+      .mockResolvedValue({
+        items: [
+          {
+            agent_repository_id: 12,
+            agent_id: 41,
+            name: "Demo Agent",
+            status: "shared",
+            version_no: 3,
+          },
+        ],
+      });
+    renderCard(
+      {
+        ...editableAgent,
+        repository_info: [
+          {
+            agent_repository_id: 12,
+            status: "shared",
+            version_no: 3,
+          },
+        ],
+      },
+      vi.fn(),
+      {
+        onGuideMenuOpenChange: vi.fn(),
+      }
+    );
+
+    await userEvent
+      .setup()
+      .click(
+        screen.getByRole("button", { name: "agentRepository.mine.menu.more" })
+      );
+    expect(
+      await screen.findByRole("menuitem", {
+        name: "agentRepository.mine.menu.review",
+      })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText("repository.status.listed · v3")
+    ).toBeInTheDocument();
+    expect(
+      screen.queryByRole("menuitem", {
+        name: "agentRepository.mine.menu.apply",
+      })
+    ).not.toBeInTheDocument();
+    expect(fetchListings).not.toHaveBeenCalled();
+    fetchListings.mockRestore();
+  });
+
+  it("shows update review when an older version is listed", async () => {
+    renderCard({
+      ...editableAgent,
+      repository_info: [
+        { agent_repository_id: 12, status: "pending_review", version_no: 3 },
+        { agent_repository_id: 10, status: "shared", version_no: 1 },
+      ],
+    });
+
+    expect(
+      screen.getByText("agentRepository.mine.status.updateReviewing · v3")
+    ).toBeInTheDocument();
+    await userEvent
+      .setup()
+      .click(
+        screen.getByRole("button", { name: "agentRepository.mine.menu.more" })
+      );
+    expect(
+      screen.getByRole("menuitem", {
+        name: "agentRepository.mine.menu.reviewUpdate",
+      })
+    ).toBeInTheDocument();
+    expect(
+      screen.queryByRole("menuitem", {
+        name: "agentRepository.mine.menu.apply",
+      })
+    ).not.toBeInTheDocument();
+  });
+
   it("UT-FE-AGUG-004 opens the selected published Agent guide from the keyboard-accessible card menu", async () => {
     const user = userEvent.setup();
     const onUsageGuide = renderCard(editableAgent);
diff --git a/frontend/types/agentConfig.ts b/frontend/types/agentConfig.ts
index 4033832f90..7ee10f29ca 100644
--- a/frontend/types/agentConfig.ts
+++ b/frontend/types/agentConfig.ts
@@ -1,5 +1,6 @@
 // Agent Configuration Types
 import type { Dispatch, SetStateAction } from "react";
+import type { MyAgentRepositoryInfoItem } from "@/types/agentRepository";
 
 import { ChatMessageType } from "./chat";
 import { ModelOption } from "@/types/modelConfig";
@@ -169,10 +170,7 @@ export interface Agent {
    * Shape: { "<model_id>": { temperature?: number|null, top_p?: number|null, extra_params?: Record<string, unknown>|null } }
    * NULL/undefined means inherit the model's default values.
    */
-  model_params_override?: Record<
-    string,
-    ModelParamsOverrideEntry
-  > | null;
+  model_params_override?: Record<string, ModelParamsOverrideEntry> | null;
   is_main_agent?: boolean;
   provide_run_summary: boolean;
   allow_chat_metadata?: boolean;
@@ -215,6 +213,7 @@ export interface Agent {
   greeting_message?: string;
   example_questions?: string[];
   icon_url?: string;
+  repository_info?: MyAgentRepositoryInfoItem[];
 }
 
 export interface Tool {
diff --git a/test/backend/app/test_agent_app.py b/test/backend/app/test_agent_app.py
index 0a2472c7aa..86c8a83dfd 100644
--- a/test/backend/app/test_agent_app.py
+++ b/test/backend/app/test_agent_app.py
@@ -1704,6 +1704,7 @@ def test_list_agent_page_api_forwards_filters_and_returns_paged_agents(
             "search": "support",
             "page": 2,
             "page_size": 5,
+            "include_repository_info": "true",
         },
         headers=mock_auth_header,
     )
@@ -1713,11 +1714,13 @@ def test_list_agent_page_api_forwards_filters_and_returns_paged_agents(
     mock_list_agent_page.assert_awaited_once_with(
         tenant_id="tenant_123",
         user_id="test_user",
+        caller_tenant_id="auth_tenant",
         permission="EDIT",
         tag="support",
         search="support",
         page=2,
         page_size=5,
+        include_repository_info=True,
     )
 
 
@@ -1774,6 +1777,7 @@ def test_list_agent_page_api_forwards_creator_and_asset_owner_tenant(
     assert response.status_code == 200
     kwargs = mock_list.await_args.kwargs
     assert kwargs["tenant_id"] == "auth_tenant"
+    assert kwargs["caller_tenant_id"] == "auth_tenant"
     assert kwargs["created_by"] == "author-7"
     assert kwargs["additional_tenant_id"] == "asset_owner"
 
diff --git a/test/backend/database/test_agent_repository_db.py b/test/backend/database/test_agent_repository_db.py
index cb1413ea5a..cb4be755e7 100644
--- a/test/backend/database/test_agent_repository_db.py
+++ b/test/backend/database/test_agent_repository_db.py
@@ -751,6 +751,23 @@ def test_list_agent_repository_by_agent_ids_success(monkeypatch, mock_session):
     assert result[0]["content"] is None
 
 
+def test_list_agent_repository_by_agent_ids_filters_publisher_user(monkeypatch, mock_session):
+    session, query = mock_session
+    inner_query = MagicMock()
+    inner_query.filter.return_value = inner_query
+    inner_query.order_by.return_value.all.return_value = []
+    query.filter.return_value = inner_query
+    _patch_session(monkeypatch, session)
+
+    list_agent_repository_by_agent_ids(
+        [10], statuses=["pending_review"],
+        publisher_tenant_id="tenant-1", publisher_user_id="alice",
+    )
+
+    assert inner_query.filter.call_count == 1
+    _AgentRepositoryModel.publisher_user_id.__eq__.assert_called_with("alice")
+
+
 def test_update_agent_repository_status_by_id_persists_content(monkeypatch, mock_session):
     session, _ = mock_session
     execute_result = MagicMock()
diff --git a/test/backend/services/test_agent_service.py b/test/backend/services/test_agent_service.py
index f29dd278f0..9a0d8f4b40 100644
--- a/test/backend/services/test_agent_service.py
+++ b/test/backend/services/test_agent_service.py
@@ -3240,6 +3240,120 @@ async def list_agents(**_kwargs):
     }
 
 
+@pytest.mark.asyncio
+async def test_list_agent_page_includes_repository_info_only_for_current_page(monkeypatch):
+    agents = [
+        {"agent_id": 1, "name": "First", "created_by": "alice"},
+        {"agent_id": 2, "name": "Second", "created_by": "alice"},
+    ]
+    _mock_paged_agent_candidates(monkeypatch, agents)
+
+    async def enrich_page(*, agent_ids, **_kwargs):
+        return [{"agent_id": agent_id, "current_version_no": 3} for agent_id in agent_ids]
+
+    repository_calls = []
+
+    def repository_rows(agent_ids, *, statuses, publisher_tenant_id):
+        repository_calls.append((agent_ids, set(statuses), publisher_tenant_id))
+        return [record for record in [
+            {"agent_repository_id": 12, "agent_id": 2, "status": "pending_review",
+             "version_no": 3, "version_name": "v3", "create_time": None, "content": "Update"},
+            {"agent_repository_id": 10, "agent_id": 2, "status": "shared",
+             "version_no": 1, "version_name": "v1", "create_time": None, "content": None},
+        ] if record["status"] in statuses]
+
+    monkeypatch.setattr(agent_management, "list_all_agent_info_impl", enrich_page)
+    monkeypatch.setattr(agent_management, "batch_search_version_names", lambda *_args: [])
+    monkeypatch.setattr(agent_management, "list_agent_repository_by_agent_ids", repository_rows)
+
+    result = await list_agent_page_impl(
+        tenant_id="tenant_123", user_id="alice", caller_tenant_id="tenant_123",
+        page=2, page_size=1,
+        include_repository_info=True,
+    )
+
+    assert [item["agent_id"] for item in result["items"]] == [2]
+    assert repository_calls == [
+        ([2], {"shared"}, "tenant_123"),
+        ([2], {"pending_review", "rejected", "shared"}, "tenant_123"),
+    ]
+    assert result["items"][0]["repository_info"] == [
+        {"agent_repository_id": 12, "status": "pending_review", "version_no": 3,
+         "version_label": "v3", "create_time": None, "content": "Update"},
+        {"agent_repository_id": 10, "status": "shared", "version_no": 1,
+         "version_label": "v1", "create_time": None, "content": None},
+    ]
+
+    empty_page = await list_agent_page_impl(
+        tenant_id="tenant_123", user_id="alice", page=3, page_size=1,
+        include_repository_info=True,
+    )
+    assert empty_page["items"] == []
+    assert len(repository_calls) == 2
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("role", "caller_tenant", "scope_tenant", "expected_statuses", "expected_content"),
+    [
+        ("USER", "tenant-a", "tenant-a", ["shared"], [None]),
+        ("ADMIN", "tenant-a", "asset-owner", ["shared"], [None]),
+        ("DEV", "tenant-a", "tenant-a", ["pending_review", "shared"], ["my review", None]),
+    ],
+)
+async def test_list_agent_page_repository_review_visibility(
+    monkeypatch, role, caller_tenant, scope_tenant, expected_statuses, expected_content,
+):
+    monkeypatch.setattr(
+        agent_management, "get_user_tenant_by_user_id", lambda _user_id: {"user_role": role}
+    )
+    monkeypatch.setattr(agent_management, "query_group_ids_by_user", lambda _user_id: [])
+    monkeypatch.setattr(
+        agent_management, "query_agent_list_candidates_by_tenant_id",
+        lambda tenant_id, **_kwargs: [
+            {"agent_id": 7, "tenant_id": tenant_id, "created_by": "alice", "enabled": True}
+        ],
+    )
+
+    async def enrich(*, agent_ids, **_kwargs):
+        return [{"agent_id": agent_id, "current_version_no": 0} for agent_id in agent_ids]
+
+    monkeypatch.setattr(agent_management, "list_all_agent_info_impl", enrich)
+    rows = [
+        {"agent_repository_id": 1, "agent_id": 7, "status": "pending_review",
+         "version_no": 2, "version_name": "v2", "create_time": "2026-09-29",
+         "content": "my review", "publisher_user_id": "alice"},
+        {"agent_repository_id": 2, "agent_id": 7, "status": "rejected",
+         "version_no": 3, "version_name": "v3", "create_time": "2026-09-28",
+         "content": "other review", "publisher_user_id": "bob"},
+        {"agent_repository_id": 3, "agent_id": 7, "status": "shared",
+         "version_no": 1, "version_name": "v1", "create_time": "2026-09-27",
+         "content": "old feedback", "publisher_user_id": "bob"},
+    ]
+    calls = []
+
+    def repository_rows(agent_ids, *, statuses, publisher_tenant_id, publisher_user_id=None):
+        calls.append((set(statuses), publisher_tenant_id, publisher_user_id))
+        assert agent_ids == [7]
+        return [row for row in rows if row["status"] in statuses and
+                (publisher_user_id is None or row["publisher_user_id"] == publisher_user_id)]
+
+    monkeypatch.setattr(agent_management, "list_agent_repository_by_agent_ids", repository_rows)
+
+    result = await list_agent_page_impl(
+        tenant_id=scope_tenant, caller_tenant_id=caller_tenant,
+        user_id="alice", include_repository_info=True,
+    )
+
+    info = result["items"][0]["repository_info"]
+    assert [record["status"] for record in info] == expected_statuses
+    assert [record["content"] for record in info] == expected_content
+    assert calls[0] == ({"shared"}, scope_tenant, None)
+    assert len(calls) == (2 if role == "DEV" else 1)
+    if role == "DEV":
+        assert calls[1] == ({"pending_review", "rejected", "shared"}, scope_tenant, "alice")
+
+
 @pytest.mark.asyncio
 async def test_list_agent_page_filters_creator_before_pagination(monkeypatch):
     agents = [