poi-plugin-remodel-assistant 1.2.5-beta.2 → 1.2.6-beta.1

package/assets/main.css

@@ -10955,67 +10955,118 @@ body.decision-modal-is-dragging * {
   text-overflow: ellipsis;
 }
 
-/* Current improvement identity stays beside the large equipment artwork. All
- * plan references are a separate scan block with deliberate horizontal air. */
+/* Current improvement identity stays beside the large equipment artwork.
+ * Header tools own a stable top-right column, while plan references may grow
+ * vertically without pushing the tools onto a later flex line. */
 #item-improvement .decision-detail-header {
-  flex-wrap: wrap;
+  display: grid;
+  grid-template-columns: auto minmax(0, 1fr) max-content;
+  grid-template-areas: "artwork heading tools";
+  align-items: start;
   gap: 12px;
 }
 
+#item-improvement .decision-detail-header.has-related-plans {
+  grid-template-columns: auto minmax(180px, 0.9fr) minmax(180px, 1.1fr) max-content;
+  grid-template-areas: "artwork heading related tools";
+}
+
+#item-improvement .decision-detail-artwork {
+  grid-area: artwork;
+  margin-right: 0;
+}
+
 #item-improvement .decision-detail-heading-copy {
-  flex: 0 1 auto;
+  grid-area: heading;
+  min-width: 0;
+}
+
+
+#item-improvement .decision-detail-show-parent-plans {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  margin: 0;
+  font-size: var(--improvement-font-small);
+  font-weight: 600;
+  cursor: pointer;
+}
+
+#item-improvement .decision-detail-show-parent-plans input {
+  margin: 0;
 }
 
 #item-improvement .decision-detail-related-plans {
   display: grid;
-  flex: 0 1 auto;
-  gap: 6px;
-  min-width: 140px;
-  margin-left: 28px;
+  grid-area: related;
+  gap: 7px;
+  min-width: 180px;
+  margin-left: 16px;
 }
 
-#item-improvement .decision-detail-related-plans-label {
-  color: #8fa8b4;
-  font-size: var(--improvement-font-small);
+#item-improvement .decision-detail-related-plan-group {
+  display: grid;
+  gap: 5px;
+}
+
+#item-improvement .decision-detail-related-plan-group-label {
+  width: fit-content;
+  padding: 1px 7px;
+  border-radius: 999px;
+  background: rgba(103, 198, 193, 0.09);
+  color: #67c6c1;
+  font-size: var(--improvement-font-caption);
   font-weight: 700;
+  line-height: 1.55;
 }
 
 #item-improvement .decision-detail-related-plan-list {
   display: flex;
   flex-wrap: wrap;
-  gap: 6px;
+  align-items: flex-start;
+  gap: 7px 8px;
 }
 
 #item-improvement .decision-detail-related-plan {
   display: inline-flex;
   align-items: baseline;
   gap: 5px;
-  padding: 3px 7px;
+  padding: 5px 9px;
   border-radius: 999px;
   background: rgba(127, 127, 127, 0.09);
   white-space: nowrap;
 }
 
-#item-improvement .decision-detail-related-plan em {
-  color: #67c6c1;
-  font-size: var(--improvement-font-caption);
-  font-style: normal;
+#item-improvement .decision-detail-related-plan strong {
+  font-size: var(--improvement-font-body-large);
   font-weight: 700;
 }
 
-#item-improvement .decision-detail-related-plan-parent {
-  color: #a9b7bf;
-  font-size: var(--improvement-font-small);
-  font-weight: 600;
+#item-improvement .decision-detail-related-plan.is-consumable {
+  background: rgba(69, 169, 165, 0.1);
 }
 
-#item-improvement .decision-detail-related-plan strong {
-  font-size: var(--improvement-font-small);
-  font-weight: 700;
+#item-improvement .decision-detail-consumable-plan-reference {
+  display: grid;
+  align-content: start;
+  gap: 3px;
+  min-width: max-content;
 }
 
-#item-improvement .decision-detail-related-plan.is-consumable {
-  background: rgba(69, 169, 165, 0.1);
+#item-improvement .decision-detail-consumable-plan-reference .decision-detail-related-plan-parent {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  padding-left: 8px;
+  color: #c8d2d7;
+  font-size: var(--improvement-font-body);
+  font-weight: 650;
+  white-space: nowrap;
+}
+
+#item-improvement .decision-detail-related-plan-parent-arrow {
+  color: #67c6c1;
+  font-weight: 700;
 }
 
 @media (max-width: 760px) {
@@ -11462,17 +11513,28 @@ body.decision-modal-is-dragging * {
 /* Page-specific detail-section manager. */
 #item-improvement .decision-detail-panel-tools {
   display: flex;
-  flex: 0 0 auto;
-  align-self: flex-start;
+  grid-area: tools;
+  align-items: center;
+  align-self: start;
   justify-content: flex-end;
-  margin-left: auto;
+  gap: 10px;
+  margin-left: 0;
+  white-space: nowrap;
 }
 
-/* Keep the manager as the last flex item in the detail header. This makes
- * auto margin resolve against the real right edge even when Related Plans
- * wraps differently across Poi/Electron machines. */
-#item-improvement .decision-detail-header > .decision-detail-panel-tools {
-  order: 99;
+/* On narrow detail panes the plan groups may move below the identity, but the
+ * parent-plan switch and detail manager stay pinned to the top-right cell. */
+@media (max-width: 900px) {
+  #item-improvement .decision-detail-header.has-related-plans {
+    grid-template-columns: auto minmax(0, 1fr) max-content;
+    grid-template-areas:
+      "artwork heading tools"
+      "artwork related related";
+  }
+
+  #item-improvement .decision-detail-related-plans {
+    margin-left: 0;
+  }
 }
 
 #item-improvement .decision-detail-layout-manager-button {

package/data/changelog.json

@@ -1,6 +1,14 @@
 {
   "schemaVersion": 1,
   "entries": [
+    {
+      "version": "1.2.6",
+      "items": [
+        "changelog_1_2_6_1",
+        "changelog_1_2_6_2",
+        "changelog_1_2_6_3"
+      ]
+    },
     {
       "version": "1.2.5",
       "items": [

package/i18n/en-US.json

@@ -905,8 +905,11 @@
   "shared.Corresponding plan target": "Corresponding Plan target",
   "shared.Current plan target": "Plan target",
   "shared.For plan": "for",
+  "shared.Parent plan": "Parent plan",
   "shared.Related plans": "Related plans",
   "shared.Consumable plan": "Consumable plan",
+  "shared.User plans": "User plans",
+  "shared.Consumable plans": "Consumable plans",
   "workbench.Plan targets": "Plan targets",
   "workbench.Plan targets available for improvement on selected day": "Today improvable",
   "workbench.No plan target is available for improvement on selected day": "No unfinished Plan target needs action on the selected day",
@@ -1592,5 +1595,9 @@
   "app.changelog_1_2_5_7": "Fixed several interface and data-handling issues.",
   "data.Backup summary %p plans %r routes %l low priority": "%p plans · %r routes · %l low-priority equipment",
   "equipment.Search equipment name": "Search equipment name",
-  "workbench.Search equipment name": "Search equipment name"
+  "workbench.Search equipment name": "Search equipment name",
+  "app.changelog_1_2_6_1": "Optimized plan calculation and startup flow to reduce redundant work on local changes and make the interface available sooner after startup.",
+  "app.changelog_1_2_6_2": "Fixed cases where user Plans and consumable Plans were handled together, improving consistency in Plan counts, equipment allocation, and diagnostics.",
+  "shared.Show parent plans": "Show parent plans",
+  "app.changelog_1_2_6_3": "Improved related-Plan and consumable-Plan details with unified target buttons and clearer parent-Plan relationships for better readability."
 }

package/i18n/ja-JP.json

@@ -1344,6 +1344,8 @@
   "shared.Comfortable density": "ゆったり",
   "shared.Compact density": "コンパクト",
   "shared.Consumable plan": "消耗材計画",
+  "shared.User plans": "ユーザー計画",
+  "shared.Consumable plans": "消耗材計画",
   "shared.Corresponding plan target": "対応する計画目標",
   "shared.Current improvement starting point": "現在の改修開始点",
   "shared.Current plan target": "現在の計画目標",
@@ -1353,6 +1355,7 @@
   "shared.Equipment category filter": "装備カテゴリ絞り込み",
   "shared.Expanded": "展開",
   "shared.For plan": "使用先",
+  "shared.Parent plan": "親計画",
   "shared.Improvement starting point": "改修開始点",
   "shared.Interface density": "表示密度",
   "shared.Move down": "下へ",
@@ -1592,5 +1595,9 @@
   "app.changelog_1_2_5_7": "一部の画面表示とデータ処理の問題を修正しました。",
   "data.Backup summary %p plans %r routes %l low priority": "プラン %p · ルート %r · 低優先装備 %l",
   "equipment.Search equipment name": "装備名を検索",
-  "workbench.Search equipment name": "装備名を検索"
+  "workbench.Search equipment name": "装備名を検索",
+  "app.changelog_1_2_6_1": "計画計算と起動処理を最適化し、局所的な変更時の重複計算を減らして、起動後に画面をより早く利用できるようにしました。",
+  "app.changelog_1_2_6_2": "一部の状況でユーザー計画と消耗品計画が混在して処理される問題を修正し、計画数・装備割り当て・異常検出の整合性を改善しました。",
+  "shared.Show parent plans": "親計画を表示",
+  "app.changelog_1_2_6_3": "関連計画と消耗品計画の詳細表示を改善し、計画目標ボタンを統一するとともに親計画との関係を明確化して、可読性を高めました。"
 }

package/i18n/zh-CN.json

@@ -905,8 +905,11 @@
   "shared.Corresponding plan target": "对应计划目标",
   "shared.Current plan target": "当前计划目标",
   "shared.For plan": "用于",
+  "shared.Parent plan": "父计划",
   "shared.Related plans": "相关计划",
   "shared.Consumable plan": "耗材计划",
+  "shared.User plans": "用户计划",
+  "shared.Consumable plans": "耗材计划",
   "workbench.Plan targets": "计划目标",
   "workbench.Plan targets available for improvement on selected day": "今日可改",
   "workbench.No plan target is available for improvement on selected day": "当天没有需要处理的未完成计划目标",
@@ -1592,5 +1595,9 @@
   "app.changelog_1_2_5_7": "修复部分界面与数据处理问题。",
   "data.Backup summary %p plans %r routes %l low priority": "计划 %p · 路线 %r · 低优先装备 %l",
   "equipment.Search equipment name": "搜索装备名称",
-  "workbench.Search equipment name": "搜索装备名称"
+  "workbench.Search equipment name": "搜索装备名称",
+  "app.changelog_1_2_6_1": "优化计划计算与启动流程，减少局部变化时的重复计算，并加快启动后的界面可用速度。",
+  "app.changelog_1_2_6_2": "修复用户计划与耗材计划在部分情况下混合处理的问题，改善计划数量、装备分配与异常检测的一致性。",
+  "shared.Show parent plans": "显示父计划",
+  "app.changelog_1_2_6_3": "优化相关计划与耗材计划详情显示，统一计划目标按钮，并补充父计划关系，提升信息可读性。"
 }

package/i18n/zh-TW.json

@@ -1344,6 +1344,8 @@
   "shared.Comfortable density": "寬鬆",
   "shared.Compact density": "緊湊",
   "shared.Consumable plan": "耗材計畫",
+  "shared.User plans": "使用者計畫",
+  "shared.Consumable plans": "耗材計畫",
   "shared.Corresponding plan target": "對應計畫目標",
   "shared.Current improvement starting point": "目前改修起點",
   "shared.Current plan target": "目前計畫目標",
@@ -1353,6 +1355,7 @@
   "shared.Equipment category filter": "裝備分類篩選",
   "shared.Expanded": "已展開",
   "shared.For plan": "用於",
+  "shared.Parent plan": "父計畫",
   "shared.Improvement starting point": "改修起點",
   "shared.Interface density": "介面密度",
   "shared.Move down": "下移",
@@ -1592,5 +1595,9 @@
   "app.changelog_1_2_5_7": "修復部分介面與資料處理問題。",
   "data.Backup summary %p plans %r routes %l low priority": "計畫 %p · 路線 %r · 低優先裝備 %l",
   "equipment.Search equipment name": "搜尋裝備名稱",
-  "workbench.Search equipment name": "搜尋裝備名稱"
+  "workbench.Search equipment name": "搜尋裝備名稱",
+  "app.changelog_1_2_6_1": "最佳化計畫計算與啟動流程，減少局部變化時的重複計算，並加快啟動後的介面可用速度。",
+  "app.changelog_1_2_6_2": "修復使用者計畫與耗材計畫在部分情況下混合處理的問題，改善計畫數量、裝備分配與異常檢測的一致性。",
+  "shared.Show parent plans": "顯示父計畫",
+  "app.changelog_1_2_6_3": "最佳化相關計畫與耗材計畫詳情顯示，統一計畫目標按鈕，並補充父計畫關係，提升資訊可讀性。"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-remodel-assistant",
-  "version": "1.2.5-beta.2",
+  "version": "1.2.6-beta.1",
   "description": "View enhanced KanColle improvement data, manage improvement plans, and receive improvement recommendations.",
   "main": "index.js",
   "author": {

package/views/new-interface/app/decision-snapshot-cache.js

@@ -9,7 +9,7 @@ var _equipmentBlacklistDomain = require("../equipment/domain/equipment-blacklist
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-const SNAPSHOT_INPUT_KEYS = ['dataRevision', 'dataIdentity', 'plans', 'initialDay', 'masterEquips', 'masterUseitems', 'equipTypes', 'staticItems', 'actualEquipLevels', 'actualEquipInventory', 'actualUseitems', 'actualResourceBudget', 'equipmentRealityReady', 'actualOwnedShipMasterIds', 'decisionSelections', 'planRouteSelections', 'currentInventoryBindings', 'equipmentBlacklist', 'routeAcquisitionIndex'];
+const SNAPSHOT_INPUT_KEYS = ['dataRevision', 'dataIdentity', 'plans', 'initialDay', 'masterEquips', 'masterUseitems', 'equipTypes', 'staticItems', 'actualEquipLevels', 'actualEquipInventory', 'actualUseitems', 'actualResourceBudget', 'equipmentRealityReady', 'actualOwnedShipMasterIds', 'decisionSelections', 'planRouteSelections', 'currentInventoryBindings', 'currentInventoryBindingOwnerRefs', 'equipmentBlacklist', 'routeAcquisitionIndex'];
 exports.SNAPSHOT_INPUT_KEYS = SNAPSHOT_INPUT_KEYS;
 const SNAPSHOT_FEEDBACK_CONTEXT_KEYS = SNAPSHOT_INPUT_KEYS.filter(key => key !== 'currentInventoryBindings');
 exports.SNAPSHOT_FEEDBACK_CONTEXT_KEYS = SNAPSHOT_FEEDBACK_CONTEXT_KEYS;
@@ -63,7 +63,7 @@ const stableSignature = value => JSON.stringify(stableValue(value || {})); // `m
 // cheap secondary guard for unexpected replacement under the same data identity.
 
 
-const CONTENT_IDENTITY_KEYS = new Set(['plans', 'actualEquipLevels', 'actualEquipInventory', 'actualUseitems', 'actualResourceBudget', 'actualOwnedShipMasterIds', 'decisionSelections', 'planRouteSelections', 'currentInventoryBindings']); // `routeAcquisitionIndex` is a large selector-derived static projection. It
+const CONTENT_IDENTITY_KEYS = new Set(['plans', 'actualEquipLevels', 'actualEquipInventory', 'actualUseitems', 'actualResourceBudget', 'actualOwnedShipMasterIds', 'decisionSelections', 'planRouteSelections', 'currentInventoryBindings', 'currentInventoryBindingOwnerRefs']); // `routeAcquisitionIndex` is a large selector-derived static projection. It
 // still needs semantic equality so a reconstructed-but-equivalent generation
 // can reuse the completed Snapshot, but repeatedly sorting/stringifying the
 // same nested object on every React update makes Plan edits unnecessarily slow.

package/views/new-interface/app/decision-snapshot-jobs.js

@@ -13,6 +13,8 @@ var _consumablePlanDomain = require("../plan/domain/consumable-plan-domain");
 
 var _currentStartAssignmentDomain = require("../plan/domain/current-start-assignment-domain");
 
+var _allocationOwnerDomain = require("../plan/domain/allocation-owner-domain");
+
 var _improvementPlanDomain = require("../plan/domain/improvement-plan-domain");
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -37,18 +39,35 @@ const prefixedProfile = (profile, prefix) => typeof profile === 'function' ? (ev
 // - composition：只提供 Derived Consumable 展示元数据。
 
 
+const attachUserPlanAuthorityProjection = (items, userItems) => {
+  const userById = new Map((userItems || []).map(item => [Number(item && item.id), item]));
+  return (items || []).map(item => {
+    const userItem = userById.get(Number(item && item.id)) || null;
+    if (!userItem) return item;
+    return _extends({}, item, {
+      userPlanAuthorityProjection: {
+        planState: userItem.planState || null,
+        planRouteEntries: Array.isArray(userItem.planRouteEntries) ? userItem.planRouteEntries : [],
+        routePlanning: userItem.routePlanning || null
+      }
+    });
+  });
+};
+
 const publishDecisionSnapshot = ({
   userAllocation,
   consumableAllocation,
   composition,
+  userPlans = {},
+  bindingTransferTransitions = [],
   useitems = {},
   resourceBudget = {}
 }) => {
   const effective = consumableAllocation;
-  const decoratedItems = (0, _consumablePlanDomain.decorateConsumablePlanEntries)({
+  const decoratedItems = attachUserPlanAuthorityProjection((0, _consumablePlanDomain.decorateConsumablePlanEntries)({
     items: effective.items,
     metadataByEquipmentId: composition.metadataByEquipmentId
-  });
+  }), userAllocation && userAllocation.items || []);
   const items = (0, _improvementPlanDomain.materializeEquipmentDetailResolutions)({
     items: decoratedItems,
     equipLevels: effective.effectiveEquipLevels,
@@ -59,6 +78,10 @@ const publishDecisionSnapshot = ({
     items: effective.workbenchItems,
     metadataByEquipmentId: composition.metadataByEquipmentId
   });
+  const liveAllocationOwners = (0, _allocationOwnerDomain.buildLiveAllocationOwnerSet)({
+    userPlans,
+    consumableMetadataByEquipmentId: composition.metadataByEquipmentId
+  });
   const snapshot = {
     effectiveEquipLevels: effective.effectiveEquipLevels,
     effectiveUseitems: useitems,
@@ -67,9 +90,10 @@ const publishDecisionSnapshot = ({
     items,
     workbenchItems,
     chainItems: effective.chainItems || [],
+    liveAllocationOwners,
     retainedBindingCurrentIds: effective.retainedBindingCurrentIds || [],
     assignmentPersistenceBindings: effective.assignmentPersistenceBindings || effective.currentInventoryBindings || {},
-    assignmentBindingTransitions: [...(userAllocation && userAllocation.assignmentBindingTransitions || []), ...(effective.assignmentBindingTransitions || [])],
+    assignmentBindingTransitions: [...(userAllocation && userAllocation.assignmentBindingTransitions || []), ...(bindingTransferTransitions || []), ...(effective.assignmentBindingTransitions || [])],
     // invariant findings 读取最终阶段即可；它不是阶段历史，不做重复累积。
     assignmentFindings: effective.assignmentFindings || [],
     assignmentDiagnostics: [...(userAllocation && userAllocation.assignmentDiagnostics || []), ...(effective.assignmentDiagnostics || [])]
@@ -230,10 +254,15 @@ const allocationStageProjection = (result, allocationScope) => ({
 
 const buildFullDecisionSnapshotPayload = input => {
   const job = input || {};
+  const userLiveOwners = (0, _allocationOwnerDomain.buildLiveAllocationOwnerSet)({
+    userPlans: job.plans || {}
+  });
+  const baseRouteSelections = (0, _allocationOwnerDomain.filterRouteSelectionsForLiveAllocationOwners)(job.planRouteSelections || {}, userLiveOwners);
   const baseBindings = (0, _currentStartAssignmentDomain.filterCurrentInventoryBindingsForPlanSpace)(job.plans || {}, job.currentInventoryBindings || {}); // Phase 1: UserAllocation（用户计划主件分配）. All eligible User Plan
   // main-equipment Bindings are established before Consumable demand derivation.
 
   const base = (0, _decisionSnapshotDomain.buildFullDecisionSnapshotCore)(_extends({}, job, {
+    planRouteSelections: baseRouteSelections,
     currentInventoryBindings: baseBindings,
     allocationScope: 'user'
   }));
@@ -246,24 +275,63 @@ const buildFullDecisionSnapshotPayload = input => {
   // whole User owner set. Derived Consumable demand is computed only after it.
   // UserBindingPhaseBoundary（用户绑定阶段边界）.
 
-  const demands = (0, _consumablePlanDomain.collectConsumablePlanDemands)(base.workbenchItems);
+  const requirements = (0, _consumablePlanDomain.collectConsumableRequirements)(base.workbenchItems);
+  observeAllocationStage(job, 'ConsumableRequirementDiscovery', {
+    mode: 'full',
+    requirements,
+    requirementCount: requirements.length
+  });
+  const requirementCoverage = (0, _consumablePlanDomain.computeConsumableRequirementCoverage)(requirements, base.workbenchItems);
+  observeAllocationStage(job, 'ConsumableCoverage', {
+    mode: 'full',
+    requirements,
+    requirementCoverage,
+    userBindings: base.currentInventoryBindings || {}
+  });
+  const demands = (0, _consumablePlanDomain.deriveConsumableAcquisitionTasks)(requirements, requirementCoverage);
+  observeAllocationStage(job, 'ConsumableAcquisitionDerivation', {
+    mode: 'full',
+    requirements,
+    requirementCoverage,
+    demands,
+    requirementCount: requirements.length,
+    demandCount: demands.length
+  });
   const composition = demands.length > 0 ? (0, _consumablePlanDomain.composeConsumablePlansAfter)(job.plans || {}, demands) : {
     plans: job.plans || {},
     demands: [],
     metadataByEquipmentId: {}
   };
-  observeAllocationStage(job, 'ConsumableDerivation', {
+  observeAllocationStage(job, 'ConsumableAcquisitionUnitExpansion', {
     mode: 'full',
-    allocationScope: 'user',
     demands: composition.demands || demands,
-    demandCount: demands.length,
-    userBindings: base.currentInventoryBindings || {}
+    metadataByEquipmentId: composition.metadataByEquipmentId || {}
+  });
+  const effectiveLiveOwners = (0, _allocationOwnerDomain.buildLiveAllocationOwnerSet)({
+    userPlans: job.plans || {},
+    consumableMetadataByEquipmentId: composition.metadataByEquipmentId
   });
-  const effectiveBindings = (0, _currentStartAssignmentDomain.filterCurrentInventoryBindingsForPlanSpace)(composition.plans, _extends({}, job.currentInventoryBindings || {}, base.currentInventoryBindings || {})); // Phase 2: ConsumableAllocation（耗材计划分配）. Existing User Bindings
+  observeAllocationStage(job, 'LiveOwnerSpace', {
+    mode: 'full',
+    liveAllocationOwners: effectiveLiveOwners
+  });
+  const effectiveRouteSelections = (0, _allocationOwnerDomain.filterRouteSelectionsForLiveAllocationOwners)(job.planRouteSelections || {}, effectiveLiveOwners);
+  const bindingTransfer = (0, _currentStartAssignmentDomain.transferBindingsAfterUserAllocation)({
+    previousBindings: job.currentInventoryBindings || {},
+    userPlanBindingsBeforeAllocation: baseBindings,
+    frozenUserBindings: base.currentInventoryBindings || {}
+  });
+  const remappedTransferredBindings = (0, _allocationOwnerDomain.remapAllocationBindingsForLiveOwners)({
+    bindings: bindingTransfer.bindings,
+    ownerRefsByTransport: job.currentInventoryBindingOwnerRefs || {},
+    owners: effectiveLiveOwners
+  });
+  const effectiveBindings = (0, _currentStartAssignmentDomain.filterCurrentInventoryBindingsForPlanSpace)(composition.plans, remappedTransferredBindings); // Phase 2: ConsumableAllocation（耗材计划分配）. Existing User Bindings
   // are retained; only Derived Consumable demands may materialize new Bindings.
 
   const effective = (0, _decisionSnapshotDomain.buildFullDecisionSnapshotCore)(_extends({}, job, {
     plans: composition.plans,
+    planRouteSelections: effectiveRouteSelections,
     currentInventoryBindings: effectiveBindings,
     allocationScope: 'consumable'
   }));
@@ -274,6 +342,8 @@ const buildFullDecisionSnapshotPayload = input => {
     userAllocation: base,
     consumableAllocation: effective,
     composition,
+    userPlans: job.plans || {},
+    bindingTransferTransitions: bindingTransfer.released || [],
     useitems: job.useitems || {},
     resourceBudget: job.resourceBudget || {}
   });
@@ -294,6 +364,10 @@ const buildDecisionSnapshotPayload = (input, profile = null) => {
     return buildFullDecisionSnapshotPayload(job, profile);
   }
 
+  const userLiveOwners = (0, _allocationOwnerDomain.buildLiveAllocationOwnerSet)({
+    userPlans: job.plans || {}
+  });
+  const baseRouteSelections = (0, _allocationOwnerDomain.filterRouteSelectionsForLiveAllocationOwners)(job.planRouteSelections || {}, userLiveOwners);
   let phaseStartedAt = profileNow();
   const baseBindings = (0, _currentStartAssignmentDomain.filterCurrentInventoryBindingsForPlanSpace)(job.plans || {}, job.currentInventoryBindings || {});
   measureProfile(profile, 'base-bindings', phaseStartedAt, {
@@ -302,6 +376,7 @@ const buildDecisionSnapshotPayload = (input, profile = null) => {
   phaseStartedAt = profileNow(); // Phase 1: UserAllocation（用户计划主件分配）.
 
   const baseResult = (0, _planDecisionIndex.buildIncrementalDecisionSnapshot)(_extends({}, job, {
+    planRouteSelections: baseRouteSelections,
     currentInventoryBindings: baseBindings,
     previous: baseIncrementalProjectionCacheState,
     allocationScope: 'user',
@@ -320,8 +395,30 @@ const buildDecisionSnapshotPayload = (input, profile = null) => {
     mode: 'incremental'
   }, allocationStageProjection(base, 'user')));
   phaseStartedAt = profileNow();
-  const demands = (0, _consumablePlanDomain.collectConsumablePlanDemands)(base.workbenchItems);
+  const requirements = (0, _consumablePlanDomain.collectConsumableRequirements)(base.workbenchItems);
+  observeAllocationStage(job, 'ConsumableRequirementDiscovery', {
+    mode: 'incremental',
+    requirements,
+    requirementCount: requirements.length
+  });
+  const requirementCoverage = (0, _consumablePlanDomain.computeConsumableRequirementCoverage)(requirements, base.workbenchItems);
+  observeAllocationStage(job, 'ConsumableCoverage', {
+    mode: 'incremental',
+    requirements,
+    requirementCoverage,
+    userBindings: base.currentInventoryBindings || {}
+  });
+  const demands = (0, _consumablePlanDomain.deriveConsumableAcquisitionTasks)(requirements, requirementCoverage);
+  observeAllocationStage(job, 'ConsumableAcquisitionDerivation', {
+    mode: 'incremental',
+    requirements,
+    requirementCoverage,
+    demands,
+    requirementCount: requirements.length,
+    demandCount: demands.length
+  });
   measureProfile(profile, 'consumable-demands', phaseStartedAt, {
+    requirementCount: requirements.length,
     demandCount: demands.length,
     workbenchCount: Array.isArray(base.workbenchItems) ? base.workbenchItems.length : 0
   });
@@ -331,18 +428,35 @@ const buildDecisionSnapshotPayload = (input, profile = null) => {
     demands: [],
     metadataByEquipmentId: {}
   };
-  observeAllocationStage(job, 'ConsumableDerivation', {
+  observeAllocationStage(job, 'ConsumableAcquisitionUnitExpansion', {
     mode: 'incremental',
-    allocationScope: 'user',
     demands: composition.demands || demands,
-    demandCount: demands.length,
-    userBindings: base.currentInventoryBindings || {}
+    metadataByEquipmentId: composition.metadataByEquipmentId || {}
   });
   measureProfile(profile, 'consumable-composition', phaseStartedAt, {
     effectivePlanGroupCount: Object.keys(composition.plans || {}).length
   });
   phaseStartedAt = profileNow();
-  const effectiveBindings = (0, _currentStartAssignmentDomain.filterCurrentInventoryBindingsForPlanSpace)(composition.plans, _extends({}, job.currentInventoryBindings || {}, base.currentInventoryBindings || {}));
+  const effectiveLiveOwners = (0, _allocationOwnerDomain.buildLiveAllocationOwnerSet)({
+    userPlans: job.plans || {},
+    consumableMetadataByEquipmentId: composition.metadataByEquipmentId
+  });
+  observeAllocationStage(job, 'LiveOwnerSpace', {
+    mode: 'incremental',
+    liveAllocationOwners: effectiveLiveOwners
+  });
+  const effectiveRouteSelections = (0, _allocationOwnerDomain.filterRouteSelectionsForLiveAllocationOwners)(job.planRouteSelections || {}, effectiveLiveOwners);
+  const bindingTransfer = (0, _currentStartAssignmentDomain.transferBindingsAfterUserAllocation)({
+    previousBindings: job.currentInventoryBindings || {},
+    userPlanBindingsBeforeAllocation: baseBindings,
+    frozenUserBindings: base.currentInventoryBindings || {}
+  });
+  const remappedTransferredBindings = (0, _allocationOwnerDomain.remapAllocationBindingsForLiveOwners)({
+    bindings: bindingTransfer.bindings,
+    ownerRefsByTransport: job.currentInventoryBindingOwnerRefs || {},
+    owners: effectiveLiveOwners
+  });
+  const effectiveBindings = (0, _currentStartAssignmentDomain.filterCurrentInventoryBindingsForPlanSpace)(composition.plans, remappedTransferredBindings);
   measureProfile(profile, 'effective-bindings', phaseStartedAt, {
     bindingCount: Object.keys(effectiveBindings || {}).length
   });
@@ -358,6 +472,7 @@ const buildDecisionSnapshotPayload = (input, profile = null) => {
   const seededEffectiveFromBase = !effectiveIncrementalProjectionCacheState && Boolean(baseResult.state);
   const effectiveResult = (0, _planDecisionIndex.buildIncrementalDecisionSnapshot)(_extends({}, job, {
     plans: composition.plans,
+    planRouteSelections: effectiveRouteSelections,
     currentInventoryBindings: effectiveBindings,
     previous: effectivePrevious,
     allocationScope: 'consumable',
@@ -378,6 +493,8 @@ const buildDecisionSnapshotPayload = (input, profile = null) => {
     userAllocation: base,
     consumableAllocation: effective,
     composition,
+    userPlans: job.plans || {},
+    bindingTransferTransitions: bindingTransfer.released || [],
     useitems: job.useitems || {},
     resourceBudget: job.resourceBudget || {}
   });

package/views/new-interface/app/decision-snapshot-service.js

@@ -175,6 +175,7 @@ const requestDecisionSnapshot = inputs => {
     planRouteSelections: inputs.planRouteSelections,
     routeAcquisitionIndex: inputs.routeAcquisitionIndex || {},
     currentInventoryBindings: inputs.currentInventoryBindings || {},
+    currentInventoryBindingOwnerRefs: inputs.currentInventoryBindingOwnerRefs || {},
     lowPriorityEquipmentIds: (0, _equipmentBlacklistDomain.getLowPriorityEquipmentIds)(inputs.equipmentBlacklist),
     startupSnapshotPath: (0, _pluginResourcePaths.getStartupSnapshotPath)()
   };