Export full Workspace V2 session container instead of single active tool payload - PR_11_276

Author: DavidQ

docs/dev/reports/PR_11_276_workspace_v2_full_session_export_contract_correction_report.md

@@ -0,0 +1,39 @@
+# PR_11_276 Workspace V2 Full-Session Export Contract Correction Report
+
+## Scope
+Workspace V2 export path only.
+
+## Files Changed
+- tools/workspace-v2/index.js
+- tests/runtime/V2CurrentSessionExport.test.mjs
+- docs/pr/PLAN_PR_11_276_WORKSPACE_V2_FULL_SESSION_EXPORT_CONTRACT_CORRECTION.md
+- docs/pr/BUILD_PR_11_276_WORKSPACE_V2_FULL_SESSION_EXPORT_CONTRACT_CORRECTION.md
+- docs/dev/reports/PR_11_276_workspace_v2_full_session_export_contract_correction_report.md
+
+## Implementation Summary
+- Corrected `Export Current Session JSON` to export a full Workspace V2 container instead of only the active tool session payload.
+- Export still validates active session via `readActiveSessionPayloadForLibraryActions()` so export gate matches active-session source used by Save session flows.
+- Exported JSON now includes:
+  - workspace/session identity
+  - active tool identity
+  - active hostContextId
+  - active session payload
+  - session library entries
+  - recent session history entries
+  - persisted session selection metadata
+  - merge audit metadata
+- Export filename now includes workspace/tool/session identity (`workspace-v2-<toolId>-<hostContextId>.json`).
+- No fallback/default payload export path introduced.
+
+## Validation Commands
+1. `node --check tools/workspace-v2/index.js`
+   - PASS
+2. `node --check tests/runtime/V2CurrentSessionExport.test.mjs`
+   - PASS
+3. `node tests/runtime/V2CurrentSessionExport.test.mjs`
+   - PASS
+   - Results: `tmp/v2-current-session-export-results.json`
+
+## Full Samples Smoke Decision
+- Skipped full samples smoke test.
+- Reason: change is scoped to Workspace V2 export serialization and covered by targeted runtime validation.

docs/pr/BUILD_PR_11_276_WORKSPACE_V2_FULL_SESSION_EXPORT_CONTRACT_CORRECTION.md

@@ -0,0 +1,32 @@
+# BUILD_PR_11_276_WORKSPACE_V2_FULL_SESSION_EXPORT_CONTRACT_CORRECTION
+
+## Purpose
+Implement full Workspace V2 session-container export from the current export control path.
+
+## Files
+- tools/workspace-v2/index.js
+- tests/runtime/V2CurrentSessionExport.test.mjs
+- docs/dev/reports/PR_11_276_workspace_v2_full_session_export_contract_correction_report.md
+
+## Implementation
+1. Keep active-session export gate based on `readActiveSessionPayloadForLibraryActions()`.
+2. Build export payload as Workspace wrapper object (not single tool payload):
+   - `version`, `toolId: workspace-v2`
+   - `workspaceSession` container including identity, active session payload, sessionLibrary, sessionHistory, selection metadata, and merge audit metadata.
+3. Keep exact success/failure export statuses:
+   - success: `Exported current workspace session JSON.`
+   - no active session: `No active Workspace V2 session is available to export.`
+4. Block export when Session Library is invalid to prevent silent data loss.
+5. Keep JSON download behavior and include workspace/tool/session identity in filename.
+6. Update targeted runtime test to validate full-session-wrapper export contract.
+
+## Acceptance
+- Export outputs full Workspace V2 container.
+- Active tool payload remains intact inside container.
+- Session metadata required by save/load/diff/merge context is included.
+- No export fallback/default data.
+
+## Validation
+- node --check tools/workspace-v2/index.js
+- node --check tests/runtime/V2CurrentSessionExport.test.mjs
+- node tests/runtime/V2CurrentSessionExport.test.mjs

docs/pr/PLAN_PR_11_276_WORKSPACE_V2_FULL_SESSION_EXPORT_CONTRACT_CORRECTION.md

@@ -0,0 +1,32 @@
+# PLAN_PR_11_276_WORKSPACE_V2_FULL_SESSION_EXPORT_CONTRACT_CORRECTION
+
+## Purpose
+Correct Workspace V2 export so it outputs the full Workspace session container instead of a single active-tool payload object.
+
+## Scope
+- tools/workspace-v2/index.js
+- tests/runtime/V2CurrentSessionExport.test.mjs
+- docs/report only
+
+## Goals
+- Export uses active-session validation gate.
+- Export serializes a Workspace V2 session wrapper preserving:
+  - workspace/session identity
+  - active/default tool identity
+  - included session library payloads
+  - included recent session history payloads
+  - session selection metadata
+  - merge audit metadata
+- Export filename includes workspace + tool + session identity when available.
+- Export does not flatten to a single tool payload object.
+- No fallback/default export payload path.
+
+## Out of Scope
+- No schema file edits.
+- No unrelated tool changes.
+- No session library/diff/merge behavior-path changes beyond export-source consistency.
+
+## Validation
+- node --check tools/workspace-v2/index.js
+- node --check tests/runtime/V2CurrentSessionExport.test.mjs
+- node tests/runtime/V2CurrentSessionExport.test.mjs

tests/runtime/V2CurrentSessionExport.test.mjs

@@ -23,7 +23,7 @@ function checkSyntax(filePath) {
   }
 }
 
-function simulateExport(activePayload, selectedToolId, currentHostContextId) {
+function simulateExport(activePayload, selectedToolId, currentHostContextId, library, history, selection, mergeAuditLog) {
   if (!activePayload || typeof activePayload !== "object" || Array.isArray(activePayload)) {
     return {
       ok: false,
@@ -37,11 +37,26 @@ function simulateExport(activePayload, selectedToolId, currentHostContextId) {
   const filenameSessionId = typeof currentHostContextId === "string" && currentHostContextId.trim()
     ? currentHostContextId.trim()
     : "session";
+  const exportedContainer = {
+    version: "v2",
+    toolId: "workspace-v2",
+    workspaceSession: {
+      workspaceToolId: "workspace-v2",
+      workspaceSessionId: filenameSessionId === "session" ? "" : filenameSessionId,
+      activeToolId: filenameToolId,
+      activeHostContextId: filenameSessionId === "session" ? "" : filenameSessionId,
+      activeSessionPayload: activePayload,
+      sessionLibrary: library,
+      sessionHistory: history,
+      sessionSelection: selection,
+      mergeAuditLog
+    }
+  };
   return {
     ok: true,
     status: "Exported current workspace session JSON.",
-    filename: `${filenameToolId}-${filenameSessionId}.json`,
-    serialized: JSON.stringify(activePayload, null, 2)
+    filename: `workspace-v2-${filenameToolId}-${filenameSessionId}.json`,
+    serialized: JSON.stringify(exportedContainer, null, 2)
   };
 }
 
@@ -61,7 +76,11 @@ export function run() {
     "No active Workspace V2 session is available to export.",
     "Exported current workspace session JSON.",
     "URL.createObjectURL",
-    "downloadLink.download"
+    "downloadLink.download",
+    "workspaceSession",
+    "sessionLibrary",
+    "sessionHistory",
+    "activeSessionPayload"
   ];
   requiredTokens.forEach((token) => {
     if (!workspaceJs.includes(token)) {
@@ -77,20 +96,32 @@ export function run() {
     toolId: "palette-manager-v2",
     payloadJson: { swatches: ["#000000", "#ffffff"] }
   };
-  const activeResult = simulateExport(activePayload, "asset-browser-v2", "palette-manager-v2-1234567890123-abcd1234");
+  const activeResult = simulateExport(
+    activePayload,
+    "asset-browser-v2",
+    "palette-manager-v2-1234567890123-abcd1234",
+    { "saved-1": { version: "v2", toolId: "asset-browser-v2", payloadJson: { id: 1 } } },
+    [{ hostContextId: "palette-manager-v2-1234567890123-abcd1234", tool: "palette-manager-v2", timestamp: "2026-05-02T12:00:00.000Z", payload: activePayload }],
+    { sessionA: "a", sessionB: "b" },
+    [{ sourceSessionContextId: "a", targetSessionContextId: "b" }]
+  );
   if (!activeResult.ok) failures.push("Active session export should be allowed.");
   if (activeResult.status !== "Exported current workspace session JSON.") {
     failures.push("Active session export status mismatch.");
   }
-  if (activeResult.filename !== "palette-manager-v2-palette-manager-v2-1234567890123-abcd1234.json") {
+  if (activeResult.filename !== "workspace-v2-palette-manager-v2-palette-manager-v2-1234567890123-abcd1234.json") {
     failures.push("Export filename should include tool/session identity.");
   }
   const parsedActive = activeResult.serialized ? JSON.parse(activeResult.serialized) : null;
-  if (JSON.stringify(parsedActive) !== JSON.stringify(activePayload)) {
-    failures.push("Exported JSON does not preserve active session payload exactly.");
+  if (!parsedActive || typeof parsedActive !== "object" || Array.isArray(parsedActive)) {
+    failures.push("Exported JSON should be a workspace container object.");
+  } else if (!parsedActive.workspaceSession || typeof parsedActive.workspaceSession !== "object") {
+    failures.push("Exported JSON should include workspaceSession container.");
+  } else if (JSON.stringify(parsedActive.workspaceSession.activeSessionPayload) !== JSON.stringify(activePayload)) {
+    failures.push("Exported workspace container does not preserve active session payload exactly.");
   }
 
-  const noActiveResult = simulateExport(null, "asset-browser-v2", "");
+  const noActiveResult = simulateExport(null, "asset-browser-v2", "", {}, [], { sessionA: "", sessionB: "" }, []);
   if (noActiveResult.ok) failures.push("Export should be blocked when no active session exists.");
   if (noActiveResult.status !== "No active Workspace V2 session is available to export.") {
     failures.push("No-active export status mismatch.");

tools/workspace-v2/index.js

@@ -2789,13 +2789,41 @@ class WorkspaceV2SessionProducer {
       return;
     }
     try {
-      const serialized = JSON.stringify(activePayload, null, 2);
-      const payloadToolId = typeof activePayload.toolId === "string" ? activePayload.toolId.trim() : "";
-      const filenameToolId = payloadToolId || this.selectedToolId() || "workspace-v2";
+      const library = this.readSessionLibrary();
+      if (library === null) {
+        this.statusNode.textContent = "Workspace V2 export blocked: Session Library is invalid.";
+        return;
+      }
+      const history = this.readSessionHistory();
+      const persistedSelection = this.readPersistedSessionSelection();
+      const mergeAuditRaw = localStorage.getItem(this.mergeAuditStorageKey);
+      const mergeAuditParsed = this.safeParseJson(typeof mergeAuditRaw === "string" ? mergeAuditRaw : "");
+      const mergeAuditEntries = mergeAuditParsed.ok && Array.isArray(mergeAuditParsed.value) ? mergeAuditParsed.value : [];
+      const activeToolId = typeof activePayload.toolId === "string" && activePayload.toolId.trim()
+        ? activePayload.toolId.trim()
+        : this.selectedToolId();
+      const workspaceContainer = {
+        version: "v2",
+        toolId: "workspace-v2",
+        workspaceSession: {
+          workspaceToolId: "workspace-v2",
+          workspaceSessionId: typeof this.currentHostContextId === "string" ? this.currentHostContextId.trim() : "",
+          activeToolId,
+          activeHostContextId: typeof this.currentHostContextId === "string" ? this.currentHostContextId.trim() : "",
+          activeSessionPayload: activePayload,
+          sessionLibrary: library,
+          sessionHistory: history,
+          sessionSelection: persistedSelection,
+          mergeAuditLog: mergeAuditEntries,
+          exportedAt: new Date().toISOString()
+        }
+      };
+      const serialized = JSON.stringify(workspaceContainer, null, 2);
+      const filenameToolId = activeToolId || "workspace-v2";
       const filenameSessionId = typeof this.currentHostContextId === "string" && this.currentHostContextId.trim()
         ? this.currentHostContextId.trim()
         : "session";
-      const downloadFileName = `${filenameToolId}-${filenameSessionId}.json`;
+      const downloadFileName = `workspace-v2-${filenameToolId}-${filenameSessionId}.json`;
       const fileBlob = new Blob([serialized], { type: "application/json" });
       const fileUrl = URL.createObjectURL(fileBlob);
       const downloadLink = document.createElement("a");