fix: close #296 review gaps

Issue: #296
User-Visible: yes

test/coincident-partitions.test.mjs

@@ -205,7 +205,8 @@ test('issue 296 removes a fully hidden saved chain before reconciling its partit
     segments: [{ cm: 15 }],
   }];
   const result = optimize(input);
-  assert.equal(result.report.removedDrafts, 1);
+  assert.equal(result.report.removedDrafts, 0);
+  assert.equal(result.report.redundantDraftsRemoved, 1);
   assert.equal(result.report.partitionsReconciled, 1);
   assert.equal(result.config.spaces[0].room_drafts, undefined);
   assert.equal(result.config.spaces[0].partitions, undefined);

test/fixtures/real-plan-second-floor.json

@@ -520,38 +520,6 @@
           3.866666667
         ],
         "cm": 30
-      },
-      {
-        "id": "partition-room-mt7ijuyq-0",
-        "a": [
-          -0.354166667,
-          2.2875
-        ],
-        "b": [
-          -0.354166667,
-          3.866666667
-        ],
-        "cm": 20
-      }
-    ],
-    "room_drafts": [
-      {
-        "id": "draft-mt7igts5",
-        "points": [
-          [
-            -0.354166667,
-            3.866666667
-          ],
-          [
-            1.058333333,
-            3.866666667
-          ]
-        ],
-        "segments": [
-          {
-            "cm": 30
-          }
-        ]
       }
     ],
     "openings": []

test/model-invariants.test.mjs

@@ -643,7 +643,7 @@ test('реальный план: перегородка поверх наруж
   // Долг фикстуры, а не «допустимо»: `partition-mt2on9ou-0` лежит на наружной
   // стене трёх комнат и выключает ресайз Мастера с/у и Гардеробной. Число здесь
   // обязано стать нулём вместе с закрытием #296 — иначе починка пройдёт молча.
-  const debt = { 'real-plan-second-floor.json': 3, 'real-plan-first-floor.json': 0 };
+  const debt = { 'real-plan-second-floor.json': 1, 'real-plan-first-floor.json': 0 };
   for (const [file, expected] of Object.entries(debt)) {
     const { config } = readModel(
       readFileSync(resolve(repoRoot, 'test/fixtures', file), 'utf8'));

test/optimize-hidden-obstacles.test.mjs

@@ -3,6 +3,7 @@ import assert from 'node:assert/strict';
 import { readFileSync } from 'node:fs';
 
 import { optimizePlans } from '../test-build/plan-optimizer.js';
+import { reconcileCoincidentPartitions } from '../test-build/coincident-partitions.js';
 import { GRID_PITCH, GRID_STEP_N as S } from '../test-build/space-geometry.js';
 import { wallIntervals, wallKey } from '../test-build/wall-thickness.js';
 
@@ -10,6 +11,15 @@ const clone = (value) => structuredClone(value);
 const fixture = JSON.parse(readFileSync(
   new URL('./fixtures/real-plan-second-floor.json', import.meta.url), 'utf8',
 ));
+fixture.space.partitions.push({
+  id: 'partition-room-mt7ijuyq-0',
+  a: [-0.354166667, 2.2875], b: [-0.354166667, 3.866666667], cm: 20,
+});
+fixture.space.room_drafts = [{
+  id: 'draft-mt7igts5',
+  points: [[-0.354166667, 3.866666667], [1.058333333, 3.866666667]],
+  segments: [{ cm: 30 }],
+}];
 
 const configOf = (space) => ({ model_version: 7, spaces: [space], markers: [], settings: {} });
 
@@ -20,7 +30,8 @@ test('issue 296 real second floor removes all three hidden blockers in one Optim
   assert.deepEqual(input, before, 'preview must stay immutable');
   assert.equal(result.changed, true);
   assert.ok(result.report.partitionsReconciled >= 2);
-  assert.equal(result.report.removedDrafts, 1);
+  assert.equal(result.report.removedDrafts, 0);
+  assert.equal(result.report.redundantDraftsRemoved, 1);
   const space = result.config.spaces[0];
   assert.equal(space.partitions, undefined);
   assert.equal(space.room_drafts, undefined);
@@ -38,6 +49,7 @@ test('issue 296 real second floor removes all three hidden blockers in one Optim
   assert.equal(second.changed, false);
   assert.equal(second.report.partitionsReconciled, 0);
   assert.equal(second.report.removedDrafts, 0);
+  assert.equal(second.report.redundantDraftsRemoved, 0);
   assert.deepEqual(second.config, result.config);
 });
 
@@ -84,7 +96,8 @@ test('issue 296 draft cleanup is all-or-nothing and preserves legal unfinished w
     ],
   };
   const result = optimizePlans(configOf(space), {});
-  assert.equal(result.report.removedDrafts, 1);
+  assert.equal(result.report.removedDrafts, 0);
+  assert.equal(result.report.redundantDraftsRemoved, 1);
   assert.deepEqual(result.config.spaces[0].room_drafts.map((draft) => draft.id), [
     'free', 'partial', 'thicker',
   ]);
@@ -117,3 +130,112 @@ test('issue 296 an opening across a structural breakpoint keeps the source parti
   assert.equal(result.config.spaces[0].openings[0].host.id, 'host');
   assert.equal(result.config.spaces[0].openings[0].host.t, 0.5);
 });
+
+test('issue 296 keeps an opening wholly on a residual with exact absolute geometry', () => {
+  const space = {
+    id: 'residual-opening', title: 'Residual opening', view_box: [-0.5, -0.5, 2, 2], cell_cm: 5,
+    rooms: [{ id: 'room', name: 'room', area: null,
+      poly: [[0, 0], [1, 0], [1, 1], [0, 1]] }],
+    walls: [{ key: wallKey([0, 0], [1, 0], S), a: [0, 0], b: [1, 0], cm: 20 }],
+    partitions: [{ id: 'host', a: [-0.25, 0], b: [1.25, 0], cm: 20 }],
+    openings: [{
+      id: 'door', type: 'door', x: 0, y: 0, angle: 0, length: 0.1,
+      host: { kind: 'partition', id: 'host', t: 0.9 },
+    }],
+  };
+  const result = optimizePlans(configOf(space), {});
+  const opening = result.config.spaces[0].openings[0];
+  assert.match(opening.host.id, /^host~r-/);
+  assert.equal(opening.x, 1.1);
+  assert.equal(opening.y, 0);
+  assert.equal(opening.angle, 0);
+  assert.equal(result.report.openingsRehosted, 0);
+});
+
+test('issue 296 computes max thickness independently for disjoint safe pieces', () => {
+  const space = {
+    id: 'piece-thickness', title: 'Piece thickness', view_box: [-0.2, -0.2, 3.4, 1.4], cell_cm: 5,
+    rooms: [
+      { id: 'left', name: 'left', area: null, poly: [[0, 0], [1, 0], [1, 1], [0, 1]] },
+      { id: 'right', name: 'right', area: null, poly: [[2, 0], [3, 0], [3, 1], [2, 1]] },
+    ],
+    walls: [
+      { key: wallKey([0, 0], [1, 0], S), a: [0, 0], b: [1, 0], cm: 15 },
+      { key: wallKey([2, 0], [3, 0], S), a: [2, 0], b: [3, 0], cm: 25 },
+    ],
+    partitions: [{ id: 'split', a: [0, 0], b: [3, 0], cm: 20 }],
+  };
+  const result = optimizePlans(configOf(space), {});
+  assert.equal(result.report.partitionsReconciled, 2);
+  assert.deepEqual(result.config.spaces[0].partitions.map((item) => [item.a, item.b]), [
+    [[1, 0], [2, 0]],
+  ]);
+  const bottom = wallIntervals(
+    result.config.spaces[0].rooms, result.config.spaces[0].walls, [], S, 5, GRID_PITCH, 1,
+  ).filter((item) => item.a[1] === 0 && item.b[1] === 0);
+  assert.equal(bottom.find((item) => Math.min(item.a[0], item.b[0]) === 0)?.cm, 20);
+  assert.equal(bottom.find((item) => Math.min(item.a[0], item.b[0]) === 2)?.cm, 25);
+});
+
+test('issue 296 applies column and unfinished-draft blockers to each piece and preserves work', () => {
+  const base = {
+    id: 'piece-blockers', title: 'Piece blockers', view_box: [-0.2, -0.2, 3.4, 1.4], cell_cm: 5,
+    rooms: [
+      { id: 'left', name: 'left', area: null, poly: [[0, 0], [1, 0], [1, 1], [0, 1]] },
+      { id: 'right', name: 'right', area: null, poly: [[2, 0], [3, 0], [3, 1], [2, 1]] },
+    ],
+    walls: [], partitions: [{ id: 'split', a: [0, 0], b: [3, 0], cm: 15 }],
+    wall_columns: [{ id: 'column', shape: 'circle', center: [0.5, 0], cm: 20 }],
+  };
+  const columnResult = optimizePlans(configOf(base), {});
+  assert.equal(columnResult.report.partitionsReconciled, 1);
+  assert.deepEqual(columnResult.config.spaces[0].partitions[0].a, [0, 0]);
+  assert.deepEqual(columnResult.config.spaces[0].partitions[0].b, [2, 0]);
+
+  const draftSpace = clone(base);
+  delete draftSpace.wall_columns;
+  draftSpace.rooms = [base.rooms[0]];
+  draftSpace.partitions = [{ id: 'blocked', a: [0, 0], b: [1, 0], cm: 15 }];
+  draftSpace.room_drafts = [{
+    id: 'unfinished', points: [[0, 0], [0.5, 0]], segments: [{ cm: 30 }],
+  }];
+  const draftResult = optimizePlans(configOf(draftSpace), {});
+  assert.equal(draftResult.report.partitionsReconciled, 0);
+  assert.equal(draftResult.report.redundantDraftsRemoved, 0);
+  assert.deepEqual(draftResult.config.spaces[0].room_drafts, draftSpace.room_drafts);
+});
+
+test('issue 296 fails closed at MAX_PARTITIONS and MAX_WALLS', () => {
+  const room = { id: 'room', name: 'room', area: null,
+    poly: [[0, 0], [1, 0], [1, 1], [0, 1]] };
+  const target = { id: 'a-target', a: [-0.25, 0], b: [1.25, 0], cm: 15 };
+  const partitions = [target, ...Array.from({ length: 1999 }, (_, index) => ({
+    id: `z-${index}`, a: [10 + index * 2, 10], b: [11 + index * 2, 10], cm: 15,
+  }))];
+  const partitionLimited = reconcileCoincidentPartitions(
+    { partitions, openings: [], room_drafts: [] },
+    { rooms: [room], partitions, room_drafts: [], wall_columns: [] },
+    [], [], { pitch: S, cellCm: 5, gridPitch: GRID_PITCH, coordScale: 1 },
+  );
+  assert.equal(partitionLimited.partitionsReconciled, 0);
+  assert.deepEqual(partitionLimited.partitions[0], target);
+
+  const count = 501;
+  const polygon = Array.from({ length: count }, (_, index) => {
+    const angle = 2 * Math.PI * index / count;
+    return [10 + Math.cos(angle), 10 + Math.sin(angle)];
+  });
+  const walls = Array.from({ length: count - 1 }, (_, index) => ({
+    key: wallKey(polygon[index + 1], polygon[(index + 2) % count], S),
+    a: polygon[index + 1], b: polygon[(index + 2) % count], cm: 15,
+  }));
+  const edgePartition = { id: 'edge', a: polygon[0], b: polygon[1], cm: 20 };
+  const wallLimited = reconcileCoincidentPartitions(
+    { partitions: [edgePartition], openings: [], room_drafts: [] },
+    { rooms: [{ id: 'many', name: 'many', poly: polygon }],
+      partitions: [edgePartition], room_drafts: [], wall_columns: [] },
+    walls, [], { pitch: S, cellCm: 5, gridPitch: GRID_PITCH, coordScale: 1 },
+  );
+  assert.equal(wallLimited.partitionsReconciled, 0);
+  assert.deepEqual(wallLimited.partitions, [edgePartition]);
+});

test/plan-optimizer.test.mjs

@@ -43,6 +43,7 @@ const assertNoPersistedChanges = (result) => {
     'moved', 'coordsCanonicalized', 'rotated', 'removedDrafts', 'migrated',
     'glowSpacesMigrated', 'glowRoomsMigrated', 'canonicalized', 'wallsMerged',
     'spansMerged', 'partitionsMerged', 'partitionsReconciled', 'openingsRehosted',
+    'redundantDraftsRemoved',
     'wallsStraightened',
     'spaceRefsRemapped', 'roomRefsRemapped',
     'positionsRemapped', 'markersDetached', 'orphanRoomLabelsRemoved',