fix: Decouple orders from time advance and implement cart cancellation

dashboard/app.js

@@ -62,24 +62,18 @@ async function updateState() {
         document.getElementById('chips-count').textContent = data.inventory.chips;
         document.getElementById('sensors-count').textContent = data.inventory.sensors;
 
-        // Update Cart with Grouping & Relative Time
+        // Update Cart 
         const cartContainer = document.getElementById('cart-container');
         if (data.active_shipments && data.active_shipments.length > 0) {
-            // Group by part and eta
-            const grouped = data.active_shipments.reduce((acc, ship) => {
-                const key = `${ship.part}-${ship.eta}`;
-                if (!acc[key]) {
-                    acc[key] = { ...ship };
-                } else {
-                    acc[key].quantity += ship.quantity;
-                }
-                return acc;
-            }, {});
-
-            cartContainer.innerHTML = Object.values(grouped).map(ship => `
+            cartContainer.innerHTML = data.active_shipments.map(ship => `
                 <div class="cart-item">
-                    <div class="cart-type">${ship.part} (x${ship.quantity})</div>
-                    <div class="cart-meta">Mode: ${ship.mode.toUpperCase()}</div>
+                    <div class="cart-type">
+                        ${ship.part} (x${ship.quantity})
+                        <button onclick="execute('cancel', event, '${ship.id}')" class="btn btn-ghost small" style="float: right; color: #ff4136;">✕</button>
+                    </div>
+                    <div class="cart-meta">Mode: ${ship.mode.toUpperCase()} 
+                         <span style="float:right; color:var(--primary-green); font-weight:600;">$${ship.cost.toFixed(0)}</span>
+                    </div>
                     <div class="arrival-day">Arrives in: ${ship.eta} days</div>
                 </div>
             `).join('');
@@ -149,7 +143,7 @@ function log(message, type = 'system') {
 }
 
 // Global Execute Function
-window.execute = async function(type, event) {
+window.execute = async function(type, event, shipment_id = null) {
     document.querySelector('main').classList.add('transitioning');
     
     let actionObj = { action_type: type };
@@ -165,6 +159,9 @@ window.execute = async function(type, event) {
         actionObj.offset_amount = 100.0;
     } else if (type === 'skip') {
         actionObj.action_type = 'skip';
+    } else if (type === 'cancel') {
+        actionObj.action_type = 'cancel';
+        actionObj.shipment_id = shipment_id;
     }
 
     try {
@@ -178,7 +175,8 @@ window.execute = async function(type, event) {
         if (result.info && result.info.error) {
             log(`ERROR: ${result.info.error}`, 'error');
         } else {
-            log(`SUCCESS: ${type === 'skip' ? 'Skipped Day' : 'Executed ' + type}`, 'action');
+            if (type === 'cancel') log(`SUCCESS: Canceled Shipment`, 'action');
+            else log(`SUCCESS: ${type === 'skip' ? 'Skipped Day' : 'Executed ' + type}`, 'action');
         }
         
         await updateState();

netzero_nav/env.py

@@ -50,44 +50,45 @@ class AtlasEcoEnv:
         )
 
     def step(self, action: Action) -> Tuple[Observation, float, bool, dict]:
-        self.step_count += 1
         reward = 0.0
         news = None
-        
-        if self.step_count < self.sea_blocked_until:
-            news = "EMERGENCY: Suez Canal blocked! Sea routes offline."
-
         info = {}
 
-        # 1. Process Action
+        # Day Advancement Loop
+        if action.action_type == ActionType.SKIP:
+            self.step_count += 1
+            if self.step_count < self.sea_blocked_until:
+                news = "EMERGENCY: Suez Canal blocked! Sea routes offline."
+
+            # 2. Advance Shipments
+            for ship in self.active_shipments:
+                ship.eta -= 1
+                if ship.eta <= 0:
+                    self._receive_shipment(ship)
+            
+            self.active_shipments = [s for s in self.active_shipments if s.eta > 0]
+
+            # 3. Check Order Deadlines
+            for order in self.pending_orders:
+                if self.step_count > order.due_date:
+                    reward -= 50.0  # Late penalty
+
+        # 1. Process Actions (No Time Advancement)
         if action.action_type == ActionType.ORDER_PARTS:
             reward += self._handle_order_parts(action, info)
         elif action.action_type == ActionType.PRODUCE:
             reward += self._handle_production(action, info)
         elif action.action_type == ActionType.OFFSET:
             reward += self._handle_offset(action, info)
-        elif action.action_type == ActionType.REROUTE:
-            reward += self._handle_reroute(action, info)
-
-        # 2. Advance Shipments
-        for ship in self.active_shipments:
-            ship.eta -= 1
-            if ship.eta <= 0:
-                self._receive_shipment(ship)
-        
-        self.active_shipments = [s for s in self.active_shipments if s.eta > 0]
+        elif action.action_type == ActionType.CANCEL:
+            reward += self._handle_cancel(action, info)
 
-        # 3. Check Order Deadlines
-        for order in self.pending_orders:
-            if self.step_count > order.due_date:
-                reward -= 50.0  # Late penalty
-        
         # 4. Check Termination
         if self.step_count >= 50 or not self.pending_orders:
             self.done = True
             info["final_score"] = self._calculate_final_score()
 
-        return self._get_obs(), reward, self.done, info
+        return self._get_obs(news=news), reward, self.done, info
 
     def _handle_order_parts(self, action: Action, info: dict) -> float:
         if not action.part_type or not action.mode or not action.quantity:
@@ -110,18 +111,40 @@ class AtlasEcoEnv:
         self.cash_balance -= total_cost
         self.carbon_total += carbon * action.quantity
         
-        new_ship = Shipment(
-            id=f"SHP_{len(self.active_shipments) + 1}",
-            part=action.part_type,
-            quantity=action.quantity,
-            mode=action.mode,
-            eta=eta,
-            carbon_impact=carbon * action.quantity,
-            cost=total_cost
-        )
-        self.active_shipments.append(new_ship)
+        merged = False
+        for ship in self.active_shipments:
+            if ship.part == action.part_type and ship.mode == action.mode and ship.eta == eta:
+                ship.quantity += action.quantity
+                ship.cost += total_cost
+                ship.carbon_impact += carbon * action.quantity
+                merged = True
+                break
+                
+        if not merged:
+            new_ship = Shipment(
+                id=f"SHP_{random.randint(1000, 9999)}",
+                part=action.part_type,
+                quantity=action.quantity,
+                mode=action.mode,
+                eta=eta,
+                carbon_impact=carbon * action.quantity,
+                cost=total_cost
+            )
+            self.active_shipments.append(new_ship)
         return 2.0 
 
+    def _handle_cancel(self, action: Action, info: dict) -> float:
+        if not action.shipment_id: return 0.0
+        
+        for i, ship in enumerate(self.active_shipments):
+            if ship.id == action.shipment_id:
+                # Refund
+                self.cash_balance += ship.cost
+                self.carbon_total = max(0.0, self.carbon_total - ship.carbon_impact)
+                self.active_shipments.pop(i)
+                return 0.0
+        return 0.0
+
     def _receive_shipment(self, ship: Shipment):
         current_val = getattr(self.inventory, ship.part.value)
         setattr(self.inventory, ship.part.value, current_val + ship.quantity)

netzero_nav/models.py

@@ -52,6 +52,7 @@ class ActionType(str, Enum):
     PRODUCE = "produce"
     OFFSET = "offset"
     SKIP = "skip"
+    CANCEL = "cancel"
 
 class Action(BaseModel):
     action_type: ActionType