From 92e452d33765ef87e01c9c12ddc5dd7331ed7805 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Sun, 22 Jun 2025 10:24:07 -0600
Subject: [PATCH 01/33] Remove unnecessary validate files system

---
 .github/workflows/sync-docs-full.yml |  3 +-
 .github/workflows/sync-docs.yml      |  3 +-
 bin/validate-files.sh                | 53 ----------------------------
 3 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100755 bin/validate-files.sh

diff --git a/.github/workflows/sync-docs-full.yml b/.github/workflows/sync-docs-full.yml
index 59f719d8..30c0f083 100644
--- a/.github/workflows/sync-docs-full.yml
+++ b/.github/workflows/sync-docs-full.yml
@@ -12,8 +12,7 @@ jobs:
       - name: Collect and validate files
         run: |
           set -euo pipefail
-          ./bin/collect-all-files.sh | \
-            ./bin/validate-files.sh > all-files.txt
+          ./bin/collect-all-files.sh > all-files.txt
           
           echo "Files to sync:"
           cat all-files.txt
diff --git a/.github/workflows/sync-docs.yml b/.github/workflows/sync-docs.yml
index 9e28e839..110fff02 100644
--- a/.github/workflows/sync-docs.yml
+++ b/.github/workflows/sync-docs.yml
@@ -19,8 +19,7 @@ jobs:
         run: |
           set -euo pipefail
           git fetch origin ${{ github.event.before }}
-          ./bin/collect-changed-files.sh "${{ github.event.before }}" "${{ github.sha }}" | \
-            ./bin/validate-files.sh > changed-files.txt
+          ./bin/collect-changed-files.sh "${{ github.event.before }}" "${{ github.sha }}" > changed-files.txt
           
           echo "Files to sync:"
           cat changed-files.txt
diff --git a/bin/validate-files.sh b/bin/validate-files.sh
deleted file mode 100755
index 6752d38d..00000000
--- a/bin/validate-files.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# validate-files.sh
-# Reads file paths from stdin, validates they exist and are safe
-# Outputs only valid file paths
-
-echo "Validating file paths" >&2
-
-valid_count=0
-invalid_count=0
-
-# Read all input into an array first
-mapfile -t files
-
-for file in "${files[@]}"; do
-    # Skip empty lines
-    if [ -z "$file" ]; then
-        continue
-    fi
-    
-    # Handle REMOVED: prefix
-    if [[ "$file" == REMOVED:* ]]; then
-        echo "$file"
-        ((valid_count++))
-        continue
-    fi
-    
-    # Security check: prevent path traversal
-    if [[ "$file" == *".."* ]] || [[ "$file" == "/"* ]]; then
-        echo "Warning: Unsafe path detected, skipping: $file" >&2
-        ((invalid_count++))
-        continue
-    fi
-    
-    # Check if file exists
-    if [ -f "content/$file" ]; then
-        echo "$file"
-        echo "  ✓ $file" >&2
-        ((valid_count++))
-    else
-        echo "Warning: File not found, skipping: $file" >&2
-        ((invalid_count++))
-    fi
-done
-
-echo "Validation complete: $valid_count valid, $invalid_count invalid" >&2
-
-# Exit with error if no valid files
-if [ "$valid_count" -eq 0 ]; then
-    echo "Error: No valid files found" >&2
-    exit 1
-fi 
\ No newline at end of file

From dc2d58de7d989b5e38e0a42c16ee9310c916a62f Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Sun, 22 Jun 2025 11:27:16 -0600
Subject: [PATCH 02/33] move config to agent-dcs dir

---
 agent-docs/config.ts                                      | 2 ++
 agent-docs/src/agents/doc-processing/docs-orchestrator.ts | 2 +-
 agent-docs/src/agents/doc-qa/index.ts                     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 agent-docs/config.ts

diff --git a/agent-docs/config.ts b/agent-docs/config.ts
new file mode 100644
index 00000000..3088c1f8
--- /dev/null
+++ b/agent-docs/config.ts
@@ -0,0 +1,2 @@
+export const VECTOR_STORE_NAME = process.env.VECTOR_STORE_NAME || 'docs';
+export const vectorSearchNumber = 20;
\ No newline at end of file
diff --git a/agent-docs/src/agents/doc-processing/docs-orchestrator.ts b/agent-docs/src/agents/doc-processing/docs-orchestrator.ts
index 3cdefbb7..c78d8682 100644
--- a/agent-docs/src/agents/doc-processing/docs-orchestrator.ts
+++ b/agent-docs/src/agents/doc-processing/docs-orchestrator.ts
@@ -1,6 +1,6 @@
 import type { AgentContext } from '@agentuity/sdk';
 import { processDoc } from './docs-processor';
-import { VECTOR_STORE_NAME } from '../../../../config';
+import { VECTOR_STORE_NAME } from '../../../config';
 import type { SyncPayload, SyncStats } from './types';
 
 /**
diff --git a/agent-docs/src/agents/doc-qa/index.ts b/agent-docs/src/agents/doc-qa/index.ts
index 54351f89..af936596 100644
--- a/agent-docs/src/agents/doc-qa/index.ts
+++ b/agent-docs/src/agents/doc-qa/index.ts
@@ -3,7 +3,7 @@ import { streamText } from 'ai';
 import { openai } from '@ai-sdk/openai';
 
 import type { ChunkMetadata } from '../doc-processing/types';
-import { VECTOR_STORE_NAME, vectorSearchNumber } from '../../../../config';
+import { VECTOR_STORE_NAME, vectorSearchNumber } from '../../../config';
 import type { RelevantDoc } from './types';
 
 export default async function Agent(

From e033b8f9e15d0d4443866d9fc55cbc0071856a27 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Sun, 22 Jun 2025 11:27:31 -0600
Subject: [PATCH 03/33] remove config from root dir

---
 config.ts | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 config.ts

diff --git a/config.ts b/config.ts
deleted file mode 100644
index 3088c1f8..00000000
--- a/config.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const VECTOR_STORE_NAME = process.env.VECTOR_STORE_NAME || 'docs';
-export const vectorSearchNumber = 20;
\ No newline at end of file

From 7fe0a04c8d4f166a8607d971b7e82a768931fb69 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Mon, 23 Jun 2025 07:58:38 -0600
Subject: [PATCH 04/33] Add prompt classifier

---
 agent-docs/src/agents/doc-qa/index.ts  |  6 +--
 agent-docs/src/agents/doc-qa/prompt.ts | 66 ++++++++++++++++++++++++++
 agent-docs/src/agents/doc-qa/types.ts  | 14 +++++-
 3 files changed, 81 insertions(+), 5 deletions(-)
 create mode 100644 agent-docs/src/agents/doc-qa/prompt.ts

diff --git a/agent-docs/src/agents/doc-qa/index.ts b/agent-docs/src/agents/doc-qa/index.ts
index af936596..5cf4cdcc 100644
--- a/agent-docs/src/agents/doc-qa/index.ts
+++ b/agent-docs/src/agents/doc-qa/index.ts
@@ -14,6 +14,8 @@ export default async function Agent(
   const prompt = await req.data.text();
   const relevantDocs = await retrieveRelevantDocs(ctx, prompt);
 
+
+
   const systemPrompt = `
 You are a developer documentation assistant. Your job is to answer user questions about the Agentuity platform as effectively and concisely as possible, adapting your style to the user's request. If the user asks for a direct answer, provide it without extra explanation. If they want an explanation, provide a clear and concise one. Use only the provided relevant documents to answer.
 
@@ -55,8 +57,6 @@ async function retrieveRelevantDocs(ctx: AgentContext, prompt: string): Promise<
     limit: vectorSearchNumber
   }
   try {
-
-
     const vectors = await ctx.vector.search(VECTOR_STORE_NAME, dbQuery);
 
     const uniquePaths = new Set<string>();
@@ -80,7 +80,7 @@ async function retrieveRelevantDocs(ctx: AgentContext, prompt: string): Promise<
         content: await retrieveDocumentBasedOnPath(ctx, path)
       }))
     );
-
+    
     return docs;
   } catch (err) {
     ctx.logger.error('Error retrieving relevant docs: %o', err);
diff --git a/agent-docs/src/agents/doc-qa/prompt.ts b/agent-docs/src/agents/doc-qa/prompt.ts
new file mode 100644
index 00000000..5b5f7f39
--- /dev/null
+++ b/agent-docs/src/agents/doc-qa/prompt.ts
@@ -0,0 +1,66 @@
+import type { AgentContext } from '@agentuity/sdk';
+import { generateObject } from 'ai';
+import { openai } from '@ai-sdk/openai';
+import { z } from 'zod';
+import { PromptType } from './types';
+
+const PromptClassificationSchema = z.object({
+  type: z.enum(['Normal', 'Thinking']),
+  confidence: z.number().min(0).max(1),
+  reasoning: z.string()
+});
+
+/**
+ * Determines the prompt type based on the input string using LLM classification.
+ * Uses specific, measurable criteria to decide between Normal and Agentic RAG.
+ * @param ctx - Agent Context for logging and LLM access
+ * @param input - The input string to analyze
+ * @returns {Promise<PromptType>} - The determined PromptType
+ */
+export async function getPromptType(ctx: AgentContext, input: string): Promise<PromptType> {
+    const systemPrompt = `
+You are a query classifier that determines whether a user question requires simple retrieval (Normal) or complex reasoning (Thinking).
+
+Use these SPECIFIC criteria for classification:
+
+**THINKING (Agentic RAG) indicators:**
+- Multi-step reasoning required (e.g., "compare and contrast", "analyze pros/cons")  
+- Synthesis across multiple concepts (e.g., "how does X relate to Y")
+- Scenario analysis (e.g., "what would happen if...", "when should I use...")
+- Troubleshooting/debugging questions requiring logical deduction
+- Questions with explicit reasoning requests ("explain why", "walk me through")
+- Comparative analysis ("which is better for...", "what are the trade-offs")
+
+**NORMAL (Simple RAG) indicators:**
+- Direct factual lookups (e.g., "what is...", "how do I install...")
+- Simple how-to questions with clear answers
+- API reference queries  
+- Configuration/syntax questions
+- Single-concept definitions
+
+Respond with a JSON object containing:
+- type: "Normal" or "Thinking"  
+- confidence: 0.0-1.0 (how certain you are)
+- reasoning: brief explanation of your classification
+
+Be conservative - when in doubt, default to "Normal" for better performance.`;
+
+    try {
+        const result = await generateObject({
+            model: openai('gpt-4o-mini'), // Use faster model for classification
+            system: systemPrompt,
+            prompt: `Classify this user query: "${input}"`,
+            schema: PromptClassificationSchema,
+            maxTokens: 200,
+        });
+
+        ctx.logger.info('Prompt classified as %s (confidence: %f): %s', 
+            result.object.type, result.object.confidence, result.object.reasoning);
+
+        return result.object.type === 'Thinking' ? PromptType.Thinking : PromptType.Normal;
+        
+    } catch (error) {
+        ctx.logger.error('Error classifying prompt, defaulting to Normal: %o', error);
+        return PromptType.Normal; // Fail-safe default
+    }
+}
diff --git a/agent-docs/src/agents/doc-qa/types.ts b/agent-docs/src/agents/doc-qa/types.ts
index 9fa227ff..d198defd 100644
--- a/agent-docs/src/agents/doc-qa/types.ts
+++ b/agent-docs/src/agents/doc-qa/types.ts
@@ -1,5 +1,15 @@
 export interface RelevantDoc {
     path: string;
     content: string;
-  }
-  
\ No newline at end of file
+}
+
+export enum PromptType {
+  Normal = 'Normal',
+  Thinking = 'Thinking'
+}
+
+export interface PromptClassification {
+  type: PromptType;
+  confidence: number;
+  reasoning: string;
+}
\ No newline at end of file

From 73ca415d25ec47e24288a8623b0a0b0711c04142 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Wed, 25 Jun 2025 07:52:34 -0600
Subject: [PATCH 05/33] enhance RAG prompt

---
 agent-docs/src/agents/doc-qa/index.ts     | 119 ++--------------------
 agent-docs/src/agents/doc-qa/prompt.ts    |  14 +--
 agent-docs/src/agents/doc-qa/rag.ts       |  68 +++++++++++++
 agent-docs/src/agents/doc-qa/retriever.ts |  75 ++++++++++++++
 agent-docs/src/agents/doc-qa/types.ts     |  40 +++++---
 5 files changed, 178 insertions(+), 138 deletions(-)
 create mode 100644 agent-docs/src/agents/doc-qa/rag.ts
 create mode 100644 agent-docs/src/agents/doc-qa/retriever.ts

diff --git a/agent-docs/src/agents/doc-qa/index.ts b/agent-docs/src/agents/doc-qa/index.ts
index 5cf4cdcc..a590b1ad 100644
--- a/agent-docs/src/agents/doc-qa/index.ts
+++ b/agent-docs/src/agents/doc-qa/index.ts
@@ -1,10 +1,6 @@
 import type { AgentContext, AgentRequest, AgentResponse } from '@agentuity/sdk';
-import { streamText } from 'ai';
-import { openai } from '@ai-sdk/openai';
-
-import type { ChunkMetadata } from '../doc-processing/types';
-import { VECTOR_STORE_NAME, vectorSearchNumber } from '../../../config';
-import type { RelevantDoc } from './types';
+import { getPromptType } from './prompt';
+import answerQuestion from './rag';
 
 export default async function Agent(
   req: AgentRequest,
@@ -12,111 +8,8 @@ export default async function Agent(
   ctx: AgentContext
 ) {
   const prompt = await req.data.text();
-  const relevantDocs = await retrieveRelevantDocs(ctx, prompt);
-
-
-
-  const systemPrompt = `
-You are a developer documentation assistant. Your job is to answer user questions about the Agentuity platform as effectively and concisely as possible, adapting your style to the user's request. If the user asks for a direct answer, provide it without extra explanation. If they want an explanation, provide a clear and concise one. Use only the provided relevant documents to answer.
-
-You must not make up answers if the provided documents don't exist. You can be direct to the user that the documentations
-don't seem to include what they are looking for. Lying to the user is prohibited as it only slows them down. Feel free to
-suggest follow up questions if what they're asking for don't seem to have an answer in the document. You can provide them
-a few related things that the documents contain that may interest them.
-
-For every answer, return a valid JSON object with:
-  1. "answer": your answer to the user's question.
-  2. "documents": an array of strings, representing the path of the documents you used to answer.
-
-If you use information from a document, include it in the "documents" array. If you do not use any documents, return an empty array for "documents".
-
-User question:
-\`\`\`
-${prompt}
-\`\`\`
-
-Relevant documents:
-${JSON.stringify(relevantDocs, null, 2)}
-
-Respond ONLY with a valid JSON object as described above. In your answer, you should format code blocks properly in Markdown style if the user needs answer in code block.
-`.trim();
-
-  const llmResponse = await streamText({
-    model: openai('gpt-4o'),
-    system: systemPrompt,
-    prompt: prompt,
-    maxTokens: 2048,
-  });
-
-  return resp.stream(llmResponse.textStream);
-}
-
-async function retrieveRelevantDocs(ctx: AgentContext, prompt: string): Promise<RelevantDoc[]> {
-  const dbQuery = {
-    query: prompt,
-    limit: vectorSearchNumber
-  }
-  try {
-    const vectors = await ctx.vector.search(VECTOR_STORE_NAME, dbQuery);
-
-    const uniquePaths = new Set<string>();
-
-    vectors.forEach(vec => {
-      if (!vec.metadata) {
-        ctx.logger.warn('Vector missing metadata');
-        return;
-      }
-      const path = typeof vec.metadata.path === 'string' ? vec.metadata.path : undefined;
-      if (!path) {
-        ctx.logger.warn('Vector metadata path is not a string');
-        return;
-      }
-      uniquePaths.add(path);
-    });
-
-    const docs = await Promise.all(
-      Array.from(uniquePaths).map(async path => ({
-        path,
-        content: await retrieveDocumentBasedOnPath(ctx, path)
-      }))
-    );
-    
-    return docs;
-  } catch (err) {
-    ctx.logger.error('Error retrieving relevant docs: %o', err);
-    return [];
-  }
-}
-
-async function retrieveDocumentBasedOnPath(ctx: AgentContext, path: string): Promise<string> {
-  const dbQuery = {
-    query: ' ',
-    limit: 10000,
-    metadata: {
-      path: path
-    }
-  }
-  try {
-    const vectors = await ctx.vector.search(VECTOR_STORE_NAME, dbQuery);
-
-    // Sort vectors by chunk index and concatenate text
-    const sortedVectors = vectors
-      .map(vec => {
-        const metadata = vec.metadata as ChunkMetadata;
-        return {
-          metadata,
-          index: metadata.chunkIndex
-        };
-      })
-      .sort((a, b) => a.index - b.index);
-
-    const fullText = sortedVectors
-      .map(vec => vec.metadata.text)
-      .join('\n\n');
-
-    return fullText;
-  } catch (err) {
-    ctx.logger.error('Error retrieving document by path %s: %o', path, err);
-    return '';
-  }
+  const promptType = await getPromptType(ctx, prompt);
+  ctx.logger.info(`Receive user prompt with type: ${promptType}`);
+  const answer = await answerQuestion(ctx, prompt);
+  return resp.json(answer);
 }
\ No newline at end of file
diff --git a/agent-docs/src/agents/doc-qa/prompt.ts b/agent-docs/src/agents/doc-qa/prompt.ts
index 5b5f7f39..178fea60 100644
--- a/agent-docs/src/agents/doc-qa/prompt.ts
+++ b/agent-docs/src/agents/doc-qa/prompt.ts
@@ -1,14 +1,8 @@
 import type { AgentContext } from '@agentuity/sdk';
 import { generateObject } from 'ai';
 import { openai } from '@ai-sdk/openai';
-import { z } from 'zod';
-import { PromptType } from './types';
-
-const PromptClassificationSchema = z.object({
-  type: z.enum(['Normal', 'Thinking']),
-  confidence: z.number().min(0).max(1),
-  reasoning: z.string()
-});
+import type { PromptType } from './types';
+import { PromptClassificationSchema } from './types';
 
 /**
  * Determines the prompt type based on the input string using LLM classification.
@@ -57,10 +51,10 @@ Be conservative - when in doubt, default to "Normal" for better performance.`;
         ctx.logger.info('Prompt classified as %s (confidence: %f): %s', 
             result.object.type, result.object.confidence, result.object.reasoning);
 
-        return result.object.type === 'Thinking' ? PromptType.Thinking : PromptType.Normal;
+        return result.object.type as PromptType;
         
     } catch (error) {
         ctx.logger.error('Error classifying prompt, defaulting to Normal: %o', error);
-        return PromptType.Normal; // Fail-safe default
+        return 'Normal' as PromptType;
     }
 }
diff --git a/agent-docs/src/agents/doc-qa/rag.ts b/agent-docs/src/agents/doc-qa/rag.ts
new file mode 100644
index 00000000..a8f33109
--- /dev/null
+++ b/agent-docs/src/agents/doc-qa/rag.ts
@@ -0,0 +1,68 @@
+import type { AgentContext } from '@agentuity/sdk';
+import { generateObject } from 'ai';
+import { openai } from '@ai-sdk/openai';
+
+import { retrieveRelevantDocs } from './retriever';
+import { AnswerSchema } from './types';
+import type { Answer } from './types';
+
+export default async function answerQuestion(ctx: AgentContext, prompt: string) {
+    const relevantDocs = await retrieveRelevantDocs(ctx, prompt);
+
+    const systemPrompt = `
+You are Agentuity's developer-documentation assistant.
+
+=== RULES ===
+1. Use ONLY the content inside <DOCS> tags to craft your reply. If the required information is missing, state that the docs do not cover it.
+2. Never fabricate or guess undocumented details.
+3. Ambiguity handling:
+   • When <DOCS> contains more than one distinct workflow or context that could satisfy the question, do **not** choose for the user.
+   • Briefly (≤ 2 sentences each) summarise each plausible interpretation and ask **one** clarifying question so the user can pick a path.
+   • Provide a definitive answer only after the ambiguity is resolved.
+4. Answer style:
+   • If the question can be answered unambiguously from a single workflow, give a short, direct answer.
+   • Add an explanation only when the user explicitly asks for one.
+   • Show any code or CLI snippets in fenced Markdown blocks.
+5. You may suggest concise follow-up questions or related topics that are present in <DOCS>.
+6. Keep a neutral, factual tone.
+
+=== OUTPUT FORMAT ===
+Return **valid JSON only** matching this TypeScript type:
+
+type LlmAnswer = {
+  answer: string;        // The reply or the clarifying question
+  documents: string[];   // Paths of documents actually cited
+}
+
+If you cited no documents, return an empty array. Do NOT wrap the JSON in Markdown or add any extra keys.
+
+<QUESTION>
+${prompt}
+</QUESTION>
+
+<DOCS>
+${JSON.stringify(relevantDocs, null, 2)}
+</DOCS>
+`;
+
+    try {
+        const result = await generateObject({
+            model: openai('gpt-4o'),
+            system: systemPrompt,
+            prompt: prompt,
+            schema: AnswerSchema,
+            maxTokens: 2048,
+        });
+        return result.object;
+    } catch (error) {
+        ctx.logger.error('Error generating answer: %o', error);
+
+        // Fallback response
+        const fallbackAnswer: Answer = {
+            answer: "I apologize, but I encountered an error while processing your question. Please try again or rephrase your question.",
+            documents: []
+        };
+
+        return fallbackAnswer;
+    }
+}
\ No newline at end of file
diff --git a/agent-docs/src/agents/doc-qa/retriever.ts b/agent-docs/src/agents/doc-qa/retriever.ts
new file mode 100644
index 00000000..d393e3b8
--- /dev/null
+++ b/agent-docs/src/agents/doc-qa/retriever.ts
@@ -0,0 +1,75 @@
+import type { AgentContext } from '@agentuity/sdk';
+
+import type { ChunkMetadata } from '../doc-processing/types';
+import { VECTOR_STORE_NAME, vectorSearchNumber } from '../../../config';
+import type { RelevantDoc } from './types';
+
+export async function retrieveRelevantDocs(ctx: AgentContext, prompt: string): Promise<RelevantDoc[]> {
+    const dbQuery = {
+      query: prompt,
+      limit: vectorSearchNumber
+    }
+    try {
+      const vectors = await ctx.vector.search(VECTOR_STORE_NAME, dbQuery);
+  
+      const uniquePaths = new Set<string>();
+  
+      vectors.forEach(vec => {
+        if (!vec.metadata) {
+          ctx.logger.warn('Vector missing metadata');
+          return;
+        }
+        const path = typeof vec.metadata.path === 'string' ? vec.metadata.path : undefined;
+        if (!path) {
+          ctx.logger.warn('Vector metadata path is not a string');
+          return;
+        }
+        uniquePaths.add(path);
+      });
+  
+      const docs = await Promise.all(
+        Array.from(uniquePaths).map(async path => ({
+          path,
+          content: await retrieveDocumentBasedOnPath(ctx, path)
+        }))
+      );
+  
+      return docs;
+    } catch (err) {
+      ctx.logger.error('Error retrieving relevant docs: %o', err);
+      return [];
+    }
+  }
+  
+  async function retrieveDocumentBasedOnPath(ctx: AgentContext, path: string): Promise<string> {
+    const dbQuery = {
+      query: ' ',
+      limit: 10000,
+      metadata: {
+        path: path
+      }
+    }
+    try {
+      const vectors = await ctx.vector.search(VECTOR_STORE_NAME, dbQuery);
+  
+      // Sort vectors by chunk index and concatenate text
+      const sortedVectors = vectors
+        .map(vec => {
+          const metadata = vec.metadata as ChunkMetadata;
+          return {
+            metadata,
+            index: metadata.chunkIndex
+          };
+        })
+        .sort((a, b) => a.index - b.index);
+  
+      const fullText = sortedVectors
+        .map(vec => vec.metadata.text)
+        .join('\n\n');
+  
+      return fullText;
+    } catch (err) {
+      ctx.logger.error('Error retrieving document by path %s: %o', path, err);
+      return '';
+    }
+  }
\ No newline at end of file
diff --git a/agent-docs/src/agents/doc-qa/types.ts b/agent-docs/src/agents/doc-qa/types.ts
index d198defd..e1d989d4 100644
--- a/agent-docs/src/agents/doc-qa/types.ts
+++ b/agent-docs/src/agents/doc-qa/types.ts
@@ -1,15 +1,25 @@
-export interface RelevantDoc {
-    path: string;
-    content: string;
-}
-
-export enum PromptType {
-  Normal = 'Normal',
-  Thinking = 'Thinking'
-}
-
-export interface PromptClassification {
-  type: PromptType;
-  confidence: number;
-  reasoning: string;
-}
\ No newline at end of file
+import { z } from 'zod';
+
+export const RelevantDocSchema = z.object({
+    path: z.string(),
+    content: z.string()
+});
+
+export const AnswerSchema = z.object({
+    answer: z.string(),
+    documents: z.array(z.string())
+});
+
+export const PromptTypeSchema = z.enum(['Normal', 'Thinking']);
+
+export const PromptClassificationSchema = z.object({
+    type: PromptTypeSchema,
+    confidence: z.number().min(0).max(1),
+    reasoning: z.string()
+});
+
+// Generated TypeScript types
+export type RelevantDoc = z.infer<typeof RelevantDocSchema>;
+export type Answer = z.infer<typeof AnswerSchema>;
+export type PromptType = z.infer<typeof PromptTypeSchema>;
+export type PromptClassification = z.infer<typeof PromptClassificationSchema>;
\ No newline at end of file

From 077c70cbb376e571d75ee4e000018aa157bb5dc8 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Thu, 26 Jun 2025 08:23:07 -0600
Subject: [PATCH 06/33] Add simple search dialog

---
 app/api/search/route.ts           |  91 +++++++++++++++-
 app/layout.tsx                    |   8 +-
 components/CustomSearchDialog.tsx | 169 ++++++++++++++++++++++++++++++
 3 files changed, 266 insertions(+), 2 deletions(-)
 create mode 100644 components/CustomSearchDialog.tsx

diff --git a/app/api/search/route.ts b/app/api/search/route.ts
index df889626..c78e1d30 100644
--- a/app/api/search/route.ts
+++ b/app/api/search/route.ts
@@ -1,4 +1,93 @@
 import { source } from '@/lib/source';
 import { createFromSource } from 'fumadocs-core/search/server';
+import { NextRequest } from 'next/server';
 
-export const { GET } = createFromSource(source);
+// Create the default search handler
+const { GET: defaultSearchHandler } = createFromSource(source);
+
+// Helper function to convert document path to URL
+function documentPathToUrl(docPath: string): string {
+  // Remove .mdx extension and convert to URL format
+  // "CLI/agent.mdx" -> "/CLI/agent"
+  return '/' + docPath.replace(/\.mdx?$/, '');
+}
+
+// Helper function to get document title from source
+function getDocumentTitle(docPath: string): string {
+  try {
+    // Convert path to URL format for source lookup
+    const urlPath = documentPathToUrl(docPath).substring(1).split('/'); // Remove leading slash and split
+    const page = source.getPage(urlPath);
+    return page?.data.title || docPath.replace(/\.mdx?$/, '').replace(/\//g, ' > ');
+  } catch {
+    // Fallback to formatted path if lookup fails
+    return docPath.replace(/\.mdx?$/, '').replace(/\//g, ' > ');
+  }
+}
+
+export async function GET(request: NextRequest) {
+  const { searchParams } = new URL(request.url);
+  console.log(request.url);
+  const query = searchParams.get('query');
+  console.log("query: " + query);
+  
+  // If no query, return empty results
+  if (!query || query.trim().length === 0) {
+    return Response.json([]);
+  }
+
+  try {
+    // Call your AI agent API
+    const response = await fetch('https://agentuity.ai/api/9ccc5545e93644bd9d7954e632a55a61', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': 'Bearer wht_843942568308430586ec1bc460245a8f',
+      },
+      body: JSON.stringify({ message: query }),
+    });
+
+    if (!response.ok) {
+      throw new Error(`Agent API error: ${response.status}`);
+    }
+
+    const data = await response.json();
+
+    const results = [];
+
+    // 1. Add the AI answer as the first result (most prominent)
+    if (data.answer) {
+      results.push({
+        id: `ai-answer-${Date.now()}`,
+        url: '#ai-answer', // Special marker for AI answers
+        title: `🤖 AI Answer`,
+        content: data.answer,
+        type: 'ai-answer' // Custom type for styling
+      });
+    }
+
+    // 2. Add related documents as clickable results
+    if (data.documents && Array.isArray(data.documents)) {
+      data.documents.forEach((docPath: string, index: number) => {
+        const url = documentPathToUrl(docPath);
+        const title = getDocumentTitle(docPath);
+        
+        results.push({
+          id: `doc-${Date.now()}-${index}`,
+          url: url,
+          title: `📄 ${title}`,
+          content: `Related documentation: ${title}`,
+          type: 'document' // Custom type for styling
+        });
+      });
+    }
+
+    return Response.json(results);
+
+  } catch (error) {
+    console.error('Error calling AI agent:', error);
+    
+    // Fallback to original Fumadocs search behavior if AI fails
+    return defaultSearchHandler(request);
+  }
+}
diff --git a/app/layout.tsx b/app/layout.tsx
index 3fea5030..b77f4892 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -2,6 +2,7 @@ import { RootProvider } from "fumadocs-ui/provider";
 import { GeistSans } from "geist/font/sans";
 import type { ReactNode } from "react";
 import type { Metadata } from 'next';
+import CustomSearchDialog from "@/components/CustomSearchDialog";
 import "./global.css";
 
 export const metadata: Metadata = {
@@ -82,7 +83,12 @@ export default function Layout({ children }: { children: ReactNode }) {
 	return (
 		<html lang="en" className={GeistSans.className} suppressHydrationWarning>
 			<body className="flex flex-col min-h-screen antialiased">
-				<RootProvider theme={{ enabled: true, enableSystem: true }}>
+				<RootProvider 
+					theme={{ enabled: true, enableSystem: true }}
+					search={{
+						SearchDialog: CustomSearchDialog
+					}}
+				>
 					{children}
 				</RootProvider>
 			</body>
diff --git a/components/CustomSearchDialog.tsx b/components/CustomSearchDialog.tsx
new file mode 100644
index 00000000..e89fe775
--- /dev/null
+++ b/components/CustomSearchDialog.tsx
@@ -0,0 +1,169 @@
+'use client';
+
+import { useState, useCallback } from 'react';
+import type { SharedProps } from 'fumadocs-ui/components/dialog/search';
+
+interface SearchResult {
+  id: string;
+  title: string;
+  content: string;
+  url?: string;
+  type?: 'ai-answer' | 'document' | 'default';
+}
+
+export default function CustomSearchDialog(props: SharedProps) {
+  const { open, onOpenChange } = props;
+  const [query, setQuery] = useState('');
+  const [results, setResults] = useState<SearchResult[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [hasSearched, setHasSearched] = useState(false);
+
+  // Perform search function
+  const performSearch = useCallback(async (searchQuery: string) => {
+    if (!searchQuery.trim()) {
+      setResults([]);
+      setHasSearched(false);
+      return;
+    }
+
+    setLoading(true);
+    setHasSearched(true);
+    const searchParams = new URLSearchParams({ query: searchQuery });
+    
+    try {
+      const response = await fetch(`/api/search?${searchParams}`);
+      const data: SearchResult[] = await response.json();
+      setResults(data || []);
+    } catch (error) {
+      console.error('Search error:', error);
+      setResults([]);
+    } finally {
+      setLoading(false);
+    }
+  }, []);
+
+  const handleInputChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+    setQuery(e.target.value);
+    // Reset search state when user starts typing again
+    if (hasSearched) {
+      setHasSearched(false);
+      setResults([]);
+    }
+  }, [hasSearched]);
+
+  const handleKeyDown = useCallback((e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === 'Enter') {
+      e.preventDefault();
+      performSearch(query);
+    }
+    if (e.key === 'Escape') {
+      onOpenChange(false);
+    }
+  }, [query, performSearch, onOpenChange]);
+
+  const handleResultClick = useCallback((result: SearchResult) => {
+    if (result.type === 'ai-answer') {
+      // For AI answers, keep dialog open for now (could copy to clipboard or show full answer)
+      return;
+    }
+    
+    if (result.url && result.url !== '#ai-answer') {
+      window.location.href = result.url;
+      onOpenChange(false);
+    }
+  }, [onOpenChange]);
+
+  const getResultStyles = (result: SearchResult) => {
+    const baseStyles = "p-3 rounded border-b border-gray-200 dark:border-gray-600 last:border-b-0";
+    
+    if (result.type === 'ai-answer') {
+      return `${baseStyles} bg-blue-50 dark:bg-blue-900/20 border-l-4 border-l-blue-500`;
+    }
+    
+    if (result.type === 'document') {
+      return `${baseStyles} hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer`;
+    }
+    
+    return `${baseStyles} hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer`;
+  };
+
+  if (!open) return null;
+
+  return (
+    <div className="fixed inset-0 z-50 bg-black/50" onClick={() => onOpenChange(false)}>
+      <div 
+        className="fixed left-1/2 top-1/2 w-full max-w-2xl -translate-x-1/2 -translate-y-1/2 bg-white dark:bg-gray-800 rounded-lg shadow-lg p-4 max-h-[80vh] flex flex-col"
+        onClick={(e) => e.stopPropagation()}
+      >
+        <input
+          type="search"
+          placeholder="Search documentation... (Press Enter to search)"
+          value={query}
+          onChange={handleInputChange}
+          onKeyDown={handleKeyDown}
+          className="w-full px-4 py-2 border rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:text-white"
+          autoFocus
+        />
+        
+        {loading && (
+          <div className="mt-4 text-center text-gray-500 py-8">
+            <div className="animate-spin w-6 h-6 border-2 border-blue-500 border-t-transparent rounded-full mx-auto mb-2"></div>
+            Searching...
+          </div>
+        )}
+        
+        {!loading && hasSearched && (
+          <div className="mt-4 flex-1 overflow-y-auto">
+            {results.length > 0 ? (
+              <div className="space-y-2">
+                {results.map((result) => (
+                  <div 
+                    key={result.id} 
+                    className={getResultStyles(result)}
+                    onClick={() => handleResultClick(result)}
+                  >
+                    <div className="font-medium text-gray-900 dark:text-white mb-1">
+                      {result.title}
+                    </div>
+                    <div className={`text-sm ${
+                      result.type === 'ai-answer' 
+                        ? 'text-gray-700 dark:text-gray-300 leading-relaxed' 
+                        : 'text-gray-600 dark:text-gray-400'
+                    }`}>
+                      {result.content}
+                    </div>
+                    {result.type === 'document' && (
+                      <div className="text-xs text-blue-600 dark:text-blue-400 mt-1 opacity-75">
+                        Click to open documentation →
+                      </div>
+                    )}
+                    {result.type === 'ai-answer' && (
+                      <div className="text-xs text-blue-600 dark:text-blue-400 mt-2 opacity-75">
+                        💡 AI-generated answer based on documentation
+                      </div>
+                    )}
+                  </div>
+                ))}
+              </div>
+            ) : (
+              <div className="text-center text-gray-500 py-8">
+                <div className="text-4xl mb-2">🔍</div>
+                No results found
+              </div>
+            )}
+          </div>
+        )}
+        
+        <div className="mt-4 text-xs text-gray-500 text-center border-t border-gray-200 dark:border-gray-600 pt-3">
+          {!hasSearched && query ? 'Press Enter to search' : 
+           hasSearched ? `${results.length} result(s) for "${query}"` :
+           'Type your search query and press Enter'}
+        </div>
+        
+        <div className="mt-2 text-xs text-gray-400 text-center">
+          Press <kbd className="px-1 py-0.5 bg-gray-200 dark:bg-gray-600 rounded">Enter</kbd> to search • <kbd className="px-1 py-0.5 bg-gray-200 dark:bg-gray-600 rounded">Esc</kbd> to close
+        </div>
+      </div>
+    </div>
+  );
+} 
\ No newline at end of file

From b3f39c95fc4da987bc2fbf83e7501b1e59d16bb7 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Fri, 27 Jun 2025 07:21:47 -0600
Subject: [PATCH 07/33] remove prompt type parsing

---
 agent-docs/src/agents/doc-qa/index.ts | 20 ++++++++--
 agent-docs/src/agents/doc-qa/rag.ts   | 55 +++++++++++++++++++++++++--
 2 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/agent-docs/src/agents/doc-qa/index.ts b/agent-docs/src/agents/doc-qa/index.ts
index a590b1ad..85d5665f 100644
--- a/agent-docs/src/agents/doc-qa/index.ts
+++ b/agent-docs/src/agents/doc-qa/index.ts
@@ -1,5 +1,4 @@
 import type { AgentContext, AgentRequest, AgentResponse } from '@agentuity/sdk';
-import { getPromptType } from './prompt';
 import answerQuestion from './rag';
 
 export default async function Agent(
@@ -7,9 +6,22 @@ export default async function Agent(
   resp: AgentResponse,
   ctx: AgentContext
 ) {
-  const prompt = await req.data.text();
-  const promptType = await getPromptType(ctx, prompt);
-  ctx.logger.info(`Receive user prompt with type: ${promptType}`);
+  let jsonRequest: any = null;
+  let prompt: string;
+
+  try {
+    jsonRequest = await req.data.json();
+    prompt = typeof jsonRequest === 'object' && jsonRequest !== null && 'message' in jsonRequest
+      ? jsonRequest.message
+      : JSON.stringify(jsonRequest);
+  } catch {
+    prompt = await req.data.text();
+  }
+
+  if (prompt === undefined || prompt === null) {
+    return resp.text("How can I help you?");
+  }
+
   const answer = await answerQuestion(ctx, prompt);
   return resp.json(answer);
 }
\ No newline at end of file
diff --git a/agent-docs/src/agents/doc-qa/rag.ts b/agent-docs/src/agents/doc-qa/rag.ts
index a8f33109..0157fa10 100644
--- a/agent-docs/src/agents/doc-qa/rag.ts
+++ b/agent-docs/src/agents/doc-qa/rag.ts
@@ -22,7 +22,12 @@ You are Agentuity's developer-documentation assistant.
 4. Answer style:
    • If the question can be answered unambiguously from a single workflow, give a short, direct answer.
    • Add an explanation only when the user explicitly asks for one.
-   • Show any code or CLI snippets in fenced Markdown blocks.
+   • Format your response in **MDX (Markdown Extended)** format with proper syntax highlighting for code blocks.
+   • Use appropriate headings (##, ###) to structure longer responses.
+   • Wrap CLI commands in \`\`\`bash code blocks for proper syntax highlighting.
+   • Wrap code snippets in appropriate language blocks (e.g., \`\`\`typescript, \`\`\`json, \`\`\`javascript).
+   • Use **bold** for important terms and *italic* for emphasis when appropriate.
+   • Use > blockquotes for important notes or warnings.
 5. You may suggest concise follow-up questions or related topics that are present in <DOCS>.
 6. Keep a neutral, factual tone.
 
@@ -30,12 +35,45 @@ You are Agentuity's developer-documentation assistant.
 Return **valid JSON only** matching this TypeScript type:
 
 type LlmAnswer = {
-  answer: string;        // The reply or the clarifying question
+  answer: string;        // The reply in MDX format or the clarifying question
   documents: string[];   // Paths of documents actually cited
 }
 
+The "answer" field should contain properly formatted MDX content that will render beautifully in a documentation site.
+
 If you cited no documents, return an empty array. Do NOT wrap the JSON in Markdown or add any extra keys.
 
+=== MDX FORMATTING EXAMPLES ===
+For CLI commands:
+\`\`\`bash
+agentuity agent create my-agent "My agent description" bearer
+\`\`\`
+
+For code examples:
+\`\`\`typescript
+import type { AgentRequest, AgentResponse, AgentContext } from "@agentuity/sdk";
+
+export default async function Agent(req: AgentRequest, resp: AgentResponse, ctx: AgentContext) {
+    return resp.json({hello: 'world'});
+}
+\`\`\`
+
+For structured responses:
+## Creating a New Agent
+
+To create a new agent, use the CLI command:
+
+\`\`\`bash
+agentuity agent create [name] [description] [auth_type]
+\`\`\`
+
+**Parameters:**
+- \`name\`: The agent name
+- \`description\`: Agent description  
+- \`auth_type\`: Either \`bearer\` or \`none\`
+
+> **Note**: This command will create the agent in the Agentuity Cloud and set up local files.
+
 <QUESTION>
 ${prompt}
 </QUESTION>
@@ -57,9 +95,18 @@ ${JSON.stringify(relevantDocs, null, 2)}
     } catch (error) {
         ctx.logger.error('Error generating answer: %o', error);
 
-        // Fallback response
+        // Fallback response with MDX formatting
         const fallbackAnswer: Answer = {
-            answer: "I apologize, but I encountered an error while processing your question. Please try again or rephrase your question.",
+            answer: `## Error
+
+I apologize, but I encountered an error while processing your question. 
+
+**Please try:**
+- Rephrasing your question
+- Being more specific about what you're looking for
+- Checking if your question relates to Agentuity's documented features
+
+> If the problem persists, please contact support.`,
             documents: []
         };
 

From 6a34d9878b063a905da575a28fb9f383a7b0559d Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Fri, 27 Jun 2025 08:11:59 -0600
Subject: [PATCH 08/33] properly rendering Markdown and retrieved documents

---
 app/api/search/route.ts           | 148 ++++++++++++++++++++--------
 components/CustomSearchDialog.tsx | 156 +++++++++++++-----------------
 package-lock.json                 |  56 ++++++++++-
 package.json                      |   3 +
 4 files changed, 233 insertions(+), 130 deletions(-)

diff --git a/app/api/search/route.ts b/app/api/search/route.ts
index c78e1d30..e398d730 100644
--- a/app/api/search/route.ts
+++ b/app/api/search/route.ts
@@ -5,89 +5,161 @@ import { NextRequest } from 'next/server';
 // Create the default search handler
 const { GET: defaultSearchHandler } = createFromSource(source);
 
-// Helper function to convert document path to URL
 function documentPathToUrl(docPath: string): string {
-  // Remove .mdx extension and convert to URL format
-  // "CLI/agent.mdx" -> "/CLI/agent"
   return '/' + docPath.replace(/\.mdx?$/, '');
 }
 
-// Helper function to get document title from source
-function getDocumentTitle(docPath: string): string {
+// Helper function to get document title and description from source
+function getDocumentMetadata(docPath: string): { title: string; description?: string } {
   try {
-    // Convert path to URL format for source lookup
-    const urlPath = documentPathToUrl(docPath).substring(1).split('/'); // Remove leading slash and split
+    const urlPath = documentPathToUrl(docPath).substring(1).split('/');
     const page = source.getPage(urlPath);
-    return page?.data.title || docPath.replace(/\.mdx?$/, '').replace(/\//g, ' > ');
+    
+    if (page?.data) {
+      return {
+        title: page.data.title || formatPathAsTitle(docPath),
+        description: page.data.description
+      };
+    }
+  } catch (error) {
+    console.warn(`Failed to get metadata for ${docPath}:`, error);
+  }
+  
+  return { title: formatPathAsTitle(docPath) };
+}
+
+function formatPathAsTitle(docPath: string): string {
+  return docPath
+    .replace(/\.mdx?$/, '')
+    .split('/')
+    .map(segment => segment.charAt(0).toUpperCase() + segment.slice(1))
+    .join(' > ');
+}
+
+function getDocumentSnippet(docPath: string, maxLength: number = 150): string {
+  try {
+    const urlPath = documentPathToUrl(docPath).substring(1).split('/');
+    const page = source.getPage(urlPath);
+    
+    if (page?.data.description) {
+      return page.data.description.length > maxLength 
+        ? page.data.description.substring(0, maxLength) + '...'
+        : page.data.description;
+    }
+    
+    // Fallback description based on path
+    const pathParts = docPath.replace(/\.mdx?$/, '').split('/');
+    const section = pathParts[0];
+    const topic = pathParts[pathParts.length - 1];
+    
+    return `Learn about ${topic} in the ${section} section of our documentation.`;
   } catch {
-    // Fallback to formatted path if lookup fails
-    return docPath.replace(/\.mdx?$/, '').replace(/\//g, ' > ');
+    return `Documentation for ${formatPathAsTitle(docPath)}`;
   }
 }
 
 export async function GET(request: NextRequest) {
   const { searchParams } = new URL(request.url);
-  console.log(request.url);
   const query = searchParams.get('query');
-  console.log("query: " + query);
-  
+   
   // If no query, return empty results
   if (!query || query.trim().length === 0) {
     return Response.json([]);
   }
 
   try {
-    // Call your AI agent API
-    const response = await fetch('https://agentuity.ai/api/9ccc5545e93644bd9d7954e632a55a61', {
+    const response = await fetch('http://127.0.0.1:3500/agent_9ccc5545e93644bd9d7954e632a55a61', {
       method: 'POST',
       headers: {
-        'Content-Type': 'application/json',
-        'Authorization': 'Bearer wht_843942568308430586ec1bc460245a8f',
+        'Content-Type': 'application/json'
       },
       body: JSON.stringify({ message: query }),
     });
 
     if (!response.ok) {
-      throw new Error(`Agent API error: ${response.status}`);
+      throw new Error(`Agent API error: ${response.status} ${response.statusText}`);
     }
 
     const data = await response.json();
-
     const results = [];
 
-    // 1. Add the AI answer as the first result (most prominent)
-    if (data.answer) {
+    if (data.answer && data.answer.trim()) {
       results.push({
         id: `ai-answer-${Date.now()}`,
-        url: '#ai-answer', // Special marker for AI answers
-        title: `🤖 AI Answer`,
-        content: data.answer,
-        type: 'ai-answer' // Custom type for styling
+        url: '#ai-answer',
+        title: 'AI Answer',
+        content: data.answer.trim(),
+        type: 'ai-answer'
       });
     }
 
     // 2. Add related documents as clickable results
-    if (data.documents && Array.isArray(data.documents)) {
-      data.documents.forEach((docPath: string, index: number) => {
-        const url = documentPathToUrl(docPath);
-        const title = getDocumentTitle(docPath);
-        
-        results.push({
-          id: `doc-${Date.now()}-${index}`,
-          url: url,
-          title: `📄 ${title}`,
-          content: `Related documentation: ${title}`,
-          type: 'document' // Custom type for styling
-        });
+    if (data.documents && Array.isArray(data.documents) && data.documents.length > 0) {
+      const uniqueDocuments = [...new Set(data.documents as string[])];
+      
+      uniqueDocuments.forEach((docPath: string, index: number) => {
+        try {
+          const url = documentPathToUrl(docPath);
+          const metadata = getDocumentMetadata(docPath);
+          const snippet = getDocumentSnippet(docPath);
+          
+          results.push({
+            id: `doc-${Date.now()}-${index}`,
+            url: url,
+            title: metadata.title,
+            content: snippet,
+            type: 'document'
+          });
+        } catch (error) {
+          console.warn(`Failed to process document ${docPath}:`, error);
+        }
       });
     }
 
+    console.log('Returning results:', results.length, 'items');
     return Response.json(results);
 
   } catch (error) {
     console.error('Error calling AI agent:', error);
     
     // Fallback to original Fumadocs search behavior if AI fails
-    return defaultSearchHandler(request);
+    console.log('Falling back to default search');
+    try {
+      const fallbackResponse = await defaultSearchHandler(request);
+      const fallbackData = await fallbackResponse.json();
+      
+      // Add a note that this is fallback search
+      if (Array.isArray(fallbackData) && fallbackData.length > 0) {
+        return Response.json([
+          {
+            id: 'fallback-notice',
+            url: '#fallback',
+            title: '⚠️ AI Search Unavailable',
+            content: 'AI search is temporarily unavailable. Showing traditional search results below.',
+            type: 'ai-answer'
+          },
+          ...fallbackData.map((item: Record<string, unknown>, index: number) => ({
+            ...item,
+            id: `fallback-${index}`,
+            type: 'document'
+          }))
+        ]);
+      }
+      
+      return fallbackResponse;
+    } catch (fallbackError) {
+      console.error('Fallback search also failed:', fallbackError);
+      
+      // Return error message as AI answer
+      return Response.json([
+        {
+          id: 'error-notice',
+          url: '#error',
+          title: '❌ Search Error',
+          content: 'Search is temporarily unavailable. Please try again later or check our documentation directly.',
+          type: 'ai-answer'
+        }
+      ]);
+    }
   }
 }
diff --git a/components/CustomSearchDialog.tsx b/components/CustomSearchDialog.tsx
index e89fe775..a1ded471 100644
--- a/components/CustomSearchDialog.tsx
+++ b/components/CustomSearchDialog.tsx
@@ -1,6 +1,9 @@
 'use client';
 
 import { useState, useCallback } from 'react';
+import { Command } from 'cmdk';
+import ReactMarkdown from 'react-markdown';
+import remarkGfm from 'remark-gfm';
 import type { SharedProps } from 'fumadocs-ui/components/dialog/search';
 
 interface SearchResult {
@@ -16,18 +19,15 @@ export default function CustomSearchDialog(props: SharedProps) {
   const [query, setQuery] = useState('');
   const [results, setResults] = useState<SearchResult[]>([]);
   const [loading, setLoading] = useState(false);
-  const [hasSearched, setHasSearched] = useState(false);
 
   // Perform search function
   const performSearch = useCallback(async (searchQuery: string) => {
     if (!searchQuery.trim()) {
       setResults([]);
-      setHasSearched(false);
       return;
     }
 
     setLoading(true);
-    setHasSearched(true);
     const searchParams = new URLSearchParams({ query: searchQuery });
     
     try {
@@ -42,98 +42,81 @@ export default function CustomSearchDialog(props: SharedProps) {
     }
   }, []);
 
-  const handleInputChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
-    setQuery(e.target.value);
-    // Reset search state when user starts typing again
-    if (hasSearched) {
-      setHasSearched(false);
-      setResults([]);
-    }
-  }, [hasSearched]);
-
   const handleKeyDown = useCallback((e: React.KeyboardEvent<HTMLInputElement>) => {
     if (e.key === 'Enter') {
       e.preventDefault();
       performSearch(query);
     }
-    if (e.key === 'Escape') {
-      onOpenChange(false);
-    }
-  }, [query, performSearch, onOpenChange]);
+  }, [query, performSearch]);
 
+  // Handle clicking on document results
   const handleResultClick = useCallback((result: SearchResult) => {
-    if (result.type === 'ai-answer') {
-      // For AI answers, keep dialog open for now (could copy to clipboard or show full answer)
-      return;
-    }
-    
-    if (result.url && result.url !== '#ai-answer') {
+    if (result.type === 'document' && result.url && result.url !== '#ai-answer') {
+      // Navigate to the document and close the dialog
       window.location.href = result.url;
       onOpenChange(false);
     }
-  }, [onOpenChange]);
 
-  const getResultStyles = (result: SearchResult) => {
-    const baseStyles = "p-3 rounded border-b border-gray-200 dark:border-gray-600 last:border-b-0";
-    
-    if (result.type === 'ai-answer') {
-      return `${baseStyles} bg-blue-50 dark:bg-blue-900/20 border-l-4 border-l-blue-500`;
-    }
-    
-    if (result.type === 'document') {
-      return `${baseStyles} hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer`;
-    }
-    
-    return `${baseStyles} hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer`;
-  };
+  }, [onOpenChange]);
 
   if (!open) return null;
 
   return (
-    <div className="fixed inset-0 z-50 bg-black/50" onClick={() => onOpenChange(false)}>
-      <div 
-        className="fixed left-1/2 top-1/2 w-full max-w-2xl -translate-x-1/2 -translate-y-1/2 bg-white dark:bg-gray-800 rounded-lg shadow-lg p-4 max-h-[80vh] flex flex-col"
-        onClick={(e) => e.stopPropagation()}
-      >
-        <input
-          type="search"
-          placeholder="Search documentation... (Press Enter to search)"
-          value={query}
-          onChange={handleInputChange}
-          onKeyDown={handleKeyDown}
-          className="w-full px-4 py-2 border rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:text-white"
-          autoFocus
-        />
-        
-        {loading && (
-          <div className="mt-4 text-center text-gray-500 py-8">
-            <div className="animate-spin w-6 h-6 border-2 border-blue-500 border-t-transparent rounded-full mx-auto mb-2"></div>
-            Searching...
-          </div>
-        )}
-        
-        {!loading && hasSearched && (
-          <div className="mt-4 flex-1 overflow-y-auto">
-            {results.length > 0 ? (
+    <Command.Dialog open={open} onOpenChange={onOpenChange} label="Search Documentation">
+      <div className="fixed inset-0 z-50 bg-black/50">
+        <div className="fixed left-1/2 top-1/2 w-full max-w-2xl -translate-x-1/2 -translate-y-1/2 bg-white dark:bg-gray-800 rounded-lg shadow-lg p-4 max-h-[80vh] flex flex-col">
+          <h2 className="sr-only">Search Documentation</h2>
+          
+          <Command.Input
+            value={query}
+            onValueChange={setQuery}
+            onKeyDown={handleKeyDown}
+            placeholder="Search documentation..."
+            className="w-full px-4 py-2 border rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:text-white"
+            autoFocus
+          />
+          
+          {loading && (
+            <div className="mt-4 text-center text-gray-500 py-8">
+              <div className="animate-spin w-6 h-6 border-2 border-blue-500 border-t-transparent rounded-full mx-auto mb-2"></div>
+              Searching...
+            </div>
+          )}
+
+          {!loading && results.length > 0 && (
+            <div className="mt-4 flex-1 overflow-y-auto">
               <div className="space-y-2">
                 {results.map((result) => (
                   <div 
                     key={result.id} 
-                    className={getResultStyles(result)}
+                    className={`p-3 border border-gray-200 dark:border-gray-600 rounded ${
+                      result.type === 'document' 
+                        ? 'cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-700 hover:border-blue-300 dark:hover:border-blue-600 transition-colors' 
+                        : 'bg-blue-50 dark:bg-blue-900/20 border-l-4 border-l-blue-500'
+                    }`}
                     onClick={() => handleResultClick(result)}
                   >
-                    <div className="font-medium text-gray-900 dark:text-white mb-1">
-                      {result.title}
-                    </div>
-                    <div className={`text-sm ${
-                      result.type === 'ai-answer' 
-                        ? 'text-gray-700 dark:text-gray-300 leading-relaxed' 
-                        : 'text-gray-600 dark:text-gray-400'
-                    }`}>
-                      {result.content}
+                    <div className="font-medium text-gray-900 dark:text-white mb-2 flex items-center justify-between">
+                      <span>{result.title}</span>
+                      {result.type === 'document' && (
+                        <svg className="w-4 h-4 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14" />
+                        </svg>
+                      )}
                     </div>
+                    {result.type === 'ai-answer' ? (
+                      <div className="text-sm text-gray-700 dark:text-gray-300 prose prose-sm max-w-none dark:prose-invert">
+                        <ReactMarkdown remarkPlugins={[remarkGfm]}>
+                          {result.content}
+                        </ReactMarkdown>
+                      </div>
+                    ) : (
+                      <div className="text-sm text-gray-600 dark:text-gray-400">
+                        {result.content}
+                      </div>
+                    )}
                     {result.type === 'document' && (
-                      <div className="text-xs text-blue-600 dark:text-blue-400 mt-1 opacity-75">
+                      <div className="text-xs text-blue-600 dark:text-blue-400 mt-2 opacity-75">
                         Click to open documentation →
                       </div>
                     )}
@@ -145,25 +128,20 @@ export default function CustomSearchDialog(props: SharedProps) {
                   </div>
                 ))}
               </div>
-            ) : (
-              <div className="text-center text-gray-500 py-8">
-                <div className="text-4xl mb-2">🔍</div>
-                No results found
-              </div>
-            )}
+            </div>
+          )}
+          
+          {!loading && results.length === 0 && query && (
+            <div className="mt-4 text-center text-gray-500 py-8">
+              No results found for "{query}"
+            </div>
+          )}
+          
+          <div className="mt-4 text-xs text-gray-500 text-center border-t border-gray-200 dark:border-gray-600 pt-3">
+            {query ? 'Press Enter to search' : 'Type your search query and press Enter'}
           </div>
-        )}
-        
-        <div className="mt-4 text-xs text-gray-500 text-center border-t border-gray-200 dark:border-gray-600 pt-3">
-          {!hasSearched && query ? 'Press Enter to search' : 
-           hasSearched ? `${results.length} result(s) for "${query}"` :
-           'Type your search query and press Enter'}
-        </div>
-        
-        <div className="mt-2 text-xs text-gray-400 text-center">
-          Press <kbd className="px-1 py-0.5 bg-gray-200 dark:bg-gray-600 rounded">Enter</kbd> to search • <kbd className="px-1 py-0.5 bg-gray-200 dark:bg-gray-600 rounded">Esc</kbd> to close
         </div>
       </div>
-    </div>
+    </Command.Dialog>
   );
 } 
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 9d915505..f4eb3eee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
 			"version": "1.0.0",
 			"hasInstallScript": true,
 			"dependencies": {
+				"cmdk": "^1.1.1",
 				"fumadocs-core": "15.2.6",
 				"fumadocs-mdx": "11.5.8",
 				"fumadocs-twoslash": "^3.1.0",
@@ -19,6 +20,8 @@
 				"next": "15.3.0",
 				"react": "^19.0.0",
 				"react-dom": "^19.0.0",
+				"react-markdown": "^10.1.0",
+				"remark-gfm": "^4.0.1",
 				"twoslash": "^0.3.1"
 			},
 			"devDependencies": {
@@ -12858,7 +12861,6 @@
 			"version": "19.0.10",
 			"resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.10.tgz",
 			"integrity": "sha512-JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g==",
-			"devOptional": true,
 			"license": "MIT",
 			"dependencies": {
 				"csstype": "^3.0.2"
@@ -13858,6 +13860,21 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/cmdk": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.1.1.tgz",
+			"integrity": "sha512-Vsv7kFaXm+ptHDMZ7izaRsP70GgrW9NBNGswt9OZaVBLlE0SNpDq8eu/VGXyF9r7M0azK3Wy7OlYXsuyYLFzHg==",
+			"dependencies": {
+				"@radix-ui/react-compose-refs": "^1.1.1",
+				"@radix-ui/react-dialog": "^1.1.6",
+				"@radix-ui/react-id": "^1.1.0",
+				"@radix-ui/react-primitive": "^2.0.2"
+			},
+			"peerDependencies": {
+				"react": "^18 || ^19 || ^19.0.0-rc",
+				"react-dom": "^18 || ^19 || ^19.0.0-rc"
+			}
+		},
 		"node_modules/collapse-white-space": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-2.1.0.tgz",
@@ -14034,7 +14051,6 @@
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
 			"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-			"devOptional": true,
 			"license": "MIT"
 		},
 		"node_modules/cytoscape": {
@@ -16837,6 +16853,15 @@
 				"url": "https://opencollective.com/unified"
 			}
 		},
+		"node_modules/html-url-attributes": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/html-url-attributes/-/html-url-attributes-3.0.1.tgz",
+			"integrity": "sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ==",
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			}
+		},
 		"node_modules/html-void-elements": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz",
@@ -20672,6 +20697,32 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/react-markdown": {
+			"version": "10.1.0",
+			"resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-10.1.0.tgz",
+			"integrity": "sha512-qKxVopLT/TyA6BX3Ue5NwabOsAzm0Q7kAPwq6L+wWDwisYs7R8vZ0nRXqq6rkueboxpkjvLGU9fWifiX/ZZFxQ==",
+			"dependencies": {
+				"@types/hast": "^3.0.0",
+				"@types/mdast": "^4.0.0",
+				"devlop": "^1.0.0",
+				"hast-util-to-jsx-runtime": "^2.0.0",
+				"html-url-attributes": "^3.0.0",
+				"mdast-util-to-hast": "^13.0.0",
+				"remark-parse": "^11.0.0",
+				"remark-rehype": "^11.0.0",
+				"unified": "^11.0.0",
+				"unist-util-visit": "^5.0.0",
+				"vfile": "^6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/unified"
+			},
+			"peerDependencies": {
+				"@types/react": ">=18",
+				"react": ">=18"
+			}
+		},
 		"node_modules/react-medium-image-zoom": {
 			"version": "5.2.14",
 			"resolved": "https://registry.npmjs.org/react-medium-image-zoom/-/react-medium-image-zoom-5.2.14.tgz",
@@ -20937,7 +20988,6 @@
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-4.0.1.tgz",
 			"integrity": "sha512-1quofZ2RQ9EWdeN34S79+KExV1764+wCUGop5CPL1WGdD0ocPpu91lzPGbwWMECpEpd42kJGQwzRfyov9j4yNg==",
-			"license": "MIT",
 			"dependencies": {
 				"@types/mdast": "^4.0.0",
 				"mdast-util-gfm": "^3.0.0",
diff --git a/package.json b/package.json
index cd150234..40ceaba8 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
 		"cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts"
 	},
 	"dependencies": {
+		"cmdk": "^1.1.1",
 		"fumadocs-core": "15.2.6",
 		"fumadocs-mdx": "11.5.8",
 		"fumadocs-twoslash": "^3.1.0",
@@ -24,6 +25,8 @@
 		"next": "15.3.0",
 		"react": "^19.0.0",
 		"react-dom": "^19.0.0",
+		"react-markdown": "^10.1.0",
+		"remark-gfm": "^4.0.1",
 		"twoslash": "^0.3.1"
 	},
 	"devDependencies": {

From 557fee02c9c27d54bd8785c690f2c64794b6152c Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Fri, 27 Jun 2025 08:54:46 -0600
Subject: [PATCH 09/33] Facelift for AI search dialog

---
 components/CustomSearchDialog.tsx  | 383 ++++++++++++++++++++++-------
 components/icons/AgentuityLogo.tsx |  30 +++
 2 files changed, 325 insertions(+), 88 deletions(-)
 create mode 100644 components/icons/AgentuityLogo.tsx

diff --git a/components/CustomSearchDialog.tsx b/components/CustomSearchDialog.tsx
index a1ded471..f337485b 100644
--- a/components/CustomSearchDialog.tsx
+++ b/components/CustomSearchDialog.tsx
@@ -1,11 +1,34 @@
 'use client';
 
-import { useState, useCallback } from 'react';
+import { useState, useCallback, useRef, useEffect } from 'react';
 import { Command } from 'cmdk';
 import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
+import { 
+  X, 
+  Send, 
+  RotateCcw, 
+  Trash2, 
+  User, 
+  HelpCircle,
+  Loader2
+} from 'lucide-react';
+import { AgentuityLogo } from './icons/AgentuityLogo';
 import type { SharedProps } from 'fumadocs-ui/components/dialog/search';
 
+interface Message {
+  id: string;
+  type: 'user' | 'ai';
+  content: string;
+  timestamp: Date;
+  sources?: Array<{
+    id: string;
+    title: string;
+    url: string;
+    content: string;
+  }>;
+}
+
 interface SearchResult {
   id: string;
   title: string;
@@ -14,131 +37,315 @@ interface SearchResult {
   type?: 'ai-answer' | 'document' | 'default';
 }
 
+const STORAGE_KEY = 'agentuity-search-history';
+
 export default function CustomSearchDialog(props: SharedProps) {
   const { open, onOpenChange } = props;
-  const [query, setQuery] = useState('');
-  const [results, setResults] = useState<SearchResult[]>([]);
+  const [messages, setMessages] = useState<Message[]>([]);
+  const [currentInput, setCurrentInput] = useState('');
   const [loading, setLoading] = useState(false);
+  const messagesEndRef = useRef<HTMLDivElement>(null);
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  // Load messages from localStorage on mount
+  useEffect(() => {
+    try {
+      const saved = localStorage.getItem(STORAGE_KEY);
+      if (saved) {
+        const parsed = JSON.parse(saved);
+        // Convert timestamp strings back to Date objects
+        const messagesWithDates = parsed.map((msg: any) => ({
+          ...msg,
+          timestamp: new Date(msg.timestamp)
+        }));
+        setMessages(messagesWithDates);
+      }
+    } catch (error) {
+      console.warn('Failed to load chat history:', error);
+    }
+  }, []);
+
+  // Save messages to localStorage whenever messages change
+  useEffect(() => {
+    try {
+      localStorage.setItem(STORAGE_KEY, JSON.stringify(messages));
+    } catch (error) {
+      console.warn('Failed to save chat history:', error);
+    }
+  }, [messages]);
 
-  // Perform search function
-  const performSearch = useCallback(async (searchQuery: string) => {
-    if (!searchQuery.trim()) {
-      setResults([]);
-      return;
+  // Auto-scroll to bottom when new messages arrive
+  useEffect(() => {
+    messagesEndRef.current?.scrollIntoView({ behavior: 'smooth' });
+  }, [messages]);
+
+  // Focus input when dialog opens
+  useEffect(() => {
+    if (open) {
+      setTimeout(() => inputRef.current?.focus(), 100);
     }
+  }, [open]);
+
+  // Send message function
+  const sendMessage = useCallback(async (query: string) => {
+    if (!query.trim()) return;
 
+    // Add user message
+    const userMessage: Message = {
+      id: `user-${Date.now()}`,
+      type: 'user',
+      content: query.trim(),
+      timestamp: new Date()
+    };
+
+    setMessages(prev => [...prev, userMessage]);
+    setCurrentInput('');
     setLoading(true);
-    const searchParams = new URLSearchParams({ query: searchQuery });
-    
+
     try {
+      const searchParams = new URLSearchParams({ query: query.trim() });
       const response = await fetch(`/api/search?${searchParams}`);
       const data: SearchResult[] = await response.json();
-      setResults(data || []);
+
+      // Find AI answer and documents
+      const aiAnswer = data.find(result => result.type === 'ai-answer');
+      const documents = data.filter(result => result.type === 'document');
+
+      if (aiAnswer) {
+        const aiMessage: Message = {
+          id: `ai-${Date.now()}`,
+          type: 'ai',
+          content: aiAnswer.content,
+          timestamp: new Date(),
+          sources: documents.length > 0 ? documents.map(doc => ({
+            id: doc.id,
+            title: doc.title,
+            url: doc.url || '#',
+            content: doc.content
+          })) : undefined
+        };
+
+        setMessages(prev => [...prev, aiMessage]);
+      } else {
+        // Fallback if no AI answer
+        const fallbackMessage: Message = {
+          id: `ai-${Date.now()}`,
+          type: 'ai',
+          content: 'I couldn\'t find a relevant answer to your question. Please try rephrasing or check our documentation directly.',
+          timestamp: new Date()
+        };
+        setMessages(prev => [...prev, fallbackMessage]);
+      }
     } catch (error) {
       console.error('Search error:', error);
-      setResults([]);
+      const errorMessage: Message = {
+        id: `ai-${Date.now()}`,
+        type: 'ai',
+        content: 'Sorry, I encountered an error while searching. Please try again.',
+        timestamp: new Date()
+      };
+      setMessages(prev => [...prev, errorMessage]);
     } finally {
       setLoading(false);
     }
   }, []);
 
   const handleKeyDown = useCallback((e: React.KeyboardEvent<HTMLInputElement>) => {
-    if (e.key === 'Enter') {
+    if (e.key === 'Enter' && !e.shiftKey) {
       e.preventDefault();
-      performSearch(query);
+      sendMessage(currentInput);
     }
-  }, [query, performSearch]);
-
-  // Handle clicking on document results
-  const handleResultClick = useCallback((result: SearchResult) => {
-    if (result.type === 'document' && result.url && result.url !== '#ai-answer') {
-      // Navigate to the document and close the dialog
-      window.location.href = result.url;
+    if (e.key === 'Escape') {
       onOpenChange(false);
     }
+  }, [currentInput, sendMessage, onOpenChange]);
+
+  const handleRetry = useCallback(() => {
+    const lastUserMessage = [...messages].reverse().find(m => m.type === 'user');
+    if (lastUserMessage) {
+      sendMessage(lastUserMessage.content);
+    }
+  }, [messages, sendMessage]);
 
-  }, [onOpenChange]);
+  const handleClear = useCallback(() => {
+    setMessages([]);
+    setCurrentInput('');
+    // Also clear from localStorage
+    try {
+      localStorage.removeItem(STORAGE_KEY);
+    } catch (error) {
+      console.warn('Failed to clear chat history:', error);
+    }
+  }, []);
+
+  const handleSourceClick = useCallback((url: string) => {
+    if (url && url !== '#') {
+      window.open(url, '_blank');
+    }
+  }, []);
 
   if (!open) return null;
 
   return (
-    <Command.Dialog open={open} onOpenChange={onOpenChange} label="Search Documentation">
-      <div className="fixed inset-0 z-50 bg-black/50">
-        <div className="fixed left-1/2 top-1/2 w-full max-w-2xl -translate-x-1/2 -translate-y-1/2 bg-white dark:bg-gray-800 rounded-lg shadow-lg p-4 max-h-[80vh] flex flex-col">
-          <h2 className="sr-only">Search Documentation</h2>
+    <Command.Dialog open={open} onOpenChange={onOpenChange} label="Search with Agentuity AI">
+      <div className="fixed inset-0 z-50 bg-black/30">
+        <div className="fixed left-1/2 top-1/2 w-full max-w-3xl h-[75vh] -translate-x-1/2 -translate-y-1/2 bg-white dark:bg-gray-900 rounded-xl shadow-lg border border-gray-100 dark:border-gray-800 flex flex-col">
           
-          <Command.Input
-            value={query}
-            onValueChange={setQuery}
-            onKeyDown={handleKeyDown}
-            placeholder="Search documentation..."
-            className="w-full px-4 py-2 border rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:text-white"
-            autoFocus
-          />
-          
-          {loading && (
-            <div className="mt-4 text-center text-gray-500 py-8">
-              <div className="animate-spin w-6 h-6 border-2 border-blue-500 border-t-transparent rounded-full mx-auto mb-2"></div>
-              Searching...
+          {/* Header */}
+          <div className="flex items-center justify-between p-5 border-b border-gray-50 dark:border-gray-800">
+            <div className="flex items-center gap-3">
+              <div className="w-7 h-7 bg-gradient-to-br from-gray-100 to-gray-200 dark:from-gray-700 dark:to-gray-800 rounded-lg flex items-center justify-center">
+                <AgentuityLogo className="w-4 h-4 text-gray-600 dark:text-gray-400" />
+              </div>
+              <div>
+                <h2 className="text-base font-medium text-gray-800 dark:text-gray-200">Search Documentation</h2>
+                <p className="text-xs text-gray-500 dark:text-gray-500">Ask questions about Agentuity</p>
+              </div>
             </div>
-          )}
-
-          {!loading && results.length > 0 && (
-            <div className="mt-4 flex-1 overflow-y-auto">
-              <div className="space-y-2">
-                {results.map((result) => (
-                  <div 
-                    key={result.id} 
-                    className={`p-3 border border-gray-200 dark:border-gray-600 rounded ${
-                      result.type === 'document' 
-                        ? 'cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-700 hover:border-blue-300 dark:hover:border-blue-600 transition-colors' 
-                        : 'bg-blue-50 dark:bg-blue-900/20 border-l-4 border-l-blue-500'
-                    }`}
-                    onClick={() => handleResultClick(result)}
-                  >
-                    <div className="font-medium text-gray-900 dark:text-white mb-2 flex items-center justify-between">
-                      <span>{result.title}</span>
-                      {result.type === 'document' && (
-                        <svg className="w-4 h-4 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14" />
-                        </svg>
-                      )}
-                    </div>
-                    {result.type === 'ai-answer' ? (
-                      <div className="text-sm text-gray-700 dark:text-gray-300 prose prose-sm max-w-none dark:prose-invert">
+            <button
+              onClick={() => onOpenChange(false)}
+              className="p-1.5 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 rounded-md hover:bg-gray-50 dark:hover:bg-gray-800 transition-colors"
+            >
+              <X className="w-4 h-4" />
+            </button>
+          </div>
+
+          {/* Messages Area */}
+          <div className="flex-1 overflow-y-auto p-5 space-y-6">
+            {messages.length === 0 && (
+              <div className="text-center py-16">
+                <div className="w-12 h-12 bg-gray-50 dark:bg-gray-800 rounded-full flex items-center justify-center mx-auto mb-3">
+                  <HelpCircle className="w-6 h-6 text-gray-400" />
+                </div>
+                <h3 className="text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Ask a question</h3>
+                <p className="text-xs text-gray-500 dark:text-gray-500 max-w-sm mx-auto leading-relaxed">
+                  Search our documentation or ask about Agentuity features
+                </p>
+              </div>
+            )}
+
+            {messages.map((message) => (
+              <div key={message.id} className={`flex gap-3 ${message.type === 'user' ? 'justify-end' : 'justify-start'}`}>
+                {message.type === 'ai' && (
+                  <div className="w-6 h-6 bg-gray-50 dark:bg-gray-800 rounded-full flex items-center justify-center flex-shrink-0 mt-0.5">
+                    <AgentuityLogo className="w-3 h-3 text-gray-500 dark:text-gray-400" />
+                  </div>
+                )}
+
+                <div className={`max-w-[85%] ${message.type === 'user' ? 'order-last' : ''}`}>
+                  <div className={`rounded-lg px-3 py-2 ${
+                    message.type === 'user' 
+                      ? 'bg-gray-100 dark:bg-gray-800 text-gray-800 dark:text-gray-200 ml-auto' 
+                      : 'bg-gray-50 dark:bg-gray-900 text-gray-700 dark:text-gray-300'
+                  }`}>
+                    {message.type === 'ai' ? (
+                      <div className="prose prose-sm max-w-none dark:prose-invert prose-gray text-sm">
                         <ReactMarkdown remarkPlugins={[remarkGfm]}>
-                          {result.content}
+                          {message.content}
                         </ReactMarkdown>
                       </div>
                     ) : (
-                      <div className="text-sm text-gray-600 dark:text-gray-400">
-                        {result.content}
-                      </div>
-                    )}
-                    {result.type === 'document' && (
-                      <div className="text-xs text-blue-600 dark:text-blue-400 mt-2 opacity-75">
-                        Click to open documentation →
-                      </div>
-                    )}
-                    {result.type === 'ai-answer' && (
-                      <div className="text-xs text-blue-600 dark:text-blue-400 mt-2 opacity-75">
-                        💡 AI-generated answer based on documentation
-                      </div>
+                      <p className="text-sm">{message.content}</p>
                     )}
                   </div>
-                ))}
+
+                  {/* Sources for AI messages */}
+                  {message.type === 'ai' && message.sources && message.sources.length > 0 && (
+                    <div className="mt-2 space-y-1">
+                      <p className="text-xs text-gray-400 dark:text-gray-500 font-medium">Related:</p>
+                      {message.sources.map((source) => (
+                        <button
+                          key={source.id}
+                          onClick={() => handleSourceClick(source.url)}
+                          className="block w-full text-left p-2 text-xs bg-white dark:bg-gray-800 hover:bg-gray-50 dark:hover:bg-gray-700 rounded border border-gray-100 dark:border-gray-700 transition-colors"
+                        >
+                          <div className="font-medium text-gray-600 dark:text-gray-400 text-xs">{source.title}</div>
+                          <div className="text-gray-500 dark:text-gray-500 truncate text-xs">{source.content}</div>
+                        </button>
+                      ))}
+                    </div>
+                  )}
+
+                  <div className="text-xs text-gray-400 mt-1.5">
+                    {message.timestamp.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
+                  </div>
+                </div>
+
+                {message.type === 'user' && (
+                  <div className="w-6 h-6 bg-gray-100 dark:bg-gray-700 rounded-full flex items-center justify-center flex-shrink-0 mt-0.5">
+                    <User className="w-3 h-3 text-gray-500 dark:text-gray-400" />
+                  </div>
+                )}
+              </div>
+            ))}
+
+            {loading && (
+              <div className="flex gap-3">
+                <div className="w-6 h-6 bg-gray-50 dark:bg-gray-800 rounded-full flex items-center justify-center flex-shrink-0">
+                  <AgentuityLogo className="w-3 h-3 text-gray-500 dark:text-gray-400" />
+                </div>
+                <div className="bg-gray-50 dark:bg-gray-900 rounded-lg px-3 py-2">
+                  <div className="flex items-center gap-2">
+                    <Loader2 className="w-3 h-3 animate-spin text-gray-400" />
+                    <span className="text-xs text-gray-500 dark:text-gray-500">Searching...</span>
+                  </div>
+                </div>
               </div>
+            )}
+
+            <div ref={messagesEndRef} />
+          </div>
+
+          {/* Input Area */}
+          <div className="border-t border-gray-50 dark:border-gray-800 p-4">
+            <div className="flex gap-2 mb-3">
+              <input
+                ref={inputRef}
+                type="text"
+                value={currentInput}
+                onChange={(e) => setCurrentInput(e.target.value)}
+                onKeyDown={handleKeyDown}
+                placeholder="Ask about Agentuity..."
+                className="flex-1 px-3 py-2 text-sm border border-gray-200 dark:border-gray-700 rounded-lg focus:outline-none focus:ring-1 focus:ring-gray-300 dark:focus:ring-gray-600 focus:border-transparent bg-white dark:bg-gray-800 text-gray-800 dark:text-gray-200 placeholder-gray-400 dark:placeholder-gray-500 transition-all"
+                disabled={loading}
+              />
+              <button
+                onClick={() => sendMessage(currentInput)}
+                disabled={loading || !currentInput.trim()}
+                className="px-3 py-2 bg-gray-800 hover:bg-gray-900 disabled:bg-gray-200 dark:disabled:bg-gray-700 disabled:text-gray-400 text-white text-sm rounded-lg transition-colors disabled:cursor-not-allowed"
+              >
+                <Send className="w-4 h-4" />
+              </button>
             </div>
-          )}
-          
-          {!loading && results.length === 0 && query && (
-            <div className="mt-4 text-center text-gray-500 py-8">
-              No results found for "{query}"
+
+            {/* Action Buttons */}
+            <div className="flex items-center justify-between text-xs">
+              <div className="flex gap-4">
+                {messages.length > 0 && (
+                  <>
+                    <button
+                      onClick={handleRetry}
+                      disabled={loading}
+                      className="flex items-center gap-1 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 disabled:opacity-50 transition-colors"
+                    >
+                      <RotateCcw className="w-3 h-3" />
+                      Retry
+                    </button>
+                    <button
+                      onClick={handleClear}
+                      disabled={loading}
+                      className="flex items-center gap-1 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 disabled:opacity-50 transition-colors"
+                    >
+                      <Trash2 className="w-3 h-3" />
+                      Clear
+                    </button>
+                  </>
+                )}
+              </div>
+              <span className="text-gray-400 dark:text-gray-500">
+                Powered by Agentuity
+              </span>
             </div>
-          )}
-          
-          <div className="mt-4 text-xs text-gray-500 text-center border-t border-gray-200 dark:border-gray-600 pt-3">
-            {query ? 'Press Enter to search' : 'Type your search query and press Enter'}
           </div>
         </div>
       </div>
diff --git a/components/icons/AgentuityLogo.tsx b/components/icons/AgentuityLogo.tsx
new file mode 100644
index 00000000..31b157ed
--- /dev/null
+++ b/components/icons/AgentuityLogo.tsx
@@ -0,0 +1,30 @@
+interface AgentuityLogoProps {
+  className?: string;
+  size?: number;
+}
+
+export function AgentuityLogo({ className = "w-5 h-5", size }: AgentuityLogoProps) {
+  return (
+    <svg 
+      className={className}
+      width={size}
+      height={size}
+      fill="currentColor" 
+      viewBox="0 0 24 22"
+      role="img"
+      aria-label="Agentuity"
+    >
+      <title>Agentuity</title>
+      <path 
+        fillRule="evenodd" 
+        clipRule="evenodd" 
+        d="M24 21.3349H0L3.4284 15.3894H0L0.872727 13.8622H19.6909L24 21.3349ZM5.19141 15.3894L2.6437 19.8076H21.3563L18.8086 15.3894H5.19141Z"
+      />
+      <path 
+        fillRule="evenodd" 
+        clipRule="evenodd" 
+        d="M12 0.498535L17.1762 9.49853H20.6182L21.4909 11.0258H5.94545L12 0.498535ZM8.58569 9.49853L12 3.56193L15.4143 9.49853H8.58569Z"
+      />
+    </svg>
+  );
+} 
\ No newline at end of file

From 4c015b7eb3b7e22bd7a33daf20bc44399dd96ea9 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Sat, 28 Jun 2025 10:33:55 -0600
Subject: [PATCH 10/33] Coderabbit suggested cleanups

---
 agent-docs/src/agents/doc-qa/index.ts     |  8 +++--
 agent-docs/src/agents/doc-qa/retriever.ts | 13 +++++---
 app/api/search/route.ts                   | 28 +++++++++---------
 components/CustomSearchDialog.tsx         | 36 ++++++++++++++---------
 4 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/agent-docs/src/agents/doc-qa/index.ts b/agent-docs/src/agents/doc-qa/index.ts
index 85d5665f..be3288ee 100644
--- a/agent-docs/src/agents/doc-qa/index.ts
+++ b/agent-docs/src/agents/doc-qa/index.ts
@@ -11,9 +11,11 @@ export default async function Agent(
 
   try {
     jsonRequest = await req.data.json();
-    prompt = typeof jsonRequest === 'object' && jsonRequest !== null && 'message' in jsonRequest
-      ? jsonRequest.message
-      : JSON.stringify(jsonRequest);
+    if (typeof jsonRequest === 'object' && jsonRequest !== null && 'message' in jsonRequest) {
+      prompt = String(jsonRequest.message || '');
+    } else {
+      prompt = JSON.stringify(jsonRequest);
+    }
   } catch {
     prompt = await req.data.text();
   }
diff --git a/agent-docs/src/agents/doc-qa/retriever.ts b/agent-docs/src/agents/doc-qa/retriever.ts
index d393e3b8..3c2b210d 100644
--- a/agent-docs/src/agents/doc-qa/retriever.ts
+++ b/agent-docs/src/agents/doc-qa/retriever.ts
@@ -44,23 +44,28 @@ export async function retrieveRelevantDocs(ctx: AgentContext, prompt: string): P
   async function retrieveDocumentBasedOnPath(ctx: AgentContext, path: string): Promise<string> {
     const dbQuery = {
       query: ' ',
-      limit: 10000,
+      limit: 1000,
       metadata: {
         path: path
       }
     }
     try {
       const vectors = await ctx.vector.search(VECTOR_STORE_NAME, dbQuery);
-  
+      
       // Sort vectors by chunk index and concatenate text
       const sortedVectors = vectors
         .map(vec => {
-          const metadata = vec.metadata as ChunkMetadata;
+          const metadata = vec.metadata;
+          if (!metadata || typeof metadata.chunkIndex !== 'number' || typeof metadata.text !== 'string') {
+            ctx.logger.warn('Invalid chunk metadata structure for path %s', path);
+            return null;
+          }
           return {
             metadata,
-            index: metadata.chunkIndex
+            index: metadata.chunkIndex as number
           };
         })
+        .filter(item => item !== null)
         .sort((a, b) => a.index - b.index);
   
       const fullText = sortedVectors
diff --git a/app/api/search/route.ts b/app/api/search/route.ts
index e398d730..1421347e 100644
--- a/app/api/search/route.ts
+++ b/app/api/search/route.ts
@@ -14,7 +14,7 @@ function getDocumentMetadata(docPath: string): { title: string; description?: st
   try {
     const urlPath = documentPathToUrl(docPath).substring(1).split('/');
     const page = source.getPage(urlPath);
-    
+
     if (page?.data) {
       return {
         title: page.data.title || formatPathAsTitle(docPath),
@@ -24,7 +24,7 @@ function getDocumentMetadata(docPath: string): { title: string; description?: st
   } catch (error) {
     console.warn(`Failed to get metadata for ${docPath}:`, error);
   }
-  
+
   return { title: formatPathAsTitle(docPath) };
 }
 
@@ -40,18 +40,18 @@ function getDocumentSnippet(docPath: string, maxLength: number = 150): string {
   try {
     const urlPath = documentPathToUrl(docPath).substring(1).split('/');
     const page = source.getPage(urlPath);
-    
+
     if (page?.data.description) {
-      return page.data.description.length > maxLength 
+      return page.data.description.length > maxLength
         ? page.data.description.substring(0, maxLength) + '...'
         : page.data.description;
     }
-    
+
     // Fallback description based on path
     const pathParts = docPath.replace(/\.mdx?$/, '').split('/');
     const section = pathParts[0];
     const topic = pathParts[pathParts.length - 1];
-    
+
     return `Learn about ${topic} in the ${section} section of our documentation.`;
   } catch {
     return `Documentation for ${formatPathAsTitle(docPath)}`;
@@ -61,7 +61,7 @@ function getDocumentSnippet(docPath: string, maxLength: number = 150): string {
 export async function GET(request: NextRequest) {
   const { searchParams } = new URL(request.url);
   const query = searchParams.get('query');
-   
+
   // If no query, return empty results
   if (!query || query.trim().length === 0) {
     return Response.json([]);
@@ -83,7 +83,7 @@ export async function GET(request: NextRequest) {
     const data = await response.json();
     const results = [];
 
-    if (data.answer && data.answer.trim()) {
+    if (data?.answer?.trim()) {
       results.push({
         id: `ai-answer-${Date.now()}`,
         url: '#ai-answer',
@@ -96,13 +96,13 @@ export async function GET(request: NextRequest) {
     // 2. Add related documents as clickable results
     if (data.documents && Array.isArray(data.documents) && data.documents.length > 0) {
       const uniqueDocuments = [...new Set(data.documents as string[])];
-      
+
       uniqueDocuments.forEach((docPath: string, index: number) => {
         try {
           const url = documentPathToUrl(docPath);
           const metadata = getDocumentMetadata(docPath);
           const snippet = getDocumentSnippet(docPath);
-          
+
           results.push({
             id: `doc-${Date.now()}-${index}`,
             url: url,
@@ -121,13 +121,13 @@ export async function GET(request: NextRequest) {
 
   } catch (error) {
     console.error('Error calling AI agent:', error);
-    
+
     // Fallback to original Fumadocs search behavior if AI fails
     console.log('Falling back to default search');
     try {
       const fallbackResponse = await defaultSearchHandler(request);
       const fallbackData = await fallbackResponse.json();
-      
+
       // Add a note that this is fallback search
       if (Array.isArray(fallbackData) && fallbackData.length > 0) {
         return Response.json([
@@ -145,11 +145,11 @@ export async function GET(request: NextRequest) {
           }))
         ]);
       }
-      
+
       return fallbackResponse;
     } catch (fallbackError) {
       console.error('Fallback search also failed:', fallbackError);
-      
+
       // Return error message as AI answer
       return Response.json([
         {
diff --git a/components/CustomSearchDialog.tsx b/components/CustomSearchDialog.tsx
index f337485b..732b6925 100644
--- a/components/CustomSearchDialog.tsx
+++ b/components/CustomSearchDialog.tsx
@@ -4,12 +4,12 @@ import { useState, useCallback, useRef, useEffect } from 'react';
 import { Command } from 'cmdk';
 import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
-import { 
-  X, 
-  Send, 
-  RotateCcw, 
-  Trash2, 
-  User, 
+import {
+  X,
+  Send,
+  RotateCcw,
+  Trash2,
+  User,
   HelpCircle,
   Loader2
 } from 'lucide-react';
@@ -104,7 +104,13 @@ export default function CustomSearchDialog(props: SharedProps) {
 
     try {
       const searchParams = new URLSearchParams({ query: query.trim() });
-      const response = await fetch(`/api/search?${searchParams}`);
+
+      const controller = new AbortController();
+      setTimeout(() => controller.abort(), 45000);
+
+      const response = await fetch(`/api/search?${searchParams}`, {
+        signal: controller.signal
+      });
       const data: SearchResult[] = await response.json();
 
       // Find AI answer and documents
@@ -179,9 +185,12 @@ export default function CustomSearchDialog(props: SharedProps) {
   }, []);
 
   const handleSourceClick = useCallback((url: string) => {
-    if (url && url !== '#') {
+    if (url && url !== '#' && (url.startsWith('/') || url.startsWith('http'))) {
       window.open(url, '_blank');
     }
+    else {
+      console.warn('Invalid or potentially unsafe URL:', url);
+    }
   }, []);
 
   if (!open) return null;
@@ -190,7 +199,7 @@ export default function CustomSearchDialog(props: SharedProps) {
     <Command.Dialog open={open} onOpenChange={onOpenChange} label="Search with Agentuity AI">
       <div className="fixed inset-0 z-50 bg-black/30">
         <div className="fixed left-1/2 top-1/2 w-full max-w-3xl h-[75vh] -translate-x-1/2 -translate-y-1/2 bg-white dark:bg-gray-900 rounded-xl shadow-lg border border-gray-100 dark:border-gray-800 flex flex-col">
-          
+
           {/* Header */}
           <div className="flex items-center justify-between p-5 border-b border-gray-50 dark:border-gray-800">
             <div className="flex items-center gap-3">
@@ -233,11 +242,10 @@ export default function CustomSearchDialog(props: SharedProps) {
                 )}
 
                 <div className={`max-w-[85%] ${message.type === 'user' ? 'order-last' : ''}`}>
-                  <div className={`rounded-lg px-3 py-2 ${
-                    message.type === 'user' 
-                      ? 'bg-gray-100 dark:bg-gray-800 text-gray-800 dark:text-gray-200 ml-auto' 
-                      : 'bg-gray-50 dark:bg-gray-900 text-gray-700 dark:text-gray-300'
-                  }`}>
+                  <div className={`rounded-lg px-3 py-2 ${message.type === 'user'
+                    ? 'bg-gray-100 dark:bg-gray-800 text-gray-800 dark:text-gray-200 ml-auto'
+                    : 'bg-gray-50 dark:bg-gray-900 text-gray-700 dark:text-gray-300'
+                    }`}>
                     {message.type === 'ai' ? (
                       <div className="prose prose-sm max-w-none dark:prose-invert prose-gray text-sm">
                         <ReactMarkdown remarkPlugins={[remarkGfm]}>

From 4d769269a773691c94d70a27ddab6a9f81c65c04 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Sat, 28 Jun 2025 11:14:47 -0600
Subject: [PATCH 11/33] fix breaking build

---
 components/CustomSearchDialog.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/CustomSearchDialog.tsx b/components/CustomSearchDialog.tsx
index 732b6925..cd38c571 100644
--- a/components/CustomSearchDialog.tsx
+++ b/components/CustomSearchDialog.tsx
@@ -54,7 +54,7 @@ export default function CustomSearchDialog(props: SharedProps) {
       if (saved) {
         const parsed = JSON.parse(saved);
         // Convert timestamp strings back to Date objects
-        const messagesWithDates = parsed.map((msg: any) => ({
+        const messagesWithDates: Message[] = (parsed as Message[]).map((msg) => ({
           ...msg,
           timestamp: new Date(msg.timestamp)
         }));

From c3b2a411b2b0be02d8b0607058f8e7da97a5bf66 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Sat, 28 Jun 2025 11:51:31 -0600
Subject: [PATCH 12/33] move config to env variable

---
 .env.example            | 10 ++++++
 .gitignore              |  2 ++
 app/api/search/route.ts | 19 +++++++++---
 app/layout.tsx          |  6 ++++
 lib/env.ts              | 68 +++++++++++++++++++++++++++++++++++++++++
 package.json            |  4 ++-
 wrangler.jsonc          |  5 ++-
 7 files changed, 108 insertions(+), 6 deletions(-)
 create mode 100644 .env.example
 create mode 100644 lib/env.ts

diff --git a/.env.example b/.env.example
new file mode 100644
index 00000000..acc73b85
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,10 @@
+# Agent Configuration
+AGENT_BASE_URL=http://127.0.0.1:3500
+AGENT_ID=agent_your_agent_id
+# AGENT_BEARER_TOKEN=your-bearer-token-here
+
+# Alternative: You can also set the full URL instead of BASE_URL + ID
+# AGENT_FULL_URL=http://127.0.0.1:3500/agent_your_agent_id
+
+# Next.js Environment
+NEXTJS_ENV=development
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index fa8246e7..d984131e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,8 @@ yarn-error.log*
 
 # others
 .env*.local
+.env.local
+.env.production
 .vercel
 next-env.d.ts
 .open-next
diff --git a/app/api/search/route.ts b/app/api/search/route.ts
index 1421347e..7db1b3d8 100644
--- a/app/api/search/route.ts
+++ b/app/api/search/route.ts
@@ -1,6 +1,7 @@
 import { source } from '@/lib/source';
 import { createFromSource } from 'fumadocs-core/search/server';
 import { NextRequest } from 'next/server';
+import { getAgentConfig } from '@/lib/env';
 
 // Create the default search handler
 const { GET: defaultSearchHandler } = createFromSource(source);
@@ -68,11 +69,21 @@ export async function GET(request: NextRequest) {
   }
 
   try {
-    const response = await fetch('http://127.0.0.1:3500/agent_9ccc5545e93644bd9d7954e632a55a61', {
+    const agentConfig = getAgentConfig();
+    
+    // Prepare headers
+    const headers: Record<string, string> = {
+      'Content-Type': 'application/json',
+    };
+
+    // Add bearer token if provided
+    if (agentConfig.bearerToken) {
+      headers['Authorization'] = `Bearer ${agentConfig.bearerToken}`;
+    }
+
+    const response = await fetch(agentConfig.url, {
       method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
+      headers,
       body: JSON.stringify({ message: query }),
     });
 
diff --git a/app/layout.tsx b/app/layout.tsx
index b77f4892..3dc1264c 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -3,8 +3,14 @@ import { GeistSans } from "geist/font/sans";
 import type { ReactNode } from "react";
 import type { Metadata } from 'next';
 import CustomSearchDialog from "@/components/CustomSearchDialog";
+import { validateEnv } from "@/lib/env";
 import "./global.css";
 
+// Validate environment variables at startup (server-side only)
+if (typeof window === 'undefined') {
+	validateEnv();
+}
+
 export const metadata: Metadata = {
 	metadataBase: new URL('https://www.agentuity.dev'),
 	title: 'Agentuity Docs',
diff --git a/lib/env.ts b/lib/env.ts
new file mode 100644
index 00000000..480834a6
--- /dev/null
+++ b/lib/env.ts
@@ -0,0 +1,68 @@
+/**
+ * Environment variable validation and configuration utility
+ */
+
+export interface AgentConfig {
+  url: string;
+  bearerToken?: string;
+}
+
+/**
+ * Validates and returns agent configuration from environment variables
+ */
+export const getAgentConfig = (): AgentConfig => {
+  const baseUrl = process.env.AGENT_BASE_URL;
+  const agentId = process.env.AGENT_ID;
+  const bearerToken = process.env.AGENT_BEARER_TOKEN;
+  const fullUrl = process.env.AGENT_FULL_URL;
+
+  // Validate required environment variables
+  if (!fullUrl && (!baseUrl || !agentId)) {
+    throw new Error(
+      'Missing required environment variables. Either set AGENT_FULL_URL or both AGENT_BASE_URL and AGENT_ID'
+    );
+  }
+
+  const url = fullUrl || `${baseUrl}/${agentId}`;
+
+  return {
+    url,
+    bearerToken: bearerToken || undefined,
+  };
+};
+
+/**
+ * Validates environment variables at startup
+ */
+export const validateEnv = (): boolean => {
+  try {
+    const config = getAgentConfig();
+    console.log('✓ Environment variables validated');
+    console.log('✓ Agent URL:', config.url);
+    console.log('✓ Bearer token:', config.bearerToken ? 'configured' : 'not set');
+    return true;
+  } catch (error) {
+    console.error('❌ Environment validation failed:', error);
+    console.error('💡 Make sure to set either:');
+    console.error('   - AGENT_FULL_URL, or');
+    console.error('   - Both AGENT_BASE_URL and AGENT_ID');
+    console.error('💡 Optionally set AGENT_BEARER_TOKEN for authentication');
+    return false;
+  }
+};
+
+/**
+ * Environment variable types
+ * Use .env.local for development and .env.production for production
+ */
+declare global {
+  namespace NodeJS {
+    interface ProcessEnv {
+      AGENT_BASE_URL?: string;
+      AGENT_ID?: string;
+      AGENT_BEARER_TOKEN?: string;
+      AGENT_FULL_URL?: string;
+      NEXTJS_ENV?: string;
+    }
+  }
+} 
\ No newline at end of file
diff --git a/package.json b/package.json
index 40ceaba8..3d3c3b19 100644
--- a/package.json
+++ b/package.json
@@ -6,12 +6,14 @@
 		"prebuild": "node scripts/generate-docs-json.js",
 		"build": "next build",
 		"build:worker": "opennextjs-cloudflare build",
+		"build:production": "NODE_ENV=production next build",
 		"dev": "PORT=3201 next dev",
 		"start": "next start",
 		"postinstall": "fumadocs-mdx",
 		"preview": "opennextjs-cloudflare && wrangler dev",
 		"deploy": "opennextjs-cloudflare && wrangler deploy --keep-vars",
-		"cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts"
+		"cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts",
+		"validate-env": "node -e \"require('./lib/env').validateEnv()\""
 	},
 	"dependencies": {
 		"cmdk": "^1.1.1",
diff --git a/wrangler.jsonc b/wrangler.jsonc
index 9d6aa327..cbdb160e 100644
--- a/wrangler.jsonc
+++ b/wrangler.jsonc
@@ -20,5 +20,8 @@
 	"routes": [
 		{ "pattern": "agentuity.dev", "custom_domain": true },
 		{ "pattern": "www.agentuity.dev", "custom_domain": true }
-	]
+	],
+	"vars": {
+		"NEXTJS_ENV": "production"
+	}
 }

From 1d0473402101ab1aa90f4eae20fe8986a89e1286 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Sat, 28 Jun 2025 12:03:38 -0600
Subject: [PATCH 13/33] small clean up

---
 agent-docs/src/agents/doc-qa/index.ts |  2 +-
 lib/env.ts                            | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/agent-docs/src/agents/doc-qa/index.ts b/agent-docs/src/agents/doc-qa/index.ts
index be3288ee..d49cef91 100644
--- a/agent-docs/src/agents/doc-qa/index.ts
+++ b/agent-docs/src/agents/doc-qa/index.ts
@@ -20,7 +20,7 @@ export default async function Agent(
     prompt = await req.data.text();
   }
 
-  if (prompt === undefined || prompt === null) {
+  if (!prompt.trim()) {
     return resp.text("How can I help you?");
   }
 
diff --git a/lib/env.ts b/lib/env.ts
index 480834a6..07598e16 100644
--- a/lib/env.ts
+++ b/lib/env.ts
@@ -1,7 +1,6 @@
 /**
  * Environment variable validation and configuration utility
  */
-
 export interface AgentConfig {
   url: string;
   bearerToken?: string;
@@ -39,7 +38,7 @@ export const validateEnv = (): boolean => {
     const config = getAgentConfig();
     console.log('✓ Environment variables validated');
     console.log('✓ Agent URL:', config.url);
-    console.log('✓ Bearer token:', config.bearerToken ? 'configured' : 'not set');
+    console.log('✓ Bearer token:', config.bearerToken ? 'configured' : 'Not Set');
     return true;
   } catch (error) {
     console.error('❌ Environment validation failed:', error);
@@ -56,13 +55,12 @@ export const validateEnv = (): boolean => {
  * Use .env.local for development and .env.production for production
  */
 declare global {
-  namespace NodeJS {
-    interface ProcessEnv {
-      AGENT_BASE_URL?: string;
-      AGENT_ID?: string;
-      AGENT_BEARER_TOKEN?: string;
-      AGENT_FULL_URL?: string;
-      NEXTJS_ENV?: string;
-    }
+  interface ProcessEnv {
+    AGENT_BASE_URL?: string;
+    AGENT_ID?: string;
+    AGENT_BEARER_TOKEN?: string;
+    AGENT_FULL_URL?: string;
+    NEXTJS_ENV?: string;
   }
-} 
\ No newline at end of file
+}
+export {}; 
\ No newline at end of file

From a0a26916de74eb55cb9a25f2c9f4324cf04b918a Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Sat, 28 Jun 2025 12:49:03 -0600
Subject: [PATCH 14/33] abort controller on component dismount

---
 components/CustomSearchDialog.tsx | 22 +++++++++++++++++++++-
 lib/env.ts                        |  3 +--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/components/CustomSearchDialog.tsx b/components/CustomSearchDialog.tsx
index cd38c571..48ef8226 100644
--- a/components/CustomSearchDialog.tsx
+++ b/components/CustomSearchDialog.tsx
@@ -46,6 +46,15 @@ export default function CustomSearchDialog(props: SharedProps) {
   const [loading, setLoading] = useState(false);
   const messagesEndRef = useRef<HTMLDivElement>(null);
   const inputRef = useRef<HTMLInputElement>(null);
+  const abortControllerRef = useRef<AbortController | null>(null);
+
+  useEffect(() => {
+    return () => {
+      if (abortControllerRef.current) {
+        abortControllerRef.current.abort();
+      }
+    };
+  }, []);
 
   // Load messages from localStorage on mount
   useEffect(() => {
@@ -105,12 +114,23 @@ export default function CustomSearchDialog(props: SharedProps) {
     try {
       const searchParams = new URLSearchParams({ query: query.trim() });
 
+      if (abortControllerRef.current) {
+        abortControllerRef.current.abort();
+      }
+      
       const controller = new AbortController();
-      setTimeout(() => controller.abort(), 45000);
+      abortControllerRef.current = controller;
+      const timeoutId = setTimeout(() => controller.abort(), 30000);
 
       const response = await fetch(`/api/search?${searchParams}`, {
         signal: controller.signal
       });
+
+      clearTimeout(timeoutId);
+      if (!response.ok) {
+        throw new Error(`Search failed: ${response.status}`);
+      }
+      
       const data: SearchResult[] = await response.json();
 
       // Find AI answer and documents
diff --git a/lib/env.ts b/lib/env.ts
index 07598e16..96d6b6bc 100644
--- a/lib/env.ts
+++ b/lib/env.ts
@@ -62,5 +62,4 @@ declare global {
     AGENT_FULL_URL?: string;
     NEXTJS_ENV?: string;
   }
-}
-export {}; 
\ No newline at end of file
+}
\ No newline at end of file

From 29e0598e047f5d835caf4b7c9b6b856fb812eeb9 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Sat, 28 Jun 2025 15:19:46 -0600
Subject: [PATCH 15/33] break custom search dialog into multiple modules

---
 components/CustomSearchDialog.tsx             | 382 +---------------
 components/CustomSearchDialog/MessageList.tsx | 128 ++++++
 components/CustomSearchDialog/SearchInput.tsx |  74 ++++
 .../CustomSearchDialog/hooks/useMessages.tsx  | 157 +++++++
 components/CustomSearchDialog/index.tsx       | 121 ++++++
 components/CustomSearchDialog/types.ts        |  37 ++
 package-lock.json                             | 410 +++++++++++++++++-
 package.json                                  |   2 +
 8 files changed, 910 insertions(+), 401 deletions(-)
 create mode 100644 components/CustomSearchDialog/MessageList.tsx
 create mode 100644 components/CustomSearchDialog/SearchInput.tsx
 create mode 100644 components/CustomSearchDialog/hooks/useMessages.tsx
 create mode 100644 components/CustomSearchDialog/index.tsx
 create mode 100644 components/CustomSearchDialog/types.ts

diff --git a/components/CustomSearchDialog.tsx b/components/CustomSearchDialog.tsx
index 48ef8226..cb7443e5 100644
--- a/components/CustomSearchDialog.tsx
+++ b/components/CustomSearchDialog.tsx
@@ -1,382 +1,4 @@
 'use client';
 
-import { useState, useCallback, useRef, useEffect } from 'react';
-import { Command } from 'cmdk';
-import ReactMarkdown from 'react-markdown';
-import remarkGfm from 'remark-gfm';
-import {
-  X,
-  Send,
-  RotateCcw,
-  Trash2,
-  User,
-  HelpCircle,
-  Loader2
-} from 'lucide-react';
-import { AgentuityLogo } from './icons/AgentuityLogo';
-import type { SharedProps } from 'fumadocs-ui/components/dialog/search';
-
-interface Message {
-  id: string;
-  type: 'user' | 'ai';
-  content: string;
-  timestamp: Date;
-  sources?: Array<{
-    id: string;
-    title: string;
-    url: string;
-    content: string;
-  }>;
-}
-
-interface SearchResult {
-  id: string;
-  title: string;
-  content: string;
-  url?: string;
-  type?: 'ai-answer' | 'document' | 'default';
-}
-
-const STORAGE_KEY = 'agentuity-search-history';
-
-export default function CustomSearchDialog(props: SharedProps) {
-  const { open, onOpenChange } = props;
-  const [messages, setMessages] = useState<Message[]>([]);
-  const [currentInput, setCurrentInput] = useState('');
-  const [loading, setLoading] = useState(false);
-  const messagesEndRef = useRef<HTMLDivElement>(null);
-  const inputRef = useRef<HTMLInputElement>(null);
-  const abortControllerRef = useRef<AbortController | null>(null);
-
-  useEffect(() => {
-    return () => {
-      if (abortControllerRef.current) {
-        abortControllerRef.current.abort();
-      }
-    };
-  }, []);
-
-  // Load messages from localStorage on mount
-  useEffect(() => {
-    try {
-      const saved = localStorage.getItem(STORAGE_KEY);
-      if (saved) {
-        const parsed = JSON.parse(saved);
-        // Convert timestamp strings back to Date objects
-        const messagesWithDates: Message[] = (parsed as Message[]).map((msg) => ({
-          ...msg,
-          timestamp: new Date(msg.timestamp)
-        }));
-        setMessages(messagesWithDates);
-      }
-    } catch (error) {
-      console.warn('Failed to load chat history:', error);
-    }
-  }, []);
-
-  // Save messages to localStorage whenever messages change
-  useEffect(() => {
-    try {
-      localStorage.setItem(STORAGE_KEY, JSON.stringify(messages));
-    } catch (error) {
-      console.warn('Failed to save chat history:', error);
-    }
-  }, [messages]);
-
-  // Auto-scroll to bottom when new messages arrive
-  useEffect(() => {
-    messagesEndRef.current?.scrollIntoView({ behavior: 'smooth' });
-  }, [messages]);
-
-  // Focus input when dialog opens
-  useEffect(() => {
-    if (open) {
-      setTimeout(() => inputRef.current?.focus(), 100);
-    }
-  }, [open]);
-
-  // Send message function
-  const sendMessage = useCallback(async (query: string) => {
-    if (!query.trim()) return;
-
-    // Add user message
-    const userMessage: Message = {
-      id: `user-${Date.now()}`,
-      type: 'user',
-      content: query.trim(),
-      timestamp: new Date()
-    };
-
-    setMessages(prev => [...prev, userMessage]);
-    setCurrentInput('');
-    setLoading(true);
-
-    try {
-      const searchParams = new URLSearchParams({ query: query.trim() });
-
-      if (abortControllerRef.current) {
-        abortControllerRef.current.abort();
-      }
-      
-      const controller = new AbortController();
-      abortControllerRef.current = controller;
-      const timeoutId = setTimeout(() => controller.abort(), 30000);
-
-      const response = await fetch(`/api/search?${searchParams}`, {
-        signal: controller.signal
-      });
-
-      clearTimeout(timeoutId);
-      if (!response.ok) {
-        throw new Error(`Search failed: ${response.status}`);
-      }
-      
-      const data: SearchResult[] = await response.json();
-
-      // Find AI answer and documents
-      const aiAnswer = data.find(result => result.type === 'ai-answer');
-      const documents = data.filter(result => result.type === 'document');
-
-      if (aiAnswer) {
-        const aiMessage: Message = {
-          id: `ai-${Date.now()}`,
-          type: 'ai',
-          content: aiAnswer.content,
-          timestamp: new Date(),
-          sources: documents.length > 0 ? documents.map(doc => ({
-            id: doc.id,
-            title: doc.title,
-            url: doc.url || '#',
-            content: doc.content
-          })) : undefined
-        };
-
-        setMessages(prev => [...prev, aiMessage]);
-      } else {
-        // Fallback if no AI answer
-        const fallbackMessage: Message = {
-          id: `ai-${Date.now()}`,
-          type: 'ai',
-          content: 'I couldn\'t find a relevant answer to your question. Please try rephrasing or check our documentation directly.',
-          timestamp: new Date()
-        };
-        setMessages(prev => [...prev, fallbackMessage]);
-      }
-    } catch (error) {
-      console.error('Search error:', error);
-      const errorMessage: Message = {
-        id: `ai-${Date.now()}`,
-        type: 'ai',
-        content: 'Sorry, I encountered an error while searching. Please try again.',
-        timestamp: new Date()
-      };
-      setMessages(prev => [...prev, errorMessage]);
-    } finally {
-      setLoading(false);
-    }
-  }, []);
-
-  const handleKeyDown = useCallback((e: React.KeyboardEvent<HTMLInputElement>) => {
-    if (e.key === 'Enter' && !e.shiftKey) {
-      e.preventDefault();
-      sendMessage(currentInput);
-    }
-    if (e.key === 'Escape') {
-      onOpenChange(false);
-    }
-  }, [currentInput, sendMessage, onOpenChange]);
-
-  const handleRetry = useCallback(() => {
-    const lastUserMessage = [...messages].reverse().find(m => m.type === 'user');
-    if (lastUserMessage) {
-      sendMessage(lastUserMessage.content);
-    }
-  }, [messages, sendMessage]);
-
-  const handleClear = useCallback(() => {
-    setMessages([]);
-    setCurrentInput('');
-    // Also clear from localStorage
-    try {
-      localStorage.removeItem(STORAGE_KEY);
-    } catch (error) {
-      console.warn('Failed to clear chat history:', error);
-    }
-  }, []);
-
-  const handleSourceClick = useCallback((url: string) => {
-    if (url && url !== '#' && (url.startsWith('/') || url.startsWith('http'))) {
-      window.open(url, '_blank');
-    }
-    else {
-      console.warn('Invalid or potentially unsafe URL:', url);
-    }
-  }, []);
-
-  if (!open) return null;
-
-  return (
-    <Command.Dialog open={open} onOpenChange={onOpenChange} label="Search with Agentuity AI">
-      <div className="fixed inset-0 z-50 bg-black/30">
-        <div className="fixed left-1/2 top-1/2 w-full max-w-3xl h-[75vh] -translate-x-1/2 -translate-y-1/2 bg-white dark:bg-gray-900 rounded-xl shadow-lg border border-gray-100 dark:border-gray-800 flex flex-col">
-
-          {/* Header */}
-          <div className="flex items-center justify-between p-5 border-b border-gray-50 dark:border-gray-800">
-            <div className="flex items-center gap-3">
-              <div className="w-7 h-7 bg-gradient-to-br from-gray-100 to-gray-200 dark:from-gray-700 dark:to-gray-800 rounded-lg flex items-center justify-center">
-                <AgentuityLogo className="w-4 h-4 text-gray-600 dark:text-gray-400" />
-              </div>
-              <div>
-                <h2 className="text-base font-medium text-gray-800 dark:text-gray-200">Search Documentation</h2>
-                <p className="text-xs text-gray-500 dark:text-gray-500">Ask questions about Agentuity</p>
-              </div>
-            </div>
-            <button
-              onClick={() => onOpenChange(false)}
-              className="p-1.5 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 rounded-md hover:bg-gray-50 dark:hover:bg-gray-800 transition-colors"
-            >
-              <X className="w-4 h-4" />
-            </button>
-          </div>
-
-          {/* Messages Area */}
-          <div className="flex-1 overflow-y-auto p-5 space-y-6">
-            {messages.length === 0 && (
-              <div className="text-center py-16">
-                <div className="w-12 h-12 bg-gray-50 dark:bg-gray-800 rounded-full flex items-center justify-center mx-auto mb-3">
-                  <HelpCircle className="w-6 h-6 text-gray-400" />
-                </div>
-                <h3 className="text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Ask a question</h3>
-                <p className="text-xs text-gray-500 dark:text-gray-500 max-w-sm mx-auto leading-relaxed">
-                  Search our documentation or ask about Agentuity features
-                </p>
-              </div>
-            )}
-
-            {messages.map((message) => (
-              <div key={message.id} className={`flex gap-3 ${message.type === 'user' ? 'justify-end' : 'justify-start'}`}>
-                {message.type === 'ai' && (
-                  <div className="w-6 h-6 bg-gray-50 dark:bg-gray-800 rounded-full flex items-center justify-center flex-shrink-0 mt-0.5">
-                    <AgentuityLogo className="w-3 h-3 text-gray-500 dark:text-gray-400" />
-                  </div>
-                )}
-
-                <div className={`max-w-[85%] ${message.type === 'user' ? 'order-last' : ''}`}>
-                  <div className={`rounded-lg px-3 py-2 ${message.type === 'user'
-                    ? 'bg-gray-100 dark:bg-gray-800 text-gray-800 dark:text-gray-200 ml-auto'
-                    : 'bg-gray-50 dark:bg-gray-900 text-gray-700 dark:text-gray-300'
-                    }`}>
-                    {message.type === 'ai' ? (
-                      <div className="prose prose-sm max-w-none dark:prose-invert prose-gray text-sm">
-                        <ReactMarkdown remarkPlugins={[remarkGfm]}>
-                          {message.content}
-                        </ReactMarkdown>
-                      </div>
-                    ) : (
-                      <p className="text-sm">{message.content}</p>
-                    )}
-                  </div>
-
-                  {/* Sources for AI messages */}
-                  {message.type === 'ai' && message.sources && message.sources.length > 0 && (
-                    <div className="mt-2 space-y-1">
-                      <p className="text-xs text-gray-400 dark:text-gray-500 font-medium">Related:</p>
-                      {message.sources.map((source) => (
-                        <button
-                          key={source.id}
-                          onClick={() => handleSourceClick(source.url)}
-                          className="block w-full text-left p-2 text-xs bg-white dark:bg-gray-800 hover:bg-gray-50 dark:hover:bg-gray-700 rounded border border-gray-100 dark:border-gray-700 transition-colors"
-                        >
-                          <div className="font-medium text-gray-600 dark:text-gray-400 text-xs">{source.title}</div>
-                          <div className="text-gray-500 dark:text-gray-500 truncate text-xs">{source.content}</div>
-                        </button>
-                      ))}
-                    </div>
-                  )}
-
-                  <div className="text-xs text-gray-400 mt-1.5">
-                    {message.timestamp.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
-                  </div>
-                </div>
-
-                {message.type === 'user' && (
-                  <div className="w-6 h-6 bg-gray-100 dark:bg-gray-700 rounded-full flex items-center justify-center flex-shrink-0 mt-0.5">
-                    <User className="w-3 h-3 text-gray-500 dark:text-gray-400" />
-                  </div>
-                )}
-              </div>
-            ))}
-
-            {loading && (
-              <div className="flex gap-3">
-                <div className="w-6 h-6 bg-gray-50 dark:bg-gray-800 rounded-full flex items-center justify-center flex-shrink-0">
-                  <AgentuityLogo className="w-3 h-3 text-gray-500 dark:text-gray-400" />
-                </div>
-                <div className="bg-gray-50 dark:bg-gray-900 rounded-lg px-3 py-2">
-                  <div className="flex items-center gap-2">
-                    <Loader2 className="w-3 h-3 animate-spin text-gray-400" />
-                    <span className="text-xs text-gray-500 dark:text-gray-500">Searching...</span>
-                  </div>
-                </div>
-              </div>
-            )}
-
-            <div ref={messagesEndRef} />
-          </div>
-
-          {/* Input Area */}
-          <div className="border-t border-gray-50 dark:border-gray-800 p-4">
-            <div className="flex gap-2 mb-3">
-              <input
-                ref={inputRef}
-                type="text"
-                value={currentInput}
-                onChange={(e) => setCurrentInput(e.target.value)}
-                onKeyDown={handleKeyDown}
-                placeholder="Ask about Agentuity..."
-                className="flex-1 px-3 py-2 text-sm border border-gray-200 dark:border-gray-700 rounded-lg focus:outline-none focus:ring-1 focus:ring-gray-300 dark:focus:ring-gray-600 focus:border-transparent bg-white dark:bg-gray-800 text-gray-800 dark:text-gray-200 placeholder-gray-400 dark:placeholder-gray-500 transition-all"
-                disabled={loading}
-              />
-              <button
-                onClick={() => sendMessage(currentInput)}
-                disabled={loading || !currentInput.trim()}
-                className="px-3 py-2 bg-gray-800 hover:bg-gray-900 disabled:bg-gray-200 dark:disabled:bg-gray-700 disabled:text-gray-400 text-white text-sm rounded-lg transition-colors disabled:cursor-not-allowed"
-              >
-                <Send className="w-4 h-4" />
-              </button>
-            </div>
-
-            {/* Action Buttons */}
-            <div className="flex items-center justify-between text-xs">
-              <div className="flex gap-4">
-                {messages.length > 0 && (
-                  <>
-                    <button
-                      onClick={handleRetry}
-                      disabled={loading}
-                      className="flex items-center gap-1 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 disabled:opacity-50 transition-colors"
-                    >
-                      <RotateCcw className="w-3 h-3" />
-                      Retry
-                    </button>
-                    <button
-                      onClick={handleClear}
-                      disabled={loading}
-                      className="flex items-center gap-1 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 disabled:opacity-50 transition-colors"
-                    >
-                      <Trash2 className="w-3 h-3" />
-                      Clear
-                    </button>
-                  </>
-                )}
-              </div>
-              <span className="text-gray-400 dark:text-gray-500">
-                Powered by Agentuity
-              </span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </Command.Dialog>
-  );
-} 
\ No newline at end of file
+import { default as CustomSearchDialogImpl } from './CustomSearchDialog/index';
+export default CustomSearchDialogImpl; 
\ No newline at end of file
diff --git a/components/CustomSearchDialog/MessageList.tsx b/components/CustomSearchDialog/MessageList.tsx
new file mode 100644
index 00000000..a6bbfd8e
--- /dev/null
+++ b/components/CustomSearchDialog/MessageList.tsx
@@ -0,0 +1,128 @@
+'use client';
+
+import { useRef, useEffect } from 'react';
+import ReactMarkdown from 'react-markdown';
+import remarkGfm from 'remark-gfm';
+import { User, HelpCircle, Loader2 } from 'lucide-react';
+import { AgentuityLogo } from '../icons/AgentuityLogo';
+import { MessageListProps, Message } from './types';
+
+export function MessageList({ messages, loading, handleSourceClick }: MessageListProps) {
+  const messagesEndRef = useRef<HTMLDivElement>(null);
+
+  // Auto-scroll to bottom when new messages arrive
+  useEffect(() => {
+    messagesEndRef.current?.scrollIntoView({ behavior: 'smooth' });
+  }, [messages]);
+
+  return (
+    <div className="flex-1 overflow-y-auto p-5 space-y-6">
+      {messages.length === 0 && <EmptyState />}
+
+      {messages.map((message) => (
+        <MessageItem 
+          key={message.id} 
+          message={message} 
+          handleSourceClick={handleSourceClick} 
+        />
+      ))}
+
+      {loading && <LoadingIndicator />}
+
+      <div ref={messagesEndRef} />
+    </div>
+  );
+}
+
+function EmptyState() {
+  return (
+    <div className="text-center py-16">
+      <div className="w-12 h-12 bg-gray-50 dark:bg-gray-800 rounded-full flex items-center justify-center mx-auto mb-3">
+        <HelpCircle className="w-6 h-6 text-gray-400" />
+      </div>
+      <h3 className="text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+        Ask a question
+      </h3>
+      <p className="text-xs text-gray-500 dark:text-gray-500 max-w-sm mx-auto leading-relaxed">
+        Search our documentation or ask about Agentuity features
+      </p>
+    </div>
+  );
+}
+
+function LoadingIndicator() {
+  return (
+    <div className="flex gap-3">
+      <div className="w-6 h-6 bg-gray-50 dark:bg-gray-800 rounded-full flex items-center justify-center flex-shrink-0">
+        <AgentuityLogo className="w-3 h-3 text-gray-500 dark:text-gray-400" />
+      </div>
+      <div className="bg-gray-50 dark:bg-gray-900 rounded-lg px-3 py-2">
+        <div className="flex items-center gap-2">
+          <Loader2 className="w-3 h-3 animate-spin text-gray-400" />
+          <span className="text-xs text-gray-500 dark:text-gray-500">Searching...</span>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+interface MessageItemProps {
+  message: Message;
+  handleSourceClick: (url: string) => void;
+}
+
+function MessageItem({ message, handleSourceClick }: MessageItemProps) {
+  return (
+    <div className={`flex gap-3 ${message.type === 'user' ? 'justify-end' : 'justify-start'}`}>
+      {message.type === 'ai' && (
+        <div className="w-6 h-6 bg-gray-50 dark:bg-gray-800 rounded-full flex items-center justify-center flex-shrink-0 mt-0.5">
+          <AgentuityLogo className="w-3 h-3 text-gray-500 dark:text-gray-400" />
+        </div>
+      )}
+
+      <div className={`max-w-[85%] ${message.type === 'user' ? 'order-last' : ''}`}>
+        <div className={`rounded-lg px-3 py-2 ${message.type === 'user'
+          ? 'bg-gray-100 dark:bg-gray-800 text-gray-800 dark:text-gray-200 ml-auto'
+          : 'bg-gray-50 dark:bg-gray-900 text-gray-700 dark:text-gray-300'
+          }`}>
+          {message.type === 'ai' ? (
+            <div className="prose prose-sm max-w-none dark:prose-invert prose-gray text-sm">
+              <ReactMarkdown remarkPlugins={[remarkGfm]}>
+                {message.content}
+              </ReactMarkdown>
+            </div>
+          ) : (
+            <p className="text-sm whitespace-pre-wrap">{message.content}</p>
+          )}
+        </div>
+
+        {/* Sources for AI messages */}
+        {message.type === 'ai' && message.sources && message.sources.length > 0 && (
+          <div className="mt-2 space-y-1">
+            <p className="text-xs text-gray-400 dark:text-gray-500 font-medium">Related:</p>
+            {message.sources.map((source) => (
+              <button
+                key={source.id}
+                onClick={() => handleSourceClick(source.url)}
+                className="block w-full text-left p-2 text-xs bg-white dark:bg-gray-800 hover:bg-gray-50 dark:hover:bg-gray-700 rounded border border-gray-100 dark:border-gray-700 transition-colors"
+              >
+                <div className="font-medium text-gray-600 dark:text-gray-400 text-xs">{source.title}</div>
+                <div className="text-gray-500 dark:text-gray-500 truncate text-xs">{source.content}</div>
+              </button>
+            ))}
+          </div>
+        )}
+
+        <div className="text-xs text-gray-400 mt-1.5">
+          {message.timestamp.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
+        </div>
+      </div>
+
+      {message.type === 'user' && (
+        <div className="w-6 h-6 bg-gray-100 dark:bg-gray-700 rounded-full flex items-center justify-center flex-shrink-0 mt-0.5">
+          <User className="w-3 h-3 text-gray-500 dark:text-gray-400" />
+        </div>
+      )}
+    </div>
+  );
+} 
\ No newline at end of file
diff --git a/components/CustomSearchDialog/SearchInput.tsx b/components/CustomSearchDialog/SearchInput.tsx
new file mode 100644
index 00000000..9cb1b440
--- /dev/null
+++ b/components/CustomSearchDialog/SearchInput.tsx
@@ -0,0 +1,74 @@
+'use client';
+
+import { useRef, useEffect, KeyboardEvent } from 'react';
+import { Send } from 'lucide-react';
+import { SearchInputProps } from './types';
+
+export function SearchInput({ currentInput, setCurrentInput, loading, sendMessage }: SearchInputProps) {
+  const textareaRef = useRef<HTMLTextAreaElement>(null);
+
+  // Auto-resize textarea based on content
+  useEffect(() => {
+    const textarea = textareaRef.current;
+    if (!textarea) return;
+
+    // Reset height to auto to get the correct scrollHeight
+    textarea.style.height = 'auto';
+    
+    // Set the height to scrollHeight to fit the content (up to max-height set in CSS)
+    const newHeight = Math.min(textarea.scrollHeight, 150); // Max height of 150px
+    textarea.style.height = `${newHeight}px`;
+  }, [currentInput]);
+
+  // Focus textarea when component mounts
+  useEffect(() => {
+    textareaRef.current?.focus();
+  }, []);
+
+  const handleKeyDown = (e: KeyboardEvent<HTMLTextAreaElement>) => {
+    if (e.key === 'Enter' && !e.shiftKey) {
+      e.preventDefault();
+      if (currentInput.trim()) {
+        sendMessage(currentInput);
+      }
+    }
+    if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
+      e.preventDefault();
+      if (currentInput.trim()) {
+        sendMessage(currentInput);
+      }
+    }
+  };
+
+  return (
+    <div className="w-full">
+      <div className="flex gap-2">
+        <div className="flex-1 relative">
+          <textarea
+            ref={textareaRef}
+            value={currentInput}
+            onChange={(e) => setCurrentInput(e.target.value)}
+            onKeyDown={handleKeyDown}
+            placeholder="Ask about Agentuity..."
+            className="w-full px-3 py-2 text-sm border border-gray-200 dark:border-gray-700 rounded-lg focus:outline-none focus:ring-1 focus:ring-gray-300 dark:focus:ring-gray-600 focus:border-transparent bg-white dark:bg-gray-800 text-gray-800 dark:text-gray-200 placeholder-gray-400 dark:placeholder-gray-500 transition-all resize-none min-h-[40px] max-h-[150px] overflow-y-auto"
+            disabled={loading}
+            rows={1}
+          />
+          {currentInput.trim() && (
+            <div className="absolute right-2 bottom-2 text-xs text-gray-400">
+              Press Enter to send
+            </div>
+          )}
+        </div>
+        <button
+          onClick={() => currentInput.trim() && sendMessage(currentInput)}
+          disabled={loading || !currentInput.trim()}
+          className="px-3 py-2 bg-gray-800 hover:bg-gray-900 disabled:bg-gray-200 dark:disabled:bg-gray-700 disabled:text-gray-400 text-white text-sm rounded-lg transition-colors disabled:cursor-not-allowed flex-shrink-0"
+          aria-label="Send message"
+        >
+          <Send className="w-4 h-4" />
+        </button>
+      </div>
+    </div>
+  );
+} 
\ No newline at end of file
diff --git a/components/CustomSearchDialog/hooks/useMessages.tsx b/components/CustomSearchDialog/hooks/useMessages.tsx
new file mode 100644
index 00000000..56bd18d9
--- /dev/null
+++ b/components/CustomSearchDialog/hooks/useMessages.tsx
@@ -0,0 +1,157 @@
+'use client';
+
+import { useState, useCallback, useRef, useEffect } from 'react';
+import { Message, SearchResult } from '../types';
+
+const STORAGE_KEY = 'agentuity-search-history';
+
+export function useMessages() {
+  const [messages, setMessages] = useState<Message[]>([]);
+  const [loading, setLoading] = useState(false);
+  const abortControllerRef = useRef<AbortController | null>(null);
+
+  useEffect(() => {
+    try {
+      const saved = localStorage.getItem(STORAGE_KEY);
+      if (saved) {
+        const parsed = JSON.parse(saved);
+        // Convert timestamp strings back to Date objects
+        const messagesWithDates: Message[] = (parsed as Message[]).map((msg) => ({
+          ...msg,
+          timestamp: new Date(msg.timestamp)
+        }));
+        setMessages(messagesWithDates);
+      }
+    } catch (error) {
+      console.warn('Failed to load chat history:', error);
+    }
+  }, []);
+
+  useEffect(() => {
+    try {
+      localStorage.setItem(STORAGE_KEY, JSON.stringify(messages));
+    } catch (error) {
+      console.warn('Failed to save chat history:', error);
+    }
+  }, [messages]);
+
+  useEffect(() => {
+    return () => {
+      if (abortControllerRef.current) {
+        abortControllerRef.current.abort();
+      }
+    };
+  }, []);
+
+  const sendMessage = useCallback(async (query: string) => {
+    if (!query.trim()) return;
+
+    const userMessage: Message = {
+      id: `user-${Date.now()}`,
+      type: 'user',
+      content: query.trim(),
+      timestamp: new Date()
+    };
+
+    setMessages(prev => [...prev, userMessage]);
+    setLoading(true);
+
+    try {
+      const searchParams = new URLSearchParams({ query: query.trim() });
+
+      if (abortControllerRef.current) {
+        abortControllerRef.current.abort();
+      }
+
+      const controller = new AbortController();
+      abortControllerRef.current = controller;
+      const timeoutId = setTimeout(() => controller.abort(), 30000);
+
+      const response = await fetch(`/api/search?${searchParams}`, {
+        signal: controller.signal
+      });
+
+      clearTimeout(timeoutId);
+      if (!response.ok) {
+        throw new Error(`Search failed: ${response.status}`);
+      }
+
+      const data: SearchResult[] = await response.json();
+
+      // Find AI answer and documents
+      const aiAnswer = data.find(result => result.type === 'ai-answer');
+      const documents = data.filter(result => result.type === 'document');
+
+      if (aiAnswer) {
+        const aiMessage: Message = {
+          id: `ai-${Date.now()}`,
+          type: 'ai',
+          content: aiAnswer.content,
+          timestamp: new Date(),
+          sources: documents.length > 0 ? documents.map(doc => ({
+            id: doc.id,
+            title: doc.title,
+            url: doc.url || '#',
+            content: doc.content
+          })) : undefined
+        };
+
+        setMessages(prev => [...prev, aiMessage]);
+      } else {
+        // Fallback if no AI answer
+        const fallbackMessage: Message = {
+          id: `ai-${Date.now()}`,
+          type: 'ai',
+          content: 'I couldn\'t find a relevant answer to your question. Please try rephrasing or check our documentation directly.',
+          timestamp: new Date()
+        };
+        setMessages(prev => [...prev, fallbackMessage]);
+      }
+    } catch (error) {
+      console.error('Search error:', error);
+      const errorMessage: Message = {
+        id: `ai-${Date.now()}`,
+        type: 'ai',
+        content: 'Sorry, I encountered an error while searching. Please try again.',
+        timestamp: new Date()
+      };
+      setMessages(prev => [...prev, errorMessage]);
+    } finally {
+      setLoading(false);
+    }
+  }, []);
+
+  const handleRetry = useCallback(() => {
+    const lastUserMessage = [...messages].reverse().find(m => m.type === 'user');
+    if (lastUserMessage) {
+      sendMessage(lastUserMessage.content);
+    }
+  }, [messages, sendMessage]);
+
+  const handleClear = useCallback(() => {
+    setMessages([]);
+    try {
+      localStorage.removeItem(STORAGE_KEY);
+    } catch (error) {
+      console.warn('Failed to clear chat history:', error);
+    }
+  }, []);
+
+  const handleSourceClick = useCallback((url: string) => {
+    if (url && url !== '#' && (url.startsWith('/') || url.startsWith('http'))) {
+      window.open(url, '_blank');
+    }
+    else {
+      console.warn('Invalid or potentially unsafe URL:', url);
+    }
+  }, []);
+
+  return {
+    messages,
+    loading,
+    sendMessage,
+    handleRetry,
+    handleClear,
+    handleSourceClick
+  };
+} 
\ No newline at end of file
diff --git a/components/CustomSearchDialog/index.tsx b/components/CustomSearchDialog/index.tsx
new file mode 100644
index 00000000..d80f851d
--- /dev/null
+++ b/components/CustomSearchDialog/index.tsx
@@ -0,0 +1,121 @@
+'use client';
+
+import { useState, useEffect, useRef } from 'react';
+import * as Dialog from '@radix-ui/react-dialog';
+import { X, RotateCcw, Trash2 } from 'lucide-react';
+import { AgentuityLogo } from '../icons/AgentuityLogo';
+import { MessageList } from './MessageList';
+import { SearchInput } from './SearchInput';
+import { useMessages } from './hooks/useMessages';
+import { CustomSearchDialogProps } from './types';
+
+export default function CustomSearchDialog(props: CustomSearchDialogProps) {
+  const { open, onOpenChange } = props;
+  const [currentInput, setCurrentInput] = useState('');
+  const inputRef = useRef<HTMLTextAreaElement>(null);
+  
+  const {
+    messages,
+    loading,
+    sendMessage,
+    handleRetry,
+    handleClear,
+    handleSourceClick
+  } = useMessages();
+
+  // Focus input when dialog opens
+  useEffect(() => {
+    if (open) {
+      setTimeout(() => inputRef.current?.focus(), 100);
+    }
+  }, [open]);
+
+  // Handle keyboard shortcuts
+  const handleKeyDown = (e: React.KeyboardEvent) => {
+    if (e.key === 'Escape') {
+      onOpenChange(false);
+    }
+  };
+
+  if (!open) return null;
+
+  return (
+    <Dialog.Root open={open} onOpenChange={onOpenChange}>
+      <Dialog.Portal>
+        <Dialog.Overlay className="fixed inset-0 z-50 bg-black/30" />
+        <Dialog.Content className="fixed inset-0 z-50">
+          <Dialog.Title className="sr-only">Search Documentation</Dialog.Title>
+          <div className="fixed left-1/2 top-1/2 w-full max-w-3xl h-[75vh] -translate-x-1/2 -translate-y-1/2 bg-white dark:bg-gray-900 rounded-xl shadow-lg border border-gray-100 dark:border-gray-800 flex flex-col">
+            {/* Header */}
+            <div className="flex items-center justify-between p-5 border-b border-gray-50 dark:border-gray-800">
+              <div className="flex items-center gap-3">
+                <div className="w-7 h-7 bg-gradient-to-br from-gray-100 to-gray-200 dark:from-gray-700 dark:to-gray-800 rounded-lg flex items-center justify-center">
+                  <AgentuityLogo className="w-4 h-4 text-gray-600 dark:text-gray-400" />
+                </div>
+                <div>
+                  <h2 className="text-base font-medium text-gray-800 dark:text-gray-200">Search Documentation</h2>
+                  <p className="text-xs text-gray-500 dark:text-gray-500">Ask questions about Agentuity</p>
+                </div>
+              </div>
+              <Dialog.Close asChild>
+                <button
+                  className="p-1.5 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 rounded-md hover:bg-gray-50 dark:hover:bg-gray-800 transition-colors"
+                >
+                  <X className="w-4 h-4" />
+                </button>
+              </Dialog.Close>
+            </div>
+
+            {/* Messages Area */}
+            <MessageList 
+              messages={messages} 
+              loading={loading}
+              handleSourceClick={handleSourceClick}
+            />
+
+            {/* Input Area */}
+            <div className="border-t border-gray-50 dark:border-gray-800 p-4">
+              <div className="flex flex-col gap-2">
+                <SearchInput
+                  currentInput={currentInput}
+                  setCurrentInput={setCurrentInput}
+                  loading={loading}
+                  sendMessage={(text) => {
+                    sendMessage(text);
+                    setCurrentInput('');
+                  }}
+                />
+              
+                {/* Action Buttons */}
+                <div className="flex items-center justify-between text-xs mt-2">
+                  <div className="flex gap-4">
+                    {messages.length > 0 && (
+                      <>
+                        <button
+                          onClick={handleRetry}
+                          disabled={loading}
+                          className="flex items-center gap-1 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 disabled:opacity-50 transition-colors"
+                        >
+                          <RotateCcw className="w-3 h-3" />
+                          Retry
+                        </button>
+                        <button
+                          onClick={handleClear}
+                          disabled={loading}
+                          className="flex items-center gap-1 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 disabled:opacity-50 transition-colors"
+                        >
+                          <Trash2 className="w-3 h-3" />
+                          Clear
+                        </button>
+                      </>
+                    )}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </Dialog.Content>
+      </Dialog.Portal>
+    </Dialog.Root>
+  );
+} 
\ No newline at end of file
diff --git a/components/CustomSearchDialog/types.ts b/components/CustomSearchDialog/types.ts
new file mode 100644
index 00000000..0f155cc9
--- /dev/null
+++ b/components/CustomSearchDialog/types.ts
@@ -0,0 +1,37 @@
+import type { SharedProps } from 'fumadocs-ui/components/dialog/search';
+
+export interface Message {
+  id: string;
+  type: 'user' | 'ai';
+  content: string;
+  timestamp: Date;
+  sources?: Array<{
+    id: string;
+    title: string;
+    url: string;
+    content: string;
+  }>;
+}
+
+export interface SearchResult {
+  id: string;
+  title: string;
+  content: string;
+  url?: string;
+  type?: 'ai-answer' | 'document' | 'default';
+}
+
+export interface CustomSearchDialogProps extends SharedProps {}
+
+export interface MessageListProps {
+  messages: Message[];
+  loading: boolean;
+  handleSourceClick: (url: string) => void;
+}
+
+export interface SearchInputProps {
+  currentInput: string;
+  setCurrentInput: (value: string) => void;
+  loading: boolean;
+  sendMessage: (text: string) => void;
+} 
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index f4eb3eee..2ad3173c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,8 @@
 			"version": "1.0.0",
 			"hasInstallScript": true,
 			"dependencies": {
+				"@radix-ui/react-dialog": "^1.1.14",
+				"@radix-ui/react-visually-hidden": "^1.2.3",
 				"cmdk": "^1.1.1",
 				"fumadocs-core": "15.2.6",
 				"fumadocs-mdx": "11.5.8",
@@ -10073,23 +10075,22 @@
 			}
 		},
 		"node_modules/@radix-ui/react-dialog": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.6.tgz",
-			"integrity": "sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw==",
-			"license": "MIT",
-			"dependencies": {
-				"@radix-ui/primitive": "1.1.1",
-				"@radix-ui/react-compose-refs": "1.1.1",
-				"@radix-ui/react-context": "1.1.1",
-				"@radix-ui/react-dismissable-layer": "1.1.5",
-				"@radix-ui/react-focus-guards": "1.1.1",
-				"@radix-ui/react-focus-scope": "1.1.2",
-				"@radix-ui/react-id": "1.1.0",
-				"@radix-ui/react-portal": "1.1.4",
-				"@radix-ui/react-presence": "1.1.2",
-				"@radix-ui/react-primitive": "2.0.2",
-				"@radix-ui/react-slot": "1.1.2",
-				"@radix-ui/react-use-controllable-state": "1.1.0",
+			"version": "1.1.14",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.14.tgz",
+			"integrity": "sha512-+CpweKjqpzTmwRwcYECQcNYbI8V9VSQt0SNFKeEBLgfucbsLssU6Ppq7wUdNXEGb573bMjFhVjKVll8rmV6zMw==",
+			"dependencies": {
+				"@radix-ui/primitive": "1.1.2",
+				"@radix-ui/react-compose-refs": "1.1.2",
+				"@radix-ui/react-context": "1.1.2",
+				"@radix-ui/react-dismissable-layer": "1.1.10",
+				"@radix-ui/react-focus-guards": "1.1.2",
+				"@radix-ui/react-focus-scope": "1.1.7",
+				"@radix-ui/react-id": "1.1.1",
+				"@radix-ui/react-portal": "1.1.9",
+				"@radix-ui/react-presence": "1.1.4",
+				"@radix-ui/react-primitive": "2.1.3",
+				"@radix-ui/react-slot": "1.2.3",
+				"@radix-ui/react-use-controllable-state": "1.2.2",
 				"aria-hidden": "^1.2.4",
 				"react-remove-scroll": "^2.6.3"
 			},
@@ -10108,6 +10109,268 @@
 				}
 			}
 		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/primitive": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.2.tgz",
+			"integrity": "sha512-XnbHrrprsNqZKQhStrSwgRUQzoCI1glLzdw79xiZPoofhGICeZRSQ3dIxAKH1gb3OHfNf4d6f+vAv3kil2eggA=="
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-compose-refs": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz",
+			"integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==",
+			"peerDependencies": {
+				"@types/react": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-context": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.2.tgz",
+			"integrity": "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==",
+			"peerDependencies": {
+				"@types/react": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-dismissable-layer": {
+			"version": "1.1.10",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.10.tgz",
+			"integrity": "sha512-IM1zzRV4W3HtVgftdQiiOmA0AdJlCtMLe00FXaHwgt3rAnNsIyDqshvkIW3hj/iu5hu8ERP7KIYki6NkqDxAwQ==",
+			"dependencies": {
+				"@radix-ui/primitive": "1.1.2",
+				"@radix-ui/react-compose-refs": "1.1.2",
+				"@radix-ui/react-primitive": "2.1.3",
+				"@radix-ui/react-use-callback-ref": "1.1.1",
+				"@radix-ui/react-use-escape-keydown": "1.1.1"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+				"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-focus-guards": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.2.tgz",
+			"integrity": "sha512-fyjAACV62oPV925xFCrH8DR5xWhg9KYtJT4s3u54jxp+L/hbpTY2kIeEFFbFe+a/HCE94zGQMZLIpVTPVZDhaA==",
+			"peerDependencies": {
+				"@types/react": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-focus-scope": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.7.tgz",
+			"integrity": "sha512-t2ODlkXBQyn7jkl6TNaw/MtVEVvIGelJDCG41Okq/KwUsJBwQ4XVZsHAVUkK4mBv3ewiAS3PGuUWuY2BoK4ZUw==",
+			"dependencies": {
+				"@radix-ui/react-compose-refs": "1.1.2",
+				"@radix-ui/react-primitive": "2.1.3",
+				"@radix-ui/react-use-callback-ref": "1.1.1"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+				"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-id": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.1.tgz",
+			"integrity": "sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==",
+			"dependencies": {
+				"@radix-ui/react-use-layout-effect": "1.1.1"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-portal": {
+			"version": "1.1.9",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.9.tgz",
+			"integrity": "sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==",
+			"dependencies": {
+				"@radix-ui/react-primitive": "2.1.3",
+				"@radix-ui/react-use-layout-effect": "1.1.1"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+				"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-presence": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.4.tgz",
+			"integrity": "sha512-ueDqRbdc4/bkaQT3GIpLQssRlFgWaL/U2z/S31qRwwLWoxHLgry3SIfCwhxeQNbirEUXFa+lq3RL3oBYXtcmIA==",
+			"dependencies": {
+				"@radix-ui/react-compose-refs": "1.1.2",
+				"@radix-ui/react-use-layout-effect": "1.1.1"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+				"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-primitive": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz",
+			"integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==",
+			"dependencies": {
+				"@radix-ui/react-slot": "1.2.3"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+				"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-slot": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
+			"integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
+			"dependencies": {
+				"@radix-ui/react-compose-refs": "1.1.2"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-callback-ref": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz",
+			"integrity": "sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==",
+			"peerDependencies": {
+				"@types/react": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-controllable-state": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz",
+			"integrity": "sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==",
+			"dependencies": {
+				"@radix-ui/react-use-effect-event": "0.0.2",
+				"@radix-ui/react-use-layout-effect": "1.1.1"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-escape-keydown": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.1.tgz",
+			"integrity": "sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==",
+			"dependencies": {
+				"@radix-ui/react-use-callback-ref": "1.1.1"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-layout-effect": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz",
+			"integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==",
+			"peerDependencies": {
+				"@types/react": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/@radix-ui/react-direction": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.0.tgz",
@@ -10244,6 +10507,28 @@
 				}
 			}
 		},
+		"node_modules/@radix-ui/react-navigation-menu/node_modules/@radix-ui/react-visually-hidden": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.2.tgz",
+			"integrity": "sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q==",
+			"dependencies": {
+				"@radix-ui/react-primitive": "2.0.2"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+				"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/@radix-ui/react-popover": {
 			"version": "1.1.6",
 			"resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.6.tgz",
@@ -10527,6 +10812,37 @@
 				}
 			}
 		},
+		"node_modules/@radix-ui/react-use-effect-event": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz",
+			"integrity": "sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==",
+			"dependencies": {
+				"@radix-ui/react-use-layout-effect": "1.1.1"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-use-effect-event/node_modules/@radix-ui/react-use-layout-effect": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz",
+			"integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==",
+			"peerDependencies": {
+				"@types/react": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/@radix-ui/react-use-escape-keydown": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz",
@@ -10612,12 +10928,47 @@
 			}
 		},
 		"node_modules/@radix-ui/react-visually-hidden": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.3.tgz",
+			"integrity": "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==",
+			"dependencies": {
+				"@radix-ui/react-primitive": "2.1.3"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"@types/react-dom": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+				"react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				},
+				"@types/react-dom": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-visually-hidden/node_modules/@radix-ui/react-compose-refs": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.2.tgz",
-			"integrity": "sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q==",
-			"license": "MIT",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz",
+			"integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==",
+			"peerDependencies": {
+				"@types/react": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@radix-ui/react-visually-hidden/node_modules/@radix-ui/react-primitive": {
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz",
+			"integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==",
 			"dependencies": {
-				"@radix-ui/react-primitive": "2.0.2"
+				"@radix-ui/react-slot": "1.2.3"
 			},
 			"peerDependencies": {
 				"@types/react": "*",
@@ -10634,6 +10985,23 @@
 				}
 			}
 		},
+		"node_modules/@radix-ui/react-visually-hidden/node_modules/@radix-ui/react-slot": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
+			"integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
+			"dependencies": {
+				"@radix-ui/react-compose-refs": "1.1.2"
+			},
+			"peerDependencies": {
+				"@types/react": "*",
+				"react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/@radix-ui/rect": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.0.tgz",
diff --git a/package.json b/package.json
index 3d3c3b19..6bdd38b8 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,8 @@
 		"validate-env": "node -e \"require('./lib/env').validateEnv()\""
 	},
 	"dependencies": {
+		"@radix-ui/react-dialog": "^1.1.14",
+		"@radix-ui/react-visually-hidden": "^1.2.3",
 		"cmdk": "^1.1.1",
 		"fumadocs-core": "15.2.6",
 		"fumadocs-mdx": "11.5.8",

From d34bb9bf705e2ae2e48a4acd45c4431e672904ca Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Sun, 29 Jun 2025 10:03:40 -0600
Subject: [PATCH 16/33] linter error fix

---
 components/CustomSearchDialog/index.tsx | 7 -------
 components/CustomSearchDialog/types.ts  | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/components/CustomSearchDialog/index.tsx b/components/CustomSearchDialog/index.tsx
index d80f851d..5a235769 100644
--- a/components/CustomSearchDialog/index.tsx
+++ b/components/CustomSearchDialog/index.tsx
@@ -30,13 +30,6 @@ export default function CustomSearchDialog(props: CustomSearchDialogProps) {
     }
   }, [open]);
 
-  // Handle keyboard shortcuts
-  const handleKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === 'Escape') {
-      onOpenChange(false);
-    }
-  };
-
   if (!open) return null;
 
   return (
diff --git a/components/CustomSearchDialog/types.ts b/components/CustomSearchDialog/types.ts
index 0f155cc9..19e94688 100644
--- a/components/CustomSearchDialog/types.ts
+++ b/components/CustomSearchDialog/types.ts
@@ -21,7 +21,7 @@ export interface SearchResult {
   type?: 'ai-answer' | 'document' | 'default';
 }
 
-export interface CustomSearchDialogProps extends SharedProps {}
+export type CustomSearchDialogProps = SharedProps;
 
 export interface MessageListProps {
   messages: Message[];

From e61a3e3aecc59f52b49ca88130fad31739a0ca6b Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Sun, 29 Jun 2025 10:05:50 -0600
Subject: [PATCH 17/33] Result format validation

---
 components/CustomSearchDialog/hooks/useMessages.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/CustomSearchDialog/hooks/useMessages.tsx b/components/CustomSearchDialog/hooks/useMessages.tsx
index 56bd18d9..5308494d 100644
--- a/components/CustomSearchDialog/hooks/useMessages.tsx
+++ b/components/CustomSearchDialog/hooks/useMessages.tsx
@@ -77,6 +77,10 @@ export function useMessages() {
       }
 
       const data: SearchResult[] = await response.json();
+      
+      if (!Array.isArray(data)) {
+        throw new Error('Incorrect search result format.');
+      }
 
       // Find AI answer and documents
       const aiAnswer = data.find(result => result.type === 'ai-answer');

From ef9e5c58b30eb176ea529b85421a60d72342d882 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Sun, 29 Jun 2025 10:18:33 -0600
Subject: [PATCH 18/33] simplify key down handler

---
 components/CustomSearchDialog/SearchInput.tsx | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/components/CustomSearchDialog/SearchInput.tsx b/components/CustomSearchDialog/SearchInput.tsx
index 9cb1b440..72aaa9bc 100644
--- a/components/CustomSearchDialog/SearchInput.tsx
+++ b/components/CustomSearchDialog/SearchInput.tsx
@@ -7,32 +7,22 @@ import { SearchInputProps } from './types';
 export function SearchInput({ currentInput, setCurrentInput, loading, sendMessage }: SearchInputProps) {
   const textareaRef = useRef<HTMLTextAreaElement>(null);
 
-  // Auto-resize textarea based on content
   useEffect(() => {
     const textarea = textareaRef.current;
     if (!textarea) return;
 
-    // Reset height to auto to get the correct scrollHeight
     textarea.style.height = 'auto';
     
-    // Set the height to scrollHeight to fit the content (up to max-height set in CSS)
     const newHeight = Math.min(textarea.scrollHeight, 150); // Max height of 150px
     textarea.style.height = `${newHeight}px`;
   }, [currentInput]);
 
-  // Focus textarea when component mounts
   useEffect(() => {
     textareaRef.current?.focus();
   }, []);
 
   const handleKeyDown = (e: KeyboardEvent<HTMLTextAreaElement>) => {
-    if (e.key === 'Enter' && !e.shiftKey) {
-      e.preventDefault();
-      if (currentInput.trim()) {
-        sendMessage(currentInput);
-      }
-    }
-    if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
+    if (e.key === 'Enter' && (!e.shiftKey || e.ctrlKey || e.metaKey)) {
       e.preventDefault();
       if (currentInput.trim()) {
         sendMessage(currentInput);

From 4e21e6b2dc8666554cd989f9774f619af85b2386 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Sun, 29 Jun 2025 11:04:33 -0600
Subject: [PATCH 19/33] enhancing the doc navigation with header locator

---
 agent-docs/src/agents/doc-qa/rag.ts           | 2 +-
 app/api/search/route.ts                       | 3 ++-
 components/CustomSearchDialog/MessageList.tsx | 2 +-
 components/CustomSearchDialog/index.tsx       | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/agent-docs/src/agents/doc-qa/rag.ts b/agent-docs/src/agents/doc-qa/rag.ts
index 0157fa10..42805791 100644
--- a/agent-docs/src/agents/doc-qa/rag.ts
+++ b/agent-docs/src/agents/doc-qa/rag.ts
@@ -40,7 +40,7 @@ type LlmAnswer = {
 }
 
 The "answer" field should contain properly formatted MDX content that will render beautifully in a documentation site.
-
+The "documents" field must contain the path to the documents you used to answer the question. On top of the path, you may include a specific heading of the document so that the navigation will take the user to the exact point of the document you reference. To format the heading, use the following convention: append the heading to the path using a hash symbol (#) followed by the heading text, replacing spaces with hyphens (-) and converting all characters to lowercase. If there are multiple identical headings, append an index to the heading in the format -index (e.g., #example-3 for the third occurrence of "Example"). For example, if the document path is "/docs/guide" and the heading is "Getting Started", the formatted path would be "/docs/guide#getting-started".
 If you cited no documents, return an empty array. Do NOT wrap the JSON in Markdown or add any extra keys.
 
 === MDX FORMATTING EXAMPLES ===
diff --git a/app/api/search/route.ts b/app/api/search/route.ts
index 7db1b3d8..eea69788 100644
--- a/app/api/search/route.ts
+++ b/app/api/search/route.ts
@@ -7,7 +7,8 @@ import { getAgentConfig } from '@/lib/env';
 const { GET: defaultSearchHandler } = createFromSource(source);
 
 function documentPathToUrl(docPath: string): string {
-  return '/' + docPath.replace(/\.mdx?$/, '');
+  // Remove the .md or .mdx extension before any # symbol
+  return '/' + docPath.replace(/\.mdx?(?=#|$)/, '');
 }
 
 // Helper function to get document title and description from source
diff --git a/components/CustomSearchDialog/MessageList.tsx b/components/CustomSearchDialog/MessageList.tsx
index a6bbfd8e..3f1cd9c1 100644
--- a/components/CustomSearchDialog/MessageList.tsx
+++ b/components/CustomSearchDialog/MessageList.tsx
@@ -23,7 +23,7 @@ export function MessageList({ messages, loading, handleSourceClick }: MessageLis
         <MessageItem 
           key={message.id} 
           message={message} 
-          handleSourceClick={handleSourceClick} 
+          handleSourceClick={handleSourceClick}
         />
       ))}
 
diff --git a/components/CustomSearchDialog/index.tsx b/components/CustomSearchDialog/index.tsx
index 5a235769..8211089e 100644
--- a/components/CustomSearchDialog/index.tsx
+++ b/components/CustomSearchDialog/index.tsx
@@ -22,7 +22,6 @@ export default function CustomSearchDialog(props: CustomSearchDialogProps) {
     handleClear,
     handleSourceClick
   } = useMessages();
-
   // Focus input when dialog opens
   useEffect(() => {
     if (open) {

From 2bb082672ae9a5a82b9487e9e4a5c10b41b477b4 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Sun, 29 Jun 2025 11:37:04 -0600
Subject: [PATCH 20/33] update readme and .env.example

---
 .env.example |  4 ++--
 README.md    | 22 +++++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.env.example b/.env.example
index acc73b85..a29b8844 100644
--- a/.env.example
+++ b/.env.example
@@ -1,10 +1,10 @@
 # Agent Configuration
 AGENT_BASE_URL=http://127.0.0.1:3500
-AGENT_ID=agent_your_agent_id
+AGENT_ID=agent_local_qa_agent_id
 # AGENT_BEARER_TOKEN=your-bearer-token-here
 
 # Alternative: You can also set the full URL instead of BASE_URL + ID
-# AGENT_FULL_URL=http://127.0.0.1:3500/agent_your_agent_id
+# AGENT_FULL_URL=http://127.0.0.1:3500/agent_local_qa_agent_id
 
 # Next.js Environment
 NEXTJS_ENV=development
\ No newline at end of file
diff --git a/README.md b/README.md
index 48a765c3..3543f137 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,27 @@
 
 This project contains the Agentuity documentation website, created using Fumadocs and running on NextJS 15.
 
-## Running
+To make the search feature work, you must set up `.env.local` with the following steps.
+
+## Setup Local Environment
+1. **Navigate to the Agent Directory:**
+   ```bash
+   cd agent-docs
+   ```
+
+2. **Start the Agent:**
+   ```bash
+   agentuity dev
+   ```
+
+3. **Update `.env.local`:**  
+   Add your agent's URL and ID:
+   ```plaintext
+   AGENT_BASE_URL=YOUR_AGENT_URL
+   AGENT_ID=YOUR_DOC_QA_AGENT_ID
+   ```
+
+## Running Docs Application
 
 ```bash
 npm run dev

From 9de517ad1a3ec3706648ead8ff499dc306e72d9e Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Mon, 30 Jun 2025 07:42:47 -0600
Subject: [PATCH 21/33] update readme

---
 .env.example | 5 ++---
 README.md    | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.env.example b/.env.example
index a29b8844..2bf6ca23 100644
--- a/.env.example
+++ b/.env.example
@@ -1,10 +1,9 @@
 # Agent Configuration
 AGENT_BASE_URL=http://127.0.0.1:3500
-AGENT_ID=agent_local_qa_agent_id
-# AGENT_BEARER_TOKEN=your-bearer-token-here
+AGENT_ID=agent_9ccc5545e93644bd9d7954e632a55a61
 
 # Alternative: You can also set the full URL instead of BASE_URL + ID
-# AGENT_FULL_URL=http://127.0.0.1:3500/agent_local_qa_agent_id
+# AGENT_FULL_URL=http://127.0.0.1:3500/agent_9ccc5545e93644bd9d7954e632a55a61
 
 # Next.js Environment
 NEXTJS_ENV=development
\ No newline at end of file
diff --git a/README.md b/README.md
index 3543f137..fd0d6e97 100644
--- a/README.md
+++ b/README.md
@@ -21,11 +21,10 @@ To make the search feature work, you must set up `.env.local` with the following
    agentuity dev
    ```
 
-3. **Update `.env.local`:**  
-   Add your agent's URL and ID:
-   ```plaintext
-   AGENT_BASE_URL=YOUR_AGENT_URL
-   AGENT_ID=YOUR_DOC_QA_AGENT_ID
+3. **Copy Environment Configuration:**
+   For local development, copy the `.env.example` file to `.env.local`:
+   ```bash
+   cp .env.example .env.local
    ```
 
 ## Running Docs Application

From abe37e916c30a34360be8c97b04718f6b207b741 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Mon, 30 Jun 2025 07:45:31 -0600
Subject: [PATCH 22/33] outside contributor instruction

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fd0d6e97..038932e0 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,8 @@ This project contains the Agentuity documentation website, created using Fumadoc
 
 To make the search feature work, you must set up `.env.local` with the following steps.
 
-## Setup Local Environment
+## Quick Start Guide
+
 1. **Navigate to the Agent Directory:**
    ```bash
    cd agent-docs
@@ -27,6 +28,9 @@ To make the search feature work, you must set up `.env.local` with the following
    cp .env.example .env.local
    ```
 
+4. **Update `AGENT_ID`:**
+   If you are a contributor from outside the Agentuity organization, ensure that you update the `AGENT_ID` in your `.env.local` file with your specific agent ID from the `agentuity dev` run.
+
 ## Running Docs Application
 
 ```bash

From 802df85e0a9eb5ed2fcea2fab84e60eec11d6247 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Tue, 1 Jul 2025 08:13:17 -0600
Subject: [PATCH 23/33] fix focus indicator

---
 components/CustomSearchDialog/index.tsx | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/components/CustomSearchDialog/index.tsx b/components/CustomSearchDialog/index.tsx
index 8211089e..0c2cf227 100644
--- a/components/CustomSearchDialog/index.tsx
+++ b/components/CustomSearchDialog/index.tsx
@@ -13,7 +13,7 @@ export default function CustomSearchDialog(props: CustomSearchDialogProps) {
   const { open, onOpenChange } = props;
   const [currentInput, setCurrentInput] = useState('');
   const inputRef = useRef<HTMLTextAreaElement>(null);
-  
+
   const {
     messages,
     loading,
@@ -28,14 +28,19 @@ export default function CustomSearchDialog(props: CustomSearchDialogProps) {
       setTimeout(() => inputRef.current?.focus(), 100);
     }
   }, [open]);
-
   if (!open) return null;
 
   return (
     <Dialog.Root open={open} onOpenChange={onOpenChange}>
       <Dialog.Portal>
         <Dialog.Overlay className="fixed inset-0 z-50 bg-black/30" />
-        <Dialog.Content className="fixed inset-0 z-50">
+        <Dialog.Content
+          className="fixed inset-0 z-50"
+          onOpenAutoFocus={(e) => {
+            e.preventDefault();
+            setTimeout(() => inputRef.current?.focus({ preventScroll: true }), 0);
+          }}
+          >
           <Dialog.Title className="sr-only">Search Documentation</Dialog.Title>
           <div className="fixed left-1/2 top-1/2 w-full max-w-3xl h-[75vh] -translate-x-1/2 -translate-y-1/2 bg-white dark:bg-gray-900 rounded-xl shadow-lg border border-gray-100 dark:border-gray-800 flex flex-col">
             {/* Header */}
@@ -59,8 +64,8 @@ export default function CustomSearchDialog(props: CustomSearchDialogProps) {
             </div>
 
             {/* Messages Area */}
-            <MessageList 
-              messages={messages} 
+            <MessageList
+              messages={messages}
               loading={loading}
               handleSourceClick={handleSourceClick}
             />
@@ -77,7 +82,7 @@ export default function CustomSearchDialog(props: CustomSearchDialogProps) {
                     setCurrentInput('');
                   }}
                 />
-              
+
                 {/* Action Buttons */}
                 <div className="flex items-center justify-between text-xs mt-2">
                   <div className="flex gap-4">

From 15d00cc02217b782ab35729bd4834e85fa8090ba Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Tue, 1 Jul 2025 08:50:12 -0600
Subject: [PATCH 24/33] fix path by removing index

---
 app/api/search/route.ts | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/api/search/route.ts b/app/api/search/route.ts
index eea69788..250d188e 100644
--- a/app/api/search/route.ts
+++ b/app/api/search/route.ts
@@ -8,7 +8,28 @@ const { GET: defaultSearchHandler } = createFromSource(source);
 
 function documentPathToUrl(docPath: string): string {
   // Remove the .md or .mdx extension before any # symbol
-  return '/' + docPath.replace(/\.mdx?(?=#|$)/, '');
+  let path = docPath.replace(/\.mdx?(?=#|$)/, '');
+
+  // Split path and hash (if any)
+  const [basePath, hash] = path.split('#');
+
+  // Split the base path into segments
+  const segments = basePath.split('/').filter(Boolean);
+
+  // If the last segment is 'index', remove it
+  if (segments.length > 0 && segments[segments.length - 1].toLowerCase() === 'index') {
+    segments.pop();
+  }
+
+  // Reconstruct the path
+  let url = '/' + segments.join('/');
+  if (url === '/') {
+    url = '/';
+  }
+  if (hash) {
+    url += '#' + hash;
+  }
+  return url;
 }
 
 // Helper function to get document title and description from source

From 68cd17ee409e4adeb3a3ddcd1d5f7f43d1fbb273 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Tue, 1 Jul 2025 08:55:01 -0600
Subject: [PATCH 25/33] rephrase prompt for better search context

---
 agent-docs/src/agents/doc-qa/prompt.ts | 65 +++++++++++++++++++++++++-
 agent-docs/src/agents/doc-qa/rag.ts    | 29 ++++++++----
 2 files changed, 85 insertions(+), 9 deletions(-)

diff --git a/agent-docs/src/agents/doc-qa/prompt.ts b/agent-docs/src/agents/doc-qa/prompt.ts
index 178fea60..5b71a09f 100644
--- a/agent-docs/src/agents/doc-qa/prompt.ts
+++ b/agent-docs/src/agents/doc-qa/prompt.ts
@@ -1,9 +1,72 @@
 import type { AgentContext } from '@agentuity/sdk';
-import { generateObject } from 'ai';
+import { generateObject, generateText } from 'ai';
 import { openai } from '@ai-sdk/openai';
+
 import type { PromptType } from './types';
 import { PromptClassificationSchema } from './types';
 
+
+export async function rephraseVaguePrompt(ctx: AgentContext, input: string): Promise<string> {
+    const systemPrompt = `You are a technical documentation search assistant for developer tools and AI agents. Your job is to CAREFULLY improve unclear queries ONLY when absolutely necessary.
+
+BE EXTREMELY CONSERVATIVE. Most queries should be returned UNCHANGED.
+
+ONLY rephrase if the query contains:
+1. OBVIOUS acronyms that need expansion (SDK, API, CLI, UI, KV, HTTP, REST, JSON, XML)
+2. Very vague single words like "error", "setup", "install" without context
+
+NEVER change or "correct" these technical terms (return them exactly as written):
+- bun, node, deno (JavaScript runtimes)
+- react, vue, angular, svelte (frameworks) 
+- typescript, javascript, python, rust (languages)
+- docker, kubernetes, aws, gcp (platforms)
+- Any proper nouns or brand names
+
+When rephrasing:
+- Keep the original technical terms EXACTLY as written
+- Only add minimal context for clarity
+- Don't assume what the user meant
+- Don't add implementation details
+
+Examples of GOOD rephrasing:
+- "SDK setup" → "SDK setup installation configuration"
+- "API error" → "API error handling troubleshooting"
+- "CLI install" → "CLI installation setup"
+
+Examples of what to LEAVE UNCHANGED:
+- "bun example agent" → "bun example agent" (bun is a known runtime)
+- "react component" → "react component" (already clear)
+- "node server setup" → "node server setup" (already specific enough)
+- "typescript agent" → "typescript agent" (clear technical terms)
+
+If in doubt, return the query UNCHANGED. Better to leave it as-is than to misinterpret the user's intent.
+
+Return ONLY the query text, nothing else.`;
+
+    try {
+        const result = await generateText({
+            model: openai('gpt-4o-mini'),
+            system: systemPrompt,
+            prompt: `User query: "${input}"`,
+            maxTokens: 100,
+            temperature: 0.1, 
+        });
+
+        const rephrasedQuery = result.text?.trim() || input;
+        console.log(rephrasedQuery);
+        // Log if we actually rephrased it
+        if (rephrasedQuery !== input) {
+            ctx.logger.info('Rephrased query from "%s" to "%s"', input, rephrasedQuery);
+        }
+
+        return rephrasedQuery;
+        
+    } catch (error) {
+        ctx.logger.error('Error rephrasing prompt, returning original: %o', error);
+        return input;
+    }
+}
+
 /**
  * Determines the prompt type based on the input string using LLM classification.
  * Uses specific, measurable criteria to decide between Normal and Agentic RAG.
diff --git a/agent-docs/src/agents/doc-qa/rag.ts b/agent-docs/src/agents/doc-qa/rag.ts
index 42805791..e710e617 100644
--- a/agent-docs/src/agents/doc-qa/rag.ts
+++ b/agent-docs/src/agents/doc-qa/rag.ts
@@ -3,23 +3,32 @@ import { generateObject } from 'ai';
 import { openai } from '@ai-sdk/openai';
 
 import { retrieveRelevantDocs } from './retriever';
+import { rephraseVaguePrompt } from './prompt';
 import { AnswerSchema } from './types';
 import type { Answer } from './types';
 
 export default async function answerQuestion(ctx: AgentContext, prompt: string) {
-    const relevantDocs = await retrieveRelevantDocs(ctx, prompt);
+    // First, rephrase the prompt for better vector search
+    const rephrasedPrompt = await rephraseVaguePrompt(ctx, prompt);
+    
+    // Use the rephrased prompt for document retrieval
+    const relevantDocs = await retrieveRelevantDocs(ctx, rephrasedPrompt);
 
     const systemPrompt = `
 You are Agentuity's developer-documentation assistant.
 
+=== CONTEXT ===
+You will receive both the user's ORIGINAL question and a REPHRASED version that was optimized for document search. The rephrased version helped find the relevant documents, but you should answer the user's original intent.
+
 === RULES ===
 1. Use ONLY the content inside <DOCS> tags to craft your reply. If the required information is missing, state that the docs do not cover it.
 2. Never fabricate or guess undocumented details.
-3. Ambiguity handling:
+3. Focus on answering the ORIGINAL QUESTION, using the documents found via the rephrased search.
+4. Ambiguity handling:
    • When <DOCS> contains more than one distinct workflow or context that could satisfy the question, do **not** choose for the user.
    • Briefly (≤ 2 sentences each) summarise each plausible interpretation and ask **one** clarifying question so the user can pick a path.
    • Provide a definitive answer only after the ambiguity is resolved.
-4. Answer style:
+5. Answer style:
    • If the question can be answered unambiguously from a single workflow, give a short, direct answer.
    • Add an explanation only when the user explicitly asks for one.
    • Format your response in **MDX (Markdown Extended)** format with proper syntax highlighting for code blocks.
@@ -28,8 +37,8 @@ You are Agentuity's developer-documentation assistant.
    • Wrap code snippets in appropriate language blocks (e.g., \`\`\`typescript, \`\`\`json, \`\`\`javascript).
    • Use **bold** for important terms and *italic* for emphasis when appropriate.
    • Use > blockquotes for important notes or warnings.
-5. You may suggest concise follow-up questions or related topics that are present in <DOCS>.
-6. Keep a neutral, factual tone.
+6. You may suggest concise follow-up questions or related topics that are present in <DOCS>.
+7. Keep a neutral, factual tone.
 
 === OUTPUT FORMAT ===
 Return **valid JSON only** matching this TypeScript type:
@@ -74,9 +83,13 @@ agentuity agent create [name] [description] [auth_type]
 
 > **Note**: This command will create the agent in the Agentuity Cloud and set up local files.
 
-<QUESTION>
+<ORIGINAL_QUESTION>
 ${prompt}
-</QUESTION>
+</ORIGINAL_QUESTION>
+
+<REPHRASED_SEARCH_QUERY>
+${rephrasedPrompt}
+</REPHRASED_SEARCH_QUERY>
 
 <DOCS>
 ${JSON.stringify(relevantDocs, null, 2)}
@@ -87,7 +100,7 @@ ${JSON.stringify(relevantDocs, null, 2)}
         const result = await generateObject({
             model: openai('gpt-4o'),
             system: systemPrompt,
-            prompt: prompt,
+            prompt: `Please answer the original question using the documentation found via the rephrased search query. Your answer should cater toward the original user prompt rather than the rephrased version of the query.`,
             schema: AnswerSchema,
             maxTokens: 2048,
         });

From b77496d6313d1b7491edb007b0f96c50d63cc7e4 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Tue, 1 Jul 2025 08:55:15 -0600
Subject: [PATCH 26/33] increase rag timeout

---
 components/CustomSearchDialog/hooks/useMessages.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/CustomSearchDialog/hooks/useMessages.tsx b/components/CustomSearchDialog/hooks/useMessages.tsx
index 5308494d..1e459286 100644
--- a/components/CustomSearchDialog/hooks/useMessages.tsx
+++ b/components/CustomSearchDialog/hooks/useMessages.tsx
@@ -65,7 +65,7 @@ export function useMessages() {
 
       const controller = new AbortController();
       abortControllerRef.current = controller;
-      const timeoutId = setTimeout(() => controller.abort(), 30000);
+      const timeoutId = setTimeout(() => controller.abort(), 90000);
 
       const response = await fetch(`/api/search?${searchParams}`, {
         signal: controller.signal
@@ -142,6 +142,7 @@ export function useMessages() {
   }, []);
 
   const handleSourceClick = useCallback((url: string) => {
+    
     if (url && url !== '#' && (url.startsWith('/') || url.startsWith('http'))) {
       window.open(url, '_blank');
     }

From 22c34d24b0243e63b82f28619d4eb5dc1c153ac0 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Tue, 1 Jul 2025 19:03:18 -0600
Subject: [PATCH 27/33] test fix

---
 .github/workflows/sync-docs-full.yml |  2 +-
 bin/send-webhook.sh                  | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/sync-docs-full.yml b/.github/workflows/sync-docs-full.yml
index 30c0f083..881cf853 100644
--- a/.github/workflows/sync-docs-full.yml
+++ b/.github/workflows/sync-docs-full.yml
@@ -1,7 +1,7 @@
 name: Full Docs Sync to Vector Store
 
 on:
-  workflow_dispatch:
+  pull_request:
 
 jobs:
   sync:
diff --git a/bin/send-webhook.sh b/bin/send-webhook.sh
index ceda5e9e..8a963a82 100755
--- a/bin/send-webhook.sh
+++ b/bin/send-webhook.sh
@@ -21,27 +21,31 @@ RETRY_DELAY=2
 
 echo "Sending webhook to $WEBHOOK_URL" >&2
 
-# Read payload from stdin
-payload=$(cat)
+# Create temporary file for payload
+TEMP_FILE=$(mktemp)
+trap "rm -f $TEMP_FILE" EXIT
 
-if [ -z "$payload" ]; then
+# Read payload from stdin to temporary file
+cat > "$TEMP_FILE"
+
+if [ ! -s "$TEMP_FILE" ]; then
     echo "Error: No payload received from stdin" >&2
     exit 1
 fi
 
 # Validate JSON
-if ! echo "$payload" | jq . >/dev/null 2>&1; then
+if ! jq . "$TEMP_FILE" >/dev/null 2>&1; then
     echo "Error: Invalid JSON payload" >&2
     exit 1
 fi
 
-echo "Payload size: $(echo "$payload" | wc -c) bytes" >&2
+echo "Payload size: $(wc -c < "$TEMP_FILE") bytes" >&2
 
-# Build curl command
+# Build curl command using temporary file
 curl_args=(
     -X POST
     -H "Content-Type: application/json"
-    -d "$payload"
+    --data-binary "@$TEMP_FILE"
     --fail
     --show-error
     --silent

From 0dd145946851d81be9d2803b56418d85431a1aa3 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Tue, 1 Jul 2025 19:09:29 -0600
Subject: [PATCH 28/33] fix linting error for build

---
 app/api/search/route.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/search/route.ts b/app/api/search/route.ts
index 250d188e..3bfd8aa3 100644
--- a/app/api/search/route.ts
+++ b/app/api/search/route.ts
@@ -8,7 +8,7 @@ const { GET: defaultSearchHandler } = createFromSource(source);
 
 function documentPathToUrl(docPath: string): string {
   // Remove the .md or .mdx extension before any # symbol
-  let path = docPath.replace(/\.mdx?(?=#|$)/, '');
+  const path = docPath.replace(/\.mdx?(?=#|$)/, '');
 
   // Split path and hash (if any)
   const [basePath, hash] = path.split('#');

From bc384dd87a6125c2205ec246a56c89fd3906c42a Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Tue, 1 Jul 2025 19:10:18 -0600
Subject: [PATCH 29/33] remove debug event

---
 .github/workflows/sync-docs-full.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sync-docs-full.yml b/.github/workflows/sync-docs-full.yml
index 881cf853..30c0f083 100644
--- a/.github/workflows/sync-docs-full.yml
+++ b/.github/workflows/sync-docs-full.yml
@@ -1,7 +1,7 @@
 name: Full Docs Sync to Vector Store
 
 on:
-  pull_request:
+  workflow_dispatch:
 
 jobs:
   sync:

From 5269d492a255570498f492d0bb804b8b6d221301 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Tue, 1 Jul 2025 20:21:52 -0600
Subject: [PATCH 30/33] allow copy and paste on code block - fix the text
 leaking

---
 components/CustomSearchDialog/MessageList.tsx | 72 +++++++++++++++++--
 components/CustomSearchDialog/SearchInput.tsx | 34 ++++++---
 2 files changed, 91 insertions(+), 15 deletions(-)

diff --git a/components/CustomSearchDialog/MessageList.tsx b/components/CustomSearchDialog/MessageList.tsx
index 3f1cd9c1..5d35b7d4 100644
--- a/components/CustomSearchDialog/MessageList.tsx
+++ b/components/CustomSearchDialog/MessageList.tsx
@@ -1,12 +1,37 @@
 'use client';
 
-import { useRef, useEffect } from 'react';
+import React, { useRef, useEffect, useState } from 'react';
 import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
-import { User, HelpCircle, Loader2 } from 'lucide-react';
+import { User, HelpCircle, Loader2, Copy, Check } from 'lucide-react';
 import { AgentuityLogo } from '../icons/AgentuityLogo';
 import { MessageListProps, Message } from './types';
 
+// Copy button component for code blocks
+function CopyButton({ text }: { text: string }) {
+  const [copied, setCopied] = useState(false);
+
+  const handleCopy = async () => {
+    try {
+      await navigator.clipboard.writeText(text);
+      setCopied(true);
+      setTimeout(() => setCopied(false), 2000);
+    } catch (err) {
+      console.error('Failed to copy text:', err);
+    }
+  };
+
+  return (
+    <button
+      onClick={handleCopy}
+      className="absolute top-2 right-2 p-1.5 rounded bg-gray-700 hover:bg-gray-600 text-white opacity-70 hover:opacity-100 transition-opacity"
+      title="Copy code"
+    >
+      {copied ? <Check className="w-3 h-3" /> : <Copy className="w-3 h-3" />}
+    </button>
+  );
+}
+
 export function MessageList({ messages, loading, handleSourceClick }: MessageListProps) {
   const messagesEndRef = useRef<HTMLDivElement>(null);
 
@@ -87,12 +112,51 @@ function MessageItem({ message, handleSourceClick }: MessageItemProps) {
           }`}>
           {message.type === 'ai' ? (
             <div className="prose prose-sm max-w-none dark:prose-invert prose-gray text-sm">
-              <ReactMarkdown remarkPlugins={[remarkGfm]}>
+              <ReactMarkdown 
+                remarkPlugins={[remarkGfm]}
+                components={{
+                  pre: ({ children }) => {
+                    // Better text extraction for copying
+                    const extractTextContent = (element: any): string => {
+                      if (typeof element === 'string') return element;
+                      if (typeof element === 'number') return String(element);
+                      if (element?.props?.children) {
+                        if (typeof element.props.children === 'string') {
+                          return element.props.children;
+                        }
+                        if (Array.isArray(element.props.children)) {
+                          return element.props.children.map(extractTextContent).join('');
+                        }
+                        return extractTextContent(element.props.children);
+                      }
+                      return '';
+                    };
+
+                    const codeText = Array.isArray(children) 
+                      ? children.map(extractTextContent).join('')
+                      : extractTextContent(children);
+
+                    return (
+                      <div className="relative group">
+                        <pre className="max-w-full whitespace-pre-wrap break-words pr-12">
+                          {children}
+                        </pre>
+                        <CopyButton text={codeText} />
+                      </div>
+                    );
+                  },
+                  code: ({ children, className }) => (
+                    <code className={`break-words whitespace-pre-wrap ${className || ''}`}>
+                      {children}
+                    </code>
+                  )
+                }}
+              >
                 {message.content}
               </ReactMarkdown>
             </div>
           ) : (
-            <p className="text-sm whitespace-pre-wrap">{message.content}</p>
+            <p className="text-sm whitespace-pre-wrap break-words">{message.content}</p>
           )}
         </div>
 
diff --git a/components/CustomSearchDialog/SearchInput.tsx b/components/CustomSearchDialog/SearchInput.tsx
index 72aaa9bc..ab5ab786 100644
--- a/components/CustomSearchDialog/SearchInput.tsx
+++ b/components/CustomSearchDialog/SearchInput.tsx
@@ -30,10 +30,17 @@ export function SearchInput({ currentInput, setCurrentInput, loading, sendMessag
     }
   };
 
+  const handleSend = () => {
+    if (currentInput.trim()) {
+      sendMessage(currentInput);
+    }
+  };
+
   return (
     <div className="w-full">
       <div className="flex gap-2">
-        <div className="flex-1 relative">
+        {/* Textarea Container */}
+        <div className="flex-1 min-w-0">
           <textarea
             ref={textareaRef}
             value={currentInput}
@@ -44,20 +51,25 @@ export function SearchInput({ currentInput, setCurrentInput, loading, sendMessag
             disabled={loading}
             rows={1}
           />
-          {currentInput.trim() && (
-            <div className="absolute right-2 bottom-2 text-xs text-gray-400">
+          {currentInput.trim() && !loading && (
+            <div className="absolute right-2 bottom-2 text-xs text-gray-400 pointer-events-none">
               Press Enter to send
             </div>
           )}
         </div>
-        <button
-          onClick={() => currentInput.trim() && sendMessage(currentInput)}
-          disabled={loading || !currentInput.trim()}
-          className="px-3 py-2 bg-gray-800 hover:bg-gray-900 disabled:bg-gray-200 dark:disabled:bg-gray-700 disabled:text-gray-400 text-white text-sm rounded-lg transition-colors disabled:cursor-not-allowed flex-shrink-0"
-          aria-label="Send message"
-        >
-          <Send className="w-4 h-4" />
-        </button>
+
+        {/* Button Container - this is the key fix */}
+        <div className="flex flex-col">
+          <button
+            onClick={handleSend}
+            disabled={loading || !currentInput.trim()}
+            className="h-[40px] w-[40px] bg-gray-800 hover:bg-gray-900 disabled:bg-gray-200 dark:disabled:bg-gray-700 disabled:text-gray-400 text-white text-sm rounded-lg transition-colors disabled:cursor-not-allowed flex items-center justify-center flex-shrink-0"
+            aria-label="Send message"
+            type="button"
+          >
+            <Send className="w-4 h-4" />
+          </button>
+        </div>
       </div>
     </div>
   );

From e5ac106bc937ed0b4d2ae64bf20094fb476f5af8 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Tue, 1 Jul 2025 20:25:36 -0600
Subject: [PATCH 31/33] use prebuilt component for code block and cli command

---
 components/CustomSearchDialog/MessageList.tsx | 89 +++++++------------
 1 file changed, 31 insertions(+), 58 deletions(-)

diff --git a/components/CustomSearchDialog/MessageList.tsx b/components/CustomSearchDialog/MessageList.tsx
index 5d35b7d4..933b5b8d 100644
--- a/components/CustomSearchDialog/MessageList.tsx
+++ b/components/CustomSearchDialog/MessageList.tsx
@@ -1,37 +1,14 @@
 'use client';
 
-import React, { useRef, useEffect, useState } from 'react';
+import React, { useRef, useEffect } from 'react';
 import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
-import { User, HelpCircle, Loader2, Copy, Check } from 'lucide-react';
+import { User, HelpCircle, Loader2 } from 'lucide-react';
 import { AgentuityLogo } from '../icons/AgentuityLogo';
+import { CLICommand } from '../CLICommand';
+import { DynamicCodeBlock } from 'fumadocs-ui/components/dynamic-codeblock';
 import { MessageListProps, Message } from './types';
 
-// Copy button component for code blocks
-function CopyButton({ text }: { text: string }) {
-  const [copied, setCopied] = useState(false);
-
-  const handleCopy = async () => {
-    try {
-      await navigator.clipboard.writeText(text);
-      setCopied(true);
-      setTimeout(() => setCopied(false), 2000);
-    } catch (err) {
-      console.error('Failed to copy text:', err);
-    }
-  };
-
-  return (
-    <button
-      onClick={handleCopy}
-      className="absolute top-2 right-2 p-1.5 rounded bg-gray-700 hover:bg-gray-600 text-white opacity-70 hover:opacity-100 transition-opacity"
-      title="Copy code"
-    >
-      {copied ? <Check className="w-3 h-3" /> : <Copy className="w-3 h-3" />}
-    </button>
-  );
-}
-
 export function MessageList({ messages, loading, handleSourceClick }: MessageListProps) {
   const messagesEndRef = useRef<HTMLDivElement>(null);
 
@@ -116,40 +93,36 @@ function MessageItem({ message, handleSourceClick }: MessageItemProps) {
                 remarkPlugins={[remarkGfm]}
                 components={{
                   pre: ({ children }) => {
-                    // Better text extraction for copying
-                    const extractTextContent = (element: any): string => {
-                      if (typeof element === 'string') return element;
-                      if (typeof element === 'number') return String(element);
-                      if (element?.props?.children) {
-                        if (typeof element.props.children === 'string') {
-                          return element.props.children;
-                        }
-                        if (Array.isArray(element.props.children)) {
-                          return element.props.children.map(extractTextContent).join('');
-                        }
-                        return extractTextContent(element.props.children);
-                      }
-                      return '';
-                    };
-
-                    const codeText = Array.isArray(children) 
-                      ? children.map(extractTextContent).join('')
-                      : extractTextContent(children);
-
+                    // Extract code content and language
+                    const codeElement = React.Children.toArray(children)[0] as any;
+                    const className = codeElement?.props?.className || '';
+                    const language = className.replace('language-', '');
+                    const code = codeElement?.props?.children || '';
+
+                    // Use CLICommand for bash/shell commands
+                    if (language === 'bash' || language === 'sh' || language === 'shell') {
+                      return <CLICommand command={code} />;
+                    }
+
+                    // Use DynamicCodeBlock for other languages
                     return (
-                      <div className="relative group">
-                        <pre className="max-w-full whitespace-pre-wrap break-words pr-12">
-                          {children}
-                        </pre>
-                        <CopyButton text={codeText} />
-                      </div>
+                      <DynamicCodeBlock 
+                        code={code} 
+                        lang={language || 'text'}
+                      />
                     );
                   },
-                  code: ({ children, className }) => (
-                    <code className={`break-words whitespace-pre-wrap ${className || ''}`}>
-                      {children}
-                    </code>
-                  )
+                  code: ({ children, className, ...props }) => {
+                    // Only handle inline code (not code blocks which are handled by pre)
+                    if (!className) {
+                      return (
+                        <code className="break-words whitespace-pre-wrap" {...props}>
+                          {children}
+                        </code>
+                      );
+                    }
+                    return <code {...props}>{children}</code>;
+                  }
                 }}
               >
                 {message.content}

From 3023e9920c5dec2c01ebca3c90f1554ae6cff626 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Tue, 1 Jul 2025 20:42:20 -0600
Subject: [PATCH 32/33] coderabbit suggestions

---
 bin/send-webhook.sh                           | 2 +-
 components/CustomSearchDialog/MessageList.tsx | 2 --
 components/CustomSearchDialog/SearchInput.tsx | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bin/send-webhook.sh b/bin/send-webhook.sh
index 8a963a82..ce029af5 100755
--- a/bin/send-webhook.sh
+++ b/bin/send-webhook.sh
@@ -23,7 +23,7 @@ echo "Sending webhook to $WEBHOOK_URL" >&2
 
 # Create temporary file for payload
 TEMP_FILE=$(mktemp)
-trap "rm -f $TEMP_FILE" EXIT
+trap 'rm -f "$TEMP_FILE"' EXIT
 
 # Read payload from stdin to temporary file
 cat > "$TEMP_FILE"
diff --git a/components/CustomSearchDialog/MessageList.tsx b/components/CustomSearchDialog/MessageList.tsx
index 933b5b8d..26bac22a 100644
--- a/components/CustomSearchDialog/MessageList.tsx
+++ b/components/CustomSearchDialog/MessageList.tsx
@@ -104,7 +104,6 @@ function MessageItem({ message, handleSourceClick }: MessageItemProps) {
                       return <CLICommand command={code} />;
                     }
 
-                    // Use DynamicCodeBlock for other languages
                     return (
                       <DynamicCodeBlock 
                         code={code} 
@@ -113,7 +112,6 @@ function MessageItem({ message, handleSourceClick }: MessageItemProps) {
                     );
                   },
                   code: ({ children, className, ...props }) => {
-                    // Only handle inline code (not code blocks which are handled by pre)
                     if (!className) {
                       return (
                         <code className="break-words whitespace-pre-wrap" {...props}>
diff --git a/components/CustomSearchDialog/SearchInput.tsx b/components/CustomSearchDialog/SearchInput.tsx
index ab5ab786..197dd768 100644
--- a/components/CustomSearchDialog/SearchInput.tsx
+++ b/components/CustomSearchDialog/SearchInput.tsx
@@ -40,7 +40,7 @@ export function SearchInput({ currentInput, setCurrentInput, loading, sendMessag
     <div className="w-full">
       <div className="flex gap-2">
         {/* Textarea Container */}
-        <div className="flex-1 min-w-0">
+         <div className="flex-1 min-w-0 relative">
           <textarea
             ref={textareaRef}
             value={currentInput}

From 049f12c6c7dc525310e37597626727e2981f0184 Mon Sep 17 00:00:00 2001
From: afterrburn <sun_rsh@outlook.com>
Date: Tue, 1 Jul 2025 20:50:49 -0600
Subject: [PATCH 33/33] fix build failure

---
 components/CustomSearchDialog/MessageList.tsx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/components/CustomSearchDialog/MessageList.tsx b/components/CustomSearchDialog/MessageList.tsx
index 26bac22a..eb5ba3d2 100644
--- a/components/CustomSearchDialog/MessageList.tsx
+++ b/components/CustomSearchDialog/MessageList.tsx
@@ -94,10 +94,17 @@ function MessageItem({ message, handleSourceClick }: MessageItemProps) {
                 components={{
                   pre: ({ children }) => {
                     // Extract code content and language
-                    const codeElement = React.Children.toArray(children)[0] as any;
+                    const codeElement = React.Children.toArray(children)[0] as React.ReactElement<{
+                      className?: string;
+                      children?: React.ReactNode;
+                    }>;
                     const className = codeElement?.props?.className || '';
                     const language = className.replace('language-', '');
-                    const code = codeElement?.props?.children || '';
+                    
+                    // Extract string content from children
+                    const code = typeof codeElement?.props?.children === 'string' 
+                      ? codeElement.props.children 
+                      : String(codeElement?.props?.children || '');
 
                     // Use CLICommand for bash/shell commands
                     if (language === 'bash' || language === 'sh' || language === 'shell') {