Apply suggestions from code review

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Nathan Randall <70299490+data-douser@users.noreply.github.com>

Author: data-douser

client/integration-tests/primitives/prompts/explain_codeql_query/invalid_query_path/after/monitoring-state.json

@@ -1,3 +1,9 @@
 {
-  "sessions": []
+  "sessions": [
+    {
+      "expectedContentPatterns": [
+        "does not exist"
+      ]
+    }
+  ]
 }

client/src/lib/integration-test-runner.js

@@ -227,12 +227,32 @@ export class IntegrationTestRunner {
       this.logger.log(`Completed ${totalIntegrationTests} tool-specific integration tests`);
 
       // Also run workflow integration tests
-      await this.runWorkflowIntegrationTests(baseDir);
+      const workflowIntegrationSucceeded = await this.runWorkflowIntegrationTests(baseDir);
+      if (!workflowIntegrationSucceeded) {
+        this.logger.logTest(
+          "Workflow integration tests",
+          false,
+          new Error("Workflow integration tests did not complete successfully")
+        );
+      }
 
       // Also run prompt integration tests
-      await this.runPromptIntegrationTests(baseDir);
+      const promptIntegrationSucceeded = await this.runPromptIntegrationTests(baseDir);
+      if (!promptIntegrationSucceeded) {
+        this.logger.logTest(
+          "Prompt integration tests",
+          false,
+          new Error("Prompt integration tests did not complete successfully")
+        );
+      }
 
-      return totalIntegrationTests > 0;
+      return (
+        (totalIntegrationTests > 0 ||
+          workflowIntegrationSucceeded ||
+          promptIntegrationSucceeded) &&
+        workflowIntegrationSucceeded &&
+        promptIntegrationSucceeded
+      );
     } catch (error) {
       this.logger.log(`Error running integration tests: ${error.message}`, "ERROR");
       return false;

server/src/prompts/workflow-prompts.ts

@@ -1031,9 +1031,16 @@ ${workspaceUri ? `- **Workspace URI**: ${workspaceUri}
 
         let resolvedWorkspaceUri = workspaceUri;
         if (workspaceUri) {
-          const wsResult = resolvePromptFilePath(workspaceUri);
-          resolvedWorkspaceUri = wsResult.resolvedPath;
-          if (wsResult.warning) warnings.push(wsResult.warning);
+          const trimmedWorkspaceUri = workspaceUri.trim();
+          // If the workspace value is already a URI (e.g., "file://..."), preserve it as-is.
+          // Only run filesystem path resolution for non-URI values.
+          if (/^file:\/\//i.test(trimmedWorkspaceUri)) {
+            resolvedWorkspaceUri = trimmedWorkspaceUri;
+          } else {
+            const wsResult = resolvePromptFilePath(workspaceUri);
+            resolvedWorkspaceUri = wsResult.resolvedPath;
+            if (wsResult.warning) warnings.push(wsResult.warning);
+          }
         }
 
         let contextSection = '## Your Development Context\n\n';