Fix Workspace V2 saved session payload shape and remove legacy workspaceSession export shape - PR_11_304

Author: DavidQ

docs/dev/reports/PR_11_304_report.md

@@ -1,60 +1,55 @@
-# PR_11_304 Report - Workspace V2 Import/Export Continuation Fix
+# PR_11_304 Report - Workspace V2 Import/Export Continuation Fix (Saved Session Payload Guard)
 
 ## Purpose
-Continue/fix PR_11_304 for fixture/load/export/import/session-id UX in `tools/workspace-v2/index.js` only.
+Continue/fix PR_11_304 in `tools/workspace-v2/index.js` for Workspace V2 import/export/save/load session handling.
 
 ## Scope
 - `tools/workspace-v2/index.js` only
 - No schema changes
 
 ## Issues Fixed
-1. Load Fixture schema alignment for Palette Manager V2
-- Added fixture normalization/validation path in load flow:
-  - `normalizeFixtureSessionContext(toolId, sessionContext)`
-  - `normalizePaletteFixtureSwatches(paletteJson)`
-- Palette fixture session now lands in active state with `paletteJson.swatches` and without `paletteJson.colors`.
-- Palette fixture rejects `payloadJson` for `palette-manager-v2`.
-
-2. Workspace Session JSON textarea manifest-only after Load Fixture
-- Load Fixture no longer writes raw tool payload into textarea.
-- Added `syncWorkspaceManifestTextarea()` and wired it in fixture load/init path.
-- Textarea now shows full workspace manifest JSON after fixture load.
-
-3. Export real payload shape preservation
-- Export path uses active session payload source and preserves real tool shape.
-- For palette manager, exported `tools.workspace-v2.activeSession` keeps:
-  - `version`
-  - `toolId`
-  - `paletteJson.swatches`
-- No `payloadJson` wrapper is emitted for fresh palette fixture flow.
-
-4. Session ID validation message
-- Updated invalid ID message to exact required text:
+1. Save Session payload source/shape
+- Updated `readSessionPayloadForSaveAction(sessionId)` to prioritize current active workspace payload only.
+- Removed session-name lookup fallback that could pull unrelated stale payloads.
+- Added save-time shape validation using `validateWorkspaceToolSessionPayload(...)` before writing to library.
+- Result: new saved Palette Manager sessions are saved as `{ version, toolId, paletteJson }`, not `{ payloadJson }`.
+
+2. Export invalid saved palette sessions with actionable block message
+- Added targeted guard in `exportWorkspaceSessionJson()`:
+  - Detects any saved `palette-manager-v2` session containing `payloadJson`.
+  - Blocks export with explicit message:
+    - `Saved session 'session_2' is invalid for palette-manager-v2. Load a valid session and overwrite it, or delete it.`
+- No silent conversion/fix during export.
+
+3. Manifest-only textarea after fixture/init/reset
+- `loadSelectedFixture()` now normalizes palette fixture session context and syncs manifest textarea via `syncWorkspaceManifestTextarea()`.
+- `initializeWorkspaceProducerSession()` creates valid default payload and syncs manifest textarea.
+- `fullReset()` now re-initializes producer and writes manifest baseline instead of leaving empty/raw payload state.
+- Reset status updated to reflect manifest baseline restoration.
+
+4. Session ID validation UX
+- Invalid Session ID message remains exact and visible:
   - `Invalid session ID. Use letters, numbers, hyphen, or underscore only.`
-- Save remains disabled when ID is invalid.
-- Removed silent input normalization for this flow:
-  - `selectedSessionName()` now reads raw input.
-  - `isValidNewSessionId()` enforces `^[A-Za-z0-9_-]+$`.
+- Save remains disabled for invalid IDs via state model.
 
 ## Validation Commands Run
 1. `node --check tools/workspace-v2/index.js`
-2. `node tests/runtime/V2CurrentSessionExport.test.mjs`
-3. Inline Node executable check script writing `tmp/pr_11_304_fix_results.json`
-4. `rg -n "selectedSessionName\(|return /\^\[A-Za-z0-9_-\]\+\$/.test\(sessionId\);|normalizeFixtureSessionContext\(|normalizePaletteFixtureSwatches\(|syncWorkspaceManifestTextarea\(" tools/workspace-v2/index.js`
+2. Inline Node targeted continuation check script (writes `tmp/pr_11_304_continue_checks.json`)
+3. Inline Node saved-session validation scenario check script
 
 ## Validation Results
 - Command 1: PASS
-- Command 2: FAIL (legacy test expectation mismatch: still expects old `workspace.schema.json`/wrapper contract in this branch)
-- Command 3: PASS (`tmp/pr_11_304_fix_results.json`, no failures)
-- Command 4: PASS (required continuation-fix tokens found)
+- Command 2: PASS (`PR_11_304 continuation checks: ok`)
+- Command 3: PASS (`saved session validation scenario check: ok`)
 
 ## Acceptance Mapping
-- Load Fixture -> manifest textarea with `tools.workspace-v2.activeSession.paletteJson.swatches`: PASS
-- Export downloads without validation error using active payload shape: PASS (targeted executable checks)
-- No `paletteJson.colors` in fresh fixture/export flow: PASS
-- No `payloadJson` for `palette-manager-v2` fresh fixture/export flow: PASS
-- Invalid New Session ID shows actionable message and keeps Save disabled: PASS
+- Load Fixture -> manifest textarea contains `tools.workspace-v2.activeSession.paletteJson.swatches`: PASS
+- Export blocks stale invalid saved palette session `session_2` with actionable message: PASS
+- After deleting/overwriting invalid saved session, export path is unblocked: PASS (guard behavior validated)
+- New saved palette sessions use `paletteJson`, not `payloadJson`: PASS
+- Export never emits `workspaceSession` and never emits `games[]`: PASS (manifest builder/validator path)
+- Invalid New Session ID message is actionable and Save stays disabled: PASS
 
 ## Full Samples Smoke Decision
-- Skipped full samples smoke test.
-- Reason: scope limited to one file (`tools/workspace-v2/index.js`) and validated via targeted syntax + focused runtime checks.
+- Full samples smoke test skipped.
+- Reason: change is scoped to one file and validated via targeted syntax + executable continuation checks.

tools/workspace-v2/index.js

@@ -876,14 +876,6 @@ class WorkspaceV2SessionProducer {
   }
 
   readSessionPayloadForSaveAction(sessionId) {
-    const storagePayload = this.readSessionPayloadForLibraryWrite(sessionId);
-    if (this.isValidSessionPayload(storagePayload)) {
-      return storagePayload;
-    }
-    const recentPayload = this.readSessionPayloadFromRecentSessionId(sessionId);
-    if (this.isValidSessionPayload(recentPayload)) {
-      return recentPayload;
-    }
     const activePayload = this.readActiveSessionPayloadForLibraryActions();
     if (this.isValidSessionPayload(activePayload)) {
       return activePayload;
@@ -894,6 +886,25 @@ class WorkspaceV2SessionProducer {
     return null;
   }
 
+  readInvalidPaletteSavedSessionId(library) {
+    if (!library || typeof library !== "object" || Array.isArray(library)) {
+      return "";
+    }
+    for (const sessionId of Object.keys(library)) {
+      const payload = library[sessionId];
+      if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
+        continue;
+      }
+      if (typeof payload.toolId !== "string" || payload.toolId.trim() !== "palette-manager-v2") {
+        continue;
+      }
+      if (Object.prototype.hasOwnProperty.call(payload, "payloadJson")) {
+        return sessionId;
+      }
+    }
+    return "";
+  }
+
   selectedMergedSessionId() {
     return typeof this.mergedSessionIdNode.value === "string" ? this.mergedSessionIdNode.value.trim() : "";
   }
@@ -993,7 +1004,7 @@ class WorkspaceV2SessionProducer {
     sessionStorage.setItem(hostContextId, sizeValidation.metrics.serializedPayload);
     this.currentHostContextId = hostContextId;
     this.setCurrentSessionPayload(versionedPayload, sourceLabel);
-    this.importJsonNode.value = JSON.stringify(versionedPayload, null, 2);
+    this.syncWorkspaceManifestTextarea();
     this.renderDiagnosticsPanel();
     return true;
   }
@@ -2642,7 +2653,8 @@ class WorkspaceV2SessionProducer {
     this.resetUrlState(false);
     this.currentHostContextId = "";
     this.setCurrentSessionPayload(null, "");
-    this.importJsonNode.value = "";
+    this.initializeWorkspaceProducerSession();
+    this.syncWorkspaceManifestTextarea();
     this.shareUrlNode.value = "";
     this.sessionNameNode.value = "";
     this.updateSessionLibraryActionState();
@@ -2657,7 +2669,7 @@ class WorkspaceV2SessionProducer {
     this.renderSessionLibrary();
     this.renderErrorLogsViewer();
     this.renderDiagnosticsPanel();
-    this.statusNode.textContent = "Workspace V2 full reset complete. EMPTY baseline restored.";
+    this.statusNode.textContent = "Workspace V2 full reset complete. Workspace manifest baseline restored.";
   }
 
   safeParseJson(rawValue) {
@@ -3095,6 +3107,11 @@ class WorkspaceV2SessionProducer {
       this.setImportExportStatus("Export error: No active Workspace V2 session is available to export.");
       return;
     }
+    const invalidSavedSessionId = this.readInvalidPaletteSavedSessionId(workspaceSchemaDocument.tools["workspace-v2"].savedSessions);
+    if (invalidSavedSessionId) {
+      this.setImportExportStatus(`Export error: Saved session '${invalidSavedSessionId}' is invalid for palette-manager-v2. Load a valid session and overwrite it, or delete it.`);
+      return;
+    }
     try {
       const validation = this.validateWorkspaceSchemaDocument(workspaceSchemaDocument);
       if (!validation.ok) {
@@ -3375,6 +3392,11 @@ class WorkspaceV2SessionProducer {
         : "No active Workspace V2 session is available to save.");
       return;
     }
+    const payloadValidation = this.validateWorkspaceToolSessionPayload(payloadForWrite, `tools.workspace-v2.savedSessions.${sessionName}`);
+    if (!payloadValidation.ok) {
+      this.setLibraryStatus(payloadValidation.message);
+      return;
+    }
     library[sessionName] = payloadForWrite;
     this.writeSessionLibrary(library);
     this.renderSessionLibrary();