fix: use graph_config as source of truth in marketplace

service/app/api/v1/marketplace.py

@@ -11,7 +11,7 @@
 - GET /my-listings: Get current user's published listings
 """
 
-from typing import Literal
+from typing import Any, Literal
 from uuid import UUID
 
 from fastapi import APIRouter, Depends, HTTPException, Query
@@ -76,6 +76,7 @@ class UpdateAgentRequest(BaseModel):
     tags: list[str] | None = None
     readme: str | None = None
     commit_message: str
+    graph_config: dict[str, Any] | None = None
 
 
 class ForkRequest(BaseModel):
@@ -633,7 +634,7 @@ async def update_agent_and_listing(
 
     try:
         updated_listing = await marketplace_service.update_agent_and_publish(
-            marketplace_id, update_data, request.commit_message
+            marketplace_id, update_data, request.commit_message, request.graph_config
         )
         if not updated_listing:
             raise HTTPException(status_code=404, detail="Marketplace listing not found")

service/app/core/marketplace/agent_marketplace_service.py

@@ -57,9 +57,10 @@ async def create_snapshot_from_agent(self, agent: Agent, commit_message: str) ->
             "tags": agent.tags or [],
             "model": agent.model,
             "temperature": agent.temperature,
-            "prompt": agent.prompt,
+            "prompt": agent.prompt,  # Legacy field, kept for backward compat
             "require_tool_confirmation": agent.require_tool_confirmation,
             "scope": agent.scope,
+            "graph_config": agent.graph_config,  # Source of truth for agent configuration
         }
 
         # Serialize MCP server metadata (no credentials)
@@ -252,11 +253,12 @@ async def fork_agent(self, marketplace_id: UUID, user_id: str, fork_name: str |
             tags=config.get("tags", []),
             model=config.get("model"),
             temperature=config.get("temperature"),
-            prompt=config.get("prompt"),
+            prompt=config.get("prompt"),  # Legacy field for backward compat
             require_tool_confirmation=config.get("require_tool_confirmation", False),
             provider_id=None,  # User must configure their own provider
             knowledge_set_id=None,  # Create empty knowledge set
             mcp_server_ids=[],  # Will link compatible MCPs below
+            graph_config=config.get("graph_config"),  # Restore from snapshot
         )
 
         # Create the forked agent
@@ -518,6 +520,7 @@ async def update_agent_and_publish(
         marketplace_id: UUID,
         agent_update: AgentMarketplaceUpdate,
         commit_message: str,
+        graph_config: dict[str, Any] | None = None,
     ) -> AgentMarketplace | None:
         """
         Updates the underlying agent and publishes a new version.
@@ -526,6 +529,7 @@ async def update_agent_and_publish(
             marketplace_id: The marketplace listing ID.
             agent_update: Data to update (name, description, tags, readme).
             commit_message: Description of the update.
+            graph_config: Optional graph configuration to update.
 
         Returns:
             The updated marketplace listing.
@@ -547,6 +551,7 @@ async def update_agent_and_publish(
             description=agent_update.description,
             avatar=agent_update.avatar,
             tags=agent_update.tags,
+            graph_config=graph_config,  # Update graph_config if provided
         )
         await self.agent_repo.update_agent(agent.id, update_data)
         # Refresh agent to get latest state for snapshot
@@ -633,8 +638,9 @@ async def pull_listing_update(self, agent_id: UUID, user_id: str) -> Agent:
             tags=config.get("tags", []),
             model=config.get("model"),
             temperature=config.get("temperature"),
-            prompt=config.get("prompt"),
+            prompt=config.get("prompt"),  # Legacy field for backward compat
             require_tool_confirmation=config.get("require_tool_confirmation", False),
+            graph_config=config.get("graph_config"),  # Sync from marketplace
         )
 
         updated_agent = await self.agent_repo.update_agent(agent.id, update_data)

service/app/core/prompts/defaults.py

@@ -73,8 +73,34 @@ def merge_prompt_configs(base: PromptConfig, override: PromptConfig) -> PromptCo
     return PromptConfig.model_validate(base_dict)
 
 
+def get_display_prompt_from_config(config: dict[str, Any]) -> str | None:
+    """
+    Extract display prompt from snapshot configuration for UI purposes.
+
+    Priority:
+    1. graph_config.prompt_config.custom_instructions
+    2. Legacy prompt field
+
+    Args:
+        config: The snapshot configuration dict
+
+    Returns:
+        The display prompt string or None if not found
+    """
+    # Priority 1: Check graph_config.prompt_config.custom_instructions
+    graph_config = config.get("graph_config")
+    if graph_config:
+        prompt_config = graph_config.get("prompt_config", {})
+        if custom_instructions := prompt_config.get("custom_instructions"):
+            return custom_instructions
+
+    # Priority 2: Legacy prompt field
+    return config.get("prompt")
+
+
 __all__ = [
     "DEFAULT_PROMPT_CONFIG",
     "get_prompt_config_from_graph_config",
     "merge_prompt_configs",
+    "get_display_prompt_from_config",
 ]

service/app/schemas/model_tier.py

@@ -57,7 +57,8 @@ class TierModelCandidate:
         TierModelCandidate(
             model="Vendor2/Claude-4.5-Opus",
             provider_type=ProviderType.GPUGEEK,
-            priority=1,
+            is_fallback=True,
+            priority=99,
             capabilities=["reasoning", "creative", "coding"],
             description="Best for coding and choose this for most tasks. Exceptional in complex coding, agentic tasks, and reasoning; highly reliable for software engineering.",
         ),
@@ -104,7 +105,8 @@ class TierModelCandidate:
         TierModelCandidate(
             model="qwen3-max",
             provider_type=ProviderType.QWEN,
-            priority=2,
+            is_fallback=True,
+            priority=99,
             capabilities=["coding", "multilingual"],
             description="Choose this if user uses Chinese. Impressive in programming, agent tasks, and multilingual support with high benchmark scores; strong for coding and math.",
         ),

web/src/app/marketplace/AgentMarketplaceDetail.tsx

@@ -22,6 +22,35 @@ import {
 import { HeartIcon as HeartSolidIcon } from "@heroicons/react/24/solid";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
+import { AgentSnapshot } from "@/service/marketplaceService";
+
+// Helper to detect agent type from graph_config
+function getAgentType(
+  graphConfig: Record<string, unknown> | null | undefined,
+): string {
+  if (!graphConfig) return "ReAct";
+  const metadata = graphConfig.metadata as Record<string, unknown> | undefined;
+  if (metadata?.builtin_key) return String(metadata.builtin_key);
+  if (metadata?.pattern) return String(metadata.pattern);
+  // Check if it has custom nodes beyond the standard react pattern
+  const nodes = graphConfig.nodes as Array<unknown> | undefined;
+  if (nodes && nodes.length > 2) return "Custom Graph";
+  return "ReAct";
+}
+
+// Helper to extract display prompt from configuration
+function getDisplayPrompt(
+  config: AgentSnapshot["configuration"],
+): string | null {
+  // Check graph_config.prompt_config.custom_instructions first
+  const gc = config.graph_config as Record<string, unknown> | undefined;
+  if (gc?.prompt_config) {
+    const pc = gc.prompt_config as Record<string, unknown>;
+    if (pc.custom_instructions) return String(pc.custom_instructions);
+  }
+  // Fallback to legacy prompt
+  return config.prompt || null;
+}
 
 interface AgentMarketplaceDetailProps {
   marketplaceId: string;
@@ -303,10 +332,15 @@ export default function AgentMarketplaceDetail({
                   <div className="space-y-6">
                     {listing.snapshot ? (
                       <>
-                        <div className="flex items-center gap-2">
+                        <div className="flex flex-wrap items-center gap-2">
                           <span className="inline-flex items-center rounded-full bg-indigo-100 px-2.5 py-1 text-xs font-semibold text-indigo-700 dark:bg-indigo-900/30 dark:text-indigo-300">
                             v{listing.snapshot.version}
                           </span>
+                          <span className="inline-flex items-center rounded-full bg-purple-100 px-2.5 py-1 text-xs font-semibold text-purple-700 dark:bg-purple-900/30 dark:text-purple-300">
+                            {getAgentType(
+                              listing.snapshot.configuration.graph_config,
+                            )}
+                          </span>
                           <span className="text-sm text-neutral-500 dark:text-neutral-400">
                             {listing.snapshot.commit_message}
                           </span>
@@ -325,14 +359,16 @@ export default function AgentMarketplaceDetail({
                         )}
 
                         {/* System Prompt */}
-                        {listing.snapshot.configuration.prompt && (
+                        {getDisplayPrompt(listing.snapshot.configuration) && (
                           <div>
                             <h3 className="text-sm font-medium text-neutral-700 dark:text-neutral-300">
                               {t("marketplace.detail.config.systemPrompt")}
                             </h3>
                             <div className="mt-2 max-h-64 overflow-y-auto rounded-lg border border-neutral-200 bg-neutral-50 p-3 dark:border-neutral-800 dark:bg-neutral-900">
                               <pre className="whitespace-pre-wrap text-xs text-neutral-600 dark:text-neutral-400">
-                                {listing.snapshot.configuration.prompt}
+                                {getDisplayPrompt(
+                                  listing.snapshot.configuration,
+                                )}
                               </pre>
                             </div>
                           </div>