@inkeep/agents-manage-ui 0.14.16 → 0.16.0

package/src/app/[tenantId]/projects/[projectId]/mcp-servers/[mcpServerId]/edit/page.tsx

@@ -39,6 +39,11 @@ async function EditMCPPage({ params }: EditMCPPageProps) {
     // Continue without credentials
   }
 
+  // Type guard - this page is only for MCP tools
+  if (mcpTool.config.type !== 'mcp') {
+    throw new Error('Invalid tool type - expected MCP tool');
+  }
+
   // Convert MCPTool to MCPToolFormData format
   const initialFormData: MCPToolFormData = {
     name: mcpTool.name,

package/src/app/api/signoz/conversations/[conversationId]/route.ts

@@ -81,10 +81,12 @@ async function signozQuery(payload: any): Promise<SigNozResp> {
       timeout: 30000,
     });
     const json = response.data as SigNozResp;
-    const responseData = json?.data?.result ? json.data.result.map((r) => ({
-      queryName: r.queryName,
-      count: r.list?.length,
-    })) : [];
+    const responseData = json?.data?.result
+      ? json.data.result.map((r) => ({
+          queryName: r.queryName,
+          count: r.list?.length,
+        }))
+      : [];
     logger.debug({ responseData }, 'SigNoz response (truncated)');
     return json;
   } catch (e) {
@@ -295,7 +297,7 @@ function buildConversationListPayload(
               ...QUERY_FIELD_CONFIGS.STRING_TAG,
             },
             {
-              key: SPAN_KEYS.CONTEXT_REQUEST_KEYS,
+              key: SPAN_KEYS.CONTEXT_HEADERS_KEYS,
               ...QUERY_FIELD_CONFIGS.STRING_TAG,
             },
           ]
@@ -353,7 +355,7 @@ function buildConversationListPayload(
               ...QUERY_FIELD_CONFIGS.STRING_TAG,
             },
             {
-              key: SPAN_KEYS.CONTEXT_REQUEST_KEYS,
+              key: SPAN_KEYS.CONTEXT_HEADERS_KEYS,
               ...QUERY_FIELD_CONFIGS.STRING_TAG,
             },
           ]
@@ -817,7 +819,7 @@ export async function GET(
       // context resolution
       contextConfigId?: string;
       contextAgentGraphId?: string;
-      contextRequestKeys?: string[];
+      contextHeadersKeys?: string[];
       contextTrigger?: string;
       contextStatusDescription?: string;
       contextUrl?: string;
@@ -861,12 +863,12 @@ export async function GET(
     // tool calls → activities
     for (const span of toolCallSpans) {
       const name = getString(span, SPAN_KEYS.AI_TOOL_CALL_NAME, 'Unknown Tool');
-      
+
       // Skip thinking_complete tool calls from the timeline
       if (name === 'thinking_complete') {
         continue;
       }
-      
+
       const hasError = getField(span, SPAN_KEYS.HAS_ERROR) === true;
       const durMs = getNumber(span, SPAN_KEYS.DURATION_NANO) / 1e6;
       const toolType = getString(span, SPAN_KEYS.AI_TOOL_TYPE, '');
@@ -960,7 +962,7 @@ export async function GET(
 
       // context keys maybe JSON
       let keys: string[] | undefined;
-      const rawKeys = getField(span, SPAN_KEYS.CONTEXT_REQUEST_KEYS);
+      const rawKeys = getField(span, SPAN_KEYS.CONTEXT_HEADERS_KEYS);
       try {
         if (typeof rawKeys === 'string') keys = JSON.parse(rawKeys);
         else if (Array.isArray(rawKeys)) keys = rawKeys as string[];
@@ -977,7 +979,7 @@ export async function GET(
         contextUrl: getString(span, SPAN_KEYS.CONTEXT_URL, '') || undefined,
         contextConfigId: getString(span, SPAN_KEYS.CONTEXT_CONFIG_ID, '') || undefined,
         contextAgentGraphId: getString(span, SPAN_KEYS.CONTEXT_AGENT_GRAPH_ID, '') || undefined,
-        contextRequestKeys: keys,
+        contextHeadersKeys: keys,
       });
     }
 
@@ -990,7 +992,7 @@ export async function GET(
 
       // context keys maybe JSON
       let keys: string[] | undefined;
-      const rawKeys = getField(span, SPAN_KEYS.CONTEXT_REQUEST_KEYS);
+      const rawKeys = getField(span, SPAN_KEYS.CONTEXT_HEADERS_KEYS);
       try {
         if (typeof rawKeys === 'string') keys = JSON.parse(rawKeys);
         else if (Array.isArray(rawKeys)) keys = rawKeys as string[];
@@ -1007,7 +1009,7 @@ export async function GET(
         contextUrl: getString(span, SPAN_KEYS.CONTEXT_URL, '') || undefined,
         contextConfigId: getString(span, SPAN_KEYS.CONTEXT_CONFIG_ID, '') || undefined,
         contextAgentGraphId: getString(span, SPAN_KEYS.CONTEXT_AGENT_GRAPH_ID, '') || undefined,
-        contextRequestKeys: keys,
+        contextHeadersKeys: keys,
       });
     }
 
@@ -1056,11 +1058,11 @@ export async function GET(
     for (const span of aiGenerationSpans) {
       const hasError = getField(span, SPAN_KEYS.HAS_ERROR) === true;
       const durMs = getNumber(span, SPAN_KEYS.DURATION_NANO) / 1e6;
-      
+
       // Extract ai.response.toolCalls and ai.prompt.messages for ai.generateText.doGenerate spans
       const aiResponseToolCalls = getString(span, SPAN_KEYS.AI_RESPONSE_TOOL_CALLS, '');
       const aiPromptMessages = getString(span, SPAN_KEYS.AI_PROMPT_MESSAGES, '');
-      
+
       activities.push({
         id: getString(span, SPAN_KEYS.SPAN_ID, ''),
         type: ACTIVITY_TYPES.AI_GENERATION,

package/src/app/utils/active-tools.ts

@@ -1,4 +1,4 @@
-import type { MCPTool } from "@/lib/types/tools";;
+import type { MCPTool } from '@/lib/types/tools';
 
 /**
  * Gets the active tools for an MCP server.
@@ -10,7 +10,7 @@ export function getActiveTools({
   activeTools,
 }: {
   availableTools: MCPTool['availableTools'];
-  activeTools: MCPTool['config']['mcp']['activeTools'];
+  activeTools: string[] | undefined;
 }): MCPTool['availableTools'] | undefined {
   if (!availableTools) return undefined;
 

package/src/components/artifact-components/form/artifact-component-form.tsx

@@ -30,11 +30,11 @@ const formatFormData = (data?: ArtifactComponentFormData): ArtifactComponentForm
   if (!data) return defaultValues;
 
   const formatted = { ...data };
-  if (formatted.summaryProps) {
-    formatted.summaryProps = formatJsonField(formatted.summaryProps);
-  }
-  if (formatted.fullProps) {
-    formatted.fullProps = formatJsonField(formatted.fullProps);
+  // Handle both null and undefined props, as well as empty strings
+  if (formatted.props && formatted.props !== '' && formatted.props !== null) {
+    formatted.props = formatJsonField(formatted.props);
+  } else {
+    formatted.props = undefined;
   }
   return formatted;
 };
@@ -63,7 +63,15 @@ export function ArtifactComponentForm({
 
   const onSubmit = async (data: ArtifactComponentFormData) => {
     try {
-      const payload = { ...data } as ArtifactComponent;
+      // Format the data before submission to handle empty props properly
+      const formattedData = formatFormData(data);
+      const payload = { ...formattedData } as ArtifactComponent;
+
+      // Explicitly set props to null if it's undefined to ensure it gets cleared
+      if (payload.props === undefined) {
+        payload.props = null;
+      }
+
       if (id) {
         const res = await updateArtifactComponentAction(tenantId, projectId, payload);
         if (!res.success) {
@@ -120,17 +128,10 @@ export function ArtifactComponentForm({
         />
         <JsonSchemaInput
           control={form.control}
-          name="summaryProps"
-          label="Summary props (JSON schema)"
-          placeholder="Enter a valid JSON Schema..."
-          isRequired
-        />
-        <JsonSchemaInput
-          control={form.control}
-          name="fullProps"
-          label="Full props (JSON schema)"
-          placeholder="Enter a valid JSON Schema..."
-          isRequired
+          name="props"
+          label="Props (JSON schema with inPreview indicators)"
+          placeholder="Enter a valid JSON Schema with inPreview flags, or leave empty to save entire tool result..."
+          description="Optional: Define specific fields with inPreview flags, or leave empty to capture the complete tool response"
         />
         <Button type="submit" disabled={isSubmitting}>
           Save

package/src/components/artifact-components/form/form-configuration.tsx

@@ -4,6 +4,5 @@ export const defaultValues: ArtifactComponentFormData = {
   id: '',
   name: '',
   description: '',
-  summaryProps: '',
-  fullProps: '',
+  props: undefined,
 };

package/src/components/artifact-components/form/validation.ts

@@ -2,16 +2,20 @@ import { z } from 'zod';
 import { getJsonParseError, validateJsonSchemaForLlm } from '@/lib/json-schema-validation';
 import { idSchema } from '@/lib/validation';
 
-const jsonSchemaValidation = (fieldName: string) =>
+const jsonSchemaValidation = () =>
   z
-    .string()
-    .min(1, `${fieldName} schema is required.`)
-    .transform((str, ctx) => {
+    .union([z.string(), z.null(), z.undefined()])
+    .transform((value, ctx) => {
+      // If no value provided, empty string, or null, return undefined
+      if (!value || value === '' || value === null) {
+        return undefined;
+      }
+
       try {
-        const parsed = JSON.parse(str);
+        const parsed = JSON.parse(value);
 
         // Validate it's a proper LLM-compatible JSON schema
-        const validationResult = validateJsonSchemaForLlm(str);
+        const validationResult = validateJsonSchemaForLlm(value);
         if (!validationResult.isValid) {
           const errorMessage = validationResult.errors[0]?.message || 'Invalid JSON schema';
           ctx.addIssue({
@@ -29,14 +33,14 @@ const jsonSchemaValidation = (fieldName: string) =>
         });
         return z.NEVER;
       }
-    });
+    })
+    .optional();
 
 export const artifactComponentSchema = z.object({
   id: idSchema,
   name: z.string().min(1, 'Name is required.'),
   description: z.string().min(1, 'Description is required.'),
-  summaryProps: jsonSchemaValidation('Summary props').optional(),
-  fullProps: jsonSchemaValidation('Full props').optional(),
+  props: jsonSchemaValidation(),
 });
 
 export type ArtifactComponentFormData = z.infer<typeof artifactComponentSchema>;

package/src/components/credentials/credential-tools-list.tsx

@@ -1,27 +1,16 @@
 import Link from 'next/link';
 import { Label } from '@/components/ui/label';
-
-interface Tool {
-  id: string;
-  name: string;
-  config: {
-    mcp: {
-      server: {
-        url: string;
-      };
-    };
-  };
-}
+import type { McpTool } from '@inkeep/agents-core';
 
 interface CredentialToolsListProps {
-  tools?: Tool[];
+  tools?: McpTool[];
   label?: string;
   tenantId?: string;
   projectId?: string;
 }
 
 interface ToolItemProps {
-  tool: Tool;
+  tool: McpTool;
   tenantId?: string;
   projectId?: string;
 }
@@ -37,7 +26,9 @@ function ToolItem({ tool, tenantId, projectId }: ToolItemProps) {
       <div className="flex items-center gap-3">
         <div>
           <p className="font-medium text-sm">{tool.name}</p>
-          <p className="text-xs text-muted-foreground">{tool.config.mcp.server.url}</p>
+          <p className="text-xs text-muted-foreground">
+            {tool.config.type === 'mcp' ? tool.config.mcp.server.url : ''}
+          </p>
         </div>
       </div>
     </>

package/src/components/credentials/views/credential-form.tsx

@@ -1,27 +1,27 @@
-'use client'
-
-import { zodResolver } from '@hookform/resolvers/zod'
-import { useEffect, useMemo, useState } from 'react'
-import { useForm } from 'react-hook-form'
-import { toast } from 'sonner'
-import { GenericInput } from '@/components/form/generic-input'
-import { GenericKeyValueInput } from '@/components/form/generic-key-value-input'
-import { GenericSelect } from '@/components/form/generic-select'
-import { Button } from '@/components/ui/button'
-import { Checkbox } from '@/components/ui/checkbox'
-import { Form } from '@/components/ui/form'
-import { InfoCard } from '@/components/ui/info-card'
-import { fetchMCPTools } from '@/lib/api/tools'
-import type { MCPTool } from '@/lib/types/tools'
-import { type CredentialFormData, credentialFormSchema } from './credential-form-validation'
+'use client';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useEffect, useMemo, useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { toast } from 'sonner';
+import { GenericInput } from '@/components/form/generic-input';
+import { GenericKeyValueInput } from '@/components/form/generic-key-value-input';
+import { GenericSelect } from '@/components/form/generic-select';
+import { Button } from '@/components/ui/button';
+import { Checkbox } from '@/components/ui/checkbox';
+import { Form } from '@/components/ui/form';
+import { InfoCard } from '@/components/ui/info-card';
+import { fetchMCPTools } from '@/lib/api/tools';
+import type { MCPTool } from '@/lib/types/tools';
+import { type CredentialFormData, credentialFormSchema } from './credential-form-validation';
 
 interface CredentialFormProps {
   /** Handler for creating new credentials */
-  onCreateCredential: (data: CredentialFormData) => Promise<void>
+  onCreateCredential: (data: CredentialFormData) => Promise<void>;
   /** Tenant ID */
-  tenantId: string
+  tenantId: string;
   /** Project ID */
-  projectId: string
+  projectId: string;
 }
 
 const defaultValues: CredentialFormData = {
@@ -29,47 +29,47 @@ const defaultValues: CredentialFormData = {
   apiKeyToSet: '',
   metadata: {},
   selectedTool: undefined,
-}
+};
 
 export function CredentialForm({ onCreateCredential, tenantId, projectId }: CredentialFormProps) {
-  const [availableTools, setAvailableTools] = useState<MCPTool[]>([])
-  const [toolsLoading, setToolsLoading] = useState(true)
-  const [shouldLinkToServer, setShouldLinkToServer] = useState(false)
+  const [availableTools, setAvailableTools] = useState<MCPTool[]>([]);
+  const [toolsLoading, setToolsLoading] = useState(true);
+  const [shouldLinkToServer, setShouldLinkToServer] = useState(false);
 
   const form = useForm({
     resolver: zodResolver(credentialFormSchema),
     defaultValues: defaultValues,
-  })
+  });
 
-  const { isSubmitting } = form.formState
+  const { isSubmitting } = form.formState;
 
   useEffect(() => {
     const loadAvailableTools = async () => {
       try {
-        const allTools = await fetchMCPTools(tenantId, projectId)
-        const toolsWithoutCredentials = allTools.filter((tool) => !tool.credentialReferenceId)
-        setAvailableTools(toolsWithoutCredentials)
+        const allTools = await fetchMCPTools(tenantId, projectId);
+        const toolsWithoutCredentials = allTools.filter((tool) => !tool.credentialReferenceId);
+        setAvailableTools(toolsWithoutCredentials);
       } catch (err) {
-        console.error('Failed to load MCP tools:', err)
+        console.error('Failed to load MCP tools:', err);
       } finally {
-        setToolsLoading(false)
+        setToolsLoading(false);
       }
-    }
+    };
 
-    loadAvailableTools()
-  }, [tenantId, projectId])
+    loadAvailableTools();
+  }, [tenantId, projectId]);
 
   // Handle checkbox state changes
   useEffect(() => {
     if (!shouldLinkToServer) {
       // Clear the selectedTool field when not linking to server
-      form.setValue('selectedTool', undefined)
+      form.setValue('selectedTool', undefined);
     }
-  }, [shouldLinkToServer, form])
+  }, [shouldLinkToServer, form]);
 
   const handleLinkToServerChange = (checked: boolean | 'indeterminate') => {
-    setShouldLinkToServer(checked === true)
-  }
+    setShouldLinkToServer(checked === true);
+  };
 
   const onSubmit = async (data: CredentialFormData) => {
     try {
@@ -77,16 +77,16 @@ export function CredentialForm({ onCreateCredential, tenantId, projectId }: Cred
         shouldLinkToServer &&
         (data.selectedTool === 'loading' || data.selectedTool === 'error')
       ) {
-        toast('Please select a valid MCP server')
-        return
+        toast('Please select a valid MCP server');
+        return;
       }
 
-      await onCreateCredential(data)
+      await onCreateCredential(data);
     } catch (err) {
-      console.error('Failed to create credential:', err)
-      toast(err instanceof Error ? err.message : 'Failed to create credential')
+      console.error('Failed to create credential:', err);
+      toast(err instanceof Error ? err.message : 'Failed to create credential');
     }
-  }
+  };
 
   const serverOptions = useMemo(
     () => [
@@ -101,11 +101,11 @@ export function CredentialForm({ onCreateCredential, tenantId, projectId }: Cred
         : []),
       ...availableTools.map((tool) => ({
         value: tool.id,
-        label: `${tool.name} - ${tool.config.mcp.server.url}`,
+        label: `${tool.name} - ${tool.config.type === 'mcp' ? tool.config.mcp.server.url : ''}`,
       })),
     ],
     [availableTools, toolsLoading]
-  )
+  );
 
   return (
     <Form {...form}>
@@ -202,5 +202,5 @@ export function CredentialForm({ onCreateCredential, tenantId, projectId }: Cred
         </div>
       </form>
     </Form>
-  )
+  );
 }

package/src/components/credentials/views/edit-credential-form.tsx

@@ -161,7 +161,11 @@ export function EditCredentialForm({
           )}
 
           {/* MCP Servers Using This Credential */}
-          <CredentialToolsList tools={credential.tools} tenantId={tenantId} projectId={projectId} />
+          <CredentialToolsList
+            tools={credential.tools}
+            tenantId={tenantId}
+            projectId={projectId}
+          />
         </div>
 
         <div className="flex gap-3 pt-4">

package/src/components/form/generic-input.tsx

@@ -11,6 +11,7 @@ interface GenericInputProps<T extends FieldValues> {
   placeholder?: string;
   type?: string;
   min?: string;
+  max?: string;
   disabled?: boolean;
   description?: string;
   isRequired?: boolean;
@@ -23,6 +24,7 @@ export function GenericInput<T extends FieldValues>({
   placeholder,
   type = 'text',
   min,
+  max,
   disabled,
   description,
   isRequired = false,
@@ -40,6 +42,7 @@ export function GenericInput<T extends FieldValues>({
           type={type}
           placeholder={placeholder}
           min={min}
+          max={max}
           disabled={disabled}
           {...field}
           value={field.value ?? ''}

package/src/components/form/generic-select.tsx

@@ -24,6 +24,7 @@ interface GenericSelectProps<T extends FieldValues> {
   options: SelectOption[];
   disabled?: boolean;
   selectTriggerClassName?: string;
+  description?: string;
   isRequired?: boolean;
 }
 
@@ -35,10 +36,17 @@ export function GenericSelect<T extends FieldValues>({
   options,
   disabled = false,
   selectTriggerClassName,
+  description,
   isRequired = false,
 }: GenericSelectProps<T>) {
   return (
-    <FormFieldWrapper control={control} name={name} label={label} isRequired={isRequired}>
+    <FormFieldWrapper
+      control={control}
+      name={name}
+      label={label}
+      description={description}
+      isRequired={isRequired}
+    >
       {(field) => (
         <Select onValueChange={field.onChange} defaultValue={field.value} disabled={disabled}>
           <SelectTrigger disabled={disabled} className={selectTriggerClassName}>

package/src/components/form/prompt-editor.tsx

@@ -146,7 +146,7 @@ export interface TextareaWithSuggestionsProps extends Omit<ReactCodeMirrorProps,
   placeholder?: string;
   disabled?: boolean;
   readOnly?: boolean;
-  ref?: RefObject<{ insertTemplateVariable: () => void }>;
+  ref?: RefObject<{ insertTemplateVariable: () => void }| null>;
 }
 
 function tryJsonParse(json: string): object {
@@ -199,9 +199,9 @@ export const PromptEditor: FC<TextareaWithSuggestionsProps> = ({
 
   const extensions = useMemo(() => {
     const contextVariables = tryJsonParse(contextConfig.contextVariables);
-    const requestContextSchema = tryJsonParse(contextConfig.requestContextSchema);
+    const headersSchema = tryJsonParse(contextConfig.headersSchema);
     const suggestions = getContextSuggestions({
-      requestContextSchema,
+      headersSchema,
       // @ts-expect-error -- todo: improve type
       contextVariables,
     });

package/src/components/form/standalone-json-editor.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { Button } from '@/components/ui/button';
-import { createLlmSchemaTemplate } from '@/lib/json-schema-validation';
+import { createSchemaTemplate } from '@/lib/json-schema-validation';
 import { formatJson } from '@/lib/utils';
 import { JsonEditor } from './json-editor';
 
@@ -26,7 +26,7 @@ export function StandaloneJsonEditor(props: StandaloneJsonEditorProps) {
   };
 
   const handleInsertTemplate = () => {
-    const template = createLlmSchemaTemplate();
+    const template = createSchemaTemplate();
     props.onChange(template);
   };
 

package/src/components/graph/configuration/graph-types.tsx

@@ -35,8 +35,6 @@ export type GraphMetadata = {
 
 export type ContextConfig = {
   id?: string;
-  name: string;
-  description: string;
   contextVariables: string; // JSON string
-  requestContextSchema: string; // JSON string
+  headersSchema: string; // JSON string
 };

package/src/components/graph/configuration/model-options.tsx

@@ -1,6 +1,6 @@
 export const DEFAULT_ANTHROPIC_BASE_MODEL = 'anthropic/claude-sonnet-4-20250514';
-export const DEFAULT_ANTHROPIC_STRUCTURED_OUTPUT_MODEL = 'anthropic/claude-haiku-3-5-20241022';
-export const DEFAULT_ANTHROPIC_SUMMARIZER_MODEL = 'anthropic/claude-haiku-3-5-20241022';
+export const DEFAULT_ANTHROPIC_STRUCTURED_OUTPUT_MODEL = 'anthropic/claude-sonnet-4-2025051';
+export const DEFAULT_ANTHROPIC_SUMMARIZER_MODEL = 'anthropic/claude-sonnet-4-20250514';
 
 export const DEFAULT_OPENAI_BASE_MODEL = 'openai/gpt-4.1-2025-04-14';
 export const DEFAULT_OPENAI_STRUCTURED_OUTPUT_MODEL = 'openai/gpt-4.1-mini-2025-04-14';
@@ -21,8 +21,8 @@ export const modelOptions = {
       label: 'anthropic/claude-sonnet-4-20250514',
     },
     {
-      value: 'anthropic/claude-haiku-3-5-20241022',
-      label: 'anthropic/claude-haiku-3-5-20241022',
+      value: 'anthropic/claude-3-5-haiku-20241022',
+      label: 'anthropic/claude-3-5-haiku-20241022',
     },
   ],
   openai: [

package/src/components/graph/configuration/node-types.tsx

@@ -1,6 +1,7 @@
-import { Bot, BotMessageSquare, Hammer } from 'lucide-react';
+import { Bot, BotMessageSquare, Code, Hammer } from 'lucide-react';
 import { AgentNode } from '../nodes/agent-node';
 import { ExternalAgentNode } from '../nodes/external-agent-node';
+import { FunctionToolNode } from '../nodes/function-tool-node';
 import { MCPNode } from '../nodes/mcp-node';
 import { MCPPlaceholderNode } from '../nodes/mcp-placeholder-node';
 import type { GraphModels } from './graph-types';
@@ -46,11 +47,21 @@ export interface ExternalAgentNodeData extends Record<string, unknown> {
   credentialReferenceId?: string | null;
 }
 
+export interface FunctionToolNodeData extends Record<string, unknown> {
+  functionToolId: string;
+  agentId?: string | null; // null when unconnected, string when connected to specific agent
+  name?: string;
+  description?: string;
+  code?: string;
+  inputSchema?: Record<string, unknown>;
+}
+
 export enum NodeType {
   Agent = 'agent',
   ExternalAgent = 'external-agent',
   MCP = 'mcp',
   MCPPlaceholder = 'mcp-placeholder',
+  FunctionTool = 'function-tool',
 }
 
 export const nodeTypes = {
@@ -58,12 +69,14 @@ export const nodeTypes = {
   [NodeType.ExternalAgent]: ExternalAgentNode,
   [NodeType.MCP]: MCPNode,
   [NodeType.MCPPlaceholder]: MCPPlaceholderNode,
+  [NodeType.FunctionTool]: FunctionToolNode,
 };
 
 export const mcpNodeHandleId = 'target-mcp';
 export const agentNodeSourceHandleId = 'source-agent';
 export const agentNodeTargetHandleId = 'target-agent';
 export const externalAgentNodeTargetHandleId = 'target-external-agent';
+export const functionToolNodeHandleId = 'target-function-tool';
 
 export const newNodeDefaults: Record<keyof typeof nodeTypes, NodeData> = {
   [NodeType.Agent]: {
@@ -80,6 +93,10 @@ export const newNodeDefaults: Record<keyof typeof nodeTypes, NodeData> = {
   [NodeType.MCPPlaceholder]: {
     name: 'Select MCP server',
   },
+  [NodeType.FunctionTool]: {
+    name: 'Function Tool',
+    agentId: null,
+  },
 };
 
 export const nodeTypeMap = {
@@ -103,4 +120,9 @@ export const nodeTypeMap = {
     name: 'MCP',
     Icon: Hammer,
   },
+  [NodeType.FunctionTool]: {
+    type: NodeType.FunctionTool,
+    name: 'Function Tool',
+    Icon: Code,
+  },
 };