poi-plugin-remodel-assistant 1.0.1069-beta → 1.0.1074-beta

package/i18n/en-US.json

@@ -974,6 +974,11 @@
   "workbench.Development": "Development",
   "workbench.Improvement source": "Improvement source",
   "workbench.Periodic quest": "Periodic quest",
+  "workbench.Quest": "Quest",
+  "workbench.Occupied by another plan": "Occupied by another plan",
+  "workbench.This equipment instance is already occupied by another plan": "This equipment instance is already occupied by another plan",
+  "workbench.Resolve the earlier Current first; this plan will not manufacture an extra copy automatically.": "Resolve the earlier Current first; this plan will not manufacture an extra copy automatically.",
+  "equipment.Occupied by another plan": "Occupied by another plan",
   "workbench.Ship source": "Ship source",
   "workbench.Acquire Current start": "Acquire Current start",
   "workbench.Obtain this Current start before improvement": "Obtain this Current start before improvement",
@@ -1213,5 +1218,14 @@
   "app.Review the current improvement starting point": "Review the current improvement starting point",
   "app.Right shows the Current Start selected from conservative candidates and current inventory.": "Right shows the Current Start selected from conservative candidates and current inventory.",
   "app.Low-priority equipment guide": "Low-priority equipment guide",
-  "app.Review low-priority reasons, add recommended or manual entries, and remove multiple items at once.": "Review low-priority reasons, add recommended or manual entries, and remove multiple items at once."
+  "app.Review low-priority reasons, add recommended or manual entries, and remove multiple items at once.": "Review low-priority reasons, add recommended or manual entries, and remove multiple items at once.",
+  "plan.Quest": "Quest",
+  "plan.Later branches are deferred until the Current reaches the real decision point.": "Later branches are deferred until the Current reaches the real decision point.",
+  "equipment.Current instance route changed": "Current instance route changed",
+  "workbench.Current instance changed": "Current instance changed",
+  "workbench.The bound equipment is outside the currently reachable route": "The bound equipment is outside the currently reachable route",
+  "workbench.The concrete api_id is kept; the system will not silently switch to another equipment instance.": "The concrete api_id is kept; the system will not silently switch to another equipment instance.",
+  "plan.Current decision target": "Current decision target",
+  "plan.Current start equipment is occupied by another plan": "Current start equipment is occupied by another plan",
+  "plan.A matching concrete equipment instance exists, but it is already bound to another Current. Resolve that conflict before creating another acquisition demand.": "A matching concrete equipment instance exists, but it is already bound to another Current. Resolve that conflict before creating another acquisition demand."
 }

package/i18n/ja-JP.json

@@ -974,6 +974,11 @@
   "workbench.Development": "開発",
   "workbench.Improvement source": "改修入手元",
   "workbench.Periodic quest": "定期任務",
+  "workbench.Quest": "任務",
+  "workbench.Occupied by another plan": "他の計画で使用中",
+  "workbench.This equipment instance is already occupied by another plan": "この装備インスタンスは別の計画ですでに使用中です",
+  "workbench.Resolve the earlier Current first; this plan will not manufacture an extra copy automatically.": "先行する Current を先に解決してください。この計画は追加の装備を自動製造しません。",
+  "equipment.Occupied by another plan": "他の計画で使用中",
   "workbench.Ship source": "艦娘入手元",
   "workbench.Acquire Current start": "Current 起点を入手",
   "workbench.Obtain this Current start before improvement": "改修前にこの Current 起点を入手",
@@ -1213,5 +1218,14 @@
   "app.Review the current improvement starting point": "現在の改修開始地点を確認",
   "app.Right shows the Current Start selected from conservative candidates and current inventory.": "右側には、保守的な候補と現在の在庫から選択した Current Start を表示します。",
   "app.Low-priority equipment guide": "低優先装備ガイド",
-  "app.Review low-priority reasons, add recommended or manual entries, and remove multiple items at once.": "低優先の理由を確認し、推奨または手動の項目を追加し、複数項目をまとめて解除できます。"
+  "app.Review low-priority reasons, add recommended or manual entries, and remove multiple items at once.": "低優先の理由を確認し、推奨または手動の項目を追加し、複数項目をまとめて解除できます。",
+  "plan.Quest": "任務",
+  "plan.Later branches are deferred until the Current reaches the real decision point.": "後続分岐は Current が実際の判断点に到達するまで保留します。",
+  "equipment.Current instance route changed": "Current 実体のルートが変化",
+  "workbench.Current instance changed": "Current 実体が変化しました",
+  "workbench.The bound equipment is outside the currently reachable route": "バインド済み装備の現在状態は到達可能なルート外です",
+  "workbench.The concrete api_id is kept; the system will not silently switch to another equipment instance.": "具体的な api_id は保持し、別の装備実体へ暗黙に切り替えません。",
+  "plan.Current decision target": "現在の判断先",
+  "plan.Current start equipment is occupied by another plan": "現在の開始装備は別の計画で使用中です",
+  "plan.A matching concrete equipment instance exists, but it is already bound to another Current. Resolve that conflict before creating another acquisition demand.": "条件に合う装備実体は存在しますが、別の Current にバインドされています。新しい入手要求を増やす前に、この競合を解消してください。"
 }

package/i18n/zh-CN.json

@@ -974,6 +974,11 @@
   "workbench.Development": "开发",
   "workbench.Improvement source": "改修来源",
   "workbench.Periodic quest": "周期任务",
+  "workbench.Quest": "任务",
+  "workbench.Occupied by another plan": "已被其他计划占用",
+  "workbench.This equipment instance is already occupied by another plan": "这件装备实例已被其他计划占用",
+  "workbench.Resolve the earlier Current first; this plan will not manufacture an extra copy automatically.": "请先处理前面的 Current；当前计划不会自动制造额外装备。",
+  "equipment.Occupied by another plan": "已被其他计划占用",
   "workbench.Ship source": "舰娘来源",
   "workbench.Acquire Current start": "获取当前起点",
   "workbench.Obtain this Current start before improvement": "改修前先获取这个 Current 起点",
@@ -1213,5 +1218,14 @@
   "app.Review the current improvement starting point": "查看当前改修起点",
   "app.Right shows the Current Start selected from conservative candidates and current inventory.": "右侧展示从保守候选与当前库存中选定的 Current Start。",
   "app.Low-priority equipment guide": "低优先装备指南",
-  "app.Review low-priority reasons, add recommended or manual entries, and remove multiple items at once.": "查看低优先原因，添加推荐或手动条目，并可批量移除。"
+  "app.Review low-priority reasons, add recommended or manual entries, and remove multiple items at once.": "查看低优先原因，添加推荐或手动条目，并可批量移除。",
+  "plan.Quest": "任务",
+  "plan.Later branches are deferred until the Current reaches the real decision point.": "后续分支延后到 Current 真正走到决策点时再选择。",
+  "equipment.Current instance route changed": "当前实例路线已变化",
+  "workbench.Current instance changed": "当前实例已变化",
+  "workbench.The bound equipment is outside the currently reachable route": "已绑定装备当前状态不在可达路线中",
+  "workbench.The concrete api_id is kept; the system will not silently switch to another equipment instance.": "保留当前具体 api_id；系统不会静默切换到其他装备实例。",
+  "plan.Current decision target": "当前决策目标",
+  "plan.Current start equipment is occupied by another plan": "当前起点装备已被其他计划占用",
+  "plan.A matching concrete equipment instance exists, but it is already bound to another Current. Resolve that conflict before creating another acquisition demand.": "存在符合条件的具体装备实例，但它已绑定给其他 Current。请先处理该冲突，不要自动扩大新的获取需求。"
 }

package/i18n/zh-TW.json

@@ -974,6 +974,11 @@
   "workbench.Development": "開發",
   "workbench.Improvement source": "改修來源",
   "workbench.Periodic quest": "週期任務",
+  "workbench.Quest": "任務",
+  "workbench.Occupied by another plan": "已被其他計畫占用",
+  "workbench.This equipment instance is already occupied by another plan": "這件裝備實例已被其他計畫占用",
+  "workbench.Resolve the earlier Current first; this plan will not manufacture an extra copy automatically.": "請先處理前面的 Current；目前計畫不會自動製造額外裝備。",
+  "equipment.Occupied by another plan": "已被其他計畫占用",
   "workbench.Ship source": "艦娘來源",
   "workbench.Acquire Current start": "取得目前起點",
   "workbench.Obtain this Current start before improvement": "改修前先取得這個 Current 起點",
@@ -1213,5 +1218,14 @@
   "app.Review the current improvement starting point": "查看目前改修起點",
   "app.Right shows the Current Start selected from conservative candidates and current inventory.": "右側顯示從保守候選與目前庫存中選定的 Current Start。",
   "app.Low-priority equipment guide": "低優先裝備指南",
-  "app.Review low-priority reasons, add recommended or manual entries, and remove multiple items at once.": "查看低優先原因，加入建議或手動項目，並可批次移除。"
+  "app.Review low-priority reasons, add recommended or manual entries, and remove multiple items at once.": "查看低優先原因，加入建議或手動項目，並可批次移除。",
+  "plan.Quest": "任務",
+  "plan.Later branches are deferred until the Current reaches the real decision point.": "後續分支延後到 Current 真正走到決策點時再選擇。",
+  "equipment.Current instance route changed": "目前實例路線已變化",
+  "workbench.Current instance changed": "目前實例已變化",
+  "workbench.The bound equipment is outside the currently reachable route": "已綁定裝備目前狀態不在可達路線中",
+  "workbench.The concrete api_id is kept; the system will not silently switch to another equipment instance.": "保留目前具體 api_id；系統不會靜默切換到其他裝備實例。",
+  "plan.Current decision target": "目前決策目標",
+  "plan.Current start equipment is occupied by another plan": "目前起點裝備已被其他計畫占用",
+  "plan.A matching concrete equipment instance exists, but it is already bound to another Current. Resolve that conflict before creating another acquisition demand.": "存在符合條件的具體裝備實例，但它已綁定給其他 Current。請先處理該衝突，不要自動擴大新的取得需求。"
 }

package/package.json

@@ -96,8 +96,11 @@
     "id": "poi-plugin-remodel-assistant",
     "priority": 50,
     "releaseChannel": "beta",
-    "title": "改修助手"
+    "title": "改修助手",
+    "runtimeFlags": {
+      "forceFullDecisionRebuild": true
+    }
   },
   "private": false,
-  "version": "1.0.1069-beta"
+  "version": "1.0.1074-beta"
 }

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

@@ -3,6 +3,8 @@
 exports.__esModule = true;
 exports.executeDecisionFoundationJob = exports.resetDecisionFoundationJobState = exports.buildDecisionFoundationPayload = exports.buildFullDecisionFoundationPayload = void 0;
 
+var _pluginMeta = require("../../shared/plugin-meta");
+
 var _decisionItemIndex = require("../incremental/decision-item-index");
 
 var _decisionChainDomain = require("../decisions/domain/decision-chain-domain");
@@ -30,6 +32,15 @@ const buildDecisionFoundationPayload = ({
   effectiveData = [],
   masterEquips = {}
 } = {}) => {
+  if (_pluginMeta.FORCE_FULL_DECISION_REBUILD) {
+    incrementalFoundationState = null;
+    return buildFullDecisionFoundationPayload({
+      data,
+      effectiveData,
+      masterEquips
+    });
+  }
+
   const result = (0, _decisionItemIndex.buildIncrementalDecisionFoundation)({
     data,
     effectiveData,

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

@@ -5,6 +5,8 @@ exports.clearProcessDecisionFoundation = exports.requestDecisionFoundation = exp
 
 var _path = _interopRequireDefault(require("path"));
 
+var _pluginMeta = require("../../shared/plugin-meta");
+
 var _decisionFoundationJobs = require("./decision-foundation-jobs");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -143,6 +145,7 @@ const execute = job => {
 };
 
 const readProcessDecisionFoundation = inputs => {
+  if (_pluginMeta.FORCE_FULL_DECISION_REBUILD) return null;
   const identity = normalizeInputs(inputs);
   return sameInputs(foundationCache, identity) ? foundationCache.value : null;
 };
@@ -151,7 +154,12 @@ exports.readProcessDecisionFoundation = readProcessDecisionFoundation;
 
 const requestDecisionFoundation = inputs => {
   const identity = normalizeInputs(inputs);
-  if (sameInputs(foundationCache, identity)) return Promise.resolve(foundationCache.value);
+
+  if (!_pluginMeta.FORCE_FULL_DECISION_REBUILD && sameInputs(foundationCache, identity)) {
+    return Promise.resolve(foundationCache.value);
+  }
+
+  if (_pluginMeta.FORCE_FULL_DECISION_REBUILD) foundationCache = null;
 
   if (foundationRequest && sameInputs(foundationRequest, identity)) {
     return foundationRequest.promise;
@@ -172,7 +180,7 @@ const requestDecisionFoundation = inputs => {
       processingMode
     });
 
-    if (requestId === foundationRequestId) {
+    if (requestId === foundationRequestId && !_pluginMeta.FORCE_FULL_DECISION_REBUILD) {
       foundationCache = _extends({}, identity, {
         value
       });

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

@@ -3,11 +3,13 @@
 exports.__esModule = true;
 exports.SNAPSHOT_INPUT_KEYS = exports.FOUNDATION_INPUT_KEYS = exports.createDecisionFoundationCache = exports.readDecisionFoundationCache = exports.clearProcessDecisionSnapshotCache = exports.writeProcessDecisionSnapshotCache = exports.readProcessDecisionSnapshotCache = exports.createDecisionSnapshotCache = exports.readDecisionSnapshotCache = exports.sameDecisionSnapshotInputs = void 0;
 
+var _pluginMeta = require("../../shared/plugin-meta");
+
 var _equipmentBlacklistDomain = require("../equipment/domain/equipment-blacklist-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); }
 
-const SNAPSHOT_INPUT_KEYS = ['dataRevision', 'plans', 'initialDay', 'masterEquips', 'actualEquipLevels', 'actualEquipInventory', 'actualOwnedShipMasterIds', 'decisionSelections', 'planRouteSelections', 'equipmentBlacklist', 'acquisitionValueIndex'];
+const SNAPSHOT_INPUT_KEYS = ['dataRevision', 'plans', 'initialDay', 'masterEquips', 'actualEquipLevels', 'actualEquipInventory', 'actualOwnedShipMasterIds', 'decisionSelections', 'planRouteSelections', 'equipmentBlacklist', 'routeAcquisitionIndex', 'acquisitionValueIndex'];
 exports.SNAPSHOT_INPUT_KEYS = SNAPSHOT_INPUT_KEYS;
 const FOUNDATION_INPUT_KEYS = ['dataRevision', 'masterEquips'];
 exports.FOUNDATION_INPUT_KEYS = FOUNDATION_INPUT_KEYS;
@@ -23,7 +25,7 @@ const stableValue = value => {
 
 const stableSignature = value => JSON.stringify(stableValue(value || {}));
 
-const CONTENT_IDENTITY_KEYS = new Set(['plans', 'actualEquipLevels', 'actualEquipInventory', 'actualOwnedShipMasterIds', 'decisionSelections', 'planRouteSelections']);
+const CONTENT_IDENTITY_KEYS = new Set(['plans', 'actualEquipLevels', 'actualEquipInventory', 'actualOwnedShipMasterIds', 'decisionSelections', 'planRouteSelections', 'routeAcquisitionIndex', 'acquisitionValueIndex']);
 
 const inputIdentity = (key, value) => {
   if (key === 'equipmentBlacklist') return (0, _equipmentBlacklistDomain.equipmentBlacklistSignature)(value);
@@ -53,7 +55,7 @@ const sameDecisionSnapshotInputs = (left, right) => sameInputs(left, right, SNAP
 
 exports.sameDecisionSnapshotInputs = sameDecisionSnapshotInputs;
 
-const readDecisionSnapshotCache = (cache, inputs) => readCache(cache, inputs, SNAPSHOT_INPUT_KEYS);
+const readDecisionSnapshotCache = (cache, inputs) => _pluginMeta.FORCE_FULL_DECISION_REBUILD ? null : readCache(cache, inputs, SNAPSHOT_INPUT_KEYS);
 
 exports.readDecisionSnapshotCache = readDecisionSnapshotCache;
 
@@ -66,6 +68,11 @@ const readProcessDecisionSnapshotCache = inputs => readDecisionSnapshotCache(pro
 exports.readProcessDecisionSnapshotCache = readProcessDecisionSnapshotCache;
 
 const writeProcessDecisionSnapshotCache = (inputs, value) => {
+  if (_pluginMeta.FORCE_FULL_DECISION_REBUILD) {
+    processDecisionSnapshotCache = null;
+    return value;
+  }
+
   processDecisionSnapshotCache = createDecisionSnapshotCache(inputs, value);
   return value;
 };
@@ -78,7 +85,7 @@ const clearProcessDecisionSnapshotCache = () => {
 
 exports.clearProcessDecisionSnapshotCache = clearProcessDecisionSnapshotCache;
 
-const readDecisionFoundationCache = (cache, inputs) => readCache(cache, inputs, FOUNDATION_INPUT_KEYS);
+const readDecisionFoundationCache = (cache, inputs) => _pluginMeta.FORCE_FULL_DECISION_REBUILD ? null : readCache(cache, inputs, FOUNDATION_INPUT_KEYS);
 
 exports.readDecisionFoundationCache = readDecisionFoundationCache;
 

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

@@ -3,6 +3,8 @@
 exports.__esModule = true;
 exports.executeDecisionSnapshotJob = exports.resetDecisionSnapshotJobState = exports.buildDecisionSnapshotPayload = exports.buildFullDecisionSnapshotPayload = void 0;
 
+var _pluginMeta = require("../../shared/plugin-meta");
+
 var _planDecisionIndex = require("../incremental/plan-decision-index");
 
 var _decisionSnapshotDomain = require("../decisions/domain/decision-snapshot-domain");
@@ -26,7 +28,8 @@ const buildFullDecisionSnapshotPayload = input => {
 
   const composition = (0, _consumablePlanDomain.composeConsumablePlansAfter)(input && input.plans || {}, demands);
   const effective = (0, _decisionSnapshotDomain.buildFullDecisionSnapshotCore)(_extends({}, input || {}, {
-    plans: composition.plans
+    plans: composition.plans,
+    currentInventoryBindings: _extends({}, input && input.currentInventoryBindings || {}, base.currentInventoryBindings || {})
   }));
   return _extends({}, base, {
     workbenchItems: (0, _consumablePlanDomain.decorateConsumablePlanEntries)({
@@ -39,6 +42,7 @@ const buildFullDecisionSnapshotPayload = input => {
       metadataByEquipmentId: composition.metadataByEquipmentId,
       parentPlanIdByEquipmentId
     }),
+    currentInventoryBindings: effective.currentInventoryBindings || base.currentInventoryBindings || {},
     consumablePlanDemands: composition.demands,
     consumablePlanMetaByEquipmentId: composition.metadataByEquipmentId
   });
@@ -50,6 +54,13 @@ let effectiveIncrementalSnapshotState = null;
 
 const buildDecisionSnapshotPayload = input => {
   const job = input || {};
+
+  if (_pluginMeta.FORCE_FULL_DECISION_REBUILD) {
+    baseIncrementalSnapshotState = null;
+    effectiveIncrementalSnapshotState = null;
+    return buildFullDecisionSnapshotPayload(job);
+  }
+
   const baseResult = (0, _planDecisionIndex.buildIncrementalDecisionSnapshot)(_extends({}, job, {
     previous: baseIncrementalSnapshotState
   }));
@@ -70,6 +81,7 @@ const buildDecisionSnapshotPayload = input => {
   const composition = (0, _consumablePlanDomain.composeConsumablePlansAfter)(job.plans || {}, demands);
   const effectiveResult = (0, _planDecisionIndex.buildIncrementalDecisionSnapshot)(_extends({}, job, {
     plans: composition.plans,
+    currentInventoryBindings: _extends({}, job.currentInventoryBindings || {}, base.currentInventoryBindings || {}),
     previous: effectiveIncrementalSnapshotState
   }));
   effectiveIncrementalSnapshotState = effectiveResult.state;
@@ -85,6 +97,7 @@ const buildDecisionSnapshotPayload = input => {
       metadataByEquipmentId: composition.metadataByEquipmentId,
       parentPlanIdByEquipmentId
     }),
+    currentInventoryBindings: effective.currentInventoryBindings || base.currentInventoryBindings || {},
     consumablePlanDemands: composition.demands,
     consumablePlanMetaByEquipmentId: composition.metadataByEquipmentId,
     incrementalMetrics: _extends({}, base.incrementalMetrics || {}, {

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

@@ -125,6 +125,7 @@ const requestDecisionSnapshot = inputs => {
     planRouteSelections: inputs.planRouteSelections,
     routeAcquisitionIndex: inputs.routeAcquisitionIndex || {},
     acquisitionValueIndex: inputs.acquisitionValueIndex || {},
+    currentInventoryBindings: inputs.currentInventoryBindings || {},
     lowPriorityEquipmentIds: (0, _equipmentBlacklistDomain.getLowPriorityEquipmentIds)(inputs.equipmentBlacklist)
   };
 

package/views/new-interface/app/new-interface-area.js

@@ -29,6 +29,8 @@ var _currentStartCandidateDomain = require("../plan/domain/current-start-candida
 
 var _currentStartSelectionDomain = require("../plan/domain/current-start-selection-domain");
 
+var _currentPlanIdentityDomain = require("../plan/domain/current-plan-identity-domain");
+
 var _currentPlanExecutionDomain = require("../plan/domain/current-plan-execution-domain");
 
 var _planStorage = require("../../shared/plan-storage");
@@ -186,6 +188,7 @@ class NewInterfaceArea extends _react.Component {
     const snapshotInputs = decisionSnapshotInputsFor(props, this.state, this.plansOverride, this.plansOverrideBase);
     this.currentDecisionSnapshot = (0, _decisionSnapshotCache.readProcessDecisionSnapshotCache)(snapshotInputs);
     this.currentDecisionSnapshotInputs = this.currentDecisionSnapshot ? snapshotInputs : null;
+    this.currentInventoryBindings = this.currentDecisionSnapshot && this.currentDecisionSnapshot.currentInventoryBindings || {};
     if (this.currentDecisionSnapshot) this.state.decisionSnapshotLoading = false;
     this.exclusionRecommendationSnapshot = {
       dataRevision: null,
@@ -212,13 +215,16 @@ class NewInterfaceArea extends _react.Component {
       initialDay
     } = this.props;
     const {
-      equipmentBlacklist
+      equipmentBlacklist,
+      workbenchDay
     } = this.state;
 
     if (prevProps.initialDay !== initialDay) {
-      const nextWorkbenchDay = (0, _jstClock.followJSTDaySelection)(this.state.workbenchDay, prevProps.initialDay, initialDay);
+      const nextWorkbenchDay = (0, _jstClock.followJSTDaySelection)(workbenchDay, prevProps.initialDay, initialDay);
 
-      if (Number(nextWorkbenchDay) !== Number(this.state.workbenchDay)) {
+      if (Number(nextWorkbenchDay) !== Number(workbenchDay)) {
+        // Prop-driven day rollover is intentionally synchronized after update.
+        // eslint-disable-next-line react/no-did-update-set-state
         this.setState({
           workbenchDay: nextWorkbenchDay
         });
@@ -617,6 +623,7 @@ var _initialiseProps = function () {
       if (cached) {
         this.currentDecisionSnapshot = cached;
         this.currentDecisionSnapshotInputs = snapshotInputs;
+        this.currentInventoryBindings = cached.currentInventoryBindings || {};
 
         const complete = () => {
           this.ensureSelection(cached);
@@ -655,7 +662,8 @@ var _initialiseProps = function () {
         equipmentBlacklist: snapshotInputs.equipmentBlacklist
       };
       const request = yieldToVisibleShell().then(() => (0, _decisionFoundationService.requestDecisionFoundation)(foundationInputs)).then(foundation => (0, _decisionSnapshotService.requestDecisionSnapshot)(_extends({}, snapshotInputs, {
-        foundation
+        foundation,
+        currentInventoryBindings: this.currentInventoryBindings || {}
       }))).then(snapshot => {
         if (!this.mounted || taskId !== this.decisionSnapshotTaskId) return null;
 
@@ -667,6 +675,7 @@ var _initialiseProps = function () {
         (0, _decisionSnapshotCache.writeProcessDecisionSnapshotCache)(snapshotInputs, snapshot);
         this.currentDecisionSnapshot = snapshot;
         this.currentDecisionSnapshotInputs = snapshotInputs;
+        this.currentInventoryBindings = snapshot.currentInventoryBindings || {};
         this.setState(previous => ({
           decisionSnapshotLoading: false,
           decisionSnapshotError: null,
@@ -794,9 +803,36 @@ var _initialiseProps = function () {
     configurable: true,
     enumerable: true,
     writable: true,
-    value: () => {// Route preference is user intent; computed path/inventory assignment is
-      // derived state. Never feed a projection back into planRouteSelections.
-      // Doing so would create a second authority that outlives live inventory.
+    value: snapshot => {
+      // Current selection is user intent, but its lifecycle is exactly one live
+      // Current. Do not persist a completed Current's decision into the next
+      // generation. Computed route/inventory fields still never flow back here.
+      const activeCurrentIds = new Set((snapshot && snapshot.routePlannings || []).map(planning => {
+        const analysis = planning && planning.analysis;
+        return analysis && analysis.goal ? (0, _currentPlanIdentityDomain.currentPlanInstanceId)(planning.id, analysis.goal.star, analysis) : '';
+      }).filter(Boolean));
+      const {
+        planRouteSelections = {}
+      } = this.state;
+      let changed = false;
+      const next = Object.keys(planRouteSelections).reduce((result, key) => {
+        const selection = planRouteSelections[key];
+        const currentId = String(selection && selection.currentId || '').trim();
+
+        if (currentId && !activeCurrentIds.has(currentId)) {
+          changed = true;
+          return result;
+        }
+
+        return _extends({}, result, {
+          [key]: selection
+        });
+      }, {});
+      if (!changed) return;
+      const normalized = (0, _currentStartSelectionDomain.setCurrentStartSelections)(config, next);
+      this.setState({
+        planRouteSelections: normalized
+      });
     }
   });
   Object.defineProperty(this, "getFilteredItems", {

package/views/new-interface/decisions/domain/decision-snapshot-domain.js

@@ -5,8 +5,12 @@ exports.buildFullDecisionSnapshotCore = void 0;
 
 var _currentStartCandidateDomain = require("../../plan/domain/current-start-candidate-domain");
 
+var _currentPlanIdentityDomain = require("../../plan/domain/current-plan-identity-domain");
+
 var _currentStartSelectionDomain = require("../../plan/domain/current-start-selection-domain");
 
+var _currentInventoryOwnershipDomain = require("../../plan/domain/current-inventory-ownership-domain");
+
 var _currentPlanExecutionDomain = require("../../plan/domain/current-plan-execution-domain");
 
 var _planFactsDomain = require("../../plan/domain/plan-facts-domain");
@@ -32,7 +36,8 @@ const buildFullDecisionSnapshotCore = ({
   decisionSelections = {},
   planRouteSelections = {},
   routeAcquisitionIndex = {},
-  lowPriorityEquipmentIds = []
+  lowPriorityEquipmentIds = [],
+  currentInventoryBindings = {}
 } = {}) => {
   if (!foundation) throw new Error('decision-snapshot-foundation-missing');
   const {
@@ -50,76 +55,114 @@ const buildFullDecisionSnapshotCore = ({
     decisionSelections,
     lowPriorityEquipmentIds
   });
-  const routePlannings = (0, _currentStartCandidateDomain.buildCurrentStartPlanningStates)({
-    data: effectiveData,
-    plans,
-    equipLevels,
-    equipInventory,
-    routeAcquisitionIndex
-  });
-  const routePlanningById = Object.fromEntries(routePlannings.map(planning => [planning.id, planning]));
-
-  const routePlanningFor = item => routePlanningById[item.id] || {
-    id: Number(item.id),
-    status: _currentStartCandidateDomain.CURRENT_START_PLANNING_STATUS.NO_PLAN,
-    planState: item.planState,
-    analysis: null
-  };
 
-  const projectionInput = (item, analysis) => {
-    const routeSelection = analysis ? (0, _currentStartSelectionDomain.getCurrentStartSelection)(planRouteSelections, item.id, analysis.goal.star, 1) : null;
-    const planning = routePlanningFor(item);
-    return {
-      item: _extends({}, item, {
-        routePlanning: planning
-      }),
-      analysis,
-      selection: routeSelection,
-      selections: planRouteSelections,
-      allItems: baseItems,
-      today: initialDay,
-      ownedShipMasterIds,
+  const projectPass = passBindings => {
+    const routePlannings = (0, _currentStartCandidateDomain.buildCurrentStartPlanningStates)({
+      data: effectiveData,
+      plans,
       equipLevels,
       equipInventory,
-      routeAcquisitionIndex
+      routeAcquisitionIndex,
+      currentInventoryBindings: passBindings
+    });
+    const routePlanningById = Object.fromEntries(routePlannings.map(planning => [planning.id, planning]));
+
+    const routePlanningFor = item => routePlanningById[item.id] || {
+      id: Number(item.id),
+      status: _currentStartCandidateDomain.CURRENT_START_PLANNING_STATUS.NO_PLAN,
+      planState: item.planState,
+      analysis: null
+    };
+
+    const projectionInput = (item, analysis) => {
+      const routeSelection = analysis ? (0, _currentStartSelectionDomain.getCurrentStartSelectionForAnalysis)(planRouteSelections, item.id, analysis.goal.star, analysis) : null;
+      const planning = routePlanningFor(item);
+      const currentId = analysis ? (0, _currentPlanIdentityDomain.currentPlanInstanceId)(item.id, analysis.goal.star, analysis) : '';
+      return {
+        item: _extends({}, item, {
+          routePlanning: planning
+        }),
+        analysis,
+        selection: routeSelection,
+        preferredInventoryId: currentId ? passBindings[currentId] : null,
+        selections: planRouteSelections,
+        allItems: baseItems,
+        today: initialDay,
+        ownedShipMasterIds,
+        equipLevels,
+        equipInventory,
+        routeAcquisitionIndex
+      };
     };
-  };
 
-  const projectedEntriesById = {};
-  baseItems.forEach(item => {
-    const planning = routePlanningFor(item);
-    let entries = [];
+    const projectedEntriesById = {};
+    baseItems.forEach(item => {
+      const planning = routePlanningFor(item);
+      let entries = [];
 
-    if (item.planState.status === _planFactsDomain.PLAN_TARGET_STATUS.PENDING) {
-      if (planning.status === _currentStartCandidateDomain.CURRENT_START_PLANNING_STATUS.READY) {
-        entries = (0, _currentPlanExecutionDomain.projectCurrentPlanTodayEntries)(projectionInput(item, planning.analysis));
-      } else if (planning.status === _currentStartCandidateDomain.CURRENT_START_PLANNING_STATUS.DIRECT_ONLY) {
-        entries = (0, _currentPlanExecutionDomain.projectCurrentPlanTodayEntries)(projectionInput(item, null));
+      if (item.planState.status === _planFactsDomain.PLAN_TARGET_STATUS.PENDING) {
+        if (planning.status === _currentStartCandidateDomain.CURRENT_START_PLANNING_STATUS.READY || planning.status === _currentStartCandidateDomain.CURRENT_START_PLANNING_STATUS.OCCUPIED) {
+          entries = (0, _currentPlanExecutionDomain.projectCurrentPlanTodayEntries)(projectionInput(item, planning.analysis));
+        } else if (planning.status === _currentStartCandidateDomain.CURRENT_START_PLANNING_STATUS.DIRECT_ONLY) {
+          entries = (0, _currentPlanExecutionDomain.projectCurrentPlanTodayEntries)(projectionInput(item, null));
+        }
       }
-    }
 
-    projectedEntriesById[item.id] = entries;
-  });
-  const items = (0, _decisionDomain.sortDecisionItems)(baseItems.map(item => {
-    const planning = routePlanningFor(item);
-    const entries = projectedEntriesById[item.id] || [];
-    const projected = entries[0] || item;
-    return _extends({}, projected, {
-      routePlanning: planning,
-      planRouteEntries: entries
+      projectedEntriesById[item.id] = entries;
     });
-  }));
-  const workbenchItems = (0, _decisionDomain.sortDecisionItems)(baseItems.reduce((result, item) => result.concat(projectedEntriesById[item.id] || []), []));
-  return {
-    decisionPoints,
-    effectiveEquipLevels: equipLevels,
-    effectiveEquipInventory: equipInventory,
-    effectiveOwnedShipMasterIds: ownedShipMasterIds,
-    items,
-    workbenchItems,
-    routePlannings,
-    chainItems
+    const projectedWorkbenchItems = (0, _decisionDomain.sortDecisionItems)(baseItems.reduce((result, item) => result.concat(projectedEntriesById[item.id] || []), []));
+    const ownership = (0, _currentInventoryOwnershipDomain.reconcileCurrentInventoryOwnership)({
+      entries: projectedWorkbenchItems,
+      equipInventory,
+      equipLevels,
+      previousBindings: passBindings
+    });
+    const reconciledById = ownership.entries.reduce((result, entry) => _extends({}, result, {
+      [Number(entry.id)]: entry
+    }), {});
+    const items = (0, _decisionDomain.sortDecisionItems)(baseItems.map(item => {
+      const planning = routePlanningFor(item);
+      const rawEntries = projectedEntriesById[item.id] || [];
+      const projected = reconciledById[item.id] || rawEntries[0] || item;
+      const entries = rawEntries.length > 0 ? [projected] : [];
+      return _extends({}, projected, {
+        routePlanning: planning,
+        planRouteEntries: entries
+      });
+    }));
+    return {
+      decisionPoints,
+      effectiveEquipLevels: equipLevels,
+      effectiveEquipInventory: equipInventory,
+      effectiveOwnedShipMasterIds: ownedShipMasterIds,
+      items,
+      workbenchItems: ownership.entries,
+      routePlannings,
+      chainItems,
+      currentInventoryBindings: ownership.bindings
+    };
   };
+
+  const sameBindings = (left, right) => {
+    const normalize = source => Object.entries(source || {}).map(([currentId, inventoryId]) => [String(currentId), Number(inventoryId)]).filter(([, inventoryId]) => Number.isInteger(inventoryId) && inventoryId > 0).sort(([leftId], [rightId]) => leftId.localeCompare(rightId));
+
+    return JSON.stringify(normalize(left)) === JSON.stringify(normalize(right));
+  }; // Ownership is a live fact used by Current Start search. Re-project until
+  // concrete bindings stabilize so a later Current can observe that an exact
+  // matching api_id was already claimed earlier in the same snapshot and
+  // becomes OCCUPIED instead of fabricating a second acquisition demand.
+
+
+  let passBindings = currentInventoryBindings || {};
+  let result = null;
+
+  for (let pass = 0; pass < 3; pass += 1) {
+    result = projectPass(passBindings);
+    if (sameBindings(result.currentInventoryBindings, passBindings)) break;
+    passBindings = result.currentInventoryBindings;
+  }
+
+  return result;
 };
 
 exports.buildFullDecisionSnapshotCore = buildFullDecisionSnapshotCore;

package/views/new-interface/equipment/components/equipment-list.js

@@ -180,7 +180,11 @@ class EquipmentList extends _react.Component {
           className: "decision-equipment-meta decision-workbench-tag-column"
         }, activePlan.todayStage && activePlan.todayStage.kind === 'missing-source' && activePlan.currentStartAcquisition && activePlan.currentStartAcquisition.available === true && _react.default.createElement("span", {
           className: "decision-pill decision-pill-warning"
-        }, __('Acquire first')), materialShortage && activePlan.todayStage && activePlan.todayStage.kind !== 'missing-source' && _react.default.createElement("span", {
+        }, __('Acquire first')), activePlan.todayStage && activePlan.todayStage.kind === 'occupied-source' && _react.default.createElement("span", {
+          className: "decision-pill decision-pill-warning"
+        }, __('Occupied by another plan')), activePlan.todayStage && activePlan.todayStage.kind === 'current-instance-diverged' && _react.default.createElement("span", {
+          className: "decision-pill decision-pill-warning"
+        }, __('Current instance route changed')), materialShortage && activePlan.todayStage && activePlan.todayStage.kind !== 'missing-source' && _react.default.createElement("span", {
           className: "decision-pill decision-pill-warning"
         }, __('Materials insufficient')), activePlan.planKind === 'consumable' && _react.default.createElement("span", {
           className: "decision-pill decision-pill-primary"