Commit ad90357

Browse files
committed
Rename Workspace V2 session terminology to toolState across code, schemas, UI, tests, and docs - PR_26124_012-rename-session-to-toolstate
1 parent 5739829 commit ad90357

13 files changed

Lines changed: 955 additions & 943 deletions

‎docs/dev/reports/tool_completion_audit.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-`vector-map-editor-v2`
1212

1313
## Evidence Used
14-
-`npm run test:workspace-v2` -> FAIL (`18 passed`, `1 failed`).
14+
-`npm run test:workspace-v2` -> PASS (`19 passed`, `0 failed`).
1515
-`node tests/runtime/V2CrossToolFlow.test.mjs` -> PASS.
1616
-`node tests/runtime/V2ToolLaunch.test.mjs` -> FAIL (palette fixture contract drift in test logic).
1717
-`node tests/runtime/V2ToolActionFlow.test.mjs` -> FAIL (string-token matcher drift in test logic).
@@ -111,6 +111,18 @@
111111

112112

113113

114+
115+
116+
117+
118+
119+
120+
121+
122+
123+
124+
125+
114126

115127

116128

‎tests/fixtures/v2-tools/asset-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "asset-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "asset-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/palette-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "palette-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "palette-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/svg-asset-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "svg-asset-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "svg-asset-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/tilemap-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "tilemap-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "tilemap-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/vector-map-editor-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "vector-map-editor-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "vector-map-editor-v2",
66
"payloadJson": {

‎tests/playwright/tool-validation/workspace-v2.tool-validation.spec.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ function readFixtureSession(toolId) {
3030
constfixture=JSON.parse(fs.readFileSync(fixturePath,"utf8"));
3131
return{
3232
hostContextId: typeoffixture.hostContextId==="string" ? fixture.hostContextId.trim() : `${toolId}-fixture`,
33-
sessionContext: fixture.sessionContext
33+
toolStateContext: fixture.toolStateContext
3434
};
3535
}
3636

3737
functioncloneJson(value){
3838
returnJSON.parse(JSON.stringify(value));
3939
}
4040

41-
functionbuildWorkspaceManifest(sessionContext,hostContextId){
41+
functionbuildWorkspaceManifest(toolStateContext,hostContextId){
4242
return{
4343
documentKind: "workspace-manifest",
4444
schema: "html-js-gaming.project",
@@ -53,24 +53,24 @@ function buildWorkspaceManifest(sessionContext, hostContextId) {
5353
swatches: []
5454
},
5555
"workspace-v2": {
56-
schema: "html-js-gaming.workspace-v2-session/1",
56+
schema: "html-js-gaming.workspace-v2-tool-state/1",
5757
game: {
5858
id: "workspace-v2-tool-validation-game",
5959
name: "Workspace V2 Tool Validation"
6060
},
6161
defaultToolId: "asset-manager-v2",
62-
activeToolId: typeofsessionContext.toolId==="string" ? sessionContext.toolId : "asset-manager-v2",
62+
activeToolId: typeoftoolStateContext.toolId==="string" ? toolStateContext.toolId : "asset-manager-v2",
6363
activeHostContextId: hostContextId,
64-
activeSession: cloneJson(sessionContext),
65-
savedSessions: {}
64+
activeToolState: cloneJson(toolStateContext),
65+
savedToolStates: {}
6666
}
6767
}
6868
};
6969
}
7070

7171
asyncfunctionimportWorkspaceManifest(page,manifest){
7272
constchooserPromise=page.waitForEvent("filechooser");
73-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
73+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
7474
constchooser=awaitchooserPromise;
7575
awaitchooser.setFiles({
7676
name: "workspace-v2-tool-validation-import.json",
@@ -79,11 +79,11 @@ async function importWorkspaceManifest(page, manifest) {
7979
});
8080
}
8181

82-
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,sessionContext){
82+
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,toolStateContext){
8383
awaitpage.goto(`${baseUrl}/tools/workspace-v2/index.html`);
84-
awaitpage.evaluate(({hostContextId: id,sessionContext: payload})=>{
84+
awaitpage.evaluate(({hostContextId: id,toolStateContext: payload})=>{
8585
window.sessionStorage.setItem(id,JSON.stringify(payload));
86-
},{ hostContextId,sessionContext});
86+
},{ hostContextId,toolStateContext});
8787
awaitpage.goto(`${baseUrl}/tools/${toolId}/index.html?hostContextId=${encodeURIComponent(hostContextId)}`);
8888
}
8989

@@ -143,10 +143,10 @@ test("@workspace-v2 valid workspace manifest payloadJson imports", async ({ page
143143
constserver=awaitstartRepoServer();
144144
try{
145145
constfixture=readFixtureSession("asset-manager-v2");
146-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-valid`);
146+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-valid`);
147147
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
148148
awaitimportWorkspaceManifest(page,manifest);
149-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
149+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
150150
}finally{
151151
awaitserver.close();
152152
}
@@ -156,8 +156,8 @@ test("@workspace-v2 invalid workspace manifest payloadJson is rejected", async (
156156
constserver=awaitstartRepoServer();
157157
try{
158158
constfixture=readFixtureSession("asset-manager-v2");
159-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-invalid`);
160-
manifest.tools["workspace-v2"].activeSession.payloadJson=null;
159+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-invalid`);
160+
manifest.tools["workspace-v2"].activeToolState.payloadJson=null;
161161
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
162162
awaitimportWorkspaceManifest(page,manifest);
163163
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
@@ -181,7 +181,7 @@ for (const toolId of toolIds) {
181181
server.baseUrl,
182182
toolId,
183183
`${fixture.hostContextId}-valid`,
184-
fixture.sessionContext
184+
fixture.toolStateContext
185185
);
186186
awaitexpect(page.locator(selectors.valid)).toBeVisible();
187187
awaitexpect(page.locator(selectors.invalid)).toBeHidden();
@@ -195,14 +195,14 @@ for (const toolId of toolIds) {
195195
constserver=awaitstartRepoServer();
196196
try{
197197
constfixture=readFixtureSession(toolId);
198-
constinvalidSession=cloneJson(fixture.sessionContext);
199-
invalidSession.payloadJson=null;
198+
constinvalidToolState=cloneJson(fixture.toolStateContext);
199+
invalidToolState.payloadJson=null;
200200
awaitseedSessionAndOpenTool(
201201
page,
202202
server.baseUrl,
203203
toolId,
204204
`${fixture.hostContextId}-invalid`,
205-
invalidSession
205+
invalidToolState
206206
);
207207
awaitexpect(page.locator(selectors.invalid)).toBeVisible();
208208
awaitexpect(page.locator(selectors.valid)).toBeHidden();

‎tests/playwright/workspace-v2.validation.spec.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ctrlTapClick } from "../helpers/playwrightCtrlTapClick.mjs";
44

55
asyncfunctionimportManifestFromObject(page,manifest){
66
constchooserPromise=page.waitForEvent("filechooser");
7-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
7+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
88
constchooser=awaitchooserPromise;
99
constjsonText=JSON.stringify(manifest,null,2);
1010
awaitchooser.setFiles({
@@ -16,7 +16,7 @@ async function importManifestFromObject(page, manifest) {
1616
}
1717

1818
asyncfunctionexportManifestFromTextarea(page){
19-
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Session JSON"}));
19+
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Tool State JSON"}));
2020
constexportedText=awaitpage.locator("#workspaceV2ImportJson").inputValue();
2121
returnJSON.parse(exportedText);
2222
}
@@ -36,13 +36,13 @@ test.describe("Workspace V2 validation coverage", () => {
3636
expect(baselineManifest.tools?.["workspace-v2"]).toBeTruthy();
3737

3838
awaitimportManifestFromObject(page,baselineManifest);
39-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
39+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4040

4141
constexportedManifest=awaitexportManifestFromTextarea(page);
4242
expect(exportedManifest.documentKind).toBe("workspace-manifest");
4343

4444
awaitimportManifestFromObject(page,exportedManifest);
45-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
45+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4646
}finally{
4747
awaitserver.close();
4848
}
@@ -71,7 +71,7 @@ test.describe("Workspace V2 validation coverage", () => {
7171
try{
7272
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
7373
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
74-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
74+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
7575

7676
awaitimportManifestFromObject(page,{
7777
schema: "html-js-gaming.project",
@@ -81,7 +81,7 @@ test.describe("Workspace V2 validation coverage", () => {
8181
tools: {}
8282
});
8383
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
84-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
84+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
8585

8686
constinvalidPayloadManifest={
8787
documentKind: "workspace-manifest",
@@ -97,26 +97,26 @@ test.describe("Workspace V2 validation coverage", () => {
9797
swatches: []
9898
},
9999
"workspace-v2": {
100-
schema: "html-js-gaming.workspace-v2-session/1",
100+
schema: "html-js-gaming.workspace-v2-tool-state/1",
101101
game: {
102102
id: "game-bad",
103103
name: "Bad Game"
104104
},
105105
defaultToolId: "asset-manager-v2",
106106
activeToolId: "asset-manager-v2",
107107
activeHostContextId: "asset-manager-v2-bad-0001",
108-
activeSession: {
108+
activeToolState: {
109109
version: "v2",
110110
toolId: "asset-manager-v2",
111111
payloadJson: null
112112
},
113-
savedSessions: {}
113+
savedToolStates: {}
114114
}
115115
}
116116
};
117117
awaitimportManifestFromObject(page,invalidPayloadManifest);
118118
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
119-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
119+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
120120
awaitexpect(page).toHaveURL(/\/tools\/workspace-v2\/index\.html/);
121121
}finally{
122122
awaitserver.close();
@@ -129,38 +129,38 @@ test.describe("Workspace V2 validation coverage", () => {
129129
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
130130
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
131131
awaitpage.locator("#workspaceV2ToolSelect").selectOption("asset-manager-v2");
132-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
132+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
133133

134134
constloadedManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
135135
constexportedManifest=awaitexportManifestFromTextarea(page);
136136
expect(exportedManifest).toEqual(loadedManifest);
137137

138138
awaitimportManifestFromObject(page,exportedManifest);
139-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
139+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
140140
constpostImportManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
141141
expect(postImportManifest).toEqual(exportedManifest);
142142
}finally{
143143
awaitserver.close();
144144
}
145145
});
146146

147-
test("tool switching keeps activeSession consistent with selected fixture tool",async({ page })=>{
147+
test("tool switching keeps activeToolState consistent with selected fixture tool",async({ page })=>{
148148
constserver=awaitstartRepoServer();
149149
try{
150150
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
151151
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
152152

153153
awaitpage.locator("#workspaceV2ToolSelect").selectOption("tilemap-studio-v2");
154-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
154+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
155155
letexportedManifest=awaitexportManifestFromTextarea(page);
156156
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("tilemap-studio-v2");
157-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("tilemap-studio-v2");
157+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("tilemap-studio-v2");
158158

159159
awaitpage.locator("#workspaceV2ToolSelect").selectOption("vector-map-editor-v2");
160-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
160+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
161161
exportedManifest=awaitexportManifestFromTextarea(page);
162162
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("vector-map-editor-v2");
163-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("vector-map-editor-v2");
163+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("vector-map-editor-v2");
164164
}finally{
165165
awaitserver.close();
166166
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit ad90357

Browse files
committed
Rename Workspace V2 session terminology to toolState across code, schemas, UI, tests, and docs - PR_26124_012-rename-session-to-toolstate
1 parent 5739829 commit ad90357

13 files changed

Lines changed: 955 additions & 943 deletions

‎docs/dev/reports/tool_completion_audit.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-`vector-map-editor-v2`
1212

1313
## Evidence Used
14-
-`npm run test:workspace-v2` -> FAIL (`18 passed`, `1 failed`).
14+
-`npm run test:workspace-v2` -> PASS (`19 passed`, `0 failed`).
1515
-`node tests/runtime/V2CrossToolFlow.test.mjs` -> PASS.
1616
-`node tests/runtime/V2ToolLaunch.test.mjs` -> FAIL (palette fixture contract drift in test logic).
1717
-`node tests/runtime/V2ToolActionFlow.test.mjs` -> FAIL (string-token matcher drift in test logic).
@@ -111,6 +111,18 @@
111111

112112

113113

114+
115+
116+
117+
118+
119+
120+
121+
122+
123+
124+
125+
114126

115127

116128

‎tests/fixtures/v2-tools/asset-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "asset-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "asset-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/palette-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "palette-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "palette-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/svg-asset-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "svg-asset-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "svg-asset-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/tilemap-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "tilemap-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "tilemap-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/vector-map-editor-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "vector-map-editor-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "vector-map-editor-v2",
66
"payloadJson": {

‎tests/playwright/tool-validation/workspace-v2.tool-validation.spec.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ function readFixtureSession(toolId) {
3030
constfixture=JSON.parse(fs.readFileSync(fixturePath,"utf8"));
3131
return{
3232
hostContextId: typeoffixture.hostContextId==="string" ? fixture.hostContextId.trim() : `${toolId}-fixture`,
33-
sessionContext: fixture.sessionContext
33+
toolStateContext: fixture.toolStateContext
3434
};
3535
}
3636

3737
functioncloneJson(value){
3838
returnJSON.parse(JSON.stringify(value));
3939
}
4040

41-
functionbuildWorkspaceManifest(sessionContext,hostContextId){
41+
functionbuildWorkspaceManifest(toolStateContext,hostContextId){
4242
return{
4343
documentKind: "workspace-manifest",
4444
schema: "html-js-gaming.project",
@@ -53,24 +53,24 @@ function buildWorkspaceManifest(sessionContext, hostContextId) {
5353
swatches: []
5454
},
5555
"workspace-v2": {
56-
schema: "html-js-gaming.workspace-v2-session/1",
56+
schema: "html-js-gaming.workspace-v2-tool-state/1",
5757
game: {
5858
id: "workspace-v2-tool-validation-game",
5959
name: "Workspace V2 Tool Validation"
6060
},
6161
defaultToolId: "asset-manager-v2",
62-
activeToolId: typeofsessionContext.toolId==="string" ? sessionContext.toolId : "asset-manager-v2",
62+
activeToolId: typeoftoolStateContext.toolId==="string" ? toolStateContext.toolId : "asset-manager-v2",
6363
activeHostContextId: hostContextId,
64-
activeSession: cloneJson(sessionContext),
65-
savedSessions: {}
64+
activeToolState: cloneJson(toolStateContext),
65+
savedToolStates: {}
6666
}
6767
}
6868
};
6969
}
7070

7171
asyncfunctionimportWorkspaceManifest(page,manifest){
7272
constchooserPromise=page.waitForEvent("filechooser");
73-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
73+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
7474
constchooser=awaitchooserPromise;
7575
awaitchooser.setFiles({
7676
name: "workspace-v2-tool-validation-import.json",
@@ -79,11 +79,11 @@ async function importWorkspaceManifest(page, manifest) {
7979
});
8080
}
8181

82-
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,sessionContext){
82+
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,toolStateContext){
8383
awaitpage.goto(`${baseUrl}/tools/workspace-v2/index.html`);
84-
awaitpage.evaluate(({hostContextId: id,sessionContext: payload})=>{
84+
awaitpage.evaluate(({hostContextId: id,toolStateContext: payload})=>{
8585
window.sessionStorage.setItem(id,JSON.stringify(payload));
86-
},{ hostContextId,sessionContext});
86+
},{ hostContextId,toolStateContext});
8787
awaitpage.goto(`${baseUrl}/tools/${toolId}/index.html?hostContextId=${encodeURIComponent(hostContextId)}`);
8888
}
8989

@@ -143,10 +143,10 @@ test("@workspace-v2 valid workspace manifest payloadJson imports", async ({ page
143143
constserver=awaitstartRepoServer();
144144
try{
145145
constfixture=readFixtureSession("asset-manager-v2");
146-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-valid`);
146+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-valid`);
147147
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
148148
awaitimportWorkspaceManifest(page,manifest);
149-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
149+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
150150
}finally{
151151
awaitserver.close();
152152
}
@@ -156,8 +156,8 @@ test("@workspace-v2 invalid workspace manifest payloadJson is rejected", async (
156156
constserver=awaitstartRepoServer();
157157
try{
158158
constfixture=readFixtureSession("asset-manager-v2");
159-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-invalid`);
160-
manifest.tools["workspace-v2"].activeSession.payloadJson=null;
159+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-invalid`);
160+
manifest.tools["workspace-v2"].activeToolState.payloadJson=null;
161161
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
162162
awaitimportWorkspaceManifest(page,manifest);
163163
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
@@ -181,7 +181,7 @@ for (const toolId of toolIds) {
181181
server.baseUrl,
182182
toolId,
183183
`${fixture.hostContextId}-valid`,
184-
fixture.sessionContext
184+
fixture.toolStateContext
185185
);
186186
awaitexpect(page.locator(selectors.valid)).toBeVisible();
187187
awaitexpect(page.locator(selectors.invalid)).toBeHidden();
@@ -195,14 +195,14 @@ for (const toolId of toolIds) {
195195
constserver=awaitstartRepoServer();
196196
try{
197197
constfixture=readFixtureSession(toolId);
198-
constinvalidSession=cloneJson(fixture.sessionContext);
199-
invalidSession.payloadJson=null;
198+
constinvalidToolState=cloneJson(fixture.toolStateContext);
199+
invalidToolState.payloadJson=null;
200200
awaitseedSessionAndOpenTool(
201201
page,
202202
server.baseUrl,
203203
toolId,
204204
`${fixture.hostContextId}-invalid`,
205-
invalidSession
205+
invalidToolState
206206
);
207207
awaitexpect(page.locator(selectors.invalid)).toBeVisible();
208208
awaitexpect(page.locator(selectors.valid)).toBeHidden();

‎tests/playwright/workspace-v2.validation.spec.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ctrlTapClick } from "../helpers/playwrightCtrlTapClick.mjs";
44

55
asyncfunctionimportManifestFromObject(page,manifest){
66
constchooserPromise=page.waitForEvent("filechooser");
7-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
7+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
88
constchooser=awaitchooserPromise;
99
constjsonText=JSON.stringify(manifest,null,2);
1010
awaitchooser.setFiles({
@@ -16,7 +16,7 @@ async function importManifestFromObject(page, manifest) {
1616
}
1717

1818
asyncfunctionexportManifestFromTextarea(page){
19-
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Session JSON"}));
19+
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Tool State JSON"}));
2020
constexportedText=awaitpage.locator("#workspaceV2ImportJson").inputValue();
2121
returnJSON.parse(exportedText);
2222
}
@@ -36,13 +36,13 @@ test.describe("Workspace V2 validation coverage", () => {
3636
expect(baselineManifest.tools?.["workspace-v2"]).toBeTruthy();
3737

3838
awaitimportManifestFromObject(page,baselineManifest);
39-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
39+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4040

4141
constexportedManifest=awaitexportManifestFromTextarea(page);
4242
expect(exportedManifest.documentKind).toBe("workspace-manifest");
4343

4444
awaitimportManifestFromObject(page,exportedManifest);
45-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
45+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4646
}finally{
4747
awaitserver.close();
4848
}
@@ -71,7 +71,7 @@ test.describe("Workspace V2 validation coverage", () => {
7171
try{
7272
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
7373
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
74-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
74+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
7575

7676
awaitimportManifestFromObject(page,{
7777
schema: "html-js-gaming.project",
@@ -81,7 +81,7 @@ test.describe("Workspace V2 validation coverage", () => {
8181
tools: {}
8282
});
8383
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
84-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
84+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
8585

8686
constinvalidPayloadManifest={
8787
documentKind: "workspace-manifest",
@@ -97,26 +97,26 @@ test.describe("Workspace V2 validation coverage", () => {
9797
swatches: []
9898
},
9999
"workspace-v2": {
100-
schema: "html-js-gaming.workspace-v2-session/1",
100+
schema: "html-js-gaming.workspace-v2-tool-state/1",
101101
game: {
102102
id: "game-bad",
103103
name: "Bad Game"
104104
},
105105
defaultToolId: "asset-manager-v2",
106106
activeToolId: "asset-manager-v2",
107107
activeHostContextId: "asset-manager-v2-bad-0001",
108-
activeSession: {
108+
activeToolState: {
109109
version: "v2",
110110
toolId: "asset-manager-v2",
111111
payloadJson: null
112112
},
113-
savedSessions: {}
113+
savedToolStates: {}
114114
}
115115
}
116116
};
117117
awaitimportManifestFromObject(page,invalidPayloadManifest);
118118
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
119-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
119+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
120120
awaitexpect(page).toHaveURL(/\/tools\/workspace-v2\/index\.html/);
121121
}finally{
122122
awaitserver.close();
@@ -129,38 +129,38 @@ test.describe("Workspace V2 validation coverage", () => {
129129
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
130130
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
131131
awaitpage.locator("#workspaceV2ToolSelect").selectOption("asset-manager-v2");
132-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
132+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
133133

134134
constloadedManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
135135
constexportedManifest=awaitexportManifestFromTextarea(page);
136136
expect(exportedManifest).toEqual(loadedManifest);
137137

138138
awaitimportManifestFromObject(page,exportedManifest);
139-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
139+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
140140
constpostImportManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
141141
expect(postImportManifest).toEqual(exportedManifest);
142142
}finally{
143143
awaitserver.close();
144144
}
145145
});
146146

147-
test("tool switching keeps activeSession consistent with selected fixture tool",async({ page })=>{
147+
test("tool switching keeps activeToolState consistent with selected fixture tool",async({ page })=>{
148148
constserver=awaitstartRepoServer();
149149
try{
150150
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
151151
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
152152

153153
awaitpage.locator("#workspaceV2ToolSelect").selectOption("tilemap-studio-v2");
154-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
154+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
155155
letexportedManifest=awaitexportManifestFromTextarea(page);
156156
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("tilemap-studio-v2");
157-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("tilemap-studio-v2");
157+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("tilemap-studio-v2");
158158

159159
awaitpage.locator("#workspaceV2ToolSelect").selectOption("vector-map-editor-v2");
160-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
160+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
161161
exportedManifest=awaitexportManifestFromTextarea(page);
162162
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("vector-map-editor-v2");
163-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("vector-map-editor-v2");
163+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("vector-map-editor-v2");
164164
}finally{
165165
awaitserver.close();
166166
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit ad90357

Browse files
committed
Rename Workspace V2 session terminology to toolState across code, schemas, UI, tests, and docs - PR_26124_012-rename-session-to-toolstate
1 parent 5739829 commit ad90357

13 files changed

Lines changed: 955 additions & 943 deletions

‎docs/dev/reports/tool_completion_audit.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-`vector-map-editor-v2`
1212

1313
## Evidence Used
14-
-`npm run test:workspace-v2` -> FAIL (`18 passed`, `1 failed`).
14+
-`npm run test:workspace-v2` -> PASS (`19 passed`, `0 failed`).
1515
-`node tests/runtime/V2CrossToolFlow.test.mjs` -> PASS.
1616
-`node tests/runtime/V2ToolLaunch.test.mjs` -> FAIL (palette fixture contract drift in test logic).
1717
-`node tests/runtime/V2ToolActionFlow.test.mjs` -> FAIL (string-token matcher drift in test logic).
@@ -111,6 +111,18 @@
111111

112112

113113

114+
115+
116+
117+
118+
119+
120+
121+
122+
123+
124+
125+
114126

115127

116128

‎tests/fixtures/v2-tools/asset-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "asset-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "asset-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/palette-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "palette-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "palette-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/svg-asset-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "svg-asset-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "svg-asset-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/tilemap-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "tilemap-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "tilemap-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/vector-map-editor-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "vector-map-editor-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "vector-map-editor-v2",
66
"payloadJson": {

‎tests/playwright/tool-validation/workspace-v2.tool-validation.spec.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ function readFixtureSession(toolId) {
3030
constfixture=JSON.parse(fs.readFileSync(fixturePath,"utf8"));
3131
return{
3232
hostContextId: typeoffixture.hostContextId==="string" ? fixture.hostContextId.trim() : `${toolId}-fixture`,
33-
sessionContext: fixture.sessionContext
33+
toolStateContext: fixture.toolStateContext
3434
};
3535
}
3636

3737
functioncloneJson(value){
3838
returnJSON.parse(JSON.stringify(value));
3939
}
4040

41-
functionbuildWorkspaceManifest(sessionContext,hostContextId){
41+
functionbuildWorkspaceManifest(toolStateContext,hostContextId){
4242
return{
4343
documentKind: "workspace-manifest",
4444
schema: "html-js-gaming.project",
@@ -53,24 +53,24 @@ function buildWorkspaceManifest(sessionContext, hostContextId) {
5353
swatches: []
5454
},
5555
"workspace-v2": {
56-
schema: "html-js-gaming.workspace-v2-session/1",
56+
schema: "html-js-gaming.workspace-v2-tool-state/1",
5757
game: {
5858
id: "workspace-v2-tool-validation-game",
5959
name: "Workspace V2 Tool Validation"
6060
},
6161
defaultToolId: "asset-manager-v2",
62-
activeToolId: typeofsessionContext.toolId==="string" ? sessionContext.toolId : "asset-manager-v2",
62+
activeToolId: typeoftoolStateContext.toolId==="string" ? toolStateContext.toolId : "asset-manager-v2",
6363
activeHostContextId: hostContextId,
64-
activeSession: cloneJson(sessionContext),
65-
savedSessions: {}
64+
activeToolState: cloneJson(toolStateContext),
65+
savedToolStates: {}
6666
}
6767
}
6868
};
6969
}
7070

7171
asyncfunctionimportWorkspaceManifest(page,manifest){
7272
constchooserPromise=page.waitForEvent("filechooser");
73-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
73+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
7474
constchooser=awaitchooserPromise;
7575
awaitchooser.setFiles({
7676
name: "workspace-v2-tool-validation-import.json",
@@ -79,11 +79,11 @@ async function importWorkspaceManifest(page, manifest) {
7979
});
8080
}
8181

82-
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,sessionContext){
82+
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,toolStateContext){
8383
awaitpage.goto(`${baseUrl}/tools/workspace-v2/index.html`);
84-
awaitpage.evaluate(({hostContextId: id,sessionContext: payload})=>{
84+
awaitpage.evaluate(({hostContextId: id,toolStateContext: payload})=>{
8585
window.sessionStorage.setItem(id,JSON.stringify(payload));
86-
},{ hostContextId,sessionContext});
86+
},{ hostContextId,toolStateContext});
8787
awaitpage.goto(`${baseUrl}/tools/${toolId}/index.html?hostContextId=${encodeURIComponent(hostContextId)}`);
8888
}
8989

@@ -143,10 +143,10 @@ test("@workspace-v2 valid workspace manifest payloadJson imports", async ({ page
143143
constserver=awaitstartRepoServer();
144144
try{
145145
constfixture=readFixtureSession("asset-manager-v2");
146-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-valid`);
146+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-valid`);
147147
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
148148
awaitimportWorkspaceManifest(page,manifest);
149-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
149+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
150150
}finally{
151151
awaitserver.close();
152152
}
@@ -156,8 +156,8 @@ test("@workspace-v2 invalid workspace manifest payloadJson is rejected", async (
156156
constserver=awaitstartRepoServer();
157157
try{
158158
constfixture=readFixtureSession("asset-manager-v2");
159-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-invalid`);
160-
manifest.tools["workspace-v2"].activeSession.payloadJson=null;
159+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-invalid`);
160+
manifest.tools["workspace-v2"].activeToolState.payloadJson=null;
161161
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
162162
awaitimportWorkspaceManifest(page,manifest);
163163
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
@@ -181,7 +181,7 @@ for (const toolId of toolIds) {
181181
server.baseUrl,
182182
toolId,
183183
`${fixture.hostContextId}-valid`,
184-
fixture.sessionContext
184+
fixture.toolStateContext
185185
);
186186
awaitexpect(page.locator(selectors.valid)).toBeVisible();
187187
awaitexpect(page.locator(selectors.invalid)).toBeHidden();
@@ -195,14 +195,14 @@ for (const toolId of toolIds) {
195195
constserver=awaitstartRepoServer();
196196
try{
197197
constfixture=readFixtureSession(toolId);
198-
constinvalidSession=cloneJson(fixture.sessionContext);
199-
invalidSession.payloadJson=null;
198+
constinvalidToolState=cloneJson(fixture.toolStateContext);
199+
invalidToolState.payloadJson=null;
200200
awaitseedSessionAndOpenTool(
201201
page,
202202
server.baseUrl,
203203
toolId,
204204
`${fixture.hostContextId}-invalid`,
205-
invalidSession
205+
invalidToolState
206206
);
207207
awaitexpect(page.locator(selectors.invalid)).toBeVisible();
208208
awaitexpect(page.locator(selectors.valid)).toBeHidden();

‎tests/playwright/workspace-v2.validation.spec.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ctrlTapClick } from "../helpers/playwrightCtrlTapClick.mjs";
44

55
asyncfunctionimportManifestFromObject(page,manifest){
66
constchooserPromise=page.waitForEvent("filechooser");
7-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
7+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
88
constchooser=awaitchooserPromise;
99
constjsonText=JSON.stringify(manifest,null,2);
1010
awaitchooser.setFiles({
@@ -16,7 +16,7 @@ async function importManifestFromObject(page, manifest) {
1616
}
1717

1818
asyncfunctionexportManifestFromTextarea(page){
19-
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Session JSON"}));
19+
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Tool State JSON"}));
2020
constexportedText=awaitpage.locator("#workspaceV2ImportJson").inputValue();
2121
returnJSON.parse(exportedText);
2222
}
@@ -36,13 +36,13 @@ test.describe("Workspace V2 validation coverage", () => {
3636
expect(baselineManifest.tools?.["workspace-v2"]).toBeTruthy();
3737

3838
awaitimportManifestFromObject(page,baselineManifest);
39-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
39+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4040

4141
constexportedManifest=awaitexportManifestFromTextarea(page);
4242
expect(exportedManifest.documentKind).toBe("workspace-manifest");
4343

4444
awaitimportManifestFromObject(page,exportedManifest);
45-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
45+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4646
}finally{
4747
awaitserver.close();
4848
}
@@ -71,7 +71,7 @@ test.describe("Workspace V2 validation coverage", () => {
7171
try{
7272
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
7373
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
74-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
74+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
7575

7676
awaitimportManifestFromObject(page,{
7777
schema: "html-js-gaming.project",
@@ -81,7 +81,7 @@ test.describe("Workspace V2 validation coverage", () => {
8181
tools: {}
8282
});
8383
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
84-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
84+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
8585

8686
constinvalidPayloadManifest={
8787
documentKind: "workspace-manifest",
@@ -97,26 +97,26 @@ test.describe("Workspace V2 validation coverage", () => {
9797
swatches: []
9898
},
9999
"workspace-v2": {
100-
schema: "html-js-gaming.workspace-v2-session/1",
100+
schema: "html-js-gaming.workspace-v2-tool-state/1",
101101
game: {
102102
id: "game-bad",
103103
name: "Bad Game"
104104
},
105105
defaultToolId: "asset-manager-v2",
106106
activeToolId: "asset-manager-v2",
107107
activeHostContextId: "asset-manager-v2-bad-0001",
108-
activeSession: {
108+
activeToolState: {
109109
version: "v2",
110110
toolId: "asset-manager-v2",
111111
payloadJson: null
112112
},
113-
savedSessions: {}
113+
savedToolStates: {}
114114
}
115115
}
116116
};
117117
awaitimportManifestFromObject(page,invalidPayloadManifest);
118118
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
119-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
119+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
120120
awaitexpect(page).toHaveURL(/\/tools\/workspace-v2\/index\.html/);
121121
}finally{
122122
awaitserver.close();
@@ -129,38 +129,38 @@ test.describe("Workspace V2 validation coverage", () => {
129129
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
130130
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
131131
awaitpage.locator("#workspaceV2ToolSelect").selectOption("asset-manager-v2");
132-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
132+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
133133

134134
constloadedManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
135135
constexportedManifest=awaitexportManifestFromTextarea(page);
136136
expect(exportedManifest).toEqual(loadedManifest);
137137

138138
awaitimportManifestFromObject(page,exportedManifest);
139-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
139+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
140140
constpostImportManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
141141
expect(postImportManifest).toEqual(exportedManifest);
142142
}finally{
143143
awaitserver.close();
144144
}
145145
});
146146

147-
test("tool switching keeps activeSession consistent with selected fixture tool",async({ page })=>{
147+
test("tool switching keeps activeToolState consistent with selected fixture tool",async({ page })=>{
148148
constserver=awaitstartRepoServer();
149149
try{
150150
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
151151
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
152152

153153
awaitpage.locator("#workspaceV2ToolSelect").selectOption("tilemap-studio-v2");
154-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
154+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
155155
letexportedManifest=awaitexportManifestFromTextarea(page);
156156
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("tilemap-studio-v2");
157-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("tilemap-studio-v2");
157+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("tilemap-studio-v2");
158158

159159
awaitpage.locator("#workspaceV2ToolSelect").selectOption("vector-map-editor-v2");
160-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
160+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
161161
exportedManifest=awaitexportManifestFromTextarea(page);
162162
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("vector-map-editor-v2");
163-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("vector-map-editor-v2");
163+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("vector-map-editor-v2");
164164
}finally{
165165
awaitserver.close();
166166
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit ad90357

Browse files
committed
Rename Workspace V2 session terminology to toolState across code, schemas, UI, tests, and docs - PR_26124_012-rename-session-to-toolstate
1 parent 5739829 commit ad90357

13 files changed

Lines changed: 955 additions & 943 deletions

‎docs/dev/reports/tool_completion_audit.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-`vector-map-editor-v2`
1212

1313
## Evidence Used
14-
-`npm run test:workspace-v2` -> FAIL (`18 passed`, `1 failed`).
14+
-`npm run test:workspace-v2` -> PASS (`19 passed`, `0 failed`).
1515
-`node tests/runtime/V2CrossToolFlow.test.mjs` -> PASS.
1616
-`node tests/runtime/V2ToolLaunch.test.mjs` -> FAIL (palette fixture contract drift in test logic).
1717
-`node tests/runtime/V2ToolActionFlow.test.mjs` -> FAIL (string-token matcher drift in test logic).
@@ -111,6 +111,18 @@
111111

112112

113113

114+
115+
116+
117+
118+
119+
120+
121+
122+
123+
124+
125+
114126

115127

116128

‎tests/fixtures/v2-tools/asset-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "asset-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "asset-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/palette-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "palette-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "palette-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/svg-asset-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "svg-asset-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "svg-asset-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/tilemap-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "tilemap-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "tilemap-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/vector-map-editor-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "vector-map-editor-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "vector-map-editor-v2",
66
"payloadJson": {

‎tests/playwright/tool-validation/workspace-v2.tool-validation.spec.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ function readFixtureSession(toolId) {
3030
constfixture=JSON.parse(fs.readFileSync(fixturePath,"utf8"));
3131
return{
3232
hostContextId: typeoffixture.hostContextId==="string" ? fixture.hostContextId.trim() : `${toolId}-fixture`,
33-
sessionContext: fixture.sessionContext
33+
toolStateContext: fixture.toolStateContext
3434
};
3535
}
3636

3737
functioncloneJson(value){
3838
returnJSON.parse(JSON.stringify(value));
3939
}
4040

41-
functionbuildWorkspaceManifest(sessionContext,hostContextId){
41+
functionbuildWorkspaceManifest(toolStateContext,hostContextId){
4242
return{
4343
documentKind: "workspace-manifest",
4444
schema: "html-js-gaming.project",
@@ -53,24 +53,24 @@ function buildWorkspaceManifest(sessionContext, hostContextId) {
5353
swatches: []
5454
},
5555
"workspace-v2": {
56-
schema: "html-js-gaming.workspace-v2-session/1",
56+
schema: "html-js-gaming.workspace-v2-tool-state/1",
5757
game: {
5858
id: "workspace-v2-tool-validation-game",
5959
name: "Workspace V2 Tool Validation"
6060
},
6161
defaultToolId: "asset-manager-v2",
62-
activeToolId: typeofsessionContext.toolId==="string" ? sessionContext.toolId : "asset-manager-v2",
62+
activeToolId: typeoftoolStateContext.toolId==="string" ? toolStateContext.toolId : "asset-manager-v2",
6363
activeHostContextId: hostContextId,
64-
activeSession: cloneJson(sessionContext),
65-
savedSessions: {}
64+
activeToolState: cloneJson(toolStateContext),
65+
savedToolStates: {}
6666
}
6767
}
6868
};
6969
}
7070

7171
asyncfunctionimportWorkspaceManifest(page,manifest){
7272
constchooserPromise=page.waitForEvent("filechooser");
73-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
73+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
7474
constchooser=awaitchooserPromise;
7575
awaitchooser.setFiles({
7676
name: "workspace-v2-tool-validation-import.json",
@@ -79,11 +79,11 @@ async function importWorkspaceManifest(page, manifest) {
7979
});
8080
}
8181

82-
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,sessionContext){
82+
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,toolStateContext){
8383
awaitpage.goto(`${baseUrl}/tools/workspace-v2/index.html`);
84-
awaitpage.evaluate(({hostContextId: id,sessionContext: payload})=>{
84+
awaitpage.evaluate(({hostContextId: id,toolStateContext: payload})=>{
8585
window.sessionStorage.setItem(id,JSON.stringify(payload));
86-
},{ hostContextId,sessionContext});
86+
},{ hostContextId,toolStateContext});
8787
awaitpage.goto(`${baseUrl}/tools/${toolId}/index.html?hostContextId=${encodeURIComponent(hostContextId)}`);
8888
}
8989

@@ -143,10 +143,10 @@ test("@workspace-v2 valid workspace manifest payloadJson imports", async ({ page
143143
constserver=awaitstartRepoServer();
144144
try{
145145
constfixture=readFixtureSession("asset-manager-v2");
146-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-valid`);
146+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-valid`);
147147
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
148148
awaitimportWorkspaceManifest(page,manifest);
149-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
149+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
150150
}finally{
151151
awaitserver.close();
152152
}
@@ -156,8 +156,8 @@ test("@workspace-v2 invalid workspace manifest payloadJson is rejected", async (
156156
constserver=awaitstartRepoServer();
157157
try{
158158
constfixture=readFixtureSession("asset-manager-v2");
159-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-invalid`);
160-
manifest.tools["workspace-v2"].activeSession.payloadJson=null;
159+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-invalid`);
160+
manifest.tools["workspace-v2"].activeToolState.payloadJson=null;
161161
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
162162
awaitimportWorkspaceManifest(page,manifest);
163163
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
@@ -181,7 +181,7 @@ for (const toolId of toolIds) {
181181
server.baseUrl,
182182
toolId,
183183
`${fixture.hostContextId}-valid`,
184-
fixture.sessionContext
184+
fixture.toolStateContext
185185
);
186186
awaitexpect(page.locator(selectors.valid)).toBeVisible();
187187
awaitexpect(page.locator(selectors.invalid)).toBeHidden();
@@ -195,14 +195,14 @@ for (const toolId of toolIds) {
195195
constserver=awaitstartRepoServer();
196196
try{
197197
constfixture=readFixtureSession(toolId);
198-
constinvalidSession=cloneJson(fixture.sessionContext);
199-
invalidSession.payloadJson=null;
198+
constinvalidToolState=cloneJson(fixture.toolStateContext);
199+
invalidToolState.payloadJson=null;
200200
awaitseedSessionAndOpenTool(
201201
page,
202202
server.baseUrl,
203203
toolId,
204204
`${fixture.hostContextId}-invalid`,
205-
invalidSession
205+
invalidToolState
206206
);
207207
awaitexpect(page.locator(selectors.invalid)).toBeVisible();
208208
awaitexpect(page.locator(selectors.valid)).toBeHidden();

‎tests/playwright/workspace-v2.validation.spec.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ctrlTapClick } from "../helpers/playwrightCtrlTapClick.mjs";
44

55
asyncfunctionimportManifestFromObject(page,manifest){
66
constchooserPromise=page.waitForEvent("filechooser");
7-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
7+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
88
constchooser=awaitchooserPromise;
99
constjsonText=JSON.stringify(manifest,null,2);
1010
awaitchooser.setFiles({
@@ -16,7 +16,7 @@ async function importManifestFromObject(page, manifest) {
1616
}
1717

1818
asyncfunctionexportManifestFromTextarea(page){
19-
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Session JSON"}));
19+
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Tool State JSON"}));
2020
constexportedText=awaitpage.locator("#workspaceV2ImportJson").inputValue();
2121
returnJSON.parse(exportedText);
2222
}
@@ -36,13 +36,13 @@ test.describe("Workspace V2 validation coverage", () => {
3636
expect(baselineManifest.tools?.["workspace-v2"]).toBeTruthy();
3737

3838
awaitimportManifestFromObject(page,baselineManifest);
39-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
39+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4040

4141
constexportedManifest=awaitexportManifestFromTextarea(page);
4242
expect(exportedManifest.documentKind).toBe("workspace-manifest");
4343

4444
awaitimportManifestFromObject(page,exportedManifest);
45-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
45+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4646
}finally{
4747
awaitserver.close();
4848
}
@@ -71,7 +71,7 @@ test.describe("Workspace V2 validation coverage", () => {
7171
try{
7272
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
7373
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
74-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
74+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
7575

7676
awaitimportManifestFromObject(page,{
7777
schema: "html-js-gaming.project",
@@ -81,7 +81,7 @@ test.describe("Workspace V2 validation coverage", () => {
8181
tools: {}
8282
});
8383
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
84-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
84+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
8585

8686
constinvalidPayloadManifest={
8787
documentKind: "workspace-manifest",
@@ -97,26 +97,26 @@ test.describe("Workspace V2 validation coverage", () => {
9797
swatches: []
9898
},
9999
"workspace-v2": {
100-
schema: "html-js-gaming.workspace-v2-session/1",
100+
schema: "html-js-gaming.workspace-v2-tool-state/1",
101101
game: {
102102
id: "game-bad",
103103
name: "Bad Game"
104104
},
105105
defaultToolId: "asset-manager-v2",
106106
activeToolId: "asset-manager-v2",
107107
activeHostContextId: "asset-manager-v2-bad-0001",
108-
activeSession: {
108+
activeToolState: {
109109
version: "v2",
110110
toolId: "asset-manager-v2",
111111
payloadJson: null
112112
},
113-
savedSessions: {}
113+
savedToolStates: {}
114114
}
115115
}
116116
};
117117
awaitimportManifestFromObject(page,invalidPayloadManifest);
118118
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
119-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
119+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
120120
awaitexpect(page).toHaveURL(/\/tools\/workspace-v2\/index\.html/);
121121
}finally{
122122
awaitserver.close();
@@ -129,38 +129,38 @@ test.describe("Workspace V2 validation coverage", () => {
129129
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
130130
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
131131
awaitpage.locator("#workspaceV2ToolSelect").selectOption("asset-manager-v2");
132-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
132+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
133133

134134
constloadedManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
135135
constexportedManifest=awaitexportManifestFromTextarea(page);
136136
expect(exportedManifest).toEqual(loadedManifest);
137137

138138
awaitimportManifestFromObject(page,exportedManifest);
139-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
139+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
140140
constpostImportManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
141141
expect(postImportManifest).toEqual(exportedManifest);
142142
}finally{
143143
awaitserver.close();
144144
}
145145
});
146146

147-
test("tool switching keeps activeSession consistent with selected fixture tool",async({ page })=>{
147+
test("tool switching keeps activeToolState consistent with selected fixture tool",async({ page })=>{
148148
constserver=awaitstartRepoServer();
149149
try{
150150
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
151151
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
152152

153153
awaitpage.locator("#workspaceV2ToolSelect").selectOption("tilemap-studio-v2");
154-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
154+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
155155
letexportedManifest=awaitexportManifestFromTextarea(page);
156156
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("tilemap-studio-v2");
157-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("tilemap-studio-v2");
157+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("tilemap-studio-v2");
158158

159159
awaitpage.locator("#workspaceV2ToolSelect").selectOption("vector-map-editor-v2");
160-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
160+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
161161
exportedManifest=awaitexportManifestFromTextarea(page);
162162
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("vector-map-editor-v2");
163-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("vector-map-editor-v2");
163+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("vector-map-editor-v2");
164164
}finally{
165165
awaitserver.close();
166166
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit ad90357

Browse files
committed
Rename Workspace V2 session terminology to toolState across code, schemas, UI, tests, and docs - PR_26124_012-rename-session-to-toolstate
1 parent 5739829 commit ad90357

13 files changed

Lines changed: 955 additions & 943 deletions

‎docs/dev/reports/tool_completion_audit.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-`vector-map-editor-v2`
1212

1313
## Evidence Used
14-
-`npm run test:workspace-v2` -> FAIL (`18 passed`, `1 failed`).
14+
-`npm run test:workspace-v2` -> PASS (`19 passed`, `0 failed`).
1515
-`node tests/runtime/V2CrossToolFlow.test.mjs` -> PASS.
1616
-`node tests/runtime/V2ToolLaunch.test.mjs` -> FAIL (palette fixture contract drift in test logic).
1717
-`node tests/runtime/V2ToolActionFlow.test.mjs` -> FAIL (string-token matcher drift in test logic).
@@ -111,6 +111,18 @@
111111

112112

113113

114+
115+
116+
117+
118+
119+
120+
121+
122+
123+
124+
125+
114126

115127

116128

‎tests/fixtures/v2-tools/asset-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "asset-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "asset-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/palette-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "palette-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "palette-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/svg-asset-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "svg-asset-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "svg-asset-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/tilemap-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "tilemap-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "tilemap-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/vector-map-editor-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "vector-map-editor-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "vector-map-editor-v2",
66
"payloadJson": {

‎tests/playwright/tool-validation/workspace-v2.tool-validation.spec.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ function readFixtureSession(toolId) {
3030
constfixture=JSON.parse(fs.readFileSync(fixturePath,"utf8"));
3131
return{
3232
hostContextId: typeoffixture.hostContextId==="string" ? fixture.hostContextId.trim() : `${toolId}-fixture`,
33-
sessionContext: fixture.sessionContext
33+
toolStateContext: fixture.toolStateContext
3434
};
3535
}
3636

3737
functioncloneJson(value){
3838
returnJSON.parse(JSON.stringify(value));
3939
}
4040

41-
functionbuildWorkspaceManifest(sessionContext,hostContextId){
41+
functionbuildWorkspaceManifest(toolStateContext,hostContextId){
4242
return{
4343
documentKind: "workspace-manifest",
4444
schema: "html-js-gaming.project",
@@ -53,24 +53,24 @@ function buildWorkspaceManifest(sessionContext, hostContextId) {
5353
swatches: []
5454
},
5555
"workspace-v2": {
56-
schema: "html-js-gaming.workspace-v2-session/1",
56+
schema: "html-js-gaming.workspace-v2-tool-state/1",
5757
game: {
5858
id: "workspace-v2-tool-validation-game",
5959
name: "Workspace V2 Tool Validation"
6060
},
6161
defaultToolId: "asset-manager-v2",
62-
activeToolId: typeofsessionContext.toolId==="string" ? sessionContext.toolId : "asset-manager-v2",
62+
activeToolId: typeoftoolStateContext.toolId==="string" ? toolStateContext.toolId : "asset-manager-v2",
6363
activeHostContextId: hostContextId,
64-
activeSession: cloneJson(sessionContext),
65-
savedSessions: {}
64+
activeToolState: cloneJson(toolStateContext),
65+
savedToolStates: {}
6666
}
6767
}
6868
};
6969
}
7070

7171
asyncfunctionimportWorkspaceManifest(page,manifest){
7272
constchooserPromise=page.waitForEvent("filechooser");
73-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
73+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
7474
constchooser=awaitchooserPromise;
7575
awaitchooser.setFiles({
7676
name: "workspace-v2-tool-validation-import.json",
@@ -79,11 +79,11 @@ async function importWorkspaceManifest(page, manifest) {
7979
});
8080
}
8181

82-
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,sessionContext){
82+
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,toolStateContext){
8383
awaitpage.goto(`${baseUrl}/tools/workspace-v2/index.html`);
84-
awaitpage.evaluate(({hostContextId: id,sessionContext: payload})=>{
84+
awaitpage.evaluate(({hostContextId: id,toolStateContext: payload})=>{
8585
window.sessionStorage.setItem(id,JSON.stringify(payload));
86-
},{ hostContextId,sessionContext});
86+
},{ hostContextId,toolStateContext});
8787
awaitpage.goto(`${baseUrl}/tools/${toolId}/index.html?hostContextId=${encodeURIComponent(hostContextId)}`);
8888
}
8989

@@ -143,10 +143,10 @@ test("@workspace-v2 valid workspace manifest payloadJson imports", async ({ page
143143
constserver=awaitstartRepoServer();
144144
try{
145145
constfixture=readFixtureSession("asset-manager-v2");
146-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-valid`);
146+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-valid`);
147147
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
148148
awaitimportWorkspaceManifest(page,manifest);
149-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
149+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
150150
}finally{
151151
awaitserver.close();
152152
}
@@ -156,8 +156,8 @@ test("@workspace-v2 invalid workspace manifest payloadJson is rejected", async (
156156
constserver=awaitstartRepoServer();
157157
try{
158158
constfixture=readFixtureSession("asset-manager-v2");
159-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-invalid`);
160-
manifest.tools["workspace-v2"].activeSession.payloadJson=null;
159+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-invalid`);
160+
manifest.tools["workspace-v2"].activeToolState.payloadJson=null;
161161
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
162162
awaitimportWorkspaceManifest(page,manifest);
163163
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
@@ -181,7 +181,7 @@ for (const toolId of toolIds) {
181181
server.baseUrl,
182182
toolId,
183183
`${fixture.hostContextId}-valid`,
184-
fixture.sessionContext
184+
fixture.toolStateContext
185185
);
186186
awaitexpect(page.locator(selectors.valid)).toBeVisible();
187187
awaitexpect(page.locator(selectors.invalid)).toBeHidden();
@@ -195,14 +195,14 @@ for (const toolId of toolIds) {
195195
constserver=awaitstartRepoServer();
196196
try{
197197
constfixture=readFixtureSession(toolId);
198-
constinvalidSession=cloneJson(fixture.sessionContext);
199-
invalidSession.payloadJson=null;
198+
constinvalidToolState=cloneJson(fixture.toolStateContext);
199+
invalidToolState.payloadJson=null;
200200
awaitseedSessionAndOpenTool(
201201
page,
202202
server.baseUrl,
203203
toolId,
204204
`${fixture.hostContextId}-invalid`,
205-
invalidSession
205+
invalidToolState
206206
);
207207
awaitexpect(page.locator(selectors.invalid)).toBeVisible();
208208
awaitexpect(page.locator(selectors.valid)).toBeHidden();

‎tests/playwright/workspace-v2.validation.spec.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ctrlTapClick } from "../helpers/playwrightCtrlTapClick.mjs";
44

55
asyncfunctionimportManifestFromObject(page,manifest){
66
constchooserPromise=page.waitForEvent("filechooser");
7-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
7+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
88
constchooser=awaitchooserPromise;
99
constjsonText=JSON.stringify(manifest,null,2);
1010
awaitchooser.setFiles({
@@ -16,7 +16,7 @@ async function importManifestFromObject(page, manifest) {
1616
}
1717

1818
asyncfunctionexportManifestFromTextarea(page){
19-
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Session JSON"}));
19+
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Tool State JSON"}));
2020
constexportedText=awaitpage.locator("#workspaceV2ImportJson").inputValue();
2121
returnJSON.parse(exportedText);
2222
}
@@ -36,13 +36,13 @@ test.describe("Workspace V2 validation coverage", () => {
3636
expect(baselineManifest.tools?.["workspace-v2"]).toBeTruthy();
3737

3838
awaitimportManifestFromObject(page,baselineManifest);
39-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
39+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4040

4141
constexportedManifest=awaitexportManifestFromTextarea(page);
4242
expect(exportedManifest.documentKind).toBe("workspace-manifest");
4343

4444
awaitimportManifestFromObject(page,exportedManifest);
45-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
45+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4646
}finally{
4747
awaitserver.close();
4848
}
@@ -71,7 +71,7 @@ test.describe("Workspace V2 validation coverage", () => {
7171
try{
7272
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
7373
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
74-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
74+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
7575

7676
awaitimportManifestFromObject(page,{
7777
schema: "html-js-gaming.project",
@@ -81,7 +81,7 @@ test.describe("Workspace V2 validation coverage", () => {
8181
tools: {}
8282
});
8383
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
84-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
84+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
8585

8686
constinvalidPayloadManifest={
8787
documentKind: "workspace-manifest",
@@ -97,26 +97,26 @@ test.describe("Workspace V2 validation coverage", () => {
9797
swatches: []
9898
},
9999
"workspace-v2": {
100-
schema: "html-js-gaming.workspace-v2-session/1",
100+
schema: "html-js-gaming.workspace-v2-tool-state/1",
101101
game: {
102102
id: "game-bad",
103103
name: "Bad Game"
104104
},
105105
defaultToolId: "asset-manager-v2",
106106
activeToolId: "asset-manager-v2",
107107
activeHostContextId: "asset-manager-v2-bad-0001",
108-
activeSession: {
108+
activeToolState: {
109109
version: "v2",
110110
toolId: "asset-manager-v2",
111111
payloadJson: null
112112
},
113-
savedSessions: {}
113+
savedToolStates: {}
114114
}
115115
}
116116
};
117117
awaitimportManifestFromObject(page,invalidPayloadManifest);
118118
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
119-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
119+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
120120
awaitexpect(page).toHaveURL(/\/tools\/workspace-v2\/index\.html/);
121121
}finally{
122122
awaitserver.close();
@@ -129,38 +129,38 @@ test.describe("Workspace V2 validation coverage", () => {
129129
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
130130
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
131131
awaitpage.locator("#workspaceV2ToolSelect").selectOption("asset-manager-v2");
132-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
132+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
133133

134134
constloadedManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
135135
constexportedManifest=awaitexportManifestFromTextarea(page);
136136
expect(exportedManifest).toEqual(loadedManifest);
137137

138138
awaitimportManifestFromObject(page,exportedManifest);
139-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
139+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
140140
constpostImportManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
141141
expect(postImportManifest).toEqual(exportedManifest);
142142
}finally{
143143
awaitserver.close();
144144
}
145145
});
146146

147-
test("tool switching keeps activeSession consistent with selected fixture tool",async({ page })=>{
147+
test("tool switching keeps activeToolState consistent with selected fixture tool",async({ page })=>{
148148
constserver=awaitstartRepoServer();
149149
try{
150150
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
151151
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
152152

153153
awaitpage.locator("#workspaceV2ToolSelect").selectOption("tilemap-studio-v2");
154-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
154+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
155155
letexportedManifest=awaitexportManifestFromTextarea(page);
156156
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("tilemap-studio-v2");
157-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("tilemap-studio-v2");
157+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("tilemap-studio-v2");
158158

159159
awaitpage.locator("#workspaceV2ToolSelect").selectOption("vector-map-editor-v2");
160-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
160+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
161161
exportedManifest=awaitexportManifestFromTextarea(page);
162162
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("vector-map-editor-v2");
163-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("vector-map-editor-v2");
163+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("vector-map-editor-v2");
164164
}finally{
165165
awaitserver.close();
166166
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit ad90357

Browse files
committed
Rename Workspace V2 session terminology to toolState across code, schemas, UI, tests, and docs - PR_26124_012-rename-session-to-toolstate
1 parent 5739829 commit ad90357

13 files changed

Lines changed: 955 additions & 943 deletions

‎docs/dev/reports/tool_completion_audit.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-`vector-map-editor-v2`
1212

1313
## Evidence Used
14-
-`npm run test:workspace-v2` -> FAIL (`18 passed`, `1 failed`).
14+
-`npm run test:workspace-v2` -> PASS (`19 passed`, `0 failed`).
1515
-`node tests/runtime/V2CrossToolFlow.test.mjs` -> PASS.
1616
-`node tests/runtime/V2ToolLaunch.test.mjs` -> FAIL (palette fixture contract drift in test logic).
1717
-`node tests/runtime/V2ToolActionFlow.test.mjs` -> FAIL (string-token matcher drift in test logic).
@@ -111,6 +111,18 @@
111111

112112

113113

114+
115+
116+
117+
118+
119+
120+
121+
122+
123+
124+
125+
114126

115127

116128

‎tests/fixtures/v2-tools/asset-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "asset-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "asset-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/palette-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "palette-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "palette-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/svg-asset-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "svg-asset-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "svg-asset-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/tilemap-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "tilemap-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "tilemap-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/vector-map-editor-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "vector-map-editor-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "vector-map-editor-v2",
66
"payloadJson": {

‎tests/playwright/tool-validation/workspace-v2.tool-validation.spec.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ function readFixtureSession(toolId) {
3030
constfixture=JSON.parse(fs.readFileSync(fixturePath,"utf8"));
3131
return{
3232
hostContextId: typeoffixture.hostContextId==="string" ? fixture.hostContextId.trim() : `${toolId}-fixture`,
33-
sessionContext: fixture.sessionContext
33+
toolStateContext: fixture.toolStateContext
3434
};
3535
}
3636

3737
functioncloneJson(value){
3838
returnJSON.parse(JSON.stringify(value));
3939
}
4040

41-
functionbuildWorkspaceManifest(sessionContext,hostContextId){
41+
functionbuildWorkspaceManifest(toolStateContext,hostContextId){
4242
return{
4343
documentKind: "workspace-manifest",
4444
schema: "html-js-gaming.project",
@@ -53,24 +53,24 @@ function buildWorkspaceManifest(sessionContext, hostContextId) {
5353
swatches: []
5454
},
5555
"workspace-v2": {
56-
schema: "html-js-gaming.workspace-v2-session/1",
56+
schema: "html-js-gaming.workspace-v2-tool-state/1",
5757
game: {
5858
id: "workspace-v2-tool-validation-game",
5959
name: "Workspace V2 Tool Validation"
6060
},
6161
defaultToolId: "asset-manager-v2",
62-
activeToolId: typeofsessionContext.toolId==="string" ? sessionContext.toolId : "asset-manager-v2",
62+
activeToolId: typeoftoolStateContext.toolId==="string" ? toolStateContext.toolId : "asset-manager-v2",
6363
activeHostContextId: hostContextId,
64-
activeSession: cloneJson(sessionContext),
65-
savedSessions: {}
64+
activeToolState: cloneJson(toolStateContext),
65+
savedToolStates: {}
6666
}
6767
}
6868
};
6969
}
7070

7171
asyncfunctionimportWorkspaceManifest(page,manifest){
7272
constchooserPromise=page.waitForEvent("filechooser");
73-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
73+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
7474
constchooser=awaitchooserPromise;
7575
awaitchooser.setFiles({
7676
name: "workspace-v2-tool-validation-import.json",
@@ -79,11 +79,11 @@ async function importWorkspaceManifest(page, manifest) {
7979
});
8080
}
8181

82-
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,sessionContext){
82+
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,toolStateContext){
8383
awaitpage.goto(`${baseUrl}/tools/workspace-v2/index.html`);
84-
awaitpage.evaluate(({hostContextId: id,sessionContext: payload})=>{
84+
awaitpage.evaluate(({hostContextId: id,toolStateContext: payload})=>{
8585
window.sessionStorage.setItem(id,JSON.stringify(payload));
86-
},{ hostContextId,sessionContext});
86+
},{ hostContextId,toolStateContext});
8787
awaitpage.goto(`${baseUrl}/tools/${toolId}/index.html?hostContextId=${encodeURIComponent(hostContextId)}`);
8888
}
8989

@@ -143,10 +143,10 @@ test("@workspace-v2 valid workspace manifest payloadJson imports", async ({ page
143143
constserver=awaitstartRepoServer();
144144
try{
145145
constfixture=readFixtureSession("asset-manager-v2");
146-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-valid`);
146+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-valid`);
147147
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
148148
awaitimportWorkspaceManifest(page,manifest);
149-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
149+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
150150
}finally{
151151
awaitserver.close();
152152
}
@@ -156,8 +156,8 @@ test("@workspace-v2 invalid workspace manifest payloadJson is rejected", async (
156156
constserver=awaitstartRepoServer();
157157
try{
158158
constfixture=readFixtureSession("asset-manager-v2");
159-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-invalid`);
160-
manifest.tools["workspace-v2"].activeSession.payloadJson=null;
159+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-invalid`);
160+
manifest.tools["workspace-v2"].activeToolState.payloadJson=null;
161161
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
162162
awaitimportWorkspaceManifest(page,manifest);
163163
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
@@ -181,7 +181,7 @@ for (const toolId of toolIds) {
181181
server.baseUrl,
182182
toolId,
183183
`${fixture.hostContextId}-valid`,
184-
fixture.sessionContext
184+
fixture.toolStateContext
185185
);
186186
awaitexpect(page.locator(selectors.valid)).toBeVisible();
187187
awaitexpect(page.locator(selectors.invalid)).toBeHidden();
@@ -195,14 +195,14 @@ for (const toolId of toolIds) {
195195
constserver=awaitstartRepoServer();
196196
try{
197197
constfixture=readFixtureSession(toolId);
198-
constinvalidSession=cloneJson(fixture.sessionContext);
199-
invalidSession.payloadJson=null;
198+
constinvalidToolState=cloneJson(fixture.toolStateContext);
199+
invalidToolState.payloadJson=null;
200200
awaitseedSessionAndOpenTool(
201201
page,
202202
server.baseUrl,
203203
toolId,
204204
`${fixture.hostContextId}-invalid`,
205-
invalidSession
205+
invalidToolState
206206
);
207207
awaitexpect(page.locator(selectors.invalid)).toBeVisible();
208208
awaitexpect(page.locator(selectors.valid)).toBeHidden();

‎tests/playwright/workspace-v2.validation.spec.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ctrlTapClick } from "../helpers/playwrightCtrlTapClick.mjs";
44

55
asyncfunctionimportManifestFromObject(page,manifest){
66
constchooserPromise=page.waitForEvent("filechooser");
7-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
7+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
88
constchooser=awaitchooserPromise;
99
constjsonText=JSON.stringify(manifest,null,2);
1010
awaitchooser.setFiles({
@@ -16,7 +16,7 @@ async function importManifestFromObject(page, manifest) {
1616
}
1717

1818
asyncfunctionexportManifestFromTextarea(page){
19-
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Session JSON"}));
19+
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Tool State JSON"}));
2020
constexportedText=awaitpage.locator("#workspaceV2ImportJson").inputValue();
2121
returnJSON.parse(exportedText);
2222
}
@@ -36,13 +36,13 @@ test.describe("Workspace V2 validation coverage", () => {
3636
expect(baselineManifest.tools?.["workspace-v2"]).toBeTruthy();
3737

3838
awaitimportManifestFromObject(page,baselineManifest);
39-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
39+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4040

4141
constexportedManifest=awaitexportManifestFromTextarea(page);
4242
expect(exportedManifest.documentKind).toBe("workspace-manifest");
4343

4444
awaitimportManifestFromObject(page,exportedManifest);
45-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
45+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4646
}finally{
4747
awaitserver.close();
4848
}
@@ -71,7 +71,7 @@ test.describe("Workspace V2 validation coverage", () => {
7171
try{
7272
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
7373
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
74-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
74+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
7575

7676
awaitimportManifestFromObject(page,{
7777
schema: "html-js-gaming.project",
@@ -81,7 +81,7 @@ test.describe("Workspace V2 validation coverage", () => {
8181
tools: {}
8282
});
8383
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
84-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
84+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
8585

8686
constinvalidPayloadManifest={
8787
documentKind: "workspace-manifest",
@@ -97,26 +97,26 @@ test.describe("Workspace V2 validation coverage", () => {
9797
swatches: []
9898
},
9999
"workspace-v2": {
100-
schema: "html-js-gaming.workspace-v2-session/1",
100+
schema: "html-js-gaming.workspace-v2-tool-state/1",
101101
game: {
102102
id: "game-bad",
103103
name: "Bad Game"
104104
},
105105
defaultToolId: "asset-manager-v2",
106106
activeToolId: "asset-manager-v2",
107107
activeHostContextId: "asset-manager-v2-bad-0001",
108-
activeSession: {
108+
activeToolState: {
109109
version: "v2",
110110
toolId: "asset-manager-v2",
111111
payloadJson: null
112112
},
113-
savedSessions: {}
113+
savedToolStates: {}
114114
}
115115
}
116116
};
117117
awaitimportManifestFromObject(page,invalidPayloadManifest);
118118
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
119-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
119+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
120120
awaitexpect(page).toHaveURL(/\/tools\/workspace-v2\/index\.html/);
121121
}finally{
122122
awaitserver.close();
@@ -129,38 +129,38 @@ test.describe("Workspace V2 validation coverage", () => {
129129
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
130130
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
131131
awaitpage.locator("#workspaceV2ToolSelect").selectOption("asset-manager-v2");
132-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
132+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
133133

134134
constloadedManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
135135
constexportedManifest=awaitexportManifestFromTextarea(page);
136136
expect(exportedManifest).toEqual(loadedManifest);
137137

138138
awaitimportManifestFromObject(page,exportedManifest);
139-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
139+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
140140
constpostImportManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
141141
expect(postImportManifest).toEqual(exportedManifest);
142142
}finally{
143143
awaitserver.close();
144144
}
145145
});
146146

147-
test("tool switching keeps activeSession consistent with selected fixture tool",async({ page })=>{
147+
test("tool switching keeps activeToolState consistent with selected fixture tool",async({ page })=>{
148148
constserver=awaitstartRepoServer();
149149
try{
150150
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
151151
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
152152

153153
awaitpage.locator("#workspaceV2ToolSelect").selectOption("tilemap-studio-v2");
154-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
154+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
155155
letexportedManifest=awaitexportManifestFromTextarea(page);
156156
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("tilemap-studio-v2");
157-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("tilemap-studio-v2");
157+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("tilemap-studio-v2");
158158

159159
awaitpage.locator("#workspaceV2ToolSelect").selectOption("vector-map-editor-v2");
160-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
160+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
161161
exportedManifest=awaitexportManifestFromTextarea(page);
162162
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("vector-map-editor-v2");
163-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("vector-map-editor-v2");
163+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("vector-map-editor-v2");
164164
}finally{
165165
awaitserver.close();
166166
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit ad90357

Browse files
committed
Rename Workspace V2 session terminology to toolState across code, schemas, UI, tests, and docs - PR_26124_012-rename-session-to-toolstate
1 parent 5739829 commit ad90357

13 files changed

Lines changed: 955 additions & 943 deletions

‎docs/dev/reports/tool_completion_audit.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-`vector-map-editor-v2`
1212

1313
## Evidence Used
14-
-`npm run test:workspace-v2` -> FAIL (`18 passed`, `1 failed`).
14+
-`npm run test:workspace-v2` -> PASS (`19 passed`, `0 failed`).
1515
-`node tests/runtime/V2CrossToolFlow.test.mjs` -> PASS.
1616
-`node tests/runtime/V2ToolLaunch.test.mjs` -> FAIL (palette fixture contract drift in test logic).
1717
-`node tests/runtime/V2ToolActionFlow.test.mjs` -> FAIL (string-token matcher drift in test logic).
@@ -111,6 +111,18 @@
111111

112112

113113

114+
115+
116+
117+
118+
119+
120+
121+
122+
123+
124+
125+
114126

115127

116128

‎tests/fixtures/v2-tools/asset-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "asset-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "asset-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/palette-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "palette-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "palette-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/svg-asset-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "svg-asset-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "svg-asset-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/tilemap-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "tilemap-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "tilemap-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/vector-map-editor-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "vector-map-editor-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "vector-map-editor-v2",
66
"payloadJson": {

‎tests/playwright/tool-validation/workspace-v2.tool-validation.spec.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ function readFixtureSession(toolId) {
3030
constfixture=JSON.parse(fs.readFileSync(fixturePath,"utf8"));
3131
return{
3232
hostContextId: typeoffixture.hostContextId==="string" ? fixture.hostContextId.trim() : `${toolId}-fixture`,
33-
sessionContext: fixture.sessionContext
33+
toolStateContext: fixture.toolStateContext
3434
};
3535
}
3636

3737
functioncloneJson(value){
3838
returnJSON.parse(JSON.stringify(value));
3939
}
4040

41-
functionbuildWorkspaceManifest(sessionContext,hostContextId){
41+
functionbuildWorkspaceManifest(toolStateContext,hostContextId){
4242
return{
4343
documentKind: "workspace-manifest",
4444
schema: "html-js-gaming.project",
@@ -53,24 +53,24 @@ function buildWorkspaceManifest(sessionContext, hostContextId) {
5353
swatches: []
5454
},
5555
"workspace-v2": {
56-
schema: "html-js-gaming.workspace-v2-session/1",
56+
schema: "html-js-gaming.workspace-v2-tool-state/1",
5757
game: {
5858
id: "workspace-v2-tool-validation-game",
5959
name: "Workspace V2 Tool Validation"
6060
},
6161
defaultToolId: "asset-manager-v2",
62-
activeToolId: typeofsessionContext.toolId==="string" ? sessionContext.toolId : "asset-manager-v2",
62+
activeToolId: typeoftoolStateContext.toolId==="string" ? toolStateContext.toolId : "asset-manager-v2",
6363
activeHostContextId: hostContextId,
64-
activeSession: cloneJson(sessionContext),
65-
savedSessions: {}
64+
activeToolState: cloneJson(toolStateContext),
65+
savedToolStates: {}
6666
}
6767
}
6868
};
6969
}
7070

7171
asyncfunctionimportWorkspaceManifest(page,manifest){
7272
constchooserPromise=page.waitForEvent("filechooser");
73-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
73+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
7474
constchooser=awaitchooserPromise;
7575
awaitchooser.setFiles({
7676
name: "workspace-v2-tool-validation-import.json",
@@ -79,11 +79,11 @@ async function importWorkspaceManifest(page, manifest) {
7979
});
8080
}
8181

82-
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,sessionContext){
82+
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,toolStateContext){
8383
awaitpage.goto(`${baseUrl}/tools/workspace-v2/index.html`);
84-
awaitpage.evaluate(({hostContextId: id,sessionContext: payload})=>{
84+
awaitpage.evaluate(({hostContextId: id,toolStateContext: payload})=>{
8585
window.sessionStorage.setItem(id,JSON.stringify(payload));
86-
},{ hostContextId,sessionContext});
86+
},{ hostContextId,toolStateContext});
8787
awaitpage.goto(`${baseUrl}/tools/${toolId}/index.html?hostContextId=${encodeURIComponent(hostContextId)}`);
8888
}
8989

@@ -143,10 +143,10 @@ test("@workspace-v2 valid workspace manifest payloadJson imports", async ({ page
143143
constserver=awaitstartRepoServer();
144144
try{
145145
constfixture=readFixtureSession("asset-manager-v2");
146-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-valid`);
146+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-valid`);
147147
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
148148
awaitimportWorkspaceManifest(page,manifest);
149-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
149+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
150150
}finally{
151151
awaitserver.close();
152152
}
@@ -156,8 +156,8 @@ test("@workspace-v2 invalid workspace manifest payloadJson is rejected", async (
156156
constserver=awaitstartRepoServer();
157157
try{
158158
constfixture=readFixtureSession("asset-manager-v2");
159-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-invalid`);
160-
manifest.tools["workspace-v2"].activeSession.payloadJson=null;
159+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-invalid`);
160+
manifest.tools["workspace-v2"].activeToolState.payloadJson=null;
161161
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
162162
awaitimportWorkspaceManifest(page,manifest);
163163
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
@@ -181,7 +181,7 @@ for (const toolId of toolIds) {
181181
server.baseUrl,
182182
toolId,
183183
`${fixture.hostContextId}-valid`,
184-
fixture.sessionContext
184+
fixture.toolStateContext
185185
);
186186
awaitexpect(page.locator(selectors.valid)).toBeVisible();
187187
awaitexpect(page.locator(selectors.invalid)).toBeHidden();
@@ -195,14 +195,14 @@ for (const toolId of toolIds) {
195195
constserver=awaitstartRepoServer();
196196
try{
197197
constfixture=readFixtureSession(toolId);
198-
constinvalidSession=cloneJson(fixture.sessionContext);
199-
invalidSession.payloadJson=null;
198+
constinvalidToolState=cloneJson(fixture.toolStateContext);
199+
invalidToolState.payloadJson=null;
200200
awaitseedSessionAndOpenTool(
201201
page,
202202
server.baseUrl,
203203
toolId,
204204
`${fixture.hostContextId}-invalid`,
205-
invalidSession
205+
invalidToolState
206206
);
207207
awaitexpect(page.locator(selectors.invalid)).toBeVisible();
208208
awaitexpect(page.locator(selectors.valid)).toBeHidden();

‎tests/playwright/workspace-v2.validation.spec.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ctrlTapClick } from "../helpers/playwrightCtrlTapClick.mjs";
44

55
asyncfunctionimportManifestFromObject(page,manifest){
66
constchooserPromise=page.waitForEvent("filechooser");
7-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
7+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
88
constchooser=awaitchooserPromise;
99
constjsonText=JSON.stringify(manifest,null,2);
1010
awaitchooser.setFiles({
@@ -16,7 +16,7 @@ async function importManifestFromObject(page, manifest) {
1616
}
1717

1818
asyncfunctionexportManifestFromTextarea(page){
19-
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Session JSON"}));
19+
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Tool State JSON"}));
2020
constexportedText=awaitpage.locator("#workspaceV2ImportJson").inputValue();
2121
returnJSON.parse(exportedText);
2222
}
@@ -36,13 +36,13 @@ test.describe("Workspace V2 validation coverage", () => {
3636
expect(baselineManifest.tools?.["workspace-v2"]).toBeTruthy();
3737

3838
awaitimportManifestFromObject(page,baselineManifest);
39-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
39+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4040

4141
constexportedManifest=awaitexportManifestFromTextarea(page);
4242
expect(exportedManifest.documentKind).toBe("workspace-manifest");
4343

4444
awaitimportManifestFromObject(page,exportedManifest);
45-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
45+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4646
}finally{
4747
awaitserver.close();
4848
}
@@ -71,7 +71,7 @@ test.describe("Workspace V2 validation coverage", () => {
7171
try{
7272
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
7373
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
74-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
74+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
7575

7676
awaitimportManifestFromObject(page,{
7777
schema: "html-js-gaming.project",
@@ -81,7 +81,7 @@ test.describe("Workspace V2 validation coverage", () => {
8181
tools: {}
8282
});
8383
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
84-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
84+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
8585

8686
constinvalidPayloadManifest={
8787
documentKind: "workspace-manifest",
@@ -97,26 +97,26 @@ test.describe("Workspace V2 validation coverage", () => {
9797
swatches: []
9898
},
9999
"workspace-v2": {
100-
schema: "html-js-gaming.workspace-v2-session/1",
100+
schema: "html-js-gaming.workspace-v2-tool-state/1",
101101
game: {
102102
id: "game-bad",
103103
name: "Bad Game"
104104
},
105105
defaultToolId: "asset-manager-v2",
106106
activeToolId: "asset-manager-v2",
107107
activeHostContextId: "asset-manager-v2-bad-0001",
108-
activeSession: {
108+
activeToolState: {
109109
version: "v2",
110110
toolId: "asset-manager-v2",
111111
payloadJson: null
112112
},
113-
savedSessions: {}
113+
savedToolStates: {}
114114
}
115115
}
116116
};
117117
awaitimportManifestFromObject(page,invalidPayloadManifest);
118118
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
119-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
119+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
120120
awaitexpect(page).toHaveURL(/\/tools\/workspace-v2\/index\.html/);
121121
}finally{
122122
awaitserver.close();
@@ -129,38 +129,38 @@ test.describe("Workspace V2 validation coverage", () => {
129129
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
130130
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
131131
awaitpage.locator("#workspaceV2ToolSelect").selectOption("asset-manager-v2");
132-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
132+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
133133

134134
constloadedManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
135135
constexportedManifest=awaitexportManifestFromTextarea(page);
136136
expect(exportedManifest).toEqual(loadedManifest);
137137

138138
awaitimportManifestFromObject(page,exportedManifest);
139-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
139+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
140140
constpostImportManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
141141
expect(postImportManifest).toEqual(exportedManifest);
142142
}finally{
143143
awaitserver.close();
144144
}
145145
});
146146

147-
test("tool switching keeps activeSession consistent with selected fixture tool",async({ page })=>{
147+
test("tool switching keeps activeToolState consistent with selected fixture tool",async({ page })=>{
148148
constserver=awaitstartRepoServer();
149149
try{
150150
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
151151
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
152152

153153
awaitpage.locator("#workspaceV2ToolSelect").selectOption("tilemap-studio-v2");
154-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
154+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
155155
letexportedManifest=awaitexportManifestFromTextarea(page);
156156
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("tilemap-studio-v2");
157-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("tilemap-studio-v2");
157+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("tilemap-studio-v2");
158158

159159
awaitpage.locator("#workspaceV2ToolSelect").selectOption("vector-map-editor-v2");
160-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
160+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
161161
exportedManifest=awaitexportManifestFromTextarea(page);
162162
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("vector-map-editor-v2");
163-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("vector-map-editor-v2");
163+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("vector-map-editor-v2");
164164
}finally{
165165
awaitserver.close();
166166
}

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit ad90357

Browse files
committed
Rename Workspace V2 session terminology to toolState across code, schemas, UI, tests, and docs - PR_26124_012-rename-session-to-toolstate
1 parent 5739829 commit ad90357

13 files changed

Lines changed: 955 additions & 943 deletions

‎docs/dev/reports/tool_completion_audit.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-`vector-map-editor-v2`
1212

1313
## Evidence Used
14-
-`npm run test:workspace-v2` -> FAIL (`18 passed`, `1 failed`).
14+
-`npm run test:workspace-v2` -> PASS (`19 passed`, `0 failed`).
1515
-`node tests/runtime/V2CrossToolFlow.test.mjs` -> PASS.
1616
-`node tests/runtime/V2ToolLaunch.test.mjs` -> FAIL (palette fixture contract drift in test logic).
1717
-`node tests/runtime/V2ToolActionFlow.test.mjs` -> FAIL (string-token matcher drift in test logic).
@@ -111,6 +111,18 @@
111111

112112

113113

114+
115+
116+
117+
118+
119+
120+
121+
122+
123+
124+
125+
114126

115127

116128

‎tests/fixtures/v2-tools/asset-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "asset-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "asset-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/palette-manager-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "palette-manager-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "palette-manager-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/svg-asset-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "svg-asset-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "svg-asset-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/tilemap-studio-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "tilemap-studio-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "tilemap-studio-v2",
66
"payloadJson": {

‎tests/fixtures/v2-tools/vector-map-editor-v2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"hostContextId": "vector-map-editor-v2-fixture",
3-
"sessionContext": {
3+
"toolStateContext": {
44
"version": "v2",
55
"toolId": "vector-map-editor-v2",
66
"payloadJson": {

‎tests/playwright/tool-validation/workspace-v2.tool-validation.spec.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ function readFixtureSession(toolId) {
3030
constfixture=JSON.parse(fs.readFileSync(fixturePath,"utf8"));
3131
return{
3232
hostContextId: typeoffixture.hostContextId==="string" ? fixture.hostContextId.trim() : `${toolId}-fixture`,
33-
sessionContext: fixture.sessionContext
33+
toolStateContext: fixture.toolStateContext
3434
};
3535
}
3636

3737
functioncloneJson(value){
3838
returnJSON.parse(JSON.stringify(value));
3939
}
4040

41-
functionbuildWorkspaceManifest(sessionContext,hostContextId){
41+
functionbuildWorkspaceManifest(toolStateContext,hostContextId){
4242
return{
4343
documentKind: "workspace-manifest",
4444
schema: "html-js-gaming.project",
@@ -53,24 +53,24 @@ function buildWorkspaceManifest(sessionContext, hostContextId) {
5353
swatches: []
5454
},
5555
"workspace-v2": {
56-
schema: "html-js-gaming.workspace-v2-session/1",
56+
schema: "html-js-gaming.workspace-v2-tool-state/1",
5757
game: {
5858
id: "workspace-v2-tool-validation-game",
5959
name: "Workspace V2 Tool Validation"
6060
},
6161
defaultToolId: "asset-manager-v2",
62-
activeToolId: typeofsessionContext.toolId==="string" ? sessionContext.toolId : "asset-manager-v2",
62+
activeToolId: typeoftoolStateContext.toolId==="string" ? toolStateContext.toolId : "asset-manager-v2",
6363
activeHostContextId: hostContextId,
64-
activeSession: cloneJson(sessionContext),
65-
savedSessions: {}
64+
activeToolState: cloneJson(toolStateContext),
65+
savedToolStates: {}
6666
}
6767
}
6868
};
6969
}
7070

7171
asyncfunctionimportWorkspaceManifest(page,manifest){
7272
constchooserPromise=page.waitForEvent("filechooser");
73-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
73+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
7474
constchooser=awaitchooserPromise;
7575
awaitchooser.setFiles({
7676
name: "workspace-v2-tool-validation-import.json",
@@ -79,11 +79,11 @@ async function importWorkspaceManifest(page, manifest) {
7979
});
8080
}
8181

82-
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,sessionContext){
82+
asyncfunctionseedSessionAndOpenTool(page,baseUrl,toolId,hostContextId,toolStateContext){
8383
awaitpage.goto(`${baseUrl}/tools/workspace-v2/index.html`);
84-
awaitpage.evaluate(({hostContextId: id,sessionContext: payload})=>{
84+
awaitpage.evaluate(({hostContextId: id,toolStateContext: payload})=>{
8585
window.sessionStorage.setItem(id,JSON.stringify(payload));
86-
},{ hostContextId,sessionContext});
86+
},{ hostContextId,toolStateContext});
8787
awaitpage.goto(`${baseUrl}/tools/${toolId}/index.html?hostContextId=${encodeURIComponent(hostContextId)}`);
8888
}
8989

@@ -143,10 +143,10 @@ test("@workspace-v2 valid workspace manifest payloadJson imports", async ({ page
143143
constserver=awaitstartRepoServer();
144144
try{
145145
constfixture=readFixtureSession("asset-manager-v2");
146-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-valid`);
146+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-valid`);
147147
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
148148
awaitimportWorkspaceManifest(page,manifest);
149-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
149+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
150150
}finally{
151151
awaitserver.close();
152152
}
@@ -156,8 +156,8 @@ test("@workspace-v2 invalid workspace manifest payloadJson is rejected", async (
156156
constserver=awaitstartRepoServer();
157157
try{
158158
constfixture=readFixtureSession("asset-manager-v2");
159-
constmanifest=buildWorkspaceManifest(fixture.sessionContext,`${fixture.hostContextId}-workspace-invalid`);
160-
manifest.tools["workspace-v2"].activeSession.payloadJson=null;
159+
constmanifest=buildWorkspaceManifest(fixture.toolStateContext,`${fixture.hostContextId}-workspace-invalid`);
160+
manifest.tools["workspace-v2"].activeToolState.payloadJson=null;
161161
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
162162
awaitimportWorkspaceManifest(page,manifest);
163163
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
@@ -181,7 +181,7 @@ for (const toolId of toolIds) {
181181
server.baseUrl,
182182
toolId,
183183
`${fixture.hostContextId}-valid`,
184-
fixture.sessionContext
184+
fixture.toolStateContext
185185
);
186186
awaitexpect(page.locator(selectors.valid)).toBeVisible();
187187
awaitexpect(page.locator(selectors.invalid)).toBeHidden();
@@ -195,14 +195,14 @@ for (const toolId of toolIds) {
195195
constserver=awaitstartRepoServer();
196196
try{
197197
constfixture=readFixtureSession(toolId);
198-
constinvalidSession=cloneJson(fixture.sessionContext);
199-
invalidSession.payloadJson=null;
198+
constinvalidToolState=cloneJson(fixture.toolStateContext);
199+
invalidToolState.payloadJson=null;
200200
awaitseedSessionAndOpenTool(
201201
page,
202202
server.baseUrl,
203203
toolId,
204204
`${fixture.hostContextId}-invalid`,
205-
invalidSession
205+
invalidToolState
206206
);
207207
awaitexpect(page.locator(selectors.invalid)).toBeVisible();
208208
awaitexpect(page.locator(selectors.valid)).toBeHidden();

‎tests/playwright/workspace-v2.validation.spec.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ctrlTapClick } from "../helpers/playwrightCtrlTapClick.mjs";
44

55
asyncfunctionimportManifestFromObject(page,manifest){
66
constchooserPromise=page.waitForEvent("filechooser");
7-
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Session JSON"}));
7+
awaitctrlTapClick(page,page.getByRole("button",{name: "Import Workspace Tool State JSON"}));
88
constchooser=awaitchooserPromise;
99
constjsonText=JSON.stringify(manifest,null,2);
1010
awaitchooser.setFiles({
@@ -16,7 +16,7 @@ async function importManifestFromObject(page, manifest) {
1616
}
1717

1818
asyncfunctionexportManifestFromTextarea(page){
19-
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Session JSON"}));
19+
awaitctrlTapClick(page,page.getByRole("button",{name: "Export Workspace Tool State JSON"}));
2020
constexportedText=awaitpage.locator("#workspaceV2ImportJson").inputValue();
2121
returnJSON.parse(exportedText);
2222
}
@@ -36,13 +36,13 @@ test.describe("Workspace V2 validation coverage", () => {
3636
expect(baselineManifest.tools?.["workspace-v2"]).toBeTruthy();
3737

3838
awaitimportManifestFromObject(page,baselineManifest);
39-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
39+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4040

4141
constexportedManifest=awaitexportManifestFromTextarea(page);
4242
expect(exportedManifest.documentKind).toBe("workspace-manifest");
4343

4444
awaitimportManifestFromObject(page,exportedManifest);
45-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
45+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
4646
}finally{
4747
awaitserver.close();
4848
}
@@ -71,7 +71,7 @@ test.describe("Workspace V2 validation coverage", () => {
7171
try{
7272
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
7373
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
74-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
74+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
7575

7676
awaitimportManifestFromObject(page,{
7777
schema: "html-js-gaming.project",
@@ -81,7 +81,7 @@ test.describe("Workspace V2 validation coverage", () => {
8181
tools: {}
8282
});
8383
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
84-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
84+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
8585

8686
constinvalidPayloadManifest={
8787
documentKind: "workspace-manifest",
@@ -97,26 +97,26 @@ test.describe("Workspace V2 validation coverage", () => {
9797
swatches: []
9898
},
9999
"workspace-v2": {
100-
schema: "html-js-gaming.workspace-v2-session/1",
100+
schema: "html-js-gaming.workspace-v2-tool-state/1",
101101
game: {
102102
id: "game-bad",
103103
name: "Bad Game"
104104
},
105105
defaultToolId: "asset-manager-v2",
106106
activeToolId: "asset-manager-v2",
107107
activeHostContextId: "asset-manager-v2-bad-0001",
108-
activeSession: {
108+
activeToolState: {
109109
version: "v2",
110110
toolId: "asset-manager-v2",
111111
payloadJson: null
112112
},
113-
savedSessions: {}
113+
savedToolStates: {}
114114
}
115115
}
116116
};
117117
awaitimportManifestFromObject(page,invalidPayloadManifest);
118118
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toContainText("Import error:");
119-
awaitexpect(page.locator("#workspaceV2SessionHistoryEmptyState")).toHaveText("No recent sessions.");
119+
awaitexpect(page.locator("#workspaceV2ToolStateHistoryEmptyState")).toHaveText("No recent tool states.");
120120
awaitexpect(page).toHaveURL(/\/tools\/workspace-v2\/index\.html/);
121121
}finally{
122122
awaitserver.close();
@@ -129,38 +129,38 @@ test.describe("Workspace V2 validation coverage", () => {
129129
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
130130
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
131131
awaitpage.locator("#workspaceV2ToolSelect").selectOption("asset-manager-v2");
132-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
132+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
133133

134134
constloadedManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
135135
constexportedManifest=awaitexportManifestFromTextarea(page);
136136
expect(exportedManifest).toEqual(loadedManifest);
137137

138138
awaitimportManifestFromObject(page,exportedManifest);
139-
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace session imported.");
139+
awaitexpect(page.locator("#workspaceV2ImportExportStatus")).toHaveText("Workspace tool state imported.");
140140
constpostImportManifest=JSON.parse(awaitpage.locator("#workspaceV2ImportJson").inputValue());
141141
expect(postImportManifest).toEqual(exportedManifest);
142142
}finally{
143143
awaitserver.close();
144144
}
145145
});
146146

147-
test("tool switching keeps activeSession consistent with selected fixture tool",async({ page })=>{
147+
test("tool switching keeps activeToolState consistent with selected fixture tool",async({ page })=>{
148148
constserver=awaitstartRepoServer();
149149
try{
150150
awaitpage.goto(`${server.baseUrl}/tools/workspace-v2/index.html`);
151151
awaitctrlTapClick(page,page.getByRole("button",{name: "Full Reset"}));
152152

153153
awaitpage.locator("#workspaceV2ToolSelect").selectOption("tilemap-studio-v2");
154-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
154+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
155155
letexportedManifest=awaitexportManifestFromTextarea(page);
156156
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("tilemap-studio-v2");
157-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("tilemap-studio-v2");
157+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("tilemap-studio-v2");
158158

159159
awaitpage.locator("#workspaceV2ToolSelect").selectOption("vector-map-editor-v2");
160-
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Fixture"}));
160+
awaitctrlTapClick(page,page.getByRole("button",{name: "Load Tool State"}));
161161
exportedManifest=awaitexportManifestFromTextarea(page);
162162
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolId).toBe("vector-map-editor-v2");
163-
expect(exportedManifest.tools?.["workspace-v2"]?.activeSession?.toolId).toBe("vector-map-editor-v2");
163+
expect(exportedManifest.tools?.["workspace-v2"]?.activeToolState?.toolId).toBe("vector-map-editor-v2");
164164
}finally{
165165
awaitserver.close();
166166
}

0 commit comments

Comments
 (0)