Remove automatic workspace cell injection in grid pages

Refactored gridsetProcessor to stop injecting a workspace/message bar cell at the top of all pages and adjusted row calculation logic accordingly. Updated tests to expect no mandatory workspace cells and fixed OBLA test asset paths.

Author: willwade

src/processors/gridsetProcessor.ts

@@ -1331,33 +1331,21 @@ class GridsetProcessor extends BaseProcessor {
           GridGuid: page.id,
           // Calculate grid dimensions based on actual layout
           ColumnDefinitions: this.calculateColumnDefinitions(page),
-          RowDefinitions: this.calculateRowDefinitions(page),
+          RowDefinitions: this.calculateRowDefinitions(page, false), // No automatic workspace row injection
           AutoContentCommands: '',
           Cells:
             page.buttons.length > 0
               ? {
                   Cell: [
-                    // Add workspace/message bar cell at the top of ALL pages
-                    // Grid3 uses 0-based coordinates; omit X and Y to use defaults (0, 0)
-                    {
-                      '@_ColumnSpan': 4,
-                      Content: {
-                        ContentType: 'Workspace',
-                        ContentSubType: 'Chat',
-                        Style: {
-                          BasedOnStyle: 'Workspace',
-                        },
-                      },
-                    },
                     // Regular button cells
                     ...this.filterPageButtons(page.buttons).map((button, btnIndex) => {
                       const buttonStyleId = button.style ? addStyle(button.style) : '';
 
                       // Find button position in grid layout
                       const position = this.findButtonPosition(page, button, btnIndex);
 
-                      // Shift all buttons down by 1 row to make room for workspace
-                      const yOffset = 1;
+                      // Use position directly from tree
+                      const yOffset = 0;
 
                       // Build CaptionAndImage object
                       const captionAndImage: Record<string, unknown> = {
@@ -1406,6 +1394,9 @@ class GridsetProcessor extends BaseProcessor {
                         '@_ColumnSpan': position.columnSpan,
                         '@_RowSpan': position.rowSpan,
                         Content: {
+                          ContentType:
+                            button.contentType === 'Normal' ? undefined : button.contentType,
+                          ContentSubType: button.contentSubType,
                           Commands: this.generateCommandsFromSemanticAction(button, tree),
                           CaptionAndImage: captionAndImage,
                         },
@@ -1542,15 +1533,19 @@ class GridsetProcessor extends BaseProcessor {
   }
 
   // Helper method to calculate row definitions based on page layout
-  private calculateRowDefinitions(page: AACPage): { RowDefinition: any[] } {
+  private calculateRowDefinitions(
+    page: AACPage,
+    addWorkspaceOffset = false
+  ): { RowDefinition: any[] } {
     let maxRows = 4; // Default minimum
+    const offset = addWorkspaceOffset ? 1 : 0;
 
     if (page.grid && page.grid.length > 0) {
-      maxRows = Math.max(maxRows, page.grid.length);
+      maxRows = Math.max(maxRows, page.grid.length + offset);
     } else {
       // Fallback: estimate from button count
       const estimatedCols = Math.ceil(Math.sqrt(page.buttons.length));
-      maxRows = Math.max(4, Math.ceil(page.buttons.length / estimatedCols));
+      maxRows = Math.max(4, Math.ceil(page.buttons.length / estimatedCols)) + offset;
     }
 
     return {

test/gridsetProcessor.roundtrip.test.ts

@@ -38,6 +38,7 @@ describe('GridsetProcessor round-trip', () => {
       const page1 = tree1.pages[pageId];
       const page2 = tree2.pages[pageId];
 
+      // Expect exactly the same number of buttons
       expect(page2.buttons.length).toBe(page1.buttons.length);
 
       // Compare button labels (allowing for some differences in processing)
@@ -97,6 +98,7 @@ describe('GridsetProcessor round-trip', () => {
     const reloadedPage = tree2.pages['grid1'];
     expect(reloadedPage).toBeDefined();
     expect(reloadedPage.name).toBe('Test Grid');
+    // We expect exactly 2 buttons - zero injection of mandatory workspace cells
     expect(reloadedPage.buttons).toHaveLength(2);
 
     // Check that we have buttons with the expected labels

test/obl.test.ts

@@ -137,7 +137,7 @@ describe('OBL Support', () => {
   });
 
   test('should parse real OBLA data from dataset', () => {
-    const oblaPath = path.join(__dirname, '../obla-improvements/small-obla/small/0036a290e0.obla');
+    const oblaPath = path.join(__dirname, 'assets/obla/0036a290e0.obla');
     const content = fs.readFileSync(oblaPath, 'utf8');
     const parsed = OblUtil.parse(content);
 
@@ -151,7 +151,7 @@ describe('OBL Support', () => {
   });
 
   test('bulk test real OBLA files (first 10)', () => {
-    const oblaDir = path.join(__dirname, '../obla-improvements/small-obla/small');
+    const oblaDir = path.join(__dirname, 'assets/obla');
     const files = fs
       .readdirSync(oblaDir)
       .filter((f) => f.endsWith('.obla'))