@operato/twin-kernel 0.11.25 → 0.11.26

package/dist/flow-engine.js

@@ -17,7 +17,7 @@ import { resolveSubject } from '@operato/ops-contract';
 import { WMS_ORDER_KIND } from '@operato/ops-contract';
 import { transformationEvent, aggregationEvent, objectEvent, parseEpc, DISP, ILMD_ATTR, CBV_BIZSTEP, objectUri, bizTransactionUri, gdtiUri } from '@operato/ops-contract';
 import { allocationPolicyOf } from "./allocation-policy.js";
-import { ORDER_FOLD_DEFAULT, emptyFoldedOrders, foldOrdersInto, foldedOrderCount, orderFoldPolicyOf, planOrderFold } from '@operato/ops-contract';
+import { ORDER_FOLD_DEFAULT, emptyFoldedOrders, foldOrdersInto, foldedOrderCount, pruneFoldedHours, orderFoldPolicyOf, planOrderFold } from '@operato/ops-contract';
 import { OP_PARAM } from '@operato/ops-contract';
 import { parseIsoDuration } from '@operato/ops-contract';
 import { analyzeCapacity } from '@operato/ops-contract';
@@ -721,7 +721,9 @@ export class FlowEngine {
         const ids = planOrderFold([...this.orders.values()], nowMs ?? this.nowMs(), this.orderFoldPolicy);
         if (!ids.length)
             return 0;
-        this.foldedOrders = foldOrdersInto(this.foldedOrders, ids.map(id => this.orders.get(id)).filter(Boolean));
+        /* 창 밖 시간 칸은 접을 때 버린다 — 칸 수가 T/1h 를 넘지 않게(ADR-0092 결정 2 보탬). */
+        const now = nowMs ?? this.nowMs();
+        this.foldedOrders = pruneFoldedHours(foldOrdersInto(this.foldedOrders, ids.map(id => this.orders.get(id)).filter(Boolean)), now, this.orderFoldPolicy);
         for (const id of ids)
             this.orders.delete(id);
         this.revision++;

package/dist/observed-reducer.js

@@ -22,7 +22,7 @@
 import { computeOee, isWorkShiftExecutionBasis } from '@operato/ops-contract';
 import { OP_EVENT, capabilityOf, itemKeyOf, judgeAgainstSpec, requiredTestsFor, locationStatusOf, readBoardEquipment, readBoardLocations, readBoardAssets, effectivityAt, offCalendarAt, offCalendarReasonAt, activeShiftAt } from '@operato/ops-contract';
 import { ILMD_ATTR, parseEpc } from '@operato/ops-contract';
-import { emptyFoldedOrders, foldOrdersInto, foldedOrderCount, isOrderTerminal, orderFoldPolicyOf, planOrderFold, standsNewOrderRow } from '@operato/ops-contract';
+import { emptyFoldedOrders, foldOrdersInto, foldedOrderCount, pruneFoldedHours, isOrderTerminal, orderFoldPolicyOf, planOrderFold, standsNewOrderRow } from '@operato/ops-contract';
 import { expiryFromAttributes, lotFromAttributes } from '@operato/ops-contract';
 /* 클래스 마스터 표는 상태를 들므로 커널에 있다(§`class-master-table`). */
 import { ClassMasterTable } from "./class-master-table.js";
@@ -1423,7 +1423,8 @@ export class ObservedReducer {
         if (!ids.length)
             return 0;
         const rows = ids.map(id => this.orders.get(id)).filter(Boolean);
-        this.foldedOrders = foldOrdersInto(this.foldedOrders, rows);
+        /* 창 밖 시간 칸은 접을 때 버린다 — 칸 수가 T/1h 를 넘지 않게(ADR-0092 결정 2 보탬). */
+        this.foldedOrders = pruneFoldedHours(foldOrdersInto(this.foldedOrders, rows), nowMs, this.orderFoldPolicy);
         for (const id of ids) {
             this.orders.delete(id);
             this.lastAt.delete(`order:${id}`);

package/dist-cjs/index.cjs

@@ -1910,6 +1910,7 @@ function gs1KeyDigitViolation(uri) {
 }
 
 // ../ops-contract/dist/order-fold.js
+var ORDER_FOLD_HOUR_MS = 60 * 60 * 1e3;
 var ORDER_FOLD_DEFAULT = Object.freeze({ afterMs: 24 * 60 * 60 * 1e3, maxTerminal: 1e3 });
 function orderFoldPolicyOf(declared) {
   const policy = { ...ORDER_FOLD_DEFAULT };
@@ -1922,6 +1923,9 @@ function orderFoldPolicyOf(declared) {
     }
     policy[key] = key === "maxTerminal" ? Math.floor(v) : v;
   }
+  if (policy.afterMs % ORDER_FOLD_HOUR_MS !== 0) {
+    return { error: `order fold afterMs must be a whole number of hours, got ${policy.afterMs} ms \u2014 the window is counted in hour slots (ADR-0092)` };
+  }
   if (policy.maxTerminal < 1)
     return { error: "order fold maxTerminal must be at least 1 (ADR-0092)" };
   return { policy };
@@ -1949,6 +1953,7 @@ function foldOrdersInto(folded, orders) {
     counts: Object.fromEntries(Object.entries(folded?.counts ?? {}).map(([k, v]) => [k, { ...v }])),
     boundaryMs: folded?.boundaryMs ?? null
   };
+  const hours = Object.fromEntries(Object.entries(folded?.hours ?? {}).map(([h, byKind]) => [h, Object.fromEntries(Object.entries(byKind).map(([k, v]) => [k, { ...v }]))]));
   for (const o of orders) {
     const kind = String(o.kind ?? "");
     const status = String(o.status ?? "");
@@ -1956,8 +1961,12 @@ function foldOrdersInto(folded, orders) {
     byStatus[status] = (byStatus[status] ?? 0) + 1;
     if (typeof o.terminalAtMs === "number" && Number.isFinite(o.terminalAtMs)) {
       out.boundaryMs = out.boundaryMs === null ? o.terminalAtMs : Math.max(out.boundaryMs, o.terminalAtMs);
+      const slot = (hours[String(hourStartOf(o.terminalAtMs))] ??= {})[kind] ??= {};
+      slot[status] = (slot[status] ?? 0) + 1;
     }
   }
+  if (Object.keys(hours).length)
+    out.hours = hours;
   return out;
 }
 function standsNewOrderRow(record, eventTimeMs, folded) {
@@ -1970,6 +1979,22 @@ function standsNewOrderRow(record, eventTimeMs, folded) {
     return true;
   return eventTimeMs > boundary;
 }
+function hourStartOf(ms2) {
+  return Math.floor(ms2 / ORDER_FOLD_HOUR_MS) * ORDER_FOLD_HOUR_MS;
+}
+function finishedWindowStartMs(nowMs, policy = ORDER_FOLD_DEFAULT) {
+  return hourStartOf(nowMs) - policy.afterMs;
+}
+function pruneFoldedHours(folded, nowMs, policy = ORDER_FOLD_DEFAULT) {
+  if (!folded.hours)
+    return folded;
+  const start = finishedWindowStartMs(nowMs, policy);
+  const kept = Object.fromEntries(Object.entries(folded.hours).filter(([h]) => Number(h) >= start));
+  const out = { counts: folded.counts, boundaryMs: folded.boundaryMs };
+  if (Object.keys(kept).length)
+    out.hours = kept;
+  return out;
+}
 
 // ../ops-contract/dist/iso-duration.js
 var RE = /^(-)?P(?:(\d+(?:\.\d+)?)W)?(?:(\d+(?:\.\d+)?)D)?(?:T(?:(\d+(?:\.\d+)?)H)?(?:(\d+(?:\.\d+)?)M)?(?:(\d+(?:\.\d+)?)S)?)?$/;
@@ -3852,7 +3877,7 @@ var ObservedReducer = class {
     const ids = planOrderFold([...this.orders.values()], nowMs, this.orderFoldPolicy);
     if (!ids.length) return 0;
     const rows = ids.map((id) => this.orders.get(id)).filter(Boolean);
-    this.foldedOrders = foldOrdersInto(this.foldedOrders, rows);
+    this.foldedOrders = pruneFoldedHours(foldOrdersInto(this.foldedOrders, rows), nowMs, this.orderFoldPolicy);
     for (const id of ids) {
       this.orders.delete(id);
       this.lastAt.delete(`order:${id}`);
@@ -4524,7 +4549,8 @@ var FlowEngine = class {
     }
     const ids = planOrderFold([...this.orders.values()], nowMs ?? this.nowMs(), this.orderFoldPolicy);
     if (!ids.length) return 0;
-    this.foldedOrders = foldOrdersInto(this.foldedOrders, ids.map((id) => this.orders.get(id)).filter(Boolean));
+    const now = nowMs ?? this.nowMs();
+    this.foldedOrders = pruneFoldedHours(foldOrdersInto(this.foldedOrders, ids.map((id) => this.orders.get(id)).filter(Boolean)), now, this.orderFoldPolicy);
     for (const id of ids) this.orders.delete(id);
     this.revision++;
     return ids.length;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@operato/twin-kernel",
-  "version": "0.11.25",
+  "version": "0.11.26",
   "type": "module",
   "description": "Twin Domain Kernel — framework-agnostic, zero-dep (domain + sim + 3-channel contract). WMS/YMS/MES, EPCIS 2.0 · ISA-95.",
   "publishConfig": {
@@ -28,6 +28,6 @@
     "test": "node --test test/*.test.ts"
   },
   "dependencies": {
-    "@operato/ops-contract": "^0.9.36"
+    "@operato/ops-contract": "^0.9.37"
   }
 }