sync: mcp-sap-docs cadb82c1450fb7014439d3d295ac5df897700bfe -> abap variant [skip-sync]

Author: actions-user

config/variants/abap.metadata.json

@@ -130,9 +130,9 @@
       "description": "SAP Business Technology Platform documentation",
       "libraryId": "/btp-cloud-platform",
       "sourcePath": "btp-cloud-platform/docs",
-      "baseUrl": "https://github.com/SAP-docs/btp-cloud-platform/blob/main",
-      "pathPattern": "/docs/{file}",
-      "anchorStyle": "github"
+      "baseUrl": "https://help.sap.com/docs/BTP/65de2977205c403bbc107264b8eccf4b",
+      "pathPattern": "/{file}.html",
+      "anchorStyle": "sap-help"
     },
     {
       "id": "sap-artificial-intelligence",
@@ -143,9 +143,9 @@
       "description": "SAP AI Core and SAP AI Launchpad documentation",
       "libraryId": "/sap-artificial-intelligence",
       "sourcePath": "sap-artificial-intelligence/docs",
-      "baseUrl": "https://github.com/SAP-docs/sap-artificial-intelligence/blob/main",
-      "pathPattern": "/docs/{file}",
-      "anchorStyle": "github"
+      "baseUrl": "https://help.sap.com/docs",
+      "pathPattern": "/{file}.html",
+      "anchorStyle": "sap-help"
     },
     {
       "id": "teched2025-dt260",

config/variants/sap-docs.json

@@ -29,6 +29,7 @@
     "/btp-cloud-platform",
     "/sap-artificial-intelligence",
     "/terraform-provider-btp",
+    "/teched2025-dt260",
     "/architecture-center"
   ],
   "submodulePaths": [
@@ -56,6 +57,7 @@
     "sources/sap-artificial-intelligence",
     "sources/abap-atc-cr-cv-s4hc",
     "sources/terraform-provider-btp",
+    "sources/teched2025-dt260",
     "sources/architecture-center"
   ],
   "tools": {

package.json

@@ -15,7 +15,7 @@
     "inspect": "npx @modelcontextprotocol/inspector",
     "test": "npm run test:url-generation && npm run test:integration",
     "test:sparse-checkout": "npx vitest run test/sparse-checkout.test.ts",
-    "test:url-generation": "npm run build:tsc && npx vitest run test/comprehensive-url-generation.test.ts test/prompts.test.ts test/software-heroes-afm.test.ts",
+    "test:url-generation": "npm run build:tsc && npx vitest run test/comprehensive-url-generation.test.ts test/source-url-matrix.test.ts test/search-response-schema.test.ts test/prompts.test.ts test/software-heroes-afm.test.ts",
     "test:url-generation:debug": "npm run build:tsc && DEBUG_TESTS=true npx vitest run test/comprehensive-url-generation.test.ts",
     "test:mcp-urls": "npm run build:tsc && npx vitest run test/mcp-search-url-verification.test.ts",
     "test:integration": "npm run build && node test/tools/run-tests.js",

scripts/build-index.ts

@@ -211,7 +211,7 @@ const SOURCES: SourceConfig[] = [
     id: "/cap-fiori-showcase",
     name: "CAP Fiori Elements Feature Showcase",
     description: "SAP Fiori Elements features and annotations showcase using CAP",
-    filePattern: "*.md",
+    filePattern: "**/*.{md,cds}",
     type: "markdown" as const
   },
   {
@@ -923,4 +923,4 @@ async function main() {
   console.log("✅  Index built with", Object.keys(all).length, "libraries.");
 }
 
-main(); 
+main();

src/lib/BaseServerHandler.ts

@@ -46,6 +46,8 @@ import { search } from "./search.js";
 import { CONFIG } from "./config.js";
 import { loadMetadata, getDocUrlConfig } from "./metadata.js";
 import { generateDocumentationUrl, formatSearchResult } from "./url-generation/index.js";
+import { extractLibraryIdFromPath } from "./url-generation/utils.js";
+import { extractSourceUrlFromText, readSourceContentSync } from "./sourceContent.js";
 import { isToolEnabled, getVariantName } from "./variant.js";
 import { searchDiscoveryCenter, getDiscoveryCenterServiceDetails } from "./discoveryCenter/index.js";
 
@@ -75,7 +77,7 @@ interface DocumentResult {
 /**
  * Create structured JSON response for search results (ChatGPT-compatible)
  */
-function createSearchResponse(results: SearchResult[]): any {
+function createSearchResponse(results: SearchResult[], extra: Record<string, any> = {}): any {
   // Clean the results to avoid JSON serialization issues in MCP protocol
   const cleanedResults = results.map(result => ({
     // ChatGPT requires: id, title, url (other fields optional)
@@ -90,18 +92,44 @@ function createSearchResponse(results: SearchResult[]): any {
     metadata: result.metadata
   }));
 
+  const payload = { results: cleanedResults, ...extra };
+
   // ChatGPT expects: { "results": [...] } in JSON-encoded text content
   return {
     content: [
       {
         type: "text",
-        text: JSON.stringify({ results: cleanedResults })
+        text: JSON.stringify(payload)
       }
     ],
-    structuredContent: { results: cleanedResults }
+    structuredContent: payload
   };
 }
 
+function createEmptySearchResponse(message: string, requestId?: string, extra: Record<string, any> = {}): any {
+  return createSearchResponse([], {
+    error: message,
+    requestId: requestId || 'unknown',
+    ...extra
+  });
+}
+
+function isAbsoluteHttpUrl(url?: string): boolean {
+  return !!url && /^https?:\/\//i.test(url);
+}
+
+function chooseSearchResultUrl(docUrl: string | null, path: string | undefined, id: string): string {
+  if (isAbsoluteHttpUrl(docUrl || undefined)) {
+    return docUrl!;
+  }
+
+  if (isAbsoluteHttpUrl(path)) {
+    return path!;
+  }
+
+  return `#${id}`;
+}
+
 /**
  * Create structured JSON response for document fetch (ChatGPT-compatible)
  */
@@ -1017,7 +1045,7 @@ RETURNS (JSON):
           if (topResults.length === 0) {
             console.log(`⚠️ [SEARCH TOOL] No results found for query: "${query}"`);
             logger.logToolSuccess(name, timing.requestId, timing.startTime, 0, { fallback: false });
-            return createErrorResponse(
+            return createEmptySearchResponse(
               `No results for "${query}". Try ABAP keywords ("SELECT", "LOOP", "RAP"), add "cloud" for ABAP Cloud syntax, or be more specific.`,
               timing.requestId
             );
@@ -1031,13 +1059,14 @@ RETURNS (JSON):
             const topic = r.id.startsWith(libraryId) ? r.id.slice(libraryId.length + 1) : '';
 
             const config = getDocUrlConfig(libraryId);
-            const docUrl = config ? generateDocumentationUrl(libraryId, r.relFile || '', r.text, config) : null;
+            const sourceContent = config ? readSourceContentSync(libraryId, r.relFile || '') : null;
+            const docUrl = config ? generateDocumentationUrl(libraryId, r.relFile || '', sourceContent || r.text, config) : null;
 
             return {
               // ChatGPT-required format: id, title, url
               id: r.id,
               title: r.text.split('\n')[0] || r.id,
-              url: docUrl || r.path || `#${r.id}`,
+              url: chooseSearchResultUrl(docUrl, r.path, r.id),
               // Additional fields
               library_id: libraryId,
               topic: topic,
@@ -1074,7 +1103,7 @@ RETURNS (JSON):
 
             if (!res.results.length) {
               logger.logToolSuccess(name, timing.requestId, timing.startTime, 0, { fallback: true });
-              return createErrorResponse(
+              return createEmptySearchResponse(
                 res.error || `No fallback results for "${query}". Try ABAP keywords ("SELECT", "LOOP", "RAP"), add "cloud" for ABAP Cloud syntax, or be more specific.`,
                 timing.requestId
               );
@@ -1097,7 +1126,7 @@ RETURNS (JSON):
             return createSearchResponse(fallbackResults);
           } catch (fallbackError) {
             logger.logToolError(name, timing.requestId, timing.startTime, fallbackError, true);
-            return createErrorResponse(
+            return createEmptySearchResponse(
               `Search temporarily unavailable. Wait 30 seconds and retry, or use more specific search terms.`,
               timing.requestId
             );
@@ -1135,13 +1164,15 @@ RETURNS (JSON):
           }
 
           // Transform document content to ChatGPT-compatible format
-          const config = getDocUrlConfig(library_id);
-          const docUrl = config ? generateDocumentationUrl(library_id, '', text, config) : null;
+          const fetchedSourceUrl = extractSourceUrlFromText(text);
+          const rootLibraryId = library_id.startsWith('/') ? extractLibraryIdFromPath(library_id) : library_id;
+          const config = getDocUrlConfig(rootLibraryId);
+          const docUrl = config ? generateDocumentationUrl(rootLibraryId, '', text, config) : null;
           const document: DocumentResult = {
             id: library_id,
             title: library_id.replace(/^\//, '').replace(/\//g, ' > ') + (topic ? ` (${topic})` : ''),
             text: text,
-            url: docUrl || `#${library_id}`,
+            url: fetchedSourceUrl || docUrl || `#${library_id}`,
             metadata: {
               source: 'abap-docs',
               library: library_id,
@@ -1243,23 +1274,11 @@ RETURNS (JSON):
 
           if (!communityResponse.results.length) {
             logger.logToolSuccess(name, timing.requestId, timing.startTime, 0);
-            return {
-              content: [
-                {
-                  type: "text",
-                  text: JSON.stringify({
-                    error: communityResponse.error || `No SAP Community posts found for "${query}". Try different keywords.`,
-                    requestId: timing.requestId,
-                    requestUrl,
-                  }),
-                },
-              ],
-              structuredContent: {
-                error: communityResponse.error || `No SAP Community posts found for "${query}". Try different keywords.`,
-                requestId: timing.requestId,
-                requestUrl,
-              },
-            };
+            return createEmptySearchResponse(
+              communityResponse.error || `No SAP Community posts found for "${query}". Try different keywords.`,
+              timing.requestId,
+              { requestUrl }
+            );
           }
 
           const searchResults: SearchResult[] = communityResponse.results.map((r, index) => ({
@@ -1286,23 +1305,11 @@ RETURNS (JSON):
           };
         } catch (error) {
           logger.logToolError(name, timing.requestId, timing.startTime, error);
-          return {
-            content: [
-              {
-                type: "text",
-                text: JSON.stringify({
-                  error: "Error searching SAP Community. Please try again later.",
-                  requestId: timing.requestId,
-                  requestUrl,
-                }),
-              },
-            ],
-            structuredContent: {
-              error: "Error searching SAP Community. Please try again later.",
-              requestId: timing.requestId,
-              requestUrl,
-            },
-          };
+          return createEmptySearchResponse(
+            "Error searching SAP Community. Please try again later.",
+            timing.requestId,
+            { requestUrl }
+          );
         }
       }
 

src/lib/communityBestMatch.ts

@@ -23,7 +23,8 @@ type Options = {
   userAgent?: string;     // optional UA override
 };
 
-const LIQL_BASE = "https://community.sap.com/api/2.0/search";
+const COMMUNITY_BASE = "https://community.sap.com";
+const LIQL_BASE = `${COMMUNITY_BASE}/api/2.0/search`;
 
 const stripTags = (html = "") =>
   html
@@ -37,13 +38,30 @@ const stripTags = (html = "") =>
     .trim();
 
 // Extract post ID from view_href URL
-const extractPostId = (url: string): string | undefined => {
+export const extractPostId = (url: string): string | undefined => {
   const urlMatch = url.match(/\/(?:ba-p|td-p|qaq-p|qaa-p|m-p)\/(\d+)/);
   if (urlMatch) return urlMatch[1];
   const endMatch = url.match(/\/(\d+)(?:[#?]|$)/);
   return endMatch ? endMatch[1] : undefined;
 };
 
+export function normalizeCommunityUrl(url?: string, postId?: string): string {
+  if (url) {
+    if (/^https?:\/\//i.test(url)) {
+      return url;
+    }
+
+    const normalizedPath = url.startsWith('/') ? url : `/${url}`;
+    return `${COMMUNITY_BASE}${normalizedPath}`;
+  }
+
+  if (postId) {
+    return `${COMMUNITY_BASE}/t5/forums/messagepage/message-id/${encodeURIComponent(postId)}`;
+  }
+
+  return COMMUNITY_BASE;
+}
+
 /**
  * Build a LiQL URL for full-text search on SAP Community.
  * Uses MATCHES on subject and/or body (combined with OR per Khoros docs).
@@ -88,8 +106,9 @@ async function executeLiqlSearch(url: string, userAgent?: string): Promise<any[]
 
 function mapItemsToHits(items: any[]): BestMatchHit[] {
   return items.map((item: any): BestMatchHit => {
-    const viewHref = item.view_href || "";
-    const postId = String(item.id || "") || extractPostId(viewHref);
+    const rawViewHref = item.view_href || "";
+    const postId = String(item.id || "") || extractPostId(rawViewHref);
+    const viewHref = normalizeCommunityUrl(rawViewHref, postId);
     const snippet = item.search_snippet ? stripTags(item.search_snippet).slice(0, CONFIG.EXCERPT_LENGTH_COMMUNITY) : undefined;
     const published = item.post_time
       ? new Date(item.post_time).toLocaleDateString("en-US", { year: "numeric", month: "short", day: "numeric" })
@@ -239,7 +258,7 @@ export async function getCommunityPostsByIds(postIds: string[], userAgent?: stri
     // Process each post
     for (const post of data.data.items) {
       const postDate = post.post_time ? new Date(post.post_time).toLocaleDateString() : 'Unknown';
-      const postUrl = post.view_href || `https://community.sap.com/t5/technology-blogs-by-sap/bg-p/t/${post.id}`;
+      const postUrl = normalizeCommunityUrl(post.view_href, String(post.id || ""));
 
       const fullContent = `# ${post.subject}
 
@@ -281,4 +300,4 @@ export async function getCommunityPostByUrl(postUrl: string, userAgent?: string)
     return null;
   }
   return getCommunityPostById(postId, userAgent);
-}
+}