@gitsense/gsc-utils 0.2.18 → 0.2.20

package/dist/gsc-utils.cjs.js

@@ -8797,21 +8797,22 @@ function formatToolBlock(toolData) {
  * @param {string} markdownContent - The original markdown string containing code blocks.
  * @param {string} toolName - The 'tool' property value of the target GitSense Chat Tool Block to replace.
  * @param {Object} newToolData - The new tool data object to insert into the block.
+ * @param {Object} CodeBlockUtils - The CodeBlockUtils class to avoid a circular dependency since we can't require it.
  * @returns {string} The markdown content with the specified tool block updated.
  * @throws {Error} If the target tool block is not found or if CodeBlockUtils encounters an error.
  */
-function replaceToolBlock(markdownContent, toolName, newToolData, processCodeBlocks, updateCodeBlockByIndex) {
+function replaceToolBlock(markdownContent, toolName, newToolData, CodeBlockUtils) {
     if (typeof markdownContent !== 'string' || !toolName || !newToolData) {
         throw new Error("Missing required parameters for replaceToolBlock.");
     }
 
     // We can't require them as this will create a circular dependency
-    if (!processCodeBlocks || !updateCodeBlockByIndex) {
-        throw new Error("Missing required dependencies processCodeBlocks and/or updateCodeBlockByIndex.");
+    if (!CodeBlockUtils) {
+        throw new Error("Missing required CodeBlockUtils dependency");
     }
 
     // 1. Process the markdown content to find all code blocks
-    const { blocks, warnings } = processCodeBlocks(markdownContent, { silent: true });
+    const { blocks, warnings } = CodeBlockUtils.processCodeBlocks(markdownContent, { silent: true });
 
     let targetBlockIndex = -1;
 
@@ -8834,7 +8835,7 @@ function replaceToolBlock(markdownContent, toolName, newToolData, processCodeBlo
 
     // 4. Use CodeBlockUtils.updateCodeBlockByIndex to perform the replacement
     // The language for GitSense Tool Blocks is always 'txt'
-    const updatedMarkdown = updateCodeBlockByIndex(
+    const updatedMarkdown = CodeBlockUtils.updateCodeBlockByIndex(
         markdownContent,
         targetBlockIndex,
         newContentBetweenFences,
@@ -8844,11 +8845,120 @@ function replaceToolBlock(markdownContent, toolName, newToolData, processCodeBlo
     return updatedMarkdown;
 }
 
+/**
+ * Detects an unfenced GitSense Chat Tool block within a given message string,
+ * validates its JSON content, and returns a properly formatted fenced block
+ * along with its original position.
+ *
+ * This function is designed to be forgiving, looking for the marker line
+ * "# GitSense Chat Tool" followed by JSON content, even if not enclosed
+ * in Markdown code fences.
+ *
+ * @param {string} messageContent - The full message content string.
+ * @returns {{
+ *   found: boolean,
+ *   formattedToolBlock?: string,
+ *   originalUnfencedContent?: string,
+ *   startIndex?: number,
+ *   endIndex?: number,
+ *   parsedToolData?: object
+ * }} An object indicating if an unfenced tool block was found, its formatted version,
+ *    its original content, start/end indices, and the parsed tool data.
+ */
+function detectAndFormatUnfencedToolBlock(messageContent) {
+    const marker = '# GitSense Chat Tool';
+    const lines = messageContent.split('\n');
+    let markerLineIndex = -1;
+
+    // 1. Find the marker line
+    for (let i = 0; i < lines.length; i++) {
+        if (lines[i].trim().startsWith(marker)) {
+            markerLineIndex = i;
+            break;
+        }
+    }
+
+    if (markerLineIndex === -1) {
+        return { found: false };
+    }
+
+    // 2. Extract potential JSON content following the marker
+    let jsonStartLineIndex = -1;
+    let jsonEndLineIndex = -1;
+    let braceCount = 0;
+    let inJsonBlock = false;
+
+    for (let i = markerLineIndex + 1; i < lines.length; i++) {
+        const trimmedLine = lines[i].trim();
+
+        if (!inJsonBlock) {
+            if (trimmedLine.length === 0 || trimmedLine.startsWith('#')) { // Skip empty lines or comments
+                continue;
+            }
+            if (trimmedLine.startsWith('{')) {
+                jsonStartLineIndex = i;
+                inJsonBlock = true;
+            } else {
+                return { found: false }; // Found something after marker but not JSON
+            }
+        }
+
+        if (inJsonBlock) {
+            for (const char of trimmedLine) {
+                if (char === '{') braceCount++;
+                else if (char === '}') braceCount--;
+            }
+            if (braceCount === 0 && trimmedLine.endsWith('}')) {
+                jsonEndLineIndex = i;
+                break; // Found the end of the JSON block
+            }
+        }
+    }
+
+    if (jsonStartLineIndex === -1 || jsonEndLineIndex === -1) {
+        return { found: false }; // JSON block not properly formed or not found
+    }
+
+    // Extract the raw unfenced content including the marker and JSON
+    const originalUnfencedContentLines = lines.slice(markerLineIndex, jsonEndLineIndex + 1);
+    const originalUnfencedContent = originalUnfencedContentLines.join('\n');
+
+    // 3. Validate the extracted content using parseToolBlock
+    let parsedToolData = null;
+    try {
+        parsedToolData = parseToolBlock$1(originalUnfencedContent);
+    } catch (error) {
+        console.warn("detectAndFormatUnfencedToolBlock: Failed to parse unfenced tool block JSON:", error.message);
+        return { found: false }; // Invalid JSON structure
+    }
+
+    if (!parsedToolData) {
+        return { found: false };
+    }
+
+    // 4. Format the validated tool data into a fenced block
+    const formattedToolBlock = `\`\`\`txt\n${formatToolBlock(parsedToolData)}\n\`\`\``;
+
+    // Calculate start and end indices in the original message string
+    const startIndex = messageContent.indexOf(originalUnfencedContent);
+    const endIndex = startIndex + originalUnfencedContent.length;
+
+    return {
+        found: true,
+        formattedToolBlock,
+        originalUnfencedContent,
+        startIndex,
+        endIndex,
+        parsedToolData
+    };
+}
+
 var GSToolBlockUtils$3 = {
     isToolBlock: isToolBlock$1,
     parseToolBlock: parseToolBlock$1,
     formatToolBlock,
     replaceToolBlock,
+    detectAndFormatUnfencedToolBlock,
 };
 
 /*

package/dist/gsc-utils.esm.js

@@ -8795,21 +8795,22 @@ function formatToolBlock(toolData) {
  * @param {string} markdownContent - The original markdown string containing code blocks.
  * @param {string} toolName - The 'tool' property value of the target GitSense Chat Tool Block to replace.
  * @param {Object} newToolData - The new tool data object to insert into the block.
+ * @param {Object} CodeBlockUtils - The CodeBlockUtils class to avoid a circular dependency since we can't require it.
  * @returns {string} The markdown content with the specified tool block updated.
  * @throws {Error} If the target tool block is not found or if CodeBlockUtils encounters an error.
  */
-function replaceToolBlock(markdownContent, toolName, newToolData, processCodeBlocks, updateCodeBlockByIndex) {
+function replaceToolBlock(markdownContent, toolName, newToolData, CodeBlockUtils) {
     if (typeof markdownContent !== 'string' || !toolName || !newToolData) {
         throw new Error("Missing required parameters for replaceToolBlock.");
     }
 
     // We can't require them as this will create a circular dependency
-    if (!processCodeBlocks || !updateCodeBlockByIndex) {
-        throw new Error("Missing required dependencies processCodeBlocks and/or updateCodeBlockByIndex.");
+    if (!CodeBlockUtils) {
+        throw new Error("Missing required CodeBlockUtils dependency");
     }
 
     // 1. Process the markdown content to find all code blocks
-    const { blocks, warnings } = processCodeBlocks(markdownContent, { silent: true });
+    const { blocks, warnings } = CodeBlockUtils.processCodeBlocks(markdownContent, { silent: true });
 
     let targetBlockIndex = -1;
 
@@ -8832,7 +8833,7 @@ function replaceToolBlock(markdownContent, toolName, newToolData, processCodeBlo
 
     // 4. Use CodeBlockUtils.updateCodeBlockByIndex to perform the replacement
     // The language for GitSense Tool Blocks is always 'txt'
-    const updatedMarkdown = updateCodeBlockByIndex(
+    const updatedMarkdown = CodeBlockUtils.updateCodeBlockByIndex(
         markdownContent,
         targetBlockIndex,
         newContentBetweenFences,
@@ -8842,11 +8843,120 @@ function replaceToolBlock(markdownContent, toolName, newToolData, processCodeBlo
     return updatedMarkdown;
 }
 
+/**
+ * Detects an unfenced GitSense Chat Tool block within a given message string,
+ * validates its JSON content, and returns a properly formatted fenced block
+ * along with its original position.
+ *
+ * This function is designed to be forgiving, looking for the marker line
+ * "# GitSense Chat Tool" followed by JSON content, even if not enclosed
+ * in Markdown code fences.
+ *
+ * @param {string} messageContent - The full message content string.
+ * @returns {{
+ *   found: boolean,
+ *   formattedToolBlock?: string,
+ *   originalUnfencedContent?: string,
+ *   startIndex?: number,
+ *   endIndex?: number,
+ *   parsedToolData?: object
+ * }} An object indicating if an unfenced tool block was found, its formatted version,
+ *    its original content, start/end indices, and the parsed tool data.
+ */
+function detectAndFormatUnfencedToolBlock(messageContent) {
+    const marker = '# GitSense Chat Tool';
+    const lines = messageContent.split('\n');
+    let markerLineIndex = -1;
+
+    // 1. Find the marker line
+    for (let i = 0; i < lines.length; i++) {
+        if (lines[i].trim().startsWith(marker)) {
+            markerLineIndex = i;
+            break;
+        }
+    }
+
+    if (markerLineIndex === -1) {
+        return { found: false };
+    }
+
+    // 2. Extract potential JSON content following the marker
+    let jsonStartLineIndex = -1;
+    let jsonEndLineIndex = -1;
+    let braceCount = 0;
+    let inJsonBlock = false;
+
+    for (let i = markerLineIndex + 1; i < lines.length; i++) {
+        const trimmedLine = lines[i].trim();
+
+        if (!inJsonBlock) {
+            if (trimmedLine.length === 0 || trimmedLine.startsWith('#')) { // Skip empty lines or comments
+                continue;
+            }
+            if (trimmedLine.startsWith('{')) {
+                jsonStartLineIndex = i;
+                inJsonBlock = true;
+            } else {
+                return { found: false }; // Found something after marker but not JSON
+            }
+        }
+
+        if (inJsonBlock) {
+            for (const char of trimmedLine) {
+                if (char === '{') braceCount++;
+                else if (char === '}') braceCount--;
+            }
+            if (braceCount === 0 && trimmedLine.endsWith('}')) {
+                jsonEndLineIndex = i;
+                break; // Found the end of the JSON block
+            }
+        }
+    }
+
+    if (jsonStartLineIndex === -1 || jsonEndLineIndex === -1) {
+        return { found: false }; // JSON block not properly formed or not found
+    }
+
+    // Extract the raw unfenced content including the marker and JSON
+    const originalUnfencedContentLines = lines.slice(markerLineIndex, jsonEndLineIndex + 1);
+    const originalUnfencedContent = originalUnfencedContentLines.join('\n');
+
+    // 3. Validate the extracted content using parseToolBlock
+    let parsedToolData = null;
+    try {
+        parsedToolData = parseToolBlock$1(originalUnfencedContent);
+    } catch (error) {
+        console.warn("detectAndFormatUnfencedToolBlock: Failed to parse unfenced tool block JSON:", error.message);
+        return { found: false }; // Invalid JSON structure
+    }
+
+    if (!parsedToolData) {
+        return { found: false };
+    }
+
+    // 4. Format the validated tool data into a fenced block
+    const formattedToolBlock = `\`\`\`txt\n${formatToolBlock(parsedToolData)}\n\`\`\``;
+
+    // Calculate start and end indices in the original message string
+    const startIndex = messageContent.indexOf(originalUnfencedContent);
+    const endIndex = startIndex + originalUnfencedContent.length;
+
+    return {
+        found: true,
+        formattedToolBlock,
+        originalUnfencedContent,
+        startIndex,
+        endIndex,
+        parsedToolData
+    };
+}
+
 var GSToolBlockUtils$3 = {
     isToolBlock: isToolBlock$1,
     parseToolBlock: parseToolBlock$1,
     formatToolBlock,
     replaceToolBlock,
+    detectAndFormatUnfencedToolBlock,
 };
 
 /*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitsense/gsc-utils",
-  "version": "0.2.18",
+  "version": "0.2.20",
   "description": "Utilities for GitSense Chat (GSC)",
   "main": "dist/gsc-utils.cjs.js",
   "module": "dist/gsc-utils.esm.js",

package/src/GSToolBlockUtils.js

@@ -114,21 +114,22 @@ function formatToolBlock(toolData) {
  * @param {string} markdownContent - The original markdown string containing code blocks.
  * @param {string} toolName - The 'tool' property value of the target GitSense Chat Tool Block to replace.
  * @param {Object} newToolData - The new tool data object to insert into the block.
+ * @param {Object} CodeBlockUtils - The CodeBlockUtils class to avoid a circular dependency since we can't require it.
  * @returns {string} The markdown content with the specified tool block updated.
  * @throws {Error} If the target tool block is not found or if CodeBlockUtils encounters an error.
  */
-function replaceToolBlock(markdownContent, toolName, newToolData, processCodeBlocks, updateCodeBlockByIndex) {
+function replaceToolBlock(markdownContent, toolName, newToolData, CodeBlockUtils) {
     if (typeof markdownContent !== 'string' || !toolName || !newToolData) {
         throw new Error("Missing required parameters for replaceToolBlock.");
     }
 
     // We can't require them as this will create a circular dependency
-    if (!processCodeBlocks || !updateCodeBlockByIndex) {
-        throw new Error("Missing required dependencies processCodeBlocks and/or updateCodeBlockByIndex.");
+    if (!CodeBlockUtils) {
+        throw new Error("Missing required CodeBlockUtils dependency");
     }
 
     // 1. Process the markdown content to find all code blocks
-    const { blocks, warnings } = processCodeBlocks(markdownContent, { silent: true });
+    const { blocks, warnings } = CodeBlockUtils.processCodeBlocks(markdownContent, { silent: true });
 
     let targetBlockIndex = -1;
 
@@ -151,7 +152,7 @@ function replaceToolBlock(markdownContent, toolName, newToolData, processCodeBlo
 
     // 4. Use CodeBlockUtils.updateCodeBlockByIndex to perform the replacement
     // The language for GitSense Tool Blocks is always 'txt'
-    const updatedMarkdown = updateCodeBlockByIndex(
+    const updatedMarkdown = CodeBlockUtils.updateCodeBlockByIndex(
         markdownContent,
         targetBlockIndex,
         newContentBetweenFences,
@@ -161,9 +162,118 @@ function replaceToolBlock(markdownContent, toolName, newToolData, processCodeBlo
     return updatedMarkdown;
 }
 
+/**
+ * Detects an unfenced GitSense Chat Tool block within a given message string,
+ * validates its JSON content, and returns a properly formatted fenced block
+ * along with its original position.
+ *
+ * This function is designed to be forgiving, looking for the marker line
+ * "# GitSense Chat Tool" followed by JSON content, even if not enclosed
+ * in Markdown code fences.
+ *
+ * @param {string} messageContent - The full message content string.
+ * @returns {{
+ *   found: boolean,
+ *   formattedToolBlock?: string,
+ *   originalUnfencedContent?: string,
+ *   startIndex?: number,
+ *   endIndex?: number,
+ *   parsedToolData?: object
+ * }} An object indicating if an unfenced tool block was found, its formatted version,
+ *    its original content, start/end indices, and the parsed tool data.
+ */
+function detectAndFormatUnfencedToolBlock(messageContent) {
+    const marker = '# GitSense Chat Tool';
+    const lines = messageContent.split('\n');
+    let markerLineIndex = -1;
+
+    // 1. Find the marker line
+    for (let i = 0; i < lines.length; i++) {
+        if (lines[i].trim().startsWith(marker)) {
+            markerLineIndex = i;
+            break;
+        }
+    }
+
+    if (markerLineIndex === -1) {
+        return { found: false };
+    }
+
+    // 2. Extract potential JSON content following the marker
+    let jsonStartLineIndex = -1;
+    let jsonEndLineIndex = -1;
+    let braceCount = 0;
+    let inJsonBlock = false;
+
+    for (let i = markerLineIndex + 1; i < lines.length; i++) {
+        const trimmedLine = lines[i].trim();
+
+        if (!inJsonBlock) {
+            if (trimmedLine.length === 0 || trimmedLine.startsWith('#')) { // Skip empty lines or comments
+                continue;
+            }
+            if (trimmedLine.startsWith('{')) {
+                jsonStartLineIndex = i;
+                inJsonBlock = true;
+            } else {
+                return { found: false }; // Found something after marker but not JSON
+            }
+        }
+
+        if (inJsonBlock) {
+            for (const char of trimmedLine) {
+                if (char === '{') braceCount++;
+                else if (char === '}') braceCount--;
+            }
+            if (braceCount === 0 && trimmedLine.endsWith('}')) {
+                jsonEndLineIndex = i;
+                break; // Found the end of the JSON block
+            }
+        }
+    }
+
+    if (jsonStartLineIndex === -1 || jsonEndLineIndex === -1) {
+        return { found: false }; // JSON block not properly formed or not found
+    }
+
+    // Extract the raw unfenced content including the marker and JSON
+    const originalUnfencedContentLines = lines.slice(markerLineIndex, jsonEndLineIndex + 1);
+    const originalUnfencedContent = originalUnfencedContentLines.join('\n');
+
+    // 3. Validate the extracted content using parseToolBlock
+    let parsedToolData = null;
+    try {
+        parsedToolData = parseToolBlock(originalUnfencedContent);
+    } catch (error) {
+        console.warn("detectAndFormatUnfencedToolBlock: Failed to parse unfenced tool block JSON:", error.message);
+        return { found: false }; // Invalid JSON structure
+    }
+
+    if (!parsedToolData) {
+        return { found: false };
+    }
+
+    // 4. Format the validated tool data into a fenced block
+    const formattedToolBlock = `\`\`\`txt\n${formatToolBlock(parsedToolData)}\n\`\`\``;
+
+    // Calculate start and end indices in the original message string
+    const startIndex = messageContent.indexOf(originalUnfencedContent);
+    const endIndex = startIndex + originalUnfencedContent.length;
+
+    return {
+        found: true,
+        formattedToolBlock,
+        originalUnfencedContent,
+        startIndex,
+        endIndex,
+        parsedToolData
+    };
+}
+
 module.exports = {
     isToolBlock,
     parseToolBlock,
     formatToolBlock,
     replaceToolBlock,
+    detectAndFormatUnfencedToolBlock,
 }