Add unfence function to handle fenced code blocks and remove unused m…

…odel specifications

packages/core/src/fence.ts

@@ -216,8 +216,10 @@ ${validation.error.split("\n").join("\n> ")}`
 }
 
 export function unfence(text: string, language: string) {
-    const startRx = new RegExp(`^\`\`\`${language}\n`)
-    const endRx = /\n```[\n\s]*$/
+    if (!text) return text
+
+    const startRx = new RegExp(`^[\r\n\s]*\`\`\`${language}\s*\r?\n`)
+    const endRx = /\r?\n```[\r\n\s]*$/
     if (startRx.test(text) && endRx.test(text)) {
         return text.replace(startRx, "").replace(endRx, "")
     }

packages/core/src/ini.ts

@@ -1,8 +1,10 @@
 import { parse, stringify } from "ini"
 import { logError } from "./util"
+import { unfence } from "./fence"
 
 export function INIParse(text: string) {
-    return parse(text)
+    const cleaned = unfence(text, "ini")
+    return parse(cleaned)
 }
 
 export function INITryParse(text: string, defaultValue?: any) {

packages/core/src/json5.ts

@@ -1,6 +1,7 @@
 /* eslint-disable curly */
 import { parse, stringify } from "json5"
 import { jsonrepair } from "jsonrepair"
+import { unfence } from "./fence"
 
 export function isJSONObjectOrArray(text: string) {
     return /^\s*[\{\[]/.test(text)
@@ -20,6 +21,7 @@ export function JSON5parse<T = unknown>(
     }
 ): T | undefined | null {
     try {
+        text = unfence(text, "json")
         if (options?.repair) {
             try {
                 const res = parse(text)
@@ -57,9 +59,8 @@ const startRx = /^\s*\`\`\`json\s/
 const endRx = /\`\`\`\s*$/
 export function JSONLLMTryParse(s: string): any {
     if (s === undefined || s === null) return s
-    if (startRx.test(s) && endRx.test(s))
-        s = s.replace(startRx, "").replace(endRx, "")
-    return JSON5TryParse(s)
+    const cleaned = unfence(s, "json")
+    return JSON5TryParse(cleaned)
 }
 
 export const JSON5Stringify = stringify

packages/core/src/toml.ts

@@ -1,8 +1,10 @@
 import { parse } from "toml"
+import { unfence } from "./fence"
 
 export function TOMLTryParse(text: string, options?: { defaultValue?: any }) {
     try {
-        const res = parse(text)
+        const cleaned = unfence(text, "toml")
+        const res = parse(cleaned)
         return res
     } catch (e) {
         return options?.defaultValue

packages/core/src/xml.ts

@@ -1,5 +1,6 @@
 import { XMLParser } from "fast-xml-parser"
 import { logError } from "./util"
+import { unfence } from "./fence"
 
 export function XMLTryParse(
     text: string,
@@ -15,6 +16,7 @@ export function XMLTryParse(
 }
 
 export function XMLParse(text: string, options?: XMLParseOptions) {
+    const cleaned = unfence(text, "xml")
     const parser = new XMLParser({
         ignoreAttributes: false,
         attributeNamePrefix: "@_",
@@ -23,5 +25,5 @@ export function XMLParse(text: string, options?: XMLParseOptions) {
         parseAttributeValue: true,
         ...(options || {}),
     })
-    return parser.parse(text)
+    return parser.parse(cleaned)
 }

packages/vscode/genaisrc/gcm.genai.mts

@@ -4,7 +4,6 @@
 script({
     title: "git commit message",
     description: "Generate a commit message for all staged changes",
-    model: "openai:gpt-4o",
 })
 
 // TODO: update this diff command to match your workspace

packages/vscode/genaisrc/iat.genai.mts

@@ -4,8 +4,6 @@
 script({
     title: "Image Alt Textify",
     description: "Generate alt text for images in markdown files",
-    model: "openai:gpt-4o",
-    // these parameters can be overridden using `--vars doc=...`
     parameters: {
         docs: {
             type: "string",

packages/vscode/genaisrc/rv.genai.mts

@@ -1,16 +1,6 @@
-/**
- * GenAIScript Reviewer
- *
- * This script is used to review the current files
- * or the changes in the git repository.
- *
- * Don't hesitate to customize this script to fit your needs!
- */
-
 script({
     title: "Reviewer",
     description: "Review the current files",
-    model: "openai:gpt-4o",
     system: ["system.annotations"],
     tools: ["fs_find_files", "fs_read_text"],
     cache: "rv",
@@ -44,7 +34,7 @@ if (env.files.length) {
     // No files selected, review the current changes
     console.log("No files found. Using git diff.")
     const { stdout: diff } = await host.exec("git diff -U6")
- // customize git diff to filter some files
+    // customize git diff to filter some files
     if (!diff) cancel("No changes found, did you forget to stage your changes?")
     content = def("GIT_DIFF", diff, { language: "diff" })
 }

packages/vscode/genaisrc/st.genai.mts

@@ -18,6 +18,7 @@ script({
         },
     },
 })
+
 const { pattern, glob, transform } = env.vars
 if (!pattern) cancel("pattern is missing")
 const patternRx = new RegExp(pattern, "g")