Associate webstudio output results to workspace

Author: ferpasri

cli/src/org/testar/cli/CliDaemonServer.java

@@ -478,6 +478,7 @@ private CliPreparedSession buildPreparedSession(CliRequest request) {
     private CliPreparedSession buildPreparedSessionFromWorkspace(CliRequest request) {
         String normalizedProfileName = normalizeProfileName(request.argumentAt(0));
         Settings profileSettings = CliSettingsLoader.loadProfile(normalizedProfileName);
+        applyWorkspaceOutputDirectory(profileSettings, normalizedProfileName);
         CliSessionTarget sessionTarget = CliSessionTargetResolver.resolve(profileSettings);
         PlatformSessionSpecification sessionSpec = PlatformSessionSpecFactory.create(
                 sessionTarget.operatingSystem(),
@@ -499,6 +500,7 @@ private CliPreparedSession buildPreparedSessionFromExplicitTarget(CliRequest req
                 : profileName.trim();
 
         Settings profileSettings = CliSettingsLoader.loadProfile(normalizedProfileName);
+        applyWorkspaceOutputDirectory(profileSettings, normalizedProfileName);
         PlatformSessionSpecification sessionSpec = buildSessionSpec(request, profileSettings);
         CliProfileConfiguration profileConfiguration = CliProfileConfigurationLoader.load(
                 normalizedProfileName,
@@ -515,6 +517,10 @@ private String normalizeProfileName(String profileName) {
         return profileName.trim();
     }
 
+    void applyWorkspaceOutputDirectory(Settings settings, String workspaceName) {
+        settings.set(ConfigTags.OutputDir, "./output/" + normalizeProfileName(workspaceName));
+    }
+
     private OperatingSystems parseOperatingSystem(String token) {
         String normalized = token.toLowerCase(Locale.ROOT);
         if ("windows".equals(normalized) || "windows10".equals(normalized)

cli/test/org/testar/cli/CliDaemonServerTest.java

@@ -91,6 +91,16 @@ public void buildSessionSpecForWindowsKeepsTargetInSessionSpec() {
         Assert.assertEquals("notepad.exe", sessionSpec.getTarget());
     }
 
+    @Test
+    public void applyWorkspaceOutputDirectoryScopesResultsToWorkspace() {
+        CliDaemonServer server = new CliDaemonServer();
+        Settings settings = defaultSettings();
+
+        server.applyWorkspaceOutputDirectory(settings, "webdriver_generic");
+
+        Assert.assertEquals("./output/webdriver_generic", settings.get(ConfigTags.OutputDir));
+    }
+
     @Test
     public void resolveCliTargetFromWebdriverConnector() {
         Settings settings = defaultSettings();

docs/architecture_distribution_workspace.md

@@ -34,6 +34,9 @@ target/install/testar/
     windows_generic/
     android_generic/
   output/
+    webdriver_generic/
+    windows_generic/
+    android_generic/
   .runtime/
 ```
 
@@ -193,16 +196,40 @@ Executable managed goal files use `.yaml` or `.yml`.
 
 The YAML contract is intentionally structured so WebStudio can validate required fields and agents can consume goal content reliably.
 
+## Workspace-Scoped Output Results
+
+Generated output results are workspace assets.
+
+Each workspace writes and reads results under its own output directory:
+
+```text
+target/install/testar/bin/output/{workspace}/
+```
+
+Examples:
+
+- `target/install/testar/bin/output/webdriver_generic/`
+- `target/install/testar/bin/output/windows_generic/`
+- `target/install/testar/bin/output/android_generic/`
+
+Generate and CLI executions share the same runtime root, but they must not mix output results across workspaces.
+
+WebStudio result inspection uses the selected workspace to resolve the output result directory.
+
+Changing the selected workspace changes the visible output results.
+
+This keeps workspace configuration, test goals, generated reports, and state model settings aligned.
+
 ## Output Folder Naming
 
 Generated output folders must include the execution mode after the timestamp.
 
 Examples:
 
-- `2026-06-29_13h23m23s_generate_webdriver_parabank_1`
-- `2026-06-29_13h23m23s_cli_webdriver_parabank_1`
+- `output/webdriver_generic/2026-06-29_13h23m23s_generate_webdriver_parabank_1`
+- `output/webdriver_generic/2026-06-29_13h23m23s_cli_webdriver_parabank_1`
 
-The mode token allows WebStudio to present mode-specific result summaries while keeping one shared output folder.
+The mode token allows WebStudio to present mode-specific result summaries inside the selected workspace output area.
 
 ## Shared Settings
 
@@ -270,6 +297,6 @@ WebStudio should:
 - start CLI sessions with the workspace-driven contract, `startSession <workspace>`
 - show warnings when mode-specific entries are ignored
 - keep mode-specific controls in their own views
-- read generated output results from the shared distribution output folder
+- read generated output results from the selected workspace output folder
 
 WebStudio reuses equivalent workspaces across execution modes.

docs/webstudio/WEBSTUDIO_FUNCTIONAL_SPEC.md

@@ -529,7 +529,19 @@ When CLI reporting is enabled, generated report artifacts must include the final
 
 ## Test Results
 
-The Test Results page supports inspection of output folders from the shared TESTAR distribution.
+The Test Results page supports inspection of output folders for the selected workspace.
+
+Output results are workspace-scoped artifacts.
+
+WebStudio must resolve result folders from:
+
+- `testar/target/install/testar/bin/output/<workspace>`
+
+Generate and CLI executions both write results for the selected workspace into that workspace output area.
+
+Changing the selected workspace changes the visible Test Results list.
+
+WebStudio must not mix output results from different workspaces in the selected workspace result list.
 
 Output result folder names must include the execution mode token after the timestamp:
 
@@ -538,8 +550,8 @@ Output result folder names must include the execution mode token after the times
 
 Example names:
 
-- `2026-06-29_13h23m23s_generate_webdriver_parabank_1`
-- `2026-06-29_13h23m23s_cli_webdriver_parabank_1`
+- `output/webdriver_generic/2026-06-29_13h23m23s_generate_webdriver_parabank_1`
+- `output/webdriver_generic/2026-06-29_13h23m23s_cli_webdriver_parabank_1`
 
 ### Output Result Selection
 
@@ -556,6 +568,7 @@ The page must support:
 
 Default behavior:
 
+- output result folders are loaded for the selected workspace
 - output result folders are sorted latest first
 - selecting an output folder shows a run-level verdict outcome summary by default
 - selecting an output folder must not automatically select the first generated file
@@ -594,7 +607,7 @@ The Test Results page must support an empty state.
 
 The empty state is shown when:
 
-- no output result folders exist
+- no output result folders exist for the selected workspace
 - filters hide all available output result folders
 - the last output result folder was deleted
 

docs/webstudio/WEBSTUDIO_UX_SPEC.md

@@ -283,7 +283,9 @@ The results page should provide fast visual understanding of output health.
 Expected behavior:
 
 - the left panel contains `Output Results`
-- `Output Results` reads from the shared Generate and CLI output folder
+- `Output Results` reads from the selected workspace output folder
+- changing the selected workspace refreshes `Output Results`
+- results from other workspaces are not shown in the selected workspace list
 - `Output Results` includes sorting by date or name
 - `Output Results` includes filtering by the result type
 - `Output Results` can be filtered by execution mode: All, Generate, or CLI
@@ -328,7 +330,7 @@ Deletion confirmation behavior:
 
 Empty state behavior:
 
-- no output result folders shows an empty message in the right preview area
+- no output result folders for the selected workspace shows an empty message in the right preview area
 - filters hiding all output result folders show an empty filtered-results message
 - no generated files for a selected output folder shows an empty message in the `Generated Files` panel
 - deleting the last output result folder shows the default Test Results empty view

webstudio/frontend/src/App.svelte

@@ -13,6 +13,7 @@
     import { clearSelectedSourceState } from "./policyEditorState.js";
     import { stateModelWorkspaceDialog } from "./stateModelNavigation.js";
     import { objectSnapshot } from "./editorDirtyState.js";
+    import { resultFileUrl, resultGroupDeleteUrl, resultListUrl } from "./resultApi.js";
 
     const STATE_MODEL_URL = "http://localhost:8090/models";
     const CLI_AGENT_SETTING_KEYS = {
@@ -239,6 +240,9 @@
             javaCompileResult = null;
             resetTestGoalSelection();
             testGoalTree = null;
+            resultsData = null;
+            selectedResultGroup = null;
+            selectedResultFile = null;
             return;
         }
 
@@ -266,6 +270,8 @@
             resetTestGoalSelection();
             if (currentPage === "test-goals") {
                 await loadTestGoalTree(workspaceName);
+            } else if (currentPage === "results") {
+                await loadResults(workspaceName);
             }
         } catch (loadError) {
             reportClientError(`Unable to load workspace ${workspaceName}`, loadError);
@@ -1427,9 +1433,16 @@
         );
     }
 
-    async function loadResults() {
+    async function loadResults(workspaceName = selectedWorkspaceName) {
+        if (!workspaceName) {
+            resultsData = null;
+            selectedResultGroup = null;
+            selectedResultFile = null;
+            return;
+        }
+
         try {
-            resultsData = await loadJson("/api/execution/scriptless/results");
+            resultsData = await loadJson(resultListUrl(workspaceName));
             const resultGroups = resultsData.groups || [];
             if (resultGroups.length > 0) {
                 await selectResultGroup(resultGroups[resultGroups.length - 1]);
@@ -1760,8 +1773,7 @@
         }
 
         try {
-            const resultPath = encodeURIComponent(resultFile.path);
-            selectedResultFile = await loadJson(`/api/execution/scriptless/results/${resultFile.name}?path=${resultPath}`);
+            selectedResultFile = await loadJson(resultFileUrl(selectedWorkspaceName, resultFile));
         } catch (fileError) {
             reportClientError(`Unable to load result file ${resultFile.name}`, fileError);
         }
@@ -1786,9 +1798,8 @@
         }
 
         try {
-            const resultPath = encodeURIComponent(resultFile.path);
             const currentGroupPath = selectedResultGroup?.path || "";
-            const refreshedResults = await loadJson(`/api/execution/scriptless/results/${resultFile.name}?path=${resultPath}`, {
+            const refreshedResults = await loadJson(resultFileUrl(selectedWorkspaceName, resultFile), {
                 method: "DELETE"
             });
             applyRefreshedResults(refreshedResults, currentGroupPath);
@@ -1803,8 +1814,7 @@
         }
 
         try {
-            const resultPath = encodeURIComponent(resultGroup.path);
-            const refreshedResults = await loadJson(`/api/execution/scriptless/result-groups?path=${resultPath}`, {
+            const refreshedResults = await loadJson(resultGroupDeleteUrl(selectedWorkspaceName, resultGroup), {
                 method: "DELETE"
             });
             applyRefreshedResults(refreshedResults);

webstudio/frontend/src/resultApi.js

@@ -0,0 +1,15 @@
+export function resultWorkspaceQuery(workspaceName) {
+    return `workspace=${encodeURIComponent(workspaceName || "")}`;
+}
+
+export function resultListUrl(workspaceName) {
+    return `/api/execution/scriptless/results?${resultWorkspaceQuery(workspaceName)}`;
+}
+
+export function resultFileUrl(workspaceName, resultFile) {
+    return `/api/execution/scriptless/results/${resultFile.name}?${resultWorkspaceQuery(workspaceName)}&path=${encodeURIComponent(resultFile.path)}`;
+}
+
+export function resultGroupDeleteUrl(workspaceName, resultGroup) {
+    return `/api/execution/scriptless/result-groups?${resultWorkspaceQuery(workspaceName)}&path=${encodeURIComponent(resultGroup.path)}`;
+}

webstudio/frontend/test/resultApi.test.js

@@ -0,0 +1,33 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import {
+    resultFileUrl,
+    resultGroupDeleteUrl,
+    resultListUrl
+} from "../src/resultApi.js";
+
+test("builds workspace-scoped result list URL", () => {
+    assert.equal(
+        resultListUrl("webdriver_generic"),
+        "/api/execution/scriptless/results?workspace=webdriver_generic"
+    );
+});
+
+test("builds workspace-scoped result file URL", () => {
+    assert.equal(
+        resultFileUrl("webdriver_generic", {
+            name: "sequence_1_V001_OK.html",
+            path: "C:\\output\\webdriver_generic\\run\\reports\\sequence_1_V001_OK.html"
+        }),
+        "/api/execution/scriptless/results/sequence_1_V001_OK.html?workspace=webdriver_generic&path=C%3A%5Coutput%5Cwebdriver_generic%5Crun%5Creports%5Csequence_1_V001_OK.html"
+    );
+});
+
+test("builds workspace-scoped result group delete URL", () => {
+    assert.equal(
+        resultGroupDeleteUrl("android_generic", {
+            path: "C:\\output\\android_generic\\run"
+        }),
+        "/api/execution/scriptless/result-groups?workspace=android_generic&path=C%3A%5Coutput%5Candroid_generic%5Crun"
+    );
+});

webstudio/src/org/testar/webstudio/api/ExecutionController.java

@@ -73,25 +73,25 @@ public ExecutionStatusDto stopCliAgentSession() {
         return cliExecutionAdapter().stopAgentSession();
     }
 
-    public ScriptlessResultsDto cliResults() {
-        return cliExecutionAdapter().cliResults();
+    public ScriptlessResultsDto cliResults(String workspaceName) {
+        return cliExecutionAdapter().cliResults(workspaceName);
     }
 
-    public ResultFileDto cliResultFile(String fileName, String filePath) {
-        return cliExecutionAdapter().readCliResultFile(fileName, filePath);
+    public ResultFileDto cliResultFile(String workspaceName, String fileName, String filePath) {
+        return cliExecutionAdapter().readCliResultFile(workspaceName, fileName, filePath);
     }
 
-    public ScriptlessResultsDto deleteCliResultFile(String filePath) {
-        return cliExecutionAdapter().deleteCliResultFile(filePath);
+    public ScriptlessResultsDto deleteCliResultFile(String workspaceName, String filePath) {
+        return cliExecutionAdapter().deleteCliResultFile(workspaceName, filePath);
     }
 
-    public ScriptlessResultsDto deleteCliResultGroup(String groupPath) {
-        return cliExecutionAdapter().deleteCliResultGroup(groupPath);
+    public ScriptlessResultsDto deleteCliResultGroup(String workspaceName, String groupPath) {
+        return cliExecutionAdapter().deleteCliResultGroup(workspaceName, groupPath);
     }
 
-    public byte[] cliResultAsset(String filePath) {
+    public byte[] cliResultAsset(String workspaceName, String filePath) {
         try {
-            return Files.readAllBytes(cliExecutionAdapter().resolveCliResultAsset(filePath));
+            return Files.readAllBytes(cliExecutionAdapter().resolveCliResultAsset(workspaceName, filePath));
         } catch (Exception exception) {
             throw new IllegalStateException("Unable to read CLI result asset: " + filePath, exception);
         }
@@ -105,25 +105,25 @@ public ExecutionStatusDto stopScriptlessRun() {
         return scriptlessExecutionAdapter().stop();
     }
 
-    public ScriptlessResultsDto scriptlessResults() {
-        return scriptlessExecutionAdapter().scriptlessResults();
+    public ScriptlessResultsDto scriptlessResults(String workspaceName) {
+        return scriptlessExecutionAdapter().scriptlessResults(workspaceName);
     }
 
-    public ResultFileDto scriptlessResultFile(String fileName, String filePath) {
-        return scriptlessExecutionAdapter().readScriptlessResultFile(fileName, filePath);
+    public ResultFileDto scriptlessResultFile(String workspaceName, String fileName, String filePath) {
+        return scriptlessExecutionAdapter().readScriptlessResultFile(workspaceName, fileName, filePath);
     }
 
-    public ScriptlessResultsDto deleteScriptlessResultFile(String filePath) {
-        return scriptlessExecutionAdapter().deleteScriptlessResultFile(filePath);
+    public ScriptlessResultsDto deleteScriptlessResultFile(String workspaceName, String filePath) {
+        return scriptlessExecutionAdapter().deleteScriptlessResultFile(workspaceName, filePath);
     }
 
-    public ScriptlessResultsDto deleteScriptlessResultGroup(String groupPath) {
-        return scriptlessExecutionAdapter().deleteScriptlessResultGroup(groupPath);
+    public ScriptlessResultsDto deleteScriptlessResultGroup(String workspaceName, String groupPath) {
+        return scriptlessExecutionAdapter().deleteScriptlessResultGroup(workspaceName, groupPath);
     }
 
-    public byte[] scriptlessResultAsset(String filePath) {
+    public byte[] scriptlessResultAsset(String workspaceName, String filePath) {
         try {
-            return Files.readAllBytes(scriptlessExecutionAdapter().resolveScriptlessResultAsset(filePath));
+            return Files.readAllBytes(scriptlessExecutionAdapter().resolveScriptlessResultAsset(workspaceName, filePath));
         } catch (Exception exception) {
             throw new IllegalStateException("Unable to read scriptless result asset: " + filePath, exception);
         }