@jetta/cargo-stabilizer 0.1.0-9 → 0.1.0

package/build/core/orchestration/build_reorder_context.js

@@ -1,4 +1,4 @@
-import { collect_loose_items } from '../filters/loose_item_filter.js';
+import { collect_movable_items } from '../filters/collect_movable_items.js';
 import { validate_waypoint_ids } from '../waypoint/validate_waypoint_ids.js';
 import { build_waypoint_zones } from '../waypoint/build_waypoint_zones.js';
 import { build_milkrun_bands_from_config } from './build_milkrun_bands_from_config.js';
@@ -12,15 +12,13 @@ import { clone_containers } from '../move/apply_move.js';
  */
 export function build_reorder_context(input, config) {
     const env = read_primary_env(input);
-    const all_items = env.containers.flatMap(container => container.items);
-    const waypoint_mode = validate_waypoint_ids(all_items);
-    const loose_items = collect_loose_items(env.containers);
+    const waypoint_mode = validate_waypoint_ids(env.containers.flatMap(container => container.items));
     const baseline_containers = clone_containers(env.containers);
     return {
         env,
         containers: env.containers,
         baseline_containers,
-        loose_items,
+        loose_items: collect_movable_items(env.containers, config.pin_tie_ratio_blocks),
         config,
         waypoint_mode,
         waypoint_zones: build_waypoint_zones(baseline_containers, waypoint_mode),

package/build/core/strategies/reorder/BeamSearchReorder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BeamSearchReorder.d.ts","sourceRoot":"","sources":["../../../../src/core/strategies/reorder/BeamSearchReorder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAA;AAahG;;GAEG;AACH,qBAAa,iBAAkB,YAAW,eAAe;IAErD,GAAG,CAAC,OAAO,EAAE,cAAc,GAAG,mBAAmB,EAAE;CAkBtD"}
+{"version":3,"file":"BeamSearchReorder.d.ts","sourceRoot":"","sources":["../../../../src/core/strategies/reorder/BeamSearchReorder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAA;AAehG;;GAEG;AACH,qBAAa,iBAAkB,YAAW,eAAe;IAErD,GAAG,CAAC,OAAO,EAAE,cAAc,GAAG,mBAAmB,EAAE;CAoBtD"}

package/build/core/strategies/reorder/BeamSearchReorder.js

@@ -1,9 +1,11 @@
 import { generate_candidates } from '../../candidates/candidate_generator.js';
 import { candidate_context_for_loose } from '../../candidates/build_candidate_context.js';
 import { select_beam_expansion_candidates } from './select_beam_expansion_candidates.js';
-import { apply_move, clone_containers } from '../../move/apply_move.js';
+import { clone_containers } from '../../move/apply_move.js';
 import { evaluate_trial_layout, evaluation_context_from_reorder } from '../../evaluation/state_evaluator.js';
 import { read_item_score } from '../../adapters/stability_adapter.js';
+import { select_surviving_beam } from './select_surviving_beam.js';
+import { append_admitted_trial } from './append_admitted_trial.js';
 /**
  * Beam search reorder with configurable width and top-K expansion.
  */
@@ -11,9 +13,11 @@ export class BeamSearchReorder {
     run(context) {
         const eval_context = evaluation_context_from_reorder(context);
         const sorted = sort_loose_by_stability(context, eval_context);
+        const root_eval = evaluate_trial_layout(context.containers, eval_context);
         let beam = [{
                 containers: clone_containers(context.containers),
-                objective: evaluate_trial_layout(context.containers, eval_context).objective
+                objective: root_eval.objective,
+                axle_excess_kg: root_eval.axle_excess_kg
             }];
         for (const loose of sorted) {
             beam = expand_beam({ reorder: context, evaluation: eval_context, beam, loose });
@@ -34,21 +38,15 @@ function expand_beam(request) {
             loose: request.loose
         });
     }
-    expanded.sort((left, right) => right.objective - left.objective);
-    return expanded.slice(0, request.reorder.config.beam_width);
+    return select_surviving_beam(expanded, request.beam, request.reorder.config.beam_width);
 }
 function append_beam_branches(beam_context) {
-    const { reorder, evaluation, expanded, state, loose } = beam_context;
+    const { reorder, evaluation, state, loose } = beam_context;
     const loose_ref = { ...loose, container_index: find_container_index(state.containers, loose.item_id) };
+    const parent_eval = evaluate_trial_layout(state.containers, evaluation);
     const candidates = select_beam_expansion_candidates(generate_candidates(candidate_context_for_loose(reorder, state.containers, loose_ref)), reorder.config.beam_top_k);
     for (const candidate of candidates) {
-        const trial = clone_containers(state.containers);
-        apply_move(trial, candidate);
-        const result = evaluate_trial_layout(trial, evaluation);
-        if (!result.all_gates_pass) {
-            continue;
-        }
-        expanded.push({ containers: trial, objective: result.objective });
+        append_admitted_trial(beam_context, parent_eval, candidate);
     }
 }
 function sort_loose_by_stability(context, eval_context) {

package/build/core/strategies/reorder/GeneticReorder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeneticReorder.d.ts","sourceRoot":"","sources":["../../../../src/core/strategies/reorder/GeneticReorder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAA;AAahG;;GAEG;AACH,qBAAa,cAAe,YAAW,eAAe;IAElD,GAAG,CAAC,OAAO,EAAE,cAAc,GAAG,mBAAmB,EAAE;CAgBtD"}
+{"version":3,"file":"GeneticReorder.d.ts","sourceRoot":"","sources":["../../../../src/core/strategies/reorder/GeneticReorder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAA;AAchG;;GAEG;AACH,qBAAa,cAAe,YAAW,eAAe;IAElD,GAAG,CAAC,OAAO,EAAE,cAAc,GAAG,mBAAmB,EAAE;CAgBtD"}

package/build/core/strategies/reorder/GeneticReorder.js

@@ -1,5 +1,6 @@
 import { build_initial_population, crossover_organisms, materialize_organism, mutate_organism } from './genetic/Chromosome.js';
 import { evaluate_trial_layout, evaluation_context_from_reorder } from '../../evaluation/state_evaluator.js';
+import { genetic_fitness } from '../../evaluation/genetic_fitness.js';
 /**
  * Genetic algorithm reorder optimizing loose-item stability sum.
  */
@@ -39,5 +40,5 @@ function score_population(context, eval_context, population) {
 function score_organism(context, eval_context, organism) {
     const layout = materialize_organism(context.baseline_containers, organism);
     const evaluation = evaluate_trial_layout(layout, eval_context);
-    organism.fitness = evaluation.all_gates_pass ? evaluation.objective : Number.NEGATIVE_INFINITY;
+    organism.fitness = genetic_fitness(evaluation);
 }

package/build/core/strategies/reorder/SimulatedAnnealingReorder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SimulatedAnnealingReorder.d.ts","sourceRoot":"","sources":["../../../../src/core/strategies/reorder/SimulatedAnnealingReorder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAA;AAyBhG;;GAEG;AACH,qBAAa,yBAA0B,YAAW,eAAe;IAE7D,GAAG,CAAC,OAAO,EAAE,cAAc,GAAG,mBAAmB,EAAE;CAqBtD"}
+{"version":3,"file":"SimulatedAnnealingReorder.d.ts","sourceRoot":"","sources":["../../../../src/core/strategies/reorder/SimulatedAnnealingReorder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAA;AA0BhG;;GAEG;AACH,qBAAa,yBAA0B,YAAW,eAAe;IAE7D,GAAG,CAAC,OAAO,EAAE,cAAc,GAAG,mBAAmB,EAAE;CAqBtD"}

package/build/core/strategies/reorder/SimulatedAnnealingReorder.js

@@ -1,6 +1,7 @@
 import { apply_move, clone_containers } from '../../move/apply_move.js';
 import { evaluate_trial_layout, evaluation_context_from_reorder } from '../../evaluation/state_evaluator.js';
 import { accept_move, propose_neighbor } from './anneal_helpers.js';
+import { is_search_trial_admissible } from '../../evaluation/is_search_trial_admissible.js';
 /**
  * Simulated annealing reorder with hard gate rejection on invalid neighbors.
  */
@@ -10,7 +11,7 @@ export class SimulatedAnnealingReorder {
         const state = {
             working: clone_containers(context.containers),
             best: clone_containers(context.containers),
-            best_energy: energy(context.containers, eval_context)
+            best_energy: search_energy(context.containers, eval_context)
         };
         let temperature = 1.0;
         const cooling_rate = 0.995;
@@ -37,12 +38,16 @@ function anneal_step(step_context) {
 function evaluate_neighbor(step_context, neighbor) {
     const trial = clone_containers(step_context.state.working);
     apply_move(trial, neighbor);
+    const working_eval = evaluate_trial_layout(step_context.state.working, step_context.evaluation);
     const evaluation = evaluate_trial_layout(trial, step_context.evaluation);
-    if (!evaluation.all_gates_pass) {
+    if (!is_search_trial_admissible(working_eval, evaluation)) {
         return undefined;
     }
+    if (!working_eval.axle_valid) {
+        return evaluation.axle_excess_kg;
+    }
     const trial_energy = -evaluation.objective;
-    const delta = trial_energy - energy(step_context.state.working, step_context.evaluation);
+    const delta = trial_energy - search_energy(step_context.state.working, step_context.evaluation);
     if (!accept_move(delta, step_context.temperature)) {
         return undefined;
     }
@@ -56,6 +61,10 @@ function apply_accepted_neighbor(step_context, neighbor, trial_energy) {
     step_context.state.best = clone_containers(step_context.state.working);
     step_context.state.best_energy = trial_energy;
 }
-function energy(containers, eval_context) {
-    return -evaluate_trial_layout(containers, eval_context).objective;
+function search_energy(containers, eval_context) {
+    const evaluation = evaluate_trial_layout(containers, eval_context);
+    if (!evaluation.axle_valid) {
+        return evaluation.axle_excess_kg;
+    }
+    return -evaluation.objective;
 }

package/build/core/strategies/reorder/append_admitted_trial.d.ts

@@ -0,0 +1,11 @@
+import type { EvaluationResult } from '../../evaluation/evaluation_result.js';
+import type { MoveCandidate } from '../../move/apply_move.js';
+import type { BeamExpansionContext } from './beam_context.js';
+/**
+ * Evaluates one candidate and keeps it when search admission allows.
+ * @param beam_context - Beam expansion context.
+ * @param parent_eval - Parent layout evaluation.
+ * @param candidate - Move candidate.
+ */
+export declare function append_admitted_trial(beam_context: BeamExpansionContext, parent_eval: EvaluationResult, candidate: MoveCandidate): void;
+//# sourceMappingURL=append_admitted_trial.d.ts.map

package/build/core/strategies/reorder/append_admitted_trial.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"append_admitted_trial.d.ts","sourceRoot":"","sources":["../../../../src/core/strategies/reorder/append_admitted_trial.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAA;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAE7D;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACjC,YAAY,EAAE,oBAAoB,EAClC,WAAW,EAAE,gBAAgB,EAC7B,SAAS,EAAE,aAAa,GACzB,IAAI,CAcN"}

package/build/core/strategies/reorder/append_admitted_trial.js

@@ -0,0 +1,22 @@
+import { apply_move, clone_containers } from '../../move/apply_move.js';
+import { evaluate_trial_layout } from '../../evaluation/state_evaluator.js';
+import { is_search_trial_admissible } from '../../evaluation/is_search_trial_admissible.js';
+/**
+ * Evaluates one candidate and keeps it when search admission allows.
+ * @param beam_context - Beam expansion context.
+ * @param parent_eval - Parent layout evaluation.
+ * @param candidate - Move candidate.
+ */
+export function append_admitted_trial(beam_context, parent_eval, candidate) {
+    const trial = clone_containers(beam_context.state.containers);
+    apply_move(trial, candidate);
+    const result = evaluate_trial_layout(trial, beam_context.evaluation);
+    if (!is_search_trial_admissible(parent_eval, result)) {
+        return;
+    }
+    beam_context.expanded.push({
+        containers: trial,
+        objective: result.objective,
+        axle_excess_kg: result.axle_excess_kg
+    });
+}

package/build/core/strategies/reorder/beam_context.d.ts

@@ -12,5 +12,6 @@ export interface BeamExpansionContext {
 export interface BeamState {
     containers: StabilizerContainer[];
     objective: number;
+    axle_excess_kg: number;
 }
 //# sourceMappingURL=beam_context.d.ts.map

package/build/core/strategies/reorder/beam_context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"beam_context.d.ts","sourceRoot":"","sources":["../../../../src/core/strategies/reorder/beam_context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAA;AAChG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAA;AAEpF,MAAM,WAAW,oBAAoB;IAEjC,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,EAAE,sBAAsB,CAAA;IAClC,QAAQ,EAAE,SAAS,EAAE,CAAA;IACrB,KAAK,EAAE,SAAS,CAAA;IAChB,KAAK,EAAE,YAAY,CAAA;CACtB;AAED,MAAM,WAAW,SAAS;IAEtB,UAAU,EAAE,mBAAmB,EAAE,CAAA;IACjC,SAAS,EAAE,MAAM,CAAA;CACpB"}
+{"version":3,"file":"beam_context.d.ts","sourceRoot":"","sources":["../../../../src/core/strategies/reorder/beam_context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAA;AAChG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAA;AAEpF,MAAM,WAAW,oBAAoB;IAEjC,OAAO,EAAE,cAAc,CAAA;IACvB,UAAU,EAAE,sBAAsB,CAAA;IAClC,QAAQ,EAAE,SAAS,EAAE,CAAA;IACrB,KAAK,EAAE,SAAS,CAAA;IAChB,KAAK,EAAE,YAAY,CAAA;CACtB;AAED,MAAM,WAAW,SAAS;IAEtB,UAAU,EAAE,mBAAmB,EAAE,CAAA;IACjC,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,MAAM,CAAA;CACzB"}

package/build/core/strategies/reorder/greedy_improvement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"greedy_improvement.d.ts","sourceRoot":"","sources":["../../../../src/core/strategies/reorder/greedy_improvement.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAA;AAEhG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAA;AAepF;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAC/B,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,mBAAmB,EAAE,EAC9B,YAAY,EAAE,sBAAsB,GACrC,OAAO,CAiBT"}
+{"version":3,"file":"greedy_improvement.d.ts","sourceRoot":"","sources":["../../../../src/core/strategies/reorder/greedy_improvement.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uDAAuD,CAAA;AAEhG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAA;AAiBpF;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAC/B,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,mBAAmB,EAAE,EAC9B,YAAY,EAAE,sBAAsB,GACrC,OAAO,CAiBT"}

package/build/core/strategies/reorder/greedy_improvement.js

@@ -2,6 +2,7 @@ import { generate_candidates } from '../../candidates/candidate_generator.js';
 import { candidate_context_for_loose } from '../../candidates/build_candidate_context.js';
 import { apply_move, clone_containers } from '../../move/apply_move.js';
 import { evaluate_trial_layout } from '../../evaluation/state_evaluator.js';
+import { is_improving_greedy_trial } from './is_improving_greedy_trial.js';
 /**
  * Attempts one greedy improvement on the worst loose item.
  * @param context - Reorder context.
@@ -21,7 +22,7 @@ export function improve_worst_loose(context, working, eval_context) {
         working,
         evaluation: eval_context,
         loose: worst,
-        baseline_objective: current_eval.objective
+        parent_eval: current_eval
     });
 }
 function try_candidate_moves(move_context) {
@@ -37,7 +38,7 @@ function apply_improving_candidate(move_context, candidate) {
     const trial = clone_containers(move_context.working);
     apply_move(trial, candidate);
     const trial_eval = evaluate_trial_layout(trial, move_context.evaluation);
-    if (!trial_eval.all_gates_pass || trial_eval.objective <= move_context.baseline_objective) {
+    if (!is_improving_greedy_trial(move_context.parent_eval, trial_eval)) {
         return false;
     }
     apply_move(move_context.working, candidate);

package/build/core/strategies/reorder/is_improving_greedy_trial.d.ts

@@ -0,0 +1,10 @@
+import type { EvaluationResult } from '../../evaluation/evaluation_result.js';
+/**
+ * Returns true when a greedy trial improves the parent layout.
+ * Over parents climb on axle excess; legal parents require a better objective.
+ * @param parent_eval - Parent evaluation.
+ * @param trial_eval - Trial evaluation.
+ * @returns True when the trial should be applied.
+ */
+export declare function is_improving_greedy_trial(parent_eval: EvaluationResult, trial_eval: EvaluationResult): boolean;
+//# sourceMappingURL=is_improving_greedy_trial.d.ts.map

package/build/core/strategies/reorder/is_improving_greedy_trial.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"is_improving_greedy_trial.d.ts","sourceRoot":"","sources":["../../../../src/core/strategies/reorder/is_improving_greedy_trial.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAA;AAG7E;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACrC,WAAW,EAAE,gBAAgB,EAC7B,UAAU,EAAE,gBAAgB,GAC7B,OAAO,CAWT"}

package/build/core/strategies/reorder/is_improving_greedy_trial.js

@@ -0,0 +1,17 @@
+import { is_search_trial_admissible } from '../../evaluation/is_search_trial_admissible.js';
+/**
+ * Returns true when a greedy trial improves the parent layout.
+ * Over parents climb on axle excess; legal parents require a better objective.
+ * @param parent_eval - Parent evaluation.
+ * @param trial_eval - Trial evaluation.
+ * @returns True when the trial should be applied.
+ */
+export function is_improving_greedy_trial(parent_eval, trial_eval) {
+    if (!is_search_trial_admissible(parent_eval, trial_eval)) {
+        return false;
+    }
+    if (!parent_eval.axle_valid) {
+        return true;
+    }
+    return trial_eval.objective > parent_eval.objective;
+}

package/build/core/strategies/reorder/select_surviving_beam.d.ts

@@ -0,0 +1,11 @@
+import type { BeamState } from './beam_context.js';
+/**
+ * Keeps ranked expansions, or the parent beam when every trial failed admission.
+ * Ranks by axle excess then stability objective.
+ * @param expanded - Trial states that passed search admission.
+ * @param parent_beam - Beam states before this item's expansion.
+ * @param beam_width - Maximum states to keep.
+ * @returns Next beam, never empty when the parent beam had states.
+ */
+export declare function select_surviving_beam(expanded: BeamState[], parent_beam: BeamState[], beam_width: number): BeamState[];
+//# sourceMappingURL=select_surviving_beam.d.ts.map

package/build/core/strategies/reorder/select_surviving_beam.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"select_surviving_beam.d.ts","sourceRoot":"","sources":["../../../../src/core/strategies/reorder/select_surviving_beam.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAGlD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACjC,QAAQ,EAAE,SAAS,EAAE,EACrB,WAAW,EAAE,SAAS,EAAE,EACxB,UAAU,EAAE,MAAM,GACnB,SAAS,EAAE,CAIb"}

package/build/core/strategies/reorder/select_surviving_beam.js

@@ -0,0 +1,13 @@
+import { compare_search_states } from '../../evaluation/compare_search_states.js';
+/**
+ * Keeps ranked expansions, or the parent beam when every trial failed admission.
+ * Ranks by axle excess then stability objective.
+ * @param expanded - Trial states that passed search admission.
+ * @param parent_beam - Beam states before this item's expansion.
+ * @param beam_width - Maximum states to keep.
+ * @returns Next beam, never empty when the parent beam had states.
+ */
+export function select_surviving_beam(expanded, parent_beam, beam_width) {
+    const ranked = [...parent_beam, ...expanded].sort(compare_search_states);
+    return ranked.slice(0, beam_width);
+}

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

@@ -7,9 +7,7 @@ export declare const ITEM_WIRE_TO_CONTRACT: {
 };
 /**
  * Cargo-movement wire keys feeding each contract item field, in precedence
- * order. Items are read-only for the stabilizer apart from their position, so
- * these keys are read rather than renamed: the original wire record is
- * retained in `attributes` and is what gets emitted back.
+ * order. Only modelled stabilizer and dependency fields are read.
  */
 export declare const ITEM_CONTRACT_WIRE_KEYS: Readonly<{
     item_id: string[];
@@ -19,6 +17,16 @@ export declare const ITEM_CONTRACT_WIRE_KEYS: Readonly<{
     height: string[];
     depth: string[];
     weight: string[];
+    tie_ratio_orientation: string[];
+    family: string[];
+    supported_families: string[];
+    constraint: string[];
+    stack_families: string[];
+    stack_same_item: string[];
+    stack_same_area: string[];
+    stacking_unit: string[];
+    supported_weight: string[];
+    priority: string[];
 }>;
 /** Item fields the stabilizer mutates, and therefore must emit itself. */
 export declare const ITEM_POSITION_KEYS: string[];
@@ -27,6 +35,30 @@ export declare const CONTAINER_WIRE_TO_CONTRACT: {
     readonly largura: "width";
     readonly altura: "height";
     readonly comprimento: "length";
+    readonly distPinoRei: "kingpin_distance";
+    readonly containerDistanceAhead: "container_distance_ahead";
+    readonly pesoMaxSuportado: "max_supported_weight";
+    readonly tara: "tare";
+    readonly pesoDeCarga: "cargo_weight";
+    readonly grouper: "grouper";
+};
+export declare const VEHICLE_WIRE_TO_CONTRACT: {
+    readonly _id: "vehicle_id";
+    readonly tipoVeiculo: "vehicle_type";
+    readonly tipoVersao: "version_type";
+    readonly tipoSuspensao: "suspension_type";
+    readonly primeiroEixo: "first_axle";
+    readonly tara: "tare";
+    readonly pesoMaxSuportado: "max_supported_weight";
+    readonly qtd: "quantity";
+};
+export declare const AXLE_WIRE_TO_CONTRACT: {
+    readonly distanciaOrigem: "distance_from_origin";
+    readonly pesoMaxSuportado: "max_supported_weight";
+    readonly pesoDnit: "dnit_weight";
+    readonly tara: "tare";
+    readonly sequenciaContainer: "container_sequence";
+    readonly sequence: "sequence";
 };
 export declare const ENV_WIRE_TO_CONTRACT: {
     readonly eixos: "axles";
@@ -34,4 +66,6 @@ export declare const ENV_WIRE_TO_CONTRACT: {
 export declare const CONTRACT_TO_ITEM_WIRE: Record<string, string>;
 export declare const CONTRACT_TO_CONTAINER_WIRE: Record<string, string>;
 export declare const CONTRACT_TO_ENV_WIRE: Record<string, string>;
+export declare const CONTRACT_TO_VEHICLE_WIRE: Record<string, string>;
+export declare const CONTRACT_TO_AXLE_WIRE: Record<string, string>;
 //# sourceMappingURL=cargo_movement_wire_field_map.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cargo_movement_wire_field_map.d.ts","sourceRoot":"","sources":["../../../../src/core/validation/contract/cargo_movement_wire_field_map.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB;;;;;;CAMxB,CAAA;AAEV;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB;;;;;;;;EAQlC,CAAA;AAEF,0EAA0E;AAC1E,eAAO,MAAM,kBAAkB,UAAkB,CAAA;AAEjD,eAAO,MAAM,0BAA0B;;;;;CAK7B,CAAA;AAEV,eAAO,MAAM,oBAAoB;;CAEvB,CAAA;AAEV,eAAO,MAAM,qBAAqB,wBAAoC,CAAA;AACtE,eAAO,MAAM,0BAA0B,wBAAyC,CAAA;AAChF,eAAO,MAAM,oBAAoB,wBAAmC,CAAA"}
+{"version":3,"file":"cargo_movement_wire_field_map.d.ts","sourceRoot":"","sources":["../../../../src/core/validation/contract/cargo_movement_wire_field_map.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB;;;;;;CAMxB,CAAA;AAEV;;;GAGG;AACH,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;EAkBlC,CAAA;AAEF,0EAA0E;AAC1E,eAAO,MAAM,kBAAkB,UAAkB,CAAA;AAEjD,eAAO,MAAM,0BAA0B;;;;;;;;;;;CAW7B,CAAA;AAEV,eAAO,MAAM,wBAAwB;;;;;;;;;CAS3B,CAAA;AAEV,eAAO,MAAM,qBAAqB;;;;;;;CAOxB,CAAA;AAEV,eAAO,MAAM,oBAAoB;;CAEvB,CAAA;AAEV,eAAO,MAAM,qBAAqB,wBAAoC,CAAA;AACtE,eAAO,MAAM,0BAA0B,wBAAyC,CAAA;AAChF,eAAO,MAAM,oBAAoB,wBAAmC,CAAA;AACpE,eAAO,MAAM,wBAAwB,wBAAuC,CAAA;AAC5E,eAAO,MAAM,qBAAqB,wBAAoC,CAAA"}

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

@@ -7,18 +7,26 @@ export const ITEM_WIRE_TO_CONTRACT = {
 };
 /**
  * Cargo-movement wire keys feeding each contract item field, in precedence
- * order. Items are read-only for the stabilizer apart from their position, so
- * these keys are read rather than renamed: the original wire record is
- * retained in `attributes` and is what gets emitted back.
+ * order. Only modelled stabilizer and dependency fields are read.
  */
 export const ITEM_CONTRACT_WIRE_KEYS = Object.freeze({
-    item_id: ['item_id', '_id'],
+    item_id: ['_id', 'item_id'],
     group_id: ['groupId', 'group_id'],
     waypoint_id: ['waypoint_id'],
     width: ['w', 'width'],
     height: ['h', 'height'],
     depth: ['d', 'depth'],
-    weight: ['wg', 'peso', 'weight']
+    weight: ['wg', 'peso', 'weight'],
+    tie_ratio_orientation: ['tie_ratio_orientation'],
+    family: ['family'],
+    supported_families: ['supported_families'],
+    constraint: ['constraint'],
+    stack_families: ['stack_families'],
+    stack_same_item: ['stack_same_item'],
+    stack_same_area: ['stack_same_area'],
+    stacking_unit: ['stacking_unit', 'stackingUnit'],
+    supported_weight: ['supported_weight', 'pesoMaxSuportado'],
+    priority: ['priority']
 });
 /** Item fields the stabilizer mutates, and therefore must emit itself. */
 export const ITEM_POSITION_KEYS = ['x', 'y', 'z'];
@@ -26,7 +34,31 @@ export const CONTAINER_WIRE_TO_CONTRACT = {
     sequencia: 'sequence',
     largura: 'width',
     altura: 'height',
-    comprimento: 'length'
+    comprimento: 'length',
+    distPinoRei: 'kingpin_distance',
+    containerDistanceAhead: 'container_distance_ahead',
+    pesoMaxSuportado: 'max_supported_weight',
+    tara: 'tare',
+    pesoDeCarga: 'cargo_weight',
+    grouper: 'grouper'
+};
+export const VEHICLE_WIRE_TO_CONTRACT = {
+    _id: 'vehicle_id',
+    tipoVeiculo: 'vehicle_type',
+    tipoVersao: 'version_type',
+    tipoSuspensao: 'suspension_type',
+    primeiroEixo: 'first_axle',
+    tara: 'tare',
+    pesoMaxSuportado: 'max_supported_weight',
+    qtd: 'quantity'
+};
+export const AXLE_WIRE_TO_CONTRACT = {
+    distanciaOrigem: 'distance_from_origin',
+    pesoMaxSuportado: 'max_supported_weight',
+    pesoDnit: 'dnit_weight',
+    tara: 'tare',
+    sequenciaContainer: 'container_sequence',
+    sequence: 'sequence'
 };
 export const ENV_WIRE_TO_CONTRACT = {
     eixos: 'axles'
@@ -34,6 +66,8 @@ export const ENV_WIRE_TO_CONTRACT = {
 export const CONTRACT_TO_ITEM_WIRE = invert_map(ITEM_WIRE_TO_CONTRACT);
 export const CONTRACT_TO_CONTAINER_WIRE = invert_map(CONTAINER_WIRE_TO_CONTRACT);
 export const CONTRACT_TO_ENV_WIRE = invert_map(ENV_WIRE_TO_CONTRACT);
+export const CONTRACT_TO_VEHICLE_WIRE = invert_map(VEHICLE_WIRE_TO_CONTRACT);
+export const CONTRACT_TO_AXLE_WIRE = invert_map(AXLE_WIRE_TO_CONTRACT);
 function invert_map(source) {
     const inverted = {};
     for (const [wire_key, contract_key] of Object.entries(source)) {

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

@@ -1 +1 @@
-{"version":3,"file":"cargo_movement_wire_mapper.d.ts","sourceRoot":"","sources":["../../../../src/core/validation/contract/cargo_movement_wire_mapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AAOzE;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAsBvE;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,oBAAoB,GAAG,OAAO,CAGtF"}
+{"version":3,"file":"cargo_movement_wire_mapper.d.ts","sourceRoot":"","sources":["../../../../src/core/validation/contract/cargo_movement_wire_mapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AAQzE;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAcvE;AAqBD;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,oBAAoB,GAAG,OAAO,CAGtF"}

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

@@ -1,7 +1,8 @@
 import { map_cargo_state_to_wire } from './map_contract_to_wire_shape.js';
 import { map_cargo_state_to_contract } from './map_wire_input_to_contract_shape.js';
+import { map_envelope_config } from './map_input_config.js';
 import { is_record } from './wire_mapper_record_utils.js';
-const INPUT_ENVELOPE_KEYS = new Set(['id', 'company', 'cargo_state', 'config', 'original_input']);
+const INPUT_ENVELOPE_KEYS = new Set(['id', 'company', 'cargo_state', 'config']);
 /**
  * Maps a cargo-movement wire payload to the English contract shape.
  * @param input_data - Unknown CM wire payload.
@@ -11,6 +12,14 @@ export function map_wire_input_to_contract(input_data) {
     if (!is_record(input_data)) {
         return input_data;
     }
+    const mapped = map_envelope_fields(input_data);
+    const mapped_config = map_envelope_config(input_data.config, input_data.cargo_state);
+    if (mapped_config !== undefined) {
+        mapped.config = mapped_config;
+    }
+    return mapped;
+}
+function map_envelope_fields(input_data) {
     const mapped = {};
     for (const [key, value] of Object.entries(input_data)) {
         if (!INPUT_ENVELOPE_KEYS.has(key)) {

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

@@ -1 +1 @@
-{"version":3,"file":"map_contract_to_wire_shape.d.ts","sourceRoot":"","sources":["../../../../src/core/validation/contract/map_contract_to_wire_shape.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AAGzE,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,oBAAoB,GAAG,OAAO,CAUlF"}
+{"version":3,"file":"map_contract_to_wire_shape.d.ts","sourceRoot":"","sources":["../../../../src/core/validation/contract/map_contract_to_wire_shape.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AAIzE,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,oBAAoB,GAAG,OAAO,CAKlF"}

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

@@ -1,42 +1,33 @@
-import { CONTRACT_TO_CONTAINER_WIRE, CONTRACT_TO_ITEM_WIRE } from './cargo_movement_wire_field_map.js';
+import { CONTRACT_TO_AXLE_WIRE, CONTRACT_TO_CONTAINER_WIRE, CONTRACT_TO_ITEM_WIRE, CONTRACT_TO_VEHICLE_WIRE } from './cargo_movement_wire_field_map.js';
 import { omit_keys, rename_keys } from './wire_mapper_record_utils.js';
+import { strip_uniquify_suffix } from './uniquify_contract_item_ids.js';
 export function map_cargo_state_to_wire(cargo_state) {
-    const wire = {
+    return {
         envs: cargo_state.envs.map(map_env_to_wire)
     };
-    if (cargo_state.config !== undefined) {
-        wire.config = cargo_state.config;
-    }
-    return wire;
 }
 function map_env_to_wire(env) {
-    const wire = { ...(env.vehicle ?? {}) };
+    const wire = env.vehicle === undefined
+        ? {}
+        : rename_keys(env.vehicle, CONTRACT_TO_VEHICLE_WIRE);
     wire.containers = env.containers.map(map_container_to_wire);
     if (env.axles !== undefined) {
-        wire.eixos = env.axles;
+        wire.eixos = env.axles.map(axle => rename_keys(axle, CONTRACT_TO_AXLE_WIRE));
     }
     return wire;
 }
 function map_container_to_wire(container) {
-    const modelled = omit_keys(container, ['attributes', 'items']);
-    const wire = { ...(container.attributes ?? {}) };
-    Object.assign(wire, rename_keys(modelled, CONTRACT_TO_CONTAINER_WIRE));
+    const modelled = omit_keys(container, ['items']);
+    const wire = rename_keys(modelled, CONTRACT_TO_CONTAINER_WIRE);
     wire.items = container.items.map(map_item_to_wire);
     return wire;
 }
 /**
- * Emits a contract item back to the wire.
- *
- * Position is the only field the stabilizer mutates, so an item that came from
- * the cargo-movement wire is emitted as its retained original record with the
- * new position stamped on. Items parsed straight from the English contract have
- * no retained record and fall back to renaming the modelled fields.
+ * Emits a contract item to CM wire keys. Position stays in contract axes
+ * for English items; CM `w`-shaped callers swap y/z before parse.
  * @param item - Contract item.
  * @returns Wire item.
  */
 function map_item_to_wire(item) {
-    if (item.attributes === undefined) {
-        return rename_keys(omit_keys(item, ['attributes']), CONTRACT_TO_ITEM_WIRE);
-    }
-    return { ...item.attributes, x: item.x, y: item.y, z: item.z };
+    return rename_keys({ ...item, item_id: strip_uniquify_suffix(item.item_id) }, CONTRACT_TO_ITEM_WIRE);
 }

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

@@ -0,0 +1,9 @@
+/**
+ * Maps envelope plus cargo-profile algoritmo maps onto English stabilizer config.
+ * English config objects are returned unchanged for strict Zod checking.
+ * @param envelope_config - Envelope config from wire or English input.
+ * @param wire_cargo_state - Wire cargo state that may hold profile algoritmo.
+ * @returns Raw English config, or the original English object.
+ */
+export declare function map_envelope_config(envelope_config: unknown, wire_cargo_state: unknown): unknown;
+//# sourceMappingURL=map_input_config.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"map_input_config.d.ts","sourceRoot":"","sources":["../../../../src/core/validation/contract/map_input_config.ts"],"names":[],"mappings":"AAKA;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,OAAO,EAAE,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAgBhG"}

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

@@ -0,0 +1,40 @@
+import { is_record } from './wire_mapper_record_utils.js';
+import { merge_algoritmo_maps, read_raw_stabilizer_config } from '../../factory/read_stabilizer_config_helpers.js';
+const ALGORITMO_PREFIX = 'cargo_stabilizer.';
+/**
+ * Maps envelope plus cargo-profile algoritmo maps onto English stabilizer config.
+ * English config objects are returned unchanged for strict Zod checking.
+ * @param envelope_config - Envelope config from wire or English input.
+ * @param wire_cargo_state - Wire cargo state that may hold profile algoritmo.
+ * @returns Raw English config, or the original English object.
+ */
+export function map_envelope_config(envelope_config, wire_cargo_state) {
+    if (envelope_config === undefined && !has_profile_algoritmo(wire_cargo_state)) {
+        return undefined;
+    }
+    if (is_algoritmo_shaped(envelope_config) || has_profile_algoritmo(wire_cargo_state)) {
+        return read_raw_stabilizer_config(merge_algoritmo_maps(as_record(envelope_config), { config: read_wire_profile_config(wire_cargo_state) }));
+    }
+    return envelope_config;
+}
+function is_algoritmo_shaped(config) {
+    if (!is_record(config)) {
+        return false;
+    }
+    if (is_record(config.algoritmo)) {
+        return true;
+    }
+    return Object.keys(config).some(key => key.startsWith(ALGORITMO_PREFIX));
+}
+function has_profile_algoritmo(wire_cargo_state) {
+    return is_record(read_wire_profile_config(wire_cargo_state)?.algoritmo);
+}
+function read_wire_profile_config(wire_cargo_state) {
+    if (!is_record(wire_cargo_state) || !is_record(wire_cargo_state.config)) {
+        return undefined;
+    }
+    return wire_cargo_state.config;
+}
+function as_record(value) {
+    return is_record(value) ? value : undefined;
+}

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":"AAkBA,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAYnE"}