diff --git a/internal/services/toolkit/client/utils.go b/internal/services/toolkit/client/utils.go index c372876..62609e0 100644 --- a/internal/services/toolkit/client/utils.go +++ b/internal/services/toolkit/client/utils.go @@ -12,7 +12,6 @@ import ( "paperdebugger/internal/libs/logger" "paperdebugger/internal/services" "paperdebugger/internal/services/toolkit/registry" - "paperdebugger/internal/services/toolkit/tools/xtramcp" chatv1 "paperdebugger/pkg/gen/api/chat/v1" "github.com/openai/openai-go/v2" @@ -105,25 +104,25 @@ func initializeToolkit( ) *registry.ToolRegistry { toolRegistry := registry.NewToolRegistry() - // Load tools dynamically from backend - xtraMCPLoader := xtramcp.NewXtraMCPLoader(db, projectService, cfg.XtraMCPURI) + // // Load tools dynamically from backend + // xtraMCPLoader := xtramcp.NewXtraMCPLoader(db, projectService, cfg.XtraMCPURI) - // initialize MCP session first and log session ID - sessionID, err := xtraMCPLoader.InitializeMCP() - if err != nil { - logger.Errorf("[XtraMCP Client] Failed to initialize XtraMCP session: %v", err) - // TODO: Fallback to static tools or exit? - } else { - logger.Info("[XtraMCP Client] XtraMCP session initialized", "sessionID", sessionID) + // // initialize MCP session first and log session ID + // sessionID, err := xtraMCPLoader.InitializeMCP() + // if err != nil { + // logger.Errorf("[XtraMCP Client] Failed to initialize XtraMCP session: %v", err) + // // TODO: Fallback to static tools or exit? + // } else { + // logger.Info("[XtraMCP Client] XtraMCP session initialized", "sessionID", sessionID) - // dynamically load all tools from XtraMCP backend - err = xtraMCPLoader.LoadToolsFromBackend(toolRegistry) - if err != nil { - logger.Errorf("[XtraMCP Client] Failed to load XtraMCP tools: %v", err) - } else { - logger.Info("[XtraMCP Client] Successfully loaded XtraMCP tools") - } - } + // // dynamically load all tools from XtraMCP backend + // err = xtraMCPLoader.LoadToolsFromBackend(toolRegistry) + // if err != nil { + // logger.Errorf("[XtraMCP Client] Failed to load XtraMCP tools: %v", err) + // } else { + // logger.Info("[XtraMCP Client] Successfully loaded XtraMCP tools") + // } + // } return toolRegistry } diff --git a/internal/services/toolkit/client/utils_v2.go b/internal/services/toolkit/client/utils_v2.go index 2ee837a..e502cb2 100644 --- a/internal/services/toolkit/client/utils_v2.go +++ b/internal/services/toolkit/client/utils_v2.go @@ -13,6 +13,7 @@ import ( "paperdebugger/internal/libs/logger" "paperdebugger/internal/services" "paperdebugger/internal/services/toolkit/registry" + "paperdebugger/internal/services/toolkit/tools/xtramcp" chatv2 "paperdebugger/pkg/gen/api/chat/v2" "strings" "time" @@ -144,22 +145,22 @@ func initializeToolkitV2( logger.Info("[AI Client V2] Registered static LaTeX tools", "count", 0) - // // Load tools dynamically from backend - // xtraMCPLoader := xtramcp.NewXtraMCPLoaderV2(db, projectService, cfg.XtraMCPURI) - - // // initialize MCP session first and log session ID - // sessionID, err := xtraMCPLoader.InitializeMCP() - // if err != nil { - // logger.Errorf("[XtraMCP Client] Failed to initialize XtraMCP session: %v", err) - // } else { - // logger.Info("[XtraMCP Client] XtraMCP session initialized", "sessionID", sessionID) - - // // dynamically load all tools from XtraMCP backend - // err = xtraMCPLoader.LoadToolsFromBackend(toolRegistry) - // if err != nil { - // logger.Errorf("[XtraMCP Client] Failed to load XtraMCP tools: %v", err) - // } - // } + // Load tools dynamically from backend + xtraMCPLoader := xtramcp.NewXtraMCPLoaderV2(db, projectService, cfg.XtraMCPURI) + + // initialize MCP session first and log session ID + sessionID, err := xtraMCPLoader.InitializeMCP() + if err != nil { + logger.Errorf("[XtraMCP Client] Failed to initialize XtraMCP session: %v", err) + } else { + logger.Info("[XtraMCP Client] XtraMCP session initialized", "sessionID", sessionID) + + // dynamically load all tools from XtraMCP backend + err = xtraMCPLoader.LoadToolsFromBackend(toolRegistry) + if err != nil { + logger.Errorf("[XtraMCP Client] Failed to load XtraMCP tools: %v", err) + } + } return toolRegistry } diff --git a/internal/services/toolkit/handler/toolcall_v2.go b/internal/services/toolkit/handler/toolcall_v2.go index b7e62fa..bee4d7e 100644 --- a/internal/services/toolkit/handler/toolcall_v2.go +++ b/internal/services/toolkit/handler/toolcall_v2.go @@ -2,9 +2,11 @@ package handler import ( "context" + "encoding/json" "fmt" "paperdebugger/internal/services/toolkit/registry" chatv2 "paperdebugger/pkg/gen/api/chat/v2" + "strings" "time" "github.com/openai/openai-go/v3" @@ -73,12 +75,128 @@ func (h *ToolCallHandlerV2) HandleToolCallsV2(ctx context.Context, toolCalls []o toolResult, err := h.Registry.Call(ctx, toolCall.ID, toolCall.Name, []byte(toolCall.Arguments)) + // Try to parse as XtraMCP ToolResult format + // This allows XtraMCP tools to use the new format while other tools continue with existing behavior + // NOTE: there is a bit of a coupled ugly logic here. (TODO: consider new API design later) + // 1. We rely on the xtramcp/tool_v2.go call method to return "" for LLM instruction + // 2. so in registry/registry_v2.go, the returned toolResult is the raw string from the tool execution + // 3. presently, it is not possible to do the parsing earlier in xtramcp/tool_v2.go because of the following branching logic + parsedXtraMCPResult, isXtraMCPFormat, parseErr := ParseXtraMCPToolResult(toolResult) + + var llmContent string // Content to send to LLM (OpenAI chat history) + var frontendToolResult string // Content to send to frontend (via stream) + + if parseErr != nil || !isXtraMCPFormat { + // for non-XtraMCP tool - use existing behavior unchanged + llmContent = toolResult + frontendToolResult = toolResult + } else { + // XtraMCP ToolResult format detected - apply specialized logic + + // BRANCH 1: Handle errors (success=false) + if !parsedXtraMCPResult.Success { + // Send error message to LLM + if parsedXtraMCPResult.Error != nil { + llmContent = *parsedXtraMCPResult.Error + } else { + llmContent = "Tool execution failed (no error message provided)" + } + + // Send error payload to frontend + frontendPayload := map[string]interface{}{ + "schema_version": parsedXtraMCPResult.SchemaVersion, + "display_mode": parsedXtraMCPResult.DisplayMode, + "success": false, + "metadata": parsedXtraMCPResult.Metadata, + } + if parsedXtraMCPResult.Error != nil { + frontendPayload["error"] = *parsedXtraMCPResult.Error + } + frontendBytes, _ := json.Marshal(frontendPayload) + frontendToolResult = string(frontendBytes) + + } else if parsedXtraMCPResult.DisplayMode == "verbatim" { + // BRANCH 2: Verbatim mode (success=true) + + // check if content is truncated, use full_content if available for updating LLM context + contentForLLM := parsedXtraMCPResult.GetFullContentAsString() + + //TODO better handle this: truncate if too long for LLM context + // this is a SAFEGUARD against extremely long tool outputs + // est 30k tokens, 4 chars/token = 120k chars + const maxLLMContentLen = 120000 + contentForLLM = TruncateContent(contentForLLM, maxLLMContentLen) + + // If instructions provided, send as structured payload + // Otherwise send raw content + if parsedXtraMCPResult.Instructions != nil && strings.TrimSpace(*parsedXtraMCPResult.Instructions) != "" { + llmContent = FormatPrompt( + toolCall.Name, + *parsedXtraMCPResult.Instructions, + parsedXtraMCPResult.GetMetadataValuesAsString(), + contentForLLM, + ) + } else { + llmContent = contentForLLM + } + + frontendMetadata := make(map[string]interface{}) + if parsedXtraMCPResult.Metadata != nil { + for k, v := range parsedXtraMCPResult.Metadata { + frontendMetadata[k] = v + } + } + + frontendPayload := map[string]interface{}{ + "schema_version": parsedXtraMCPResult.SchemaVersion, + "display_mode": "verbatim", + "content": parsedXtraMCPResult.GetContentAsString(), + "success": true, + } + if len(frontendMetadata) > 0 { + frontendPayload["metadata"] = frontendMetadata + } + frontendBytes, _ := json.Marshal(frontendPayload) + frontendToolResult = string(frontendBytes) + + } else if parsedXtraMCPResult.DisplayMode == "interpret" { + // BRANCH 3: Interpret mode (success=true) + + // LLM gets content + optional instructions for reformatting + if parsedXtraMCPResult.Instructions != nil && strings.TrimSpace(*parsedXtraMCPResult.Instructions) != "" { + llmContent = FormatPrompt( + toolCall.Name, + *parsedXtraMCPResult.Instructions, + parsedXtraMCPResult.GetMetadataValuesAsString(), + parsedXtraMCPResult.GetFullContentAsString(), + ) + } else { + llmContent = parsedXtraMCPResult.GetFullContentAsString() + } + + // Frontend gets minimal display (LLM will provide formatted response) + frontendPayload := map[string]interface{}{ + "schema_version": parsedXtraMCPResult.SchemaVersion, + "display_mode": "interpret", + "success": true, + } + if parsedXtraMCPResult.Metadata != nil { + frontendPayload["metadata"] = parsedXtraMCPResult.Metadata + } + frontendBytes, _ := json.Marshal(frontendPayload) + frontendToolResult = string(frontendBytes) + } + } + + // Send result to stream handler (frontend) if streamHandler != nil { - streamHandler.SendToolCallEnd(toolCall, toolResult, err) + streamHandler.SendToolCallEnd(toolCall, frontendToolResult, err) } - resultStr := toolResult + // Prepare content for LLM (OpenAI chat history) + resultStr := llmContent if err != nil { + // Tool execution error (different from ToolResult.success=false) resultStr = "Error: " + err.Error() } @@ -108,7 +226,7 @@ func (h *ToolCallHandlerV2) HandleToolCallsV2(ctx context.Context, toolCalls []o if err != nil { toolCallMsg.Error = err.Error() } else { - toolCallMsg.Result = resultStr + toolCallMsg.Result = frontendToolResult } inappChatHistory = append(inappChatHistory, chatv2.Message{ diff --git a/internal/services/toolkit/handler/xtramcp_toolresult.go b/internal/services/toolkit/handler/xtramcp_toolresult.go new file mode 100644 index 0000000..1491870 --- /dev/null +++ b/internal/services/toolkit/handler/xtramcp_toolresult.go @@ -0,0 +1,145 @@ +package handler + +import ( + "encoding/json" + "fmt" + "strings" +) + +// XtraMCPToolResult represents the standardized response from XtraMCP tools +// This format is specific to XtraMCP backend and not used by other MCP servers +type XtraMCPToolResult struct { + SchemaVersion string `json:"schema_version"` // "xtramcp.tool_result_v{version}" + DisplayMode string `json:"display_mode"` // "verbatim" or "interpret" + Instructions *string `json:"instructions"` // Optional: instruction template for interpret mode + Content interface{} `json:"content"` // Optional: string for verbatim, dict/list for interpret (can be nil on error) + FullContent interface{} `json:"full_content"` // Optional: full untruncated content (can be nil). NOTE: Empty if content is not truncated (to avoid duplication) + Success bool `json:"success"` // Explicit success flag + Error *string `json:"error"` // Optional: error message if success=false + Metadata map[string]interface{} `json:"metadata"` // Optional: tool-specific data (nil if not provided) +} + +// ParseXtraMCPToolResult attempts to parse a tool response as XtraMCP ToolResult format +// Returns (result, isXtraMCPFormat, error) +// If the result is not in XtraMCP format, isXtraMCPFormat will be false (not an error) +func ParseXtraMCPToolResult(rawResult string) (*XtraMCPToolResult, bool, error) { + var result XtraMCPToolResult + + // Attempt to unmarshal as ToolResult + if err := json.Unmarshal([]byte(rawResult), &result); err != nil { + // Not ToolResult format - this is OK, might be legacy format + return nil, false, nil + } + + // Validate that it's actually a ToolResult (has required fields) + // check if SchemaVersion is prefixed with xtramcp.tool_result + if result.SchemaVersion == "" || !strings.HasPrefix(result.SchemaVersion, "xtramcp.tool_result") { + // not our XtraMCP ToolResult format + return nil, false, nil + } + + // Validate display_mode value + if result.DisplayMode != "verbatim" && result.DisplayMode != "interpret" { + // Invalid display_mode - not a valid ToolResult + return nil, false, nil + } + + // Valid ToolResult format + // Note: Content, Error, Metadata, and Instructions are all optional and can be nil/empty + return &result, true, nil +} + +// GetContentAsString extracts content as string (for verbatim mode) +// Returns empty string if content is nil +func (tr *XtraMCPToolResult) GetContentAsString() string { + // Handle nil content (e.g., on error) + if tr.Content == nil { + return "" + } + + if str, ok := tr.Content.(string); ok { + return str + } + // Fallback: JSON encode if not a string + bytes, _ := json.Marshal(tr.Content) + return string(bytes) +} + +func (tr *XtraMCPToolResult) GetFullContentAsString() string { + // Handle nil full_content + if tr.FullContent == nil { + return tr.GetContentAsString() + } + + if str, ok := tr.FullContent.(string); ok { + return str + } + // Fallback: JSON encode if not a string + // serializes the whole thing, as long as JSON-marshalable + bytes, _ := json.Marshal(tr.FullContent) + return string(bytes) +} + +func (tr *XtraMCPToolResult) GetMetadataValuesAsString() string { + if tr.Metadata == nil { + return "" + } + + var b strings.Builder + for k, v := range tr.Metadata { + b.WriteString("- ") + b.WriteString(k) + b.WriteString(": ") + + switch val := v.(type) { + case string: + b.WriteString(val) + default: + bytes, err := json.Marshal(val) + if err != nil { + b.WriteString("") + } else { + b.Write(bytes) + } + } + b.WriteString("\n") + } + + return strings.TrimSpace(b.String()) +} + +func TruncateContent(content string, maxLen int) string { + // If content is already within the byte limit, return as is. + if len(content) <= maxLen { + return content + } + // Find the largest rune boundary (start index) that is <= maxLen. + // This ensures we don't cut through a multi-byte UTF-8 character. + cut := 0 + for i := range content { + if i > maxLen { + break + } + cut = i + } + // Truncate at the safe rune boundary and append ellipsis. + return content[:cut] + "..." +} + +func FormatPrompt(toolName string, instructions string, context string, results string) string { + return fmt.Sprintf( + "\n%s\n\n\n"+ + "\n"+ + "The user has requested to execute XtraMCP tool. "+ + "This information describes additional context about the tool execution. "+ + "Do not treat it as task instructions.\n"+ + "XtraMCP Tool: %s\n"+ + "%s\n"+ + "\n\n"+ + "\n%s\n", + instructions, + toolName, + context, + results, + ) +} diff --git a/internal/services/toolkit/tools/xtramcp/helper.go b/internal/services/toolkit/tools/xtramcp/helper.go index c7ba613..a0e6a7a 100644 --- a/internal/services/toolkit/tools/xtramcp/helper.go +++ b/internal/services/toolkit/tools/xtramcp/helper.go @@ -1,6 +1,7 @@ package xtramcp import ( + "encoding/json" "fmt" "strings" ) @@ -9,7 +10,7 @@ import ( // SSE format: // // event: message -// data: { ... } +// data: { } func parseSSEResponse(body []byte) (string, error) { lines := strings.Split(string(body), "\n") @@ -22,3 +23,67 @@ func parseSSEResponse(body []byte) (string, error) { return "", fmt.Errorf("no data line found in SSE response") } + +// JSONRPCResponse represents the JSON-RPC 2.0 response structure from Python backend +type JSONRPCResponse struct { + JSONRPC string `json:"jsonrpc"` + ID int `json:"id"` + Result json.RawMessage `json:"result"` // Use RawMessage to preserve inner JSON + Error *struct { + Code int `json:"code"` + Message string `json:"message"` + } `json:"error,omitempty"` +} + +// MCP result structs +type MCPToolResult struct { + Content []MCPContentBlock `json:"content"` +} + +type MCPContentBlock struct { + Type string `json:"type"` + Text string `json:"text,omitempty"` +} + +// unwrapJSONRPC extracts the inner result from JSON-RPC 2.0 response +// Input: {"jsonrpc":"2.0","id":4,"result":{}} +// Output: {} +// Returns the inner result as string, or error if JSON-RPC error present +func unwrapJSONRPC(jsonRPCStr string) (string, error) { + var rpcResp JSONRPCResponse + + // Try to unmarshal as JSON-RPC + if err := json.Unmarshal([]byte(jsonRPCStr), &rpcResp); err != nil { + // Not JSON-RPC format - return as-is (backward compatibility with legacy tools) + return jsonRPCStr, nil + } + + // Check for JSON-RPC error response + if rpcResp.Error != nil { + return "", fmt.Errorf("JSON-RPC error %d: %s", rpcResp.Error.Code, rpcResp.Error.Message) + } + + // Validate it looks like JSON-RPC (has jsonrpc field) + if rpcResp.JSONRPC == "" { + // Not actually JSON-RPC format - return as-is + return jsonRPCStr, nil + } + + var toolResult MCPToolResult + if err := json.Unmarshal(rpcResp.Result, &toolResult); err != nil { + // not conventional MCP result, return raw result + return string(rpcResp.Result), nil + } + + // Extract and return inner result + // TODO: can consider handling multi-modality in the future + // presently, just return the text content of the first text block + for _, block := range toolResult.Content { + if block.Type == "text" { + // Return the text content of the first text block + return block.Text, nil + } + } + + return "", fmt.Errorf("MCP result had no extractable content") +} diff --git a/internal/services/toolkit/tools/xtramcp/schema_filter.go b/internal/services/toolkit/tools/xtramcp/schema_filter.go index 34b6280..dd64107 100644 --- a/internal/services/toolkit/tools/xtramcp/schema_filter.go +++ b/internal/services/toolkit/tools/xtramcp/schema_filter.go @@ -32,7 +32,7 @@ func deepCopySchema(schema map[string]interface{}) map[string]interface{} { jsonBytes, err := json.Marshal(schema) if err != nil { // Extremely unlikely with valid JSON schemas (MCP schemas are JSON-compatible) - // // If marshaling fails, return original schema + // If marshaling fails, return original schema return schema } diff --git a/internal/services/toolkit/tools/xtramcp/tool_v2.go b/internal/services/toolkit/tools/xtramcp/tool_v2.go index bd6d604..fe11189 100644 --- a/internal/services/toolkit/tools/xtramcp/tool_v2.go +++ b/internal/services/toolkit/tools/xtramcp/tool_v2.go @@ -214,5 +214,13 @@ func (t *DynamicToolV2) executeTool(args map[string]interface{}) (string, error) return "", fmt.Errorf("failed to parse SSE response: %w", err) } - return extractedJSON, nil + // Unwrap JSON-RPC envelope to get inner ToolResult + // Input: {"jsonrpc":"2.0","id":4,"result":{}} + // Output: {} + innerResult, err := unwrapJSONRPC(extractedJSON) + if err != nil { + return "", fmt.Errorf("JSON-RPC error: %w", err) + } + + return innerResult, nil } diff --git a/webapp/_webapp/src/components/markdown.tsx b/webapp/_webapp/src/components/markdown.tsx index 7ca9305..3da2beb 100644 --- a/webapp/_webapp/src/components/markdown.tsx +++ b/webapp/_webapp/src/components/markdown.tsx @@ -61,23 +61,23 @@ const MarkdownComponent = memo(({ children, prevAttachment, animated }: Markdown // }, h1: { component: ({ children, ...props }: ComponentProps) => ( -
+

{typeof children === "string" ? {children} : children} -

+ ), }, h2: { component: ({ children, ...props }: ComponentProps) => ( -
+

{typeof children === "string" ? {children} : children} -

+ ), }, h3: { component: ({ children, ...props }: ComponentProps) => ( -
+

{typeof children === "string" ? {children} : children} -

+ ), }, code: { diff --git a/webapp/_webapp/src/components/message-entry-container/tools/general.tsx b/webapp/_webapp/src/components/message-entry-container/tools/general.tsx index c9a4d0f..f521acd 100644 --- a/webapp/_webapp/src/components/message-entry-container/tools/general.tsx +++ b/webapp/_webapp/src/components/message-entry-container/tools/general.tsx @@ -60,7 +60,7 @@ export const GeneralToolCard = ({ functionName, message, animated }: GeneralTool -

{pascalCase(functionName)}

+

{pascalCase(functionName)}

{ - if (preparing) { - return ( -
-
-

{"Calling " + functionName}

-
- -
- ); - } - - return ( -
-
-

{functionName}

-
-
- ); -}; diff --git a/webapp/_webapp/src/components/message-entry-container/tools/review-paper.tsx b/webapp/_webapp/src/components/message-entry-container/tools/review-paper.tsx deleted file mode 100644 index bd5d4f9..0000000 --- a/webapp/_webapp/src/components/message-entry-container/tools/review-paper.tsx +++ /dev/null @@ -1,72 +0,0 @@ -import { cn } from "@heroui/react"; -import { JsonRpcResult } from "./utils/common"; -import { LoadingIndicator } from "../../loading-indicator"; -import MarkdownComponent from "../../markdown"; -import { useState } from "react"; - -type ReviewPaperProps = { - jsonRpcResult: JsonRpcResult; - preparing: boolean; - animated: boolean; -}; - -export const ReviewPaperCard = ({ jsonRpcResult, preparing, animated }: ReviewPaperProps) => { - const [isCollapsed, setIsCollapsed] = useState(false); - - if (preparing) { - return ( -
-
-

Reviewing Paper

-
- -
- ); - } - - const toggleCollapse = () => { - setIsCollapsed(!isCollapsed); - }; - - return ( -
-
-

review_paper

- -
- -
- {jsonRpcResult.result && ( -
- - ℹ️ Review paper is currently scaled back to balance cost. Presently it identifies issues in Title, - Abstract, and Introduction. We are working to support the full review flow again. If you find the input - might not be properly passed, try highlighting the relevant sections and adding to chat. - -
- )} - - {jsonRpcResult.error &&
{jsonRpcResult.error.message}
} -
-
- ); -}; diff --git a/webapp/_webapp/src/components/message-entry-container/tools/tools.tsx b/webapp/_webapp/src/components/message-entry-container/tools/tools.tsx index dc43d54..862c49e 100644 --- a/webapp/_webapp/src/components/message-entry-container/tools/tools.tsx +++ b/webapp/_webapp/src/components/message-entry-container/tools/tools.tsx @@ -3,9 +3,12 @@ import { PaperScoreCommentCard } from "./paper-score-comment/index"; import { GreetingCard } from "./greeting"; import { ErrorToolCard } from "./error"; import { AlwaysExceptionCard } from "./always-exception"; -import { JsonRpc } from "./jsonrpc"; -import { ReviewPaperCard } from "./review-paper"; -import { parseJsonRpcResult, UNKNOWN_JSONRPC_RESULT } from "./utils/common"; +import { XtraMcpGenericCard } from "./xtramcp/xtramcp-generic-card"; +import { ReviewPaperCard } from "./xtramcp/review-paper"; +import { SearchRelevantPapersCard } from "./xtramcp/search-relevant-papers"; +import { OnlineSearchPapersCard } from "./xtramcp/online-search-papers"; +import { VerifyCitationsCard } from "./xtramcp/verify-citations"; +import { isXtraMcpTool } from "./xtramcp/utils/common"; import { GeneralToolCard } from "./general"; type ToolsProps = { @@ -17,29 +20,15 @@ type ToolsProps = { animated: boolean; }; -// define a const string list. -const XTRA_MCP_TOOL_NAMES = [ - // RESEARCHER TOOLS - "search_relevant_papers", - "online_search_papers", - // "deep_research", - // REVIEWER TOOLS - "review_paper", - "verify_citations", - // ENHANCER TOOLS - // "enhance_academic_writing", - // OPENREVIEW ONLINE TOOLS - // "get_user_papers", - // "search_user" -]; - export default function Tools({ messageId, functionName, message, error, preparing, animated }: ToolsProps) { if (error && error !== "") { return ; } - const jsonRpcResult = parseJsonRpcResult(message); + // Check if tool is one of the XtraMCP tools + const isXtraMcp = isXtraMcpTool(functionName); + // Legacy tool handlers (non-XtraMCP format) if (functionName === "paper_score") { return ; } else if (functionName === "paper_score_comment") { @@ -48,22 +37,52 @@ export default function Tools({ messageId, functionName, message, error, prepari return ; } else if (functionName === "always_exception") { return ; - } else if (functionName === "review_paper") { - return ( - - ); - } else if (XTRA_MCP_TOOL_NAMES.includes(functionName)) { - return ; } - // fallback to unknown tool card if the json rpc result is not defined - if (jsonRpcResult) { - return ; - } else { - return ; + // XtraMCP specialized tool handlers + if (isXtraMcp) { + if (functionName === "review_paper") { + return ( + + ); + } else if (functionName === "search_relevant_papers") { + return ( + + ); + } else if (functionName === "online_search_papers") { + return ( + + ); + } else if (functionName === "verify_citations") { + return ( + + ); + } + + // Generic XtraMCP tool (not specialized) + return ; } + + // Fallback to general tool card (non-XtraMCP tools) + return ; } diff --git a/webapp/_webapp/src/components/message-entry-container/tools/unknown-jsonrpc.tsx b/webapp/_webapp/src/components/message-entry-container/tools/unknown-jsonrpc.tsx deleted file mode 100644 index f4a280a..0000000 --- a/webapp/_webapp/src/components/message-entry-container/tools/unknown-jsonrpc.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import { cn } from "@heroui/react"; - -type UnknownJsonRpcProps = { - functionName: string; - message: string; - animated: boolean; -}; - -export const UnknownJsonRpc = ({ functionName, message, animated }: UnknownJsonRpcProps) => { - return ( -
-

- Unknown JsonRPC "{functionName}" -

- {message} -
- ); -}; diff --git a/webapp/_webapp/src/components/message-entry-container/tools/utils/common.tsx b/webapp/_webapp/src/components/message-entry-container/tools/utils/common.tsx deleted file mode 100644 index 58cdc8e..0000000 --- a/webapp/_webapp/src/components/message-entry-container/tools/utils/common.tsx +++ /dev/null @@ -1,93 +0,0 @@ -export type JsonRpcResult = { - jsonrpc: string; - id: number; - result?: { - content: Array<{ - type: string; - text: string; - }>; - }; - error?: { - code: number; - message: string; - }; -}; - -export const UNKNOWN_JSONRPC_RESULT: JsonRpcResult = { - jsonrpc: "2.0", - id: -1, - error: { - code: -1, - message: "Unknown JSONRPC result", - }, -}; - -// eslint-disable-next-line @typescript-eslint/no-explicit-any -const isValidJsonRpcResult = (obj: any): obj is JsonRpcResult => { - // Check if obj is an object and not null - if (typeof obj !== "object" || obj === null) { - return false; - } - - // Check required properties - if (typeof obj.jsonrpc !== "string" || typeof obj.id !== "number") { - return false; - } - - // Check that either result or error is present (but not both required) - const hasResult = obj.result !== undefined; - const hasError = obj.error !== undefined; - - // Validate result structure if present - if (hasResult) { - if (typeof obj.result !== "object" || obj.result === null) { - return false; - } - if (obj.result.content !== undefined) { - if (!Array.isArray(obj.result.content)) { - return false; - } - // Validate each content item - for (const item of obj.result.content) { - if ( - typeof item !== "object" || - item === null || - typeof item.type !== "string" || - typeof item.text !== "string" - ) { - return false; - } - } - } - } - - // Validate error structure if present - if (hasError) { - if ( - typeof obj.error !== "object" || - obj.error === null || - typeof obj.error.code !== "number" || - typeof obj.error.message !== "string" - ) { - return false; - } - } - - return true; -}; - -export const parseJsonRpcResult = (message: string): JsonRpcResult | undefined => { - try { - const json = JSON.parse(message); - - // Validate the structure before casting - if (isValidJsonRpcResult(json)) { - return json; - } - - return undefined; - } catch { - // Error parsing JSONRPC result - return undefined; - } -}; diff --git a/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/online-search-papers.tsx b/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/online-search-papers.tsx new file mode 100644 index 0000000..17da497 --- /dev/null +++ b/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/online-search-papers.tsx @@ -0,0 +1,110 @@ +import { cn } from "@heroui/react"; +import { LoadingIndicator } from "../../../loading-indicator"; +import MarkdownComponent from "../../../markdown"; +import { useState } from "react"; +import { XtraMcpToolCardProps, parseXtraMcpToolResult, CollapseArrowButton, CollapseWrapper } from "./utils/common"; + +export const OnlineSearchPapersCard = ({ functionName, message, preparing, animated }: XtraMcpToolCardProps) => { + const [isMetadataCollapsed, setIsMetadataCollapsed] = useState(false); + + // Loading state (tool executing) + if (preparing) { + return ( +
+
+

Searching online..

+
+ +
+ ); + } + + // Parse XtraMCP ToolResult format + const result = parseXtraMcpToolResult(message); + + // No result or not ToolResult format - minimal display + if (!result) { + return ( +
+
+

{functionName}

+
+
+ ); + } + + // Error state + if (result.error || result.success === false) { + return ( +
+ {/* Header with Error label and arrow button */} +
setIsMetadataCollapsed(!isMetadataCollapsed)}> +

{functionName}

+
+ Error + +
+
+ + {/* Error message dropdown */} + +
+ {result.error || "Tool execution failed"} +
+ +
+ ); + } + + // Success state - verbatim mode (guaranteed for this tool on success) + // Display compact card + content below + if (typeof result.content === "string") { + return ( + <> + {/* COMPACT TOOL CARD - Just title + metadata dropdown */} +
+ {/* Header with arrow button */} +
setIsMetadataCollapsed(!isMetadataCollapsed)}> +

{functionName}

+ +
+ + {/* Metadata dropdown - INSIDE the tool card */} + {result.metadata && Object.keys(result.metadata).length > 0 && ( + +
+ {/* Custom metadata rendering */} + {result.metadata.query && ( +
+ Query Used: "{result.metadata.query}" +
+ )} + {result.metadata.total_count !== undefined && ( +
+ Total Found: {result.metadata.total_count} +
+ )} +
+ + )} +
+ + {/* CONTENT - OUTSIDE/BELOW the tool card, always visible */} +
+ + {result.content} + +
+ + ); + } + + // Fallback - unknown format + return ( +
+
+

{functionName}

+
+
+ ); +}; diff --git a/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/review-paper.tsx b/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/review-paper.tsx new file mode 100644 index 0000000..169d99c --- /dev/null +++ b/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/review-paper.tsx @@ -0,0 +1,131 @@ +import { cn } from "@heroui/react"; +import { LoadingIndicator } from "../../../loading-indicator"; +import MarkdownComponent from "../../../markdown"; +import { useState } from "react"; +import { XtraMcpToolCardProps, parseXtraMcpToolResult, CollapseArrowButton, CollapseWrapper } from "./utils/common"; + +// Helper function to format array to comma-separated string +const formatArray = (arr: any): string => { + if (Array.isArray(arr)) { + return arr.join(", "); + } + return String(arr); +}; + +export const ReviewPaperCard = ({ functionName, message, preparing, animated }: XtraMcpToolCardProps) => { + const [isMetadataCollapsed, setIsMetadataCollapsed] = useState(false); + + // Loading state (tool executing) + if (preparing) { + return ( +
+
+

Reviewing your work..

+
+ +
+ ); + } + + // Parse XtraMCP ToolResult format + const result = parseXtraMcpToolResult(message); + + // No result or not ToolResult format - minimal display + if (!result) { + return ( +
+
+

{functionName}

+
+
+ ); + } + + // Error state + if (result.error || result.success === false) { + return ( +
+ {/* Header with Error label and arrow button */} +
setIsMetadataCollapsed(!isMetadataCollapsed)}> +

{functionName}

+
+ Error + +
+
+ + {/* Error message dropdown */} + +
+ {result.error || "Tool execution failed"} +
+ +
+ ); + } + + // Success state - verbatim mode (guaranteed for this tool on success) + // Display compact card + content below + if (typeof result.content === "string") { + return ( + <> + {/* COMPACT TOOL CARD - Just title + metadata dropdown */} +
+ {/* Header with arrow button */} +
setIsMetadataCollapsed(!isMetadataCollapsed)}> +

{functionName}

+ +
+ + {/* Metadata dropdown - INSIDE the tool card */} + {result.metadata && Object.keys(result.metadata).length > 0 && ( + +
+ {/* Informational note */} +
+ + ℹ️ Review paper is currently scaled back to balance cost. Presently it identifies issues in Title, + Abstract, and Introduction. We are working to support the full review flow again. + +
+ + {/* Custom metadata rendering */} + {result.metadata.target_venue !== undefined && ( +
+ Checked for: "{result.metadata.target_venue || "General review"}" +
+ )} + {result.metadata.severity_threshold && ( +
+ Filtered: "{result.metadata.severity_threshold}" and above +
+ )} + {result.metadata.sections_to_review && ( +
+ Sections reviewed: {formatArray(result.metadata.sections_to_review)} +
+ )} +
+ + )} +
+ + {/* CONTENT - OUTSIDE/BELOW the tool card, always visible */} +
+ + {result.content} + +
+ + ); + } + + // Fallback - unknown format + return ( +
+
+

{functionName}

+
+
+ ); +}; diff --git a/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/search-relevant-papers.tsx b/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/search-relevant-papers.tsx new file mode 100644 index 0000000..0b0bea0 --- /dev/null +++ b/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/search-relevant-papers.tsx @@ -0,0 +1,123 @@ +import { cn } from "@heroui/react"; +import { LoadingIndicator } from "../../../loading-indicator"; +import MarkdownComponent from "../../../markdown"; +import { useState } from "react"; +import { XtraMcpToolCardProps, parseXtraMcpToolResult, CollapseArrowButton, CollapseWrapper } from "./utils/common"; + +// Helper function to format time +const formatTime = (time: any): string => { + if (typeof time === 'number') { + return `${time.toFixed(2)}s`; + } + return String(time); +}; + +export const SearchRelevantPapersCard = ({ functionName, message, preparing, animated }: XtraMcpToolCardProps) => { + const [isMetadataCollapsed, setIsMetadataCollapsed] = useState(false); + + // Loading state (tool executing) + if (preparing) { + return ( +
+
+

Searching for papers..

+
+ +
+ ); + } + + // Parse XtraMCP ToolResult format + const result = parseXtraMcpToolResult(message); + + // No result or not ToolResult format - minimal display + if (!result) { + return ( +
+
+

{functionName}

+
+
+ ); + } + + // Error state + if (result.error || result.success === false) { + return ( +
+ {/* Header with Error label and arrow button */} +
setIsMetadataCollapsed(!isMetadataCollapsed)}> +

{functionName}

+
+ Error + +
+
+ + {/* Error message dropdown */} + +
+ {result.error || "Tool execution failed"} +
+ +
+ ); + } + + // Success state - verbatim mode (guaranteed for this tool on success) + // Display compact card + content below + if (typeof result.content === "string") { + return ( + <> + {/* COMPACT TOOL CARD - Just title + metadata dropdown */} +
+ {/* Header with arrow button */} +
setIsMetadataCollapsed(!isMetadataCollapsed)}> +

{functionName}

+ +
+ + {/* Metadata dropdown - INSIDE the tool card */} + {result.metadata && Object.keys(result.metadata).length > 0 && ( + +
+ {/* Custom metadata rendering */} + {result.metadata.query && ( +
+ Query Used: "{result.metadata.query}" +
+ )} + {result.metadata.search_time !== undefined && ( +
+ Time Taken: {formatTime(result.metadata.search_time)} +
+ )} + {result.metadata.total_count !== undefined && ( +
+ Total Results: {result.metadata.total_count} +
+ )} +
+ + )} +
+ + {/* CONTENT - OUTSIDE/BELOW the tool card, always visible */} +
+ + {result.content} + +
+ + ); + } + + // Fallback - unknown format + return ( +
+
+

{functionName}

+
+
+ ); +}; diff --git a/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/utils/common.tsx b/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/utils/common.tsx new file mode 100644 index 0000000..ce01e18 --- /dev/null +++ b/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/utils/common.tsx @@ -0,0 +1,102 @@ +import { cn } from "@heroui/react"; +import { ReactNode } from "react"; + +export type XtraMcpToolResult = { + schema_version: string; + display_mode: "verbatim" | "interpret"; + content?: string | object; + metadata?: Record; + success?: boolean; + error?: string; +}; + +export type XtraMcpToolCardProps = { + functionName: string; + message?: string; + preparing: boolean; + animated: boolean; +}; + +// we can probably handle this with a prefixed tool name check +// for now, whitelist the tools +const XTRA_MCP_TOOL_NAMES = [ + // RESEARCHER TOOLS + "search_relevant_papers", + "online_search_papers", + "deep_research", + // REVIEWER TOOLS + "review_paper", + "verify_citations", + // ENHANCER TOOLS + // "enhance_academic_writing", + // OPENREVIEW ONLINE TOOLS + // "search_user", + // "get_user_papers" +]; + +export const isXtraMcpTool = (functionName: string): boolean => { + return XTRA_MCP_TOOL_NAMES.includes(functionName); +}; + +export const isXtraMcpToolResult = (message?: string): boolean => { + if (!message) return false; + + try { + const parsed = JSON.parse(message); + return parsed.schema_version?.startsWith('xtramcp.tool_result') ?? false; + } catch { + return false; + } +}; + +export const parseXtraMcpToolResult = (message?: string): XtraMcpToolResult | null => { + if (!isXtraMcpToolResult(message)) return null; + + try { + const parsed = JSON.parse(message!); + return parsed as XtraMcpToolResult; + } catch { + return null; + } +}; + + +// Shared UI components +interface CollapseArrowButtonProps { + isCollapsed: boolean; + ariaLabel?: string; +} + +export const CollapseArrowButton = ({ isCollapsed, ariaLabel }: CollapseArrowButtonProps) => ( + +); + +interface CollapseWrapperProps { + isCollapsed: boolean; + children: ReactNode; +} + +export const CollapseWrapper = ({ isCollapsed, children }: CollapseWrapperProps) => ( +
+ {children} +
+); diff --git a/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/verify-citations.tsx b/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/verify-citations.tsx new file mode 100644 index 0000000..36acbd3 --- /dev/null +++ b/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/verify-citations.tsx @@ -0,0 +1,113 @@ +import { cn } from "@heroui/react"; +import { LoadingIndicator } from "../../../loading-indicator"; +import MarkdownComponent from "../../../markdown"; +import { useState } from "react"; +import { XtraMcpToolCardProps, parseXtraMcpToolResult, CollapseArrowButton, CollapseWrapper } from "./utils/common"; + +export const VerifyCitationsCard = ({ functionName, message, preparing, animated }: XtraMcpToolCardProps) => { + const [isMetadataCollapsed, setIsMetadataCollapsed] = useState(false); + + // Loading state (tool executing) + if (preparing) { + return ( +
+
+

Verifying your citations..

+
+ +
+ ); + } + + // Parse XtraMCP ToolResult format + const result = parseXtraMcpToolResult(message); + + // No result or not ToolResult format - minimal display + if (!result) { + return ( +
+
+

{functionName}

+
+
+ ); + } + + // Error state + if (result.error || result.success === false) { + return ( +
+ {/* Header with Error label and arrow button */} +
setIsMetadataCollapsed(!isMetadataCollapsed)}> +

{functionName}

+
+ Error + +
+
+ + {/* Error message dropdown */} + +
+ {result.error || "Tool execution failed"} +
+ +
+ ); + } + + // Success state - verbatim mode (guaranteed for this tool on success) + // Display compact card + content below + if (typeof result.content === "string") { + return ( + <> + {/* COMPACT TOOL CARD - Just title + metadata dropdown */} +
+ {/* Header with arrow button */} +
setIsMetadataCollapsed(!isMetadataCollapsed)}> +

{functionName}

+ +
+ + {/* Metadata dropdown - INSIDE the tool card */} + {result.metadata && Object.keys(result.metadata).length > 0 && ( + +
+ {/* Custom metadata rendering */} + {result.metadata.bibliography_file && ( +
+ Bib source file:{" "} + + {result.metadata.bibliography_file} + +
+ )} + {result.metadata.total_citations !== undefined && ( +
+ Total Citations: {result.metadata.total_citations} +
+ )} +
+ + )} +
+ + {/* CONTENT - OUTSIDE/BELOW the tool card, always visible */} +
+ + {result.content} + +
+ + ); + } + + // Fallback - unknown format + return ( +
+
+

{functionName}

+
+
+ ); +}; diff --git a/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/xtramcp-generic-card.tsx b/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/xtramcp-generic-card.tsx new file mode 100644 index 0000000..dd4ac01 --- /dev/null +++ b/webapp/_webapp/src/components/message-entry-container/tools/xtramcp/xtramcp-generic-card.tsx @@ -0,0 +1,151 @@ +import { cn } from "@heroui/react"; +import { LoadingIndicator } from "../../../loading-indicator"; +import MarkdownComponent from "../../../markdown"; +import { useState } from "react"; +import { XtraMcpToolCardProps, parseXtraMcpToolResult, CollapseArrowButton, CollapseWrapper } from "./utils/common"; + +export const XtraMcpGenericCard = ({ functionName, message, preparing, animated }: XtraMcpToolCardProps) => { + const [isMetadataCollapsed, setIsMetadataCollapsed] = useState(false); + + // Loading state (tool executing) + if (preparing) { + return ( +
+
+

Calling {functionName}

+
+ +
+ ); + } + + // Parse XtraMCP ToolResult format + const result = parseXtraMcpToolResult(message); + + // No result or not ToolResult format - minimal display + if (!result) { + return ( +
+
+

{functionName}

+
+
+ ); + } + + // Error state + if (result.error || result.success === false) { + return ( +
+ {/* Header with Error label and arrow button */} +
setIsMetadataCollapsed(!isMetadataCollapsed)}> +

{functionName}

+
+ Error + +
+
+ + {/* Error message dropdown */} + +
+ {result.error || "Tool execution failed"} +
+ +
+ ); + } + + // Verbatim mode - display pre-formatted content + if (result.display_mode === "verbatim" && typeof result.content === "string") { + return ( + <> + {/* COMPACT TOOL CARD - Just title + metadata dropdown */} +
+ {/* Header with arrow button */} +
setIsMetadataCollapsed(!isMetadataCollapsed)}> +

{functionName}

+ +
+ + {/* Metadata dropdown - INSIDE the tool card */} + {result.metadata && Object.keys(result.metadata).length > 0 && ( + +
+ {/* Generic metadata rendering - display all fields */} + {Object.entries(result.metadata).map(([key, value], index) => { + const isLastItem = index === Object.entries(result.metadata).length - 1; + + // Format value based on type + let formattedValue; + if (typeof value === 'object') { + formattedValue = JSON.stringify(value); + } else if (typeof value === 'string') { + // Check if it's a file path (contains a dot extension) + const isFilePath = value.includes('.') && (value.endsWith('.bib') || value.endsWith('.tex') || value.endsWith('.pdf') || value.includes('/')); + + if (isFilePath) { + formattedValue = ( + + {value} + + ); + } else { + formattedValue = `"${value}"`; + } + } else { + formattedValue = String(value); + } + + return ( +
+ {key}: {formattedValue} +
+ ); + })} +
+ + )} +
+ + {/* CONTENT - OUTSIDE/BELOW the tool card, always visible */} +
+ + {result.content} + +
+ + ); + } + + // Interpret mode - minimal display (LLM will format in response) + if (result.display_mode === "interpret") { + return ( +
+
setIsMetadataCollapsed(!isMetadataCollapsed)}> +

{functionName}

+
+ + {/* Show metadata in interpret mode */} + {!isMetadataCollapsed && result.metadata && Object.keys(result.metadata).length > 0 && ( +
+ {Object.entries(result.metadata).map(([key, value]) => ( + + {key}: {typeof value === 'object' ? JSON.stringify(value) : String(value)} + + ))} +
+ )} +
+ ); + } + + // Fallback - unknown format + return ( +
+
+

{functionName}

+
+
+ ); +}; diff --git a/webapp/_webapp/src/index.css b/webapp/_webapp/src/index.css index 177c4c7..e2c0714 100644 --- a/webapp/_webapp/src/index.css +++ b/webapp/_webapp/src/index.css @@ -105,7 +105,7 @@ body { @apply text-xs font-semibold font-sans text-primary-700 tracking-wider noselect; } -.tool-card-title.tool-card-jsonrpc { +.tool-card-title { @apply font-medium text-gray-500; }