Fix env.files not populated when selecting folders in VS Code extension (#1915)

* Initial plan

* Fix env.files not populated for folder selection in VS Code

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

* Fix haiku generation to handle multiple files in environment variable

* Refactor type annotations and improve file URI handling in runScriptInternal and VSCodeHost

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
Co-authored-by: Peli de Halleux <pelikhan@users.noreply.github.com>

Author: Copilot

demo/genaisrc/haiku.genai.mts

@@ -1,2 +1,2 @@
 script({ model: "github_copilot_chat:gpt-4.1", metadata: { name: "haiku" } })
-$`Write a haiku about ${env.files[0] || "code"}`
+$`Write a haiku about ${env.files || "code"}`

packages/api/src/run.ts

@@ -103,6 +103,7 @@ import {
   createGitIgnorer,
   resolveRuntimeHost,
 } from "@genaiscript/core";
+import { fileURLToPath } from "node:url";
 
 const dbg = genaiscriptDebug("run");
 
@@ -315,10 +316,12 @@ export async function runScriptInternal(
   );
   files = files.filter((f) => !NEGATIVE_GLOB_REGEX.test(f));
   dbg(`files (remaining): %O`, files);
-  for (let arg of files) {
+  for (let fileOrUri of files) {
+    let arg = /^file:\/\//.test(fileOrUri) ? fileURLToPath(fileOrUri) : fileOrUri;
     checkCancelled(cancellationToken);
     dbg(`resolving ${arg}`);
     const stat = await runtimeHost.statFile(arg);
+    dbg(`stat type: %s`, stat?.type);
     if (stat?.type === "file") {
       dbg(`file found %s`, arg);
       if (ignorer && !ignorer([arg]).length) {
@@ -756,7 +759,7 @@ export async function runScriptInternal(
       // Generate title (simple approach for now, can be enhanced with small model later)
       const firstLine = result.text.split("\n")[0]?.trim();
       const shortContent = firstLine ? firstLine.substring(0, 60) : "";
-      let title = shortContent ? `${script.id}: ${shortContent}` : `Generated by ${script.id}`;
+      const title = shortContent ? `${script.id}: ${shortContent}` : `Generated by ${script.id}`;
 
       // TODO: Enhance with small model title generation
       // This could be implemented by creating a temporary script and running it with the small model,

packages/vscode/src/servermanager.ts

@@ -81,7 +81,7 @@ export class TerminalServerManager extends EventTarget implements ServerManager
     );
   }
 
-  private dispatchChange() {
+  private dispatchChange(): void {
     this.dispatchEvent(new Event(CHANGE));
   }
 
@@ -91,44 +91,45 @@ export class TerminalServerManager extends EventTarget implements ServerManager
     return this._startClientPromise || (this._startClientPromise = this.startClient());
   }
 
-  get authority() {
+  get authority(): string {
     if (!this._port) return undefined;
     return `${SERVER_LOCALHOST}:${this._port}`;
   }
 
-  get url() {
+  get url(): string {
     return this.state.sessionApiKey
       ? `${this.authority}?api-key=${encodeURIComponent(this.state.sessionApiKey)}`
       : this.authority;
   }
 
-  get browserUrl() {
+  get browserUrl(): string {
     return this.state.sessionApiKey
       ? `${this.authority}#api-key=${encodeURIComponent(this.state.sessionApiKey)}`
       : this.authority;
   }
 
-  private async allocatePort() {
+  private async allocatePort(): Promise<number> {
     if (isNaN(this._port)) this._port = await findRandomOpenPort();
     return this._port;
   }
 
-  get version() {
+  get version(): string {
     return this._version;
   }
 
   private async startClient(): Promise<VsCodeClient> {
     if (this._client) throw new Error("client already started");
     await this.allocatePort();
     const url = this.url;
-    const authority = (await vscode.env.asExternalUri(vscode.Uri.parse(this.authority))).toString();
+    const authorityUri = await vscode.env.asExternalUri(vscode.Uri.parse(this.authority));
+    const authority = authorityUri.toString();
     const externalUrl =
       authority +
       (this.state.sessionApiKey ? `#api-key=${encodeURIComponent(this.state.sessionApiKey)}` : "");
     logInfo(`client url: ${url}`);
     logVerbose(`client external url: ${externalUrl}`);
     const client = (this._client = new VsCodeClient(url, externalUrl, authority));
-    client.chatRequest = createChatModelRunner(this.state);
+      client.chatRequest = createChatModelRunner(this.state);
     client.addEventListener(OPEN, async () => {
       if (client !== this._client) return;
       this._terminalStartAttempts = 0;
@@ -162,7 +163,7 @@ export class TerminalServerManager extends EventTarget implements ServerManager
     return this._client;
   }
 
-  private clearTerminalStartWatcher() {
+  private clearTerminalStartWatcher(): void {
     if (this._terminalStartWatcher) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       clearTimeout(this._terminalStartWatcher as any);
@@ -300,7 +301,7 @@ export class TerminalServerManager extends EventTarget implements ServerManager
     }
   }
 
-  async close() {
+  async close(): Promise<void> {
     try {
       this.status = "stopping";
       this._startClientPromise = undefined;
@@ -311,12 +312,12 @@ export class TerminalServerManager extends EventTarget implements ServerManager
     }
   }
 
-  async show(preserveFocus?: boolean) {
+  async show(preserveFocus?: boolean): Promise<void> {
     if (!this._terminal) await this.start();
     this._terminal?.show(preserveFocus);
   }
 
-  private closeTerminal() {
+  private closeTerminal(): void {
     const t = this._terminal;
     this._port = undefined;
     this._terminal = undefined;
@@ -326,7 +327,7 @@ export class TerminalServerManager extends EventTarget implements ServerManager
     if (!this.state.diagnostics) t?.dispose();
   }
 
-  dispose() {
+  dispose(): void {
     this.close();
   }
 }

packages/vscode/src/state.ts

@@ -398,7 +398,7 @@ export class ExtensionState extends EventTarget {
     return p;
   }
 
-  private async uncachedParseWorkspace() {
+  private async uncachedParseWorkspace(): Promise<void> {
     try {
       logVerbose(`parse workspace`);
       this.dispatchChange();

packages/vscode/src/vshost.ts

@@ -111,14 +111,17 @@ export class VSCodeHost extends EventTarget implements Host {
     const uri = this.toProjectFileUri(name);
     await vscode.workspace.fs.writeFile(uri, content);
   }
-  private toProjectFileUri(name: string) {
+  private toProjectFileUri(name: string): vscode.Uri {
     const wksrx = /^workspace:\/\//i;
+    const fileUriRx = /^file:\/\//i;
     const uri = wksrx.test(name)
       ? Utils.joinPath(vscode.workspace.workspaceFolders[0].uri, name.replace(wksrx, ""))
-      : /^(\/|\w:\\)/i.test(name) ||
-          name.startsWith(vscode.workspace.workspaceFolders[0].uri.fsPath)
-        ? Uri.file(name)
-        : Utils.joinPath(vscode.workspace.workspaceFolders[0].uri, name);
+      : fileUriRx.test(name)
+        ? vscode.Uri.parse(name, true)
+        : /^(\/|\w:\\)/i.test(name) ||
+            name.startsWith(vscode.workspace.workspaceFolders[0].uri.fsPath)
+          ? Uri.file(name)
+          : Utils.joinPath(vscode.workspace.workspaceFolders[0].uri, name);
     return uri;
   }