@jetta/cargo-stabilizer 0.1.0-11 → 0.1.0-14

package/CHANGELOG.md

@@ -13,13 +13,14 @@ Format based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - Empty-space candidate discovery for floor and elevated slots via `@jetta/empty-spaces-manager`.
 - Supporter-top candidate slots aligned to each stacked item footprint, included in beam expansion (`top_k ∪ supporter_top`).
 - Elevated candidates must sit on a supporter `(x, z)` origin so stacked loose items copy the supporter footprint.
-- `cargo_stabilizer.pin_tie_ratio_blocks` (default `false`): when true, 3_2/2_3 groups stay pinned; otherwise every item is movable.
+- `cargo_stabilizer.pin_tie_ratio_blocks` (default `false`): when true, only **floor five-slot** `3_2`/`2_3` walls stay pinned; stacked tie-ratio items and generic groups stay movable.
 - Public contract exports: `parse_stabilizer_input`, `parse_stabilizer_output`, `safe_parse_stabilizer_input`, `safe_parse_stabilizer_output`, and related domain types.
 
 ### Changed
 
 - README documents I/O contract mapping, configuration keys, dependencies, and test/coverage commands.
 - Reorder objective is whole-cargo `transport_score`; loose-item score sum is only a tie-break. Axle, waypoint, and milkrun gates are unchanged.
+- `pin_tie_ratio_blocks` pins only floor five-slot `3_2`/`2_3` walls; stacked members of the same group stay movable.
 
 ### Testing
 

package/README.md

@@ -1,6 +1,6 @@
 # @jetta/cargo-stabilizer
 
-TypeScript library that reorders items to improve **whole-cargo transport stability**. By default every item is movable; set `cargo_stabilizer.pin_tie_ratio_blocks` to pin 3_2/2_3 groups. The reorder objective is `transport_score` (loose-item score sum is a tie-break). Implements five config-selectable strategies with organization gates (waypoint order, milkrun wall reservation) and empty-space candidate discovery (JET-2262).
+TypeScript library that reorders items to improve **whole-cargo transport stability**. By default every item is movable; set `cargo_stabilizer.pin_tie_ratio_blocks` to pin **floor five-slot** `3_2`/`2_3` walls. Stacked tie-ratio pieces and generic groups stay movable one item at a time. The reorder objective is `transport_score` (loose-item score sum is a tie-break). Implements five config-selectable strategies with organization gates (waypoint order, milkrun wall reservation) and empty-space candidate discovery (JET-2262).
 
 ## Requirements
 
@@ -73,7 +73,7 @@ Exported parsers: `parse_stabilizer_input`, `parse_stabilizer_output`, `safe_par
 | `cargo_stabilizer.transport_stability_floor` | `0` | Hard minimum transport stability score (gate, not the maximize objective) |
 | `cargo_stabilizer.max_iteration` | `10` | Greedy / SA iteration budget |
 | `cargo_stabilizer.preserve_tie_block_organization` | `true` | When true, enforce waypoint Z zones and macro delivery order |
-| `cargo_stabilizer.pin_tie_ratio_blocks` | `false` | When true, do not move 3_2/2_3 groups; other items remain movable |
+| `cargo_stabilizer.pin_tie_ratio_blocks` | `false` | When true, do not move floor five-slot `3_2`/`2_3` walls; stacked tie-ratio items and other groups remain movable |
 | `cargo_stabilizer.enforce_milkrun_wall_reservation` | `false` | When true, reserve rear compound-wall Z bands using profile key below |
 | `number_of_wall_to_allocate_from_last_waypoints` | `0` | Count of trailing waypoints whose compound walls are reserved (read from `cargo_state.config.algoritmo` when milkrun enforcement is enabled) |
 | `folga_de_peso_nos_eixos` | `0` | Axle folga percent |

package/build/core/adapters/coordinate_mapper.d.ts

@@ -15,7 +15,7 @@ export interface StabilityContainerPayload {
     item_list: StabilityItemPayload[];
 }
 /**
- * Maps contract CM coordinates onto cargo-stability axes (y = height, z = length).
+ * Maps contract coordinates onto cargo-stability axes (y = height, z = length).
  * @param item - Stabilizer item record.
  * @returns Stability item payload entry.
  */

package/build/core/adapters/coordinate_mapper.js

@@ -1,14 +1,14 @@
 import { item_to_box } from '../geometry/box_geometry.js';
 /**
- * Maps contract CM coordinates onto cargo-stability axes (y = height, z = length).
+ * Maps contract coordinates onto cargo-stability axes (y = height, z = length).
  * @param item - Stabilizer item record.
  * @returns Stability item payload entry.
  */
 export function map_item_to_stability(item) {
     return {
         x: item.x,
-        y: item.z,
-        z: item.y,
+        y: item.y,
+        z: item.z,
         w: item.width,
         h: item.height,
         l: item.depth

package/build/core/filters/collect_movable_items.d.ts

@@ -3,7 +3,7 @@ import type { LooseItemRef } from './loose_item_filter.js';
 /**
  * Collects items the stabilizer may move.
  * @param containers - Container list from env.
- * @param pin_tie_ratio_blocks - When true, skip 3_2/2_3 groups.
+ * @param pin_tie_ratio_blocks - When true, skip floor five-slot 3_2/2_3 walls.
  * @returns Movable item references with container index.
  */
 export declare function collect_movable_items(containers: {
@@ -11,8 +11,8 @@ export declare function collect_movable_items(containers: {
 }[], pin_tie_ratio_blocks: boolean): LooseItemRef[];
 /**
  * @param item - Item record.
- * @param tie_ratio_group_ids - Group ids that contain a 3_2/2_3 member.
- * @returns True when the item belongs to a pinned tie-ratio group.
+ * @param pinned_group_ids - Floor five-slot 3_2/2_3 group ids.
+ * @returns True when the item is a floor member of a pinned wall.
  */
-export declare function is_tie_ratio_block_item(item: StabilizerItem, tie_ratio_group_ids: Set<string>): boolean;
+export declare function is_tie_ratio_block_item(item: StabilizerItem, pinned_group_ids: Set<string>): boolean;
 //# sourceMappingURL=collect_movable_items.d.ts.map

package/build/core/filters/collect_movable_items.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collect_movable_items.d.ts","sourceRoot":"","sources":["../../../src/core/filters/collect_movable_items.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAA;AAExF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAE1D;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACjC,UAAU,EAAE;IAAE,KAAK,EAAE,cAAc,EAAE,CAAA;CAAE,EAAE,EACzC,oBAAoB,EAAE,OAAO,GAC9B,YAAY,EAAE,CAMhB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACnC,IAAI,EAAE,cAAc,EACpB,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,GACjC,OAAO,CAOT"}
+{"version":3,"file":"collect_movable_items.d.ts","sourceRoot":"","sources":["../../../src/core/filters/collect_movable_items.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAA;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAI1D;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACjC,UAAU,EAAE;IAAE,KAAK,EAAE,cAAc,EAAE,CAAA;CAAE,EAAE,EACzC,oBAAoB,EAAE,OAAO,GAC9B,YAAY,EAAE,CAMhB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACnC,IAAI,EAAE,cAAc,EACpB,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,GAC9B,OAAO,CAOT"}

package/build/core/filters/collect_movable_items.js

@@ -1,38 +1,27 @@
-import { TIE_RATIO_ORIENTATION } from '../constants/TieRatioOrientation.js';
+import { collect_pinned_floor_tie_ratio_group_ids } from './collect_pinned_floor_tie_ratio_group_ids.js';
+import { is_item_on_cm_floor } from './is_item_on_cm_floor.js';
 /**
  * Collects items the stabilizer may move.
  * @param containers - Container list from env.
- * @param pin_tie_ratio_blocks - When true, skip 3_2/2_3 groups.
+ * @param pin_tie_ratio_blocks - When true, skip floor five-slot 3_2/2_3 walls.
  * @returns Movable item references with container index.
  */
 export function collect_movable_items(containers, pin_tie_ratio_blocks) {
     const pinned_groups = pin_tie_ratio_blocks
-        ? collect_tie_ratio_group_ids(flatten_container_items(containers))
+        ? collect_pinned_floor_tie_ratio_group_ids(flatten_container_items(containers))
         : new Set();
     return collect_items_except_pinned(containers, pinned_groups);
 }
 /**
  * @param item - Item record.
- * @param tie_ratio_group_ids - Group ids that contain a 3_2/2_3 member.
- * @returns True when the item belongs to a pinned tie-ratio group.
+ * @param pinned_group_ids - Floor five-slot 3_2/2_3 group ids.
+ * @returns True when the item is a floor member of a pinned wall.
  */
-export function is_tie_ratio_block_item(item, tie_ratio_group_ids) {
-    if (item.group_id == null) {
+export function is_tie_ratio_block_item(item, pinned_group_ids) {
+    if (item.group_id == null || !is_item_on_cm_floor(item)) {
         return false;
     }
-    return tie_ratio_group_ids.has(item.group_id);
-}
-function collect_tie_ratio_group_ids(items) {
-    const group_ids = new Set();
-    for (const item of items) {
-        if (item.group_id == null) {
-            continue;
-        }
-        if (is_tie_ratio_orientation(read_tie_ratio_orientation(item))) {
-            group_ids.add(item.group_id);
-        }
-    }
-    return group_ids;
+    return pinned_group_ids.has(item.group_id);
 }
 function collect_items_except_pinned(containers, pinned_groups) {
     const movable = [];
@@ -62,11 +51,3 @@ function flatten_container_items(containers) {
     }
     return items;
 }
-function read_tie_ratio_orientation(item) {
-    const orientation = item.attributes?.tie_ratio_orientation;
-    return typeof orientation === 'string' ? orientation : undefined;
-}
-function is_tie_ratio_orientation(orientation) {
-    return orientation === TIE_RATIO_ORIENTATION.THREE_TWO
-        || orientation === TIE_RATIO_ORIENTATION.TWO_THREE;
-}

package/build/core/filters/collect_pinned_floor_tie_ratio_group_ids.d.ts

@@ -0,0 +1,8 @@
+import type { StabilizerItem } from '../validation/contract/stabilizer_domain_schema.js';
+/**
+ * Group ids of floor five-slot 3_2/2_3 walls that the stabilizer must pin.
+ * @param items - All items in the cargo.
+ * @returns Group ids with exactly five floor tie-ratio members.
+ */
+export declare function collect_pinned_floor_tie_ratio_group_ids(items: StabilizerItem[]): Set<string>;
+//# sourceMappingURL=collect_pinned_floor_tie_ratio_group_ids.d.ts.map

package/build/core/filters/collect_pinned_floor_tie_ratio_group_ids.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"collect_pinned_floor_tie_ratio_group_ids.d.ts","sourceRoot":"","sources":["../../../src/core/filters/collect_pinned_floor_tie_ratio_group_ids.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAA;AAMxF;;;;GAIG;AACH,wBAAgB,wCAAwC,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAQ7F"}

package/build/core/filters/collect_pinned_floor_tie_ratio_group_ids.js

@@ -0,0 +1,41 @@
+import { TIE_RATIO_ORIENTATION } from '../constants/TieRatioOrientation.js';
+import { is_item_on_cm_floor } from './is_item_on_cm_floor.js';
+const FULL_TIE_RATIO_FLOOR_COUNT = 5;
+/**
+ * Group ids of floor five-slot 3_2/2_3 walls that the stabilizer must pin.
+ * @param items - All items in the cargo.
+ * @returns Group ids with exactly five floor tie-ratio members.
+ */
+export function collect_pinned_floor_tie_ratio_group_ids(items) {
+    const floor_tie_count_by_group = new Map();
+    for (const item of items) {
+        add_floor_tie_member(floor_tie_count_by_group, item);
+    }
+    return groups_with_full_floor_wall(floor_tie_count_by_group);
+}
+function add_floor_tie_member(counts, item) {
+    if (item.group_id == null || !is_item_on_cm_floor(item)) {
+        return;
+    }
+    if (!is_tie_ratio_orientation(read_tie_ratio_orientation(item))) {
+        return;
+    }
+    counts.set(item.group_id, (counts.get(item.group_id) ?? 0) + 1);
+}
+function groups_with_full_floor_wall(counts) {
+    const pinned = new Set();
+    for (const [group_id, count] of counts) {
+        if (count === FULL_TIE_RATIO_FLOOR_COUNT) {
+            pinned.add(group_id);
+        }
+    }
+    return pinned;
+}
+function read_tie_ratio_orientation(item) {
+    const orientation = item.attributes?.tie_ratio_orientation;
+    return typeof orientation === 'string' ? orientation : undefined;
+}
+function is_tie_ratio_orientation(orientation) {
+    return orientation === TIE_RATIO_ORIENTATION.THREE_TWO
+        || orientation === TIE_RATIO_ORIENTATION.TWO_THREE;
+}

package/build/core/filters/is_item_on_cm_floor.d.ts

@@ -0,0 +1,8 @@
+import type { StabilizerItem } from '../validation/contract/stabilizer_domain_schema.js';
+/**
+ * True when the item rests on the floor (contract y is height after wire map).
+ * @param item - Stabilizer item in contract coordinates.
+ * @returns True when height origin is on the floor.
+ */
+export declare function is_item_on_cm_floor(item: StabilizerItem): boolean;
+//# sourceMappingURL=is_item_on_cm_floor.d.ts.map

package/build/core/filters/is_item_on_cm_floor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"is_item_on_cm_floor.d.ts","sourceRoot":"","sources":["../../../src/core/filters/is_item_on_cm_floor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAA;AAIxF;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAGjE"}

package/build/core/filters/is_item_on_cm_floor.js

@@ -0,0 +1,9 @@
+const CM_FLOOR_HEIGHT_EPSILON = 1e-6;
+/**
+ * True when the item rests on the floor (contract y is height after wire map).
+ * @param item - Stabilizer item in contract coordinates.
+ * @returns True when height origin is on the floor.
+ */
+export function is_item_on_cm_floor(item) {
+    return item.y <= CM_FLOOR_HEIGHT_EPSILON;
+}

package/build/core/geometry/has_penetrating_overlap.d.ts

@@ -1,7 +1,7 @@
 import type { StabilizerContainer } from '../validation/contract/stabilizer_domain_schema.js';
 /**
- * True when any two items penetrate in the axle-calculator CM frame
- * (x + width, y + depth, z + height) by more than a face-touch epsilon.
+ * True when any two items penetrate in the contract frame
+ * (x + width, y + height, z + depth) by more than a face-touch epsilon.
  * @param containers - Layout to inspect.
  * @returns True when a pair occupies the same volume beyond float error.
  */

package/build/core/geometry/has_penetrating_overlap.js

@@ -1,7 +1,7 @@
 const PENETRATION_EPSILON = 1e-6;
 /**
- * True when any two items penetrate in the axle-calculator CM frame
- * (x + width, y + depth, z + height) by more than a face-touch epsilon.
+ * True when any two items penetrate in the contract frame
+ * (x + width, y + height, z + depth) by more than a face-touch epsilon.
  * @param containers - Layout to inspect.
  * @returns True when a pair occupies the same volume beyond float error.
  */
@@ -20,7 +20,7 @@ function container_has_penetrating_overlap(container) {
     return false;
 }
 function items_penetrate(left, right) {
-    return interval_penetration({ min: left.x, max: left.x + left.width }, { min: right.x, max: right.x + right.width }) && interval_penetration({ min: left.y, max: left.y + left.depth }, { min: right.y, max: right.y + right.depth }) && interval_penetration({ min: left.z, max: left.z + left.height }, { min: right.z, max: right.z + right.height });
+    return interval_penetration({ min: left.x, max: left.x + left.width }, { min: right.x, max: right.x + right.width }) && interval_penetration({ min: left.y, max: left.y + left.height }, { min: right.y, max: right.y + right.height }) && interval_penetration({ min: left.z, max: left.z + left.depth }, { min: right.z, max: right.z + right.depth });
 }
 function interval_penetration(left, right) {
     return Math.min(left.max, right.max) - Math.max(left.min, right.min) > PENETRATION_EPSILON;

package/build/core/validation/contract/map_contract_to_wire_shape.js

@@ -38,5 +38,8 @@ function map_item_to_wire(item) {
     if (item.attributes === undefined) {
         return rename_keys(omit_keys(item, ['attributes']), CONTRACT_TO_ITEM_WIRE);
     }
+    if (typeof item.attributes.w === 'number') {
+        return { ...item.attributes, x: item.x, y: item.z, z: item.y };
+    }
     return { ...item.attributes, x: item.x, y: item.y, z: item.z };
 }

package/build/core/validation/contract/map_wire_input_to_contract_shape.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map_wire_input_to_contract_shape.d.ts","sourceRoot":"","sources":["../../../../src/core/validation/contract/map_wire_input_to_contract_shape.ts"],"names":[],"mappings":"AAUA,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAiBnE"}
+{"version":3,"file":"map_wire_input_to_contract_shape.d.ts","sourceRoot":"","sources":["../../../../src/core/validation/contract/map_wire_input_to_contract_shape.ts"],"names":[],"mappings":"AAWA,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAiBnE"}

package/build/core/validation/contract/map_wire_input_to_contract_shape.js

@@ -1,5 +1,6 @@
 import { CONTAINER_WIRE_TO_CONTRACT, ENV_WIRE_TO_CONTRACT } from './cargo_movement_wire_field_map.js';
 import { map_wire_item_to_contract } from './map_wire_item_to_contract.js';
+import { uniquify_contract_item_ids } from './uniquify_contract_item_ids.js';
 import { is_record, omit_keys, pick_keys, rename_keys } from './wire_mapper_record_utils.js';
 const CONTAINER_CONTRACT_KEYS = ['sequence', 'width', 'height', 'length'];
 const ENV_CONTRACT_KEYS = ['axles'];
@@ -32,7 +33,7 @@ function map_container_to_contract(value) {
     }
     const mapped = rename_keys(value, CONTAINER_WIRE_TO_CONTRACT);
     if (Array.isArray(value.items)) {
-        mapped.items = value.items.map(map_wire_item_to_contract);
+        mapped.items = uniquify_contract_item_ids(value.items.map(map_wire_item_to_contract));
     }
     return pick_container_contract_keys(mapped);
 }

package/build/core/validation/contract/map_wire_item_to_contract.js

@@ -22,11 +22,7 @@ export function map_wire_item_to_contract(value) {
     return contract;
 }
 function read_contract_item_fields(source) {
-    const contract = {
-        x: source.x,
-        y: source.y,
-        z: source.z
-    };
+    const contract = read_contract_position(source);
     for (const [contract_key, wire_keys] of Object.entries(ITEM_CONTRACT_WIRE_KEYS)) {
         const value = read_first_present(source, wire_keys);
         if (value !== undefined) {
@@ -35,6 +31,18 @@ function read_contract_item_fields(source) {
     }
     return contract;
 }
+/**
+ * BWA `to_json` stores length on `y` and height on `z`. Candidate geometry
+ * uses the opposite (y = height, z = length), so CM wire items are swapped.
+ * @param source - Wire or English item record.
+ * @returns Contract x/y/z.
+ */
+function read_contract_position(source) {
+    if (typeof source.w === 'number') {
+        return { x: source.x, y: source.z, z: source.y };
+    }
+    return { x: source.x, y: source.y, z: source.z };
+}
 /**
  * Coerces blocks-wall numeric group ids to the string contract type.
  * @param contract_key - English contract field name.

package/build/core/validation/contract/uniquify_contract_item_ids.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Makes contract item_id unique when the same SKU id repeats.
+ * Original `_id` stays in attributes for the wire round-trip.
+ * @param items - Mapped contract items.
+ * @returns Items with unique `item_id` values.
+ */
+export declare function uniquify_contract_item_ids(items: unknown[]): unknown[];
+//# sourceMappingURL=uniquify_contract_item_ids.d.ts.map

package/build/core/validation/contract/uniquify_contract_item_ids.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uniquify_contract_item_ids.d.ts","sourceRoot":"","sources":["../../../../src/core/validation/contract/uniquify_contract_item_ids.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAKtE"}

package/build/core/validation/contract/uniquify_contract_item_ids.js

@@ -0,0 +1,38 @@
+import { is_record } from './wire_mapper_record_utils.js';
+/**
+ * Makes contract item_id unique when the same SKU id repeats.
+ * Original `_id` stays in attributes for the wire round-trip.
+ * @param items - Mapped contract items.
+ * @returns Items with unique `item_id` values.
+ */
+export function uniquify_contract_item_ids(items) {
+    const counts = count_item_ids(items);
+    const seen = new Map();
+    return items.map(item => uniquify_one_item(item, counts, seen));
+}
+function count_item_ids(items) {
+    const counts = new Map();
+    for (const item of items) {
+        const item_id = read_item_id(item);
+        if (item_id === undefined) {
+            continue;
+        }
+        counts.set(item_id, (counts.get(item_id) ?? 0) + 1);
+    }
+    return counts;
+}
+function uniquify_one_item(item, counts, seen) {
+    const item_id = read_item_id(item);
+    if (item_id === undefined || (counts.get(item_id) ?? 0) <= 1 || !is_record(item)) {
+        return item;
+    }
+    const occurrence = seen.get(item_id) ?? 0;
+    seen.set(item_id, occurrence + 1);
+    return { ...item, item_id: `${item_id}#${occurrence}` };
+}
+function read_item_id(item) {
+    if (!is_record(item) || typeof item.item_id !== 'string') {
+        return undefined;
+    }
+    return item.item_id;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jetta/cargo-stabilizer",
-    "version": "0.1.0-11",
+    "version": "0.1.0-14",
     "description": "Stable loose-item reorder library for cargo-movement (JET-2262)",
     "main": "build/index.js",
     "types": "build/index.d.ts",