Add quoteify utility function and refactor task provider and nodehost…

… code
microsoft · Sep 13, 2024 · d4d8067 · d4d8067
1 parent cf74d4d
commit d4d8067
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -38,6 +38,7 @@
         "promptdom",
         "promptfoo",
         "prompty",
+        "quoteify",
         "stringifying",
         "sysr",
         "tabletojson",

diff --git a/packages/cli/src/nodehost.ts b/packages/cli/src/nodehost.ts
@@ -39,7 +39,7 @@ import {
     ResponseStatus,
 } from "../../core/src/host"
 import { AbortSignalOptions, TraceOptions } from "../../core/src/trace"
-import { logVerbose, unique } from "../../core/src/util"
+import { logVerbose, quoteify, unique } from "../../core/src/util"
 import { parseModelIdentifier } from "../../core/src/models"
 import {
     AuthenticationToken,
@@ -300,7 +300,6 @@ export class NodeHost implements RuntimeHost {
             if (command === "python" && process.platform !== "win32")
                 command = "python3"
 
-            const quoteify = (a: string) => (/\s/.test(a) ? `"${a}"` : a)
             logVerbose(
                 `${cwd ? `${cwd}> ` : ""}${quoteify(command)} ${args.map(quoteify).join(" ")}`
             )

diff --git a/packages/core/src/util.ts b/packages/core/src/util.ts
@@ -196,6 +196,10 @@ export function logError(msg: string | Error | SerializedError) {
         if (!/^\s*\{\s*\}\s*$/.test(se)) host.log(LogLevel.Verbose, se)
     }
 }
+export function quoteify(a: string) {
+    return /\s/.test(a) ? `"${a}"` : a
+}
+
 export function concatArrays<T>(...arrays: T[][]): T[] {
     if (arrays.length == 0) return []
     return arrays[0].concat(...arrays.slice(1))

diff --git a/packages/vscode/package.json b/packages/vscode/package.json
@@ -63,14 +63,6 @@
                     "script": {
                         "type": "string",
                         "description": "GenAIScript script to run"
-                    },
-                    "files": {
-                        "type": "array",
-                        "description": "Files to include in the script",
-                        "items": {
-                            "type": "string",
-                            "description": "File or glob to include in the script"
-                        }
                     }
                 }
             }

diff --git a/packages/vscode/src/taskprovider.ts b/packages/vscode/src/taskprovider.ts
@@ -2,6 +2,7 @@ import * as vscode from "vscode"
 import { ExtensionState } from "./state"
 import { resolveCli } from "./config"
 import { TOOL_ID } from "../../core/src/constants"
+import { quoteify } from "../../core/src/util"
 
 export async function activeTaskProvider(state: ExtensionState) {
     const { context, host } = state
@@ -11,7 +12,7 @@ export async function activeTaskProvider(state: ExtensionState) {
         provideTasks: async () => {
             const { cliPath, cliVersion } = await resolveCli()
             const exec = cliPath
-                ? cliPath
+                ? quoteify(cliPath)
                 : `npx --yes genaiscript@${cliVersion}`
             const scripts = state.project.templates.filter((t) => !t.isSystem)
             const tasks = scripts.map((script) => {
@@ -20,13 +21,15 @@ export async function activeTaskProvider(state: ExtensionState) {
                     script.filename
                 )
                 const task = new vscode.Task(
-                    { type: TOOL_ID, script: script.id },
+                    { type: TOOL_ID, script: script.filename },
                     vscode.TaskScope.Workspace,
                     script.id,
                     TOOL_ID,
-                    new vscode.ShellExecution(
-                        `${exec} run "${scriptp}" $\{relativeFile\}`
-                    )
+                    new vscode.ShellExecution(exec, [
+                        "run",
+                        scriptp,
+                        "${relativeFile}",
+                    ])
                 )
                 task.detail = `${script.title ?? script.description} - ${scriptp}`
                 task.problemMatchers = ["$tsc"]