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

package/assets/main.css

@@ -10808,7 +10808,7 @@ body.decision-modal-is-dragging * {
 /* 1.0.1065: Today list uses one stable visual grid. Two tag slots are reserved
  * even when empty so icon/name alignment never changes with row state. */
 #item-improvement .decision-equipment-row.is-workbench {
-  grid-template-columns: 42px 76px minmax(0, 1fr);
+  grid-template-columns: 42px minmax(0, 1fr) 76px;
   column-gap: 10px;
   align-items: center;
   height: 64px;
@@ -10825,7 +10825,7 @@ body.decision-modal-is-dragging * {
 #item-improvement .decision-equipment-row.is-workbench .decision-workbench-tag-column {
   display: flex;
   flex-direction: column;
-  align-items: flex-start;
+  align-items: flex-end;
   justify-content: center;
   gap: 3px;
   width: 76px;
@@ -10910,6 +10910,12 @@ body.decision-modal-is-dragging * {
   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 strong {
   font-size: var(--improvement-font-small);
   font-weight: 700;
@@ -10925,3 +10931,15 @@ body.decision-modal-is-dragging * {
     margin-left: 137px;
   }
 }
+
+/* 1.0.1069: an unowned Acquisition Current Start is actionable Today work.
+ * Keep source facts prominent while deferring improvement-only assistant/date/cost
+ * sections until the equipment actually enters live inventory. */
+#item-improvement .decision-workbench-acquisition-source-list {
+  margin: 6px 0 0;
+  padding-left: 18px;
+}
+
+#item-improvement .decision-workbench-acquisition-source-list li + li {
+  margin-top: 3px;
+}

package/i18n/en-US.json

@@ -370,6 +370,7 @@
   "equipment.Plan management": "Plan management",
   "equipment.Consumable plan": "Consumable plan",
   "equipment.Materials insufficient": "Materials insufficient",
+  "equipment.Acquire first": "Acquire first",
   "equipment.Clear": "Clear",
   "equipment.Clear filters": "Clear filters",
   "equipment.Completed": "Completed",
@@ -933,12 +934,17 @@
   "shared.System-recommended improvement starting point": "System-recommended improvement starting point",
   "shared.Select a valid route before the system can recommend a starting point": "Select a valid route before the system can recommend a starting point",
   "shared.Corresponding plan target": "Corresponding Plan target",
+  "shared.Current plan target": "Current Plan target",
+  "shared.For plan": "for",
   "shared.Related plans": "Related plans",
   "shared.Consumable plan": "Consumable plan",
   "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 is available for improvement on the selected day",
+  "workbench.No plan target is available for improvement on selected day": "No unfinished Plan target needs action on the selected day",
   "app.Left shows Plan targets that satisfy the selected day's improvement conditions.": "Left shows Plan targets that satisfy the selected day's improvement conditions.",
+  "app.Review Current Plan actions today": "Review Current Plan actions today",
+  "app.Left shows the next Current Plan action, including acquisition before improvement.": "Left shows the next Current Plan action, including acquisition before improvement.",
+  "app.Right shows the selected Current Start; low-cost acquisition and equipment-conversion Alternatives remain user-selectable.": "Right shows the selected Current Start; low-cost acquisition and equipment-conversion Alternatives remain user-selectable.",
   "data.Data management": "Data management",
   "data.Export plans, route choices, and interface settings to a data file": "Export improvement plans, route choices, and interface settings.",
   "data.Import plans, route choices, and interface settings from a data file": "Import improvement plans, route choices, and interface settings from a data file.",
@@ -955,7 +961,7 @@
   "equipment.Search and sort": "Search and sort",
   "workbench.Clear filters": "Clear filters",
   "workbench.Display scope": "Display scope",
-  "workbench.Today improvable": "Today improvable",
+  "workbench.Today improvable": "Today actions",
   "equipment.Plan %d": "Plan %d",
   "workbench.Available dates": "Available dates",
   "workbench.Expected materials for this upgrade": "Expected materials for this upgrade",
@@ -969,6 +975,11 @@
   "workbench.Improvement source": "Improvement source",
   "workbench.Periodic quest": "Periodic quest",
   "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",
+  "workbench.The selected Current start is not owned yet; acquire it first, then continue the selected route.": "The selected Current start is not owned yet; acquire it first, then continue the selected route.",
+  "workbench.Ship remodel at Lv.%d": "Ship remodel at Lv.%d",
+  "workbench.Ship initial equipment": "Ship initial equipment",
   "workbench.Sources": "Sources",
   "workbench.No known source": "No known source",
   "workbench.Search sources": "Search sources",

package/i18n/ja-JP.json

@@ -370,6 +370,7 @@
   "equipment.Plan management": "計画管理",
   "equipment.Consumable plan": "消耗材計画",
   "equipment.Materials insufficient": "資材不足",
+  "equipment.Acquire first": "先に入手",
   "equipment.Clear": "解除",
   "equipment.Clear filters": "条件をクリア",
   "equipment.Completed": "完了",
@@ -933,12 +934,17 @@
   "shared.System-recommended improvement starting point": "システム推奨の改修開始装備",
   "shared.Select a valid route before the system can recommend a starting point": "有効なルートを選択すると、システムが改修開始装備を推奨できます",
   "shared.Corresponding plan target": "対応する計画目標",
+  "shared.Current plan target": "現在の計画目標",
+  "shared.For plan": "使用先",
   "shared.Related plans": "関連計画",
   "shared.Consumable plan": "消耗材計画",
   "workbench.Plan targets": "計画目標",
   "workbench.Plan targets available for improvement on selected day": "今日改修可",
-  "workbench.No plan target is available for improvement on selected day": "選択した曜日に改修できる未完了の計画目標はありません",
+  "workbench.No plan target is available for improvement on selected day": "選択した曜日に対応が必要な未完了計画はありません",
   "app.Left shows Plan targets that satisfy the selected day's improvement conditions.": "左側には選択した曜日の改修条件を満たす計画目標を表示します。",
+  "app.Review Current Plan actions today": "今日の Current Plan 行動を確認",
+  "app.Left shows the next Current Plan action, including acquisition before improvement.": "左側には、改修前の装備入手を含む Current Plan の次の行動を表示します。",
+  "app.Right shows the selected Current Start; low-cost acquisition and equipment-conversion Alternatives remain user-selectable.": "右側には選択した Current Start を表示し、低コスト入手と装備更新の Alternative はどちらも選択肢として残します。",
   "data.Data management": "データ管理",
   "data.Export plans, route choices, and interface settings to a data file": "改修計画、ルート選択、画面設定を書き出します。",
   "data.Import plans, route choices, and interface settings from a data file": "データファイルから改修計画、ルート選択、画面設定を読み込みます。",
@@ -955,7 +961,7 @@
   "equipment.Search and sort": "検索と並び替え",
   "workbench.Clear filters": "フィルターをクリア",
   "workbench.Display scope": "表示範囲",
-  "workbench.Today improvable": "本日改修可",
+  "workbench.Today improvable": "今日やること",
   "equipment.Plan %d": "計画 %d",
   "workbench.Available dates": "改修可能日",
   "workbench.Expected materials for this upgrade": "今回の改修期待資材",
@@ -969,6 +975,11 @@
   "workbench.Improvement source": "改修入手元",
   "workbench.Periodic quest": "定期任務",
   "workbench.Ship source": "艦娘入手元",
+  "workbench.Acquire Current start": "Current 起点を入手",
+  "workbench.Obtain this Current start before improvement": "改修前にこの Current 起点を入手",
+  "workbench.The selected Current start is not owned yet; acquire it first, then continue the selected route.": "選択した Current 起点は未所持です。先に入手してから、選択済みルートを続行します。",
+  "workbench.Ship remodel at Lv.%d": "Lv.%d で艦娘改造",
+  "workbench.Ship initial equipment": "初期装備",
   "workbench.Sources": "入手元",
   "workbench.No known source": "既知の入手元なし",
   "workbench.Search sources": "入手元を検索",
@@ -1194,7 +1205,7 @@
   "workbench.Select an item to choose its Current start": "装備を選び、Current 開始地点を決めます",
   "workbench.The item stays outside Today until its Current start is resolved": "現在開始地点が確定するまで、この装備は Today に入りません",
   "shared.Choose a Current start before this plan can enter Today": "Current 開始地点を選ぶと、この計画を Today に出せます",
-  "shared.Current improvement starting point": "現在の改修開始地点",
+  "shared.Current improvement starting point": "現在の改修開始点",
   "plan.Choose a Current start candidate before calculating the current execution cost.": "現在実行コストを計算する前に Current 開始候補を選択してください。",
   "plan.Current start selection is still incomplete": "現在開始地点の選択が未完了",
   "workbench.Choose a temporary Current start": "一時的な Current 開始地点を選択",

package/i18n/zh-CN.json

@@ -370,6 +370,7 @@
   "equipment.Plan management": "计划管理",
   "equipment.Consumable plan": "耗材计划",
   "equipment.Materials insufficient": "材料不足",
+  "equipment.Acquire first": "先获取",
   "equipment.Clear": "清空",
   "equipment.Clear filters": "清除筛选",
   "equipment.Completed": "已完成",
@@ -933,12 +934,17 @@
   "shared.System-recommended improvement starting point": "系统推荐的改造起点",
   "shared.Select a valid route before the system can recommend a starting point": "选择有效路线后，系统才能推荐改造起点",
   "shared.Corresponding plan target": "对应计划目标",
+  "shared.Current plan target": "当前计划目标",
+  "shared.For plan": "用于",
   "shared.Related plans": "相关计划",
   "shared.Consumable plan": "耗材计划",
   "workbench.Plan targets": "计划目标",
   "workbench.Plan targets available for improvement on selected day": "今日可改",
-  "workbench.No plan target is available for improvement on selected day": "当天没有可改的未完成计划目标",
+  "workbench.No plan target is available for improvement on selected day": "当天没有需要处理的未完成计划目标",
   "app.Left shows Plan targets that satisfy the selected day's improvement conditions.": "左侧展示当天满足改修条件的计划目标。",
+  "app.Review Current Plan actions today": "查看今天的当前计划动作",
+  "app.Left shows the next Current Plan action, including acquisition before improvement.": "左侧展示当前计划的下一动作，包括改修前需要先获取装备的情况。",
+  "app.Right shows the selected Current Start; low-cost acquisition and equipment-conversion Alternatives remain user-selectable.": "右侧展示已选择的当前起点；低成本获取与装备改修转换备选都保留给用户选择。",
   "data.Data management": "数据管理",
   "data.Export plans, route choices, and interface settings to a data file": "导出改修计划、路线选择和界面设置。",
   "data.Import plans, route choices, and interface settings from a data file": "从数据文件导入改修计划、路线选择和界面设置。",
@@ -955,7 +961,7 @@
   "equipment.Search and sort": "搜索与排序",
   "workbench.Clear filters": "清除筛选",
   "workbench.Display scope": "显示范围",
-  "workbench.Today improvable": "今日可改",
+  "workbench.Today improvable": "今天改什么",
   "equipment.Plan %d": "计划 %d",
   "workbench.Available dates": "可改日期",
   "workbench.Expected materials for this upgrade": "本次升级期望材料",
@@ -969,6 +975,11 @@
   "workbench.Improvement source": "改修来源",
   "workbench.Periodic quest": "周期任务",
   "workbench.Ship source": "舰娘来源",
+  "workbench.Acquire Current start": "获取当前起点",
+  "workbench.Obtain this Current start before improvement": "改修前先获取这个 Current 起点",
+  "workbench.The selected Current start is not owned yet; acquire it first, then continue the selected route.": "当前还没有选中的起点装备；先通过下面的方式获得，再继续所选路线。",
+  "workbench.Ship remodel at Lv.%d": "Lv.%d 舰娘改造获得",
+  "workbench.Ship initial equipment": "初始装备",
   "workbench.Sources": "来源",
   "workbench.No known source": "暂无已知来源",
   "workbench.Search sources": "搜索来源",
@@ -1194,12 +1205,12 @@
   "workbench.Select an item to choose its Current start": "选择一个装备，为它确定 Current 起点",
   "workbench.The item stays outside Today until its Current start is resolved": "当前起点确定之前，该装备不会进入“今天改什么”",
   "shared.Choose a Current start before this plan can enter Today": "选择当前起点后，这个计划才能进入“今天改什么”",
-  "shared.Current improvement starting point": "当前改造起点",
+  "shared.Current improvement starting point": "当前改修起点",
   "plan.Choose a Current start candidate before calculating the current execution cost.": "请先选择 Current 起点候选，再计算当前执行成本。",
   "plan.Current start selection is still incomplete": "当前起点尚未选择",
   "workbench.Choose a temporary Current start": "选择临时 Current 起点",
-  "workbench.Current improvement starting point": "当前改造起点",
-  "app.Review the current improvement starting point": "查看当前改造起点",
+  "workbench.Current improvement starting point": "当前改修起点",
+  "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.": "查看低优先原因，添加推荐或手动条目，并可批量移除。"

package/i18n/zh-TW.json

@@ -370,6 +370,7 @@
   "equipment.Plan management": "計畫管理",
   "equipment.Consumable plan": "耗材計畫",
   "equipment.Materials insufficient": "材料不足",
+  "equipment.Acquire first": "先取得",
   "equipment.Clear": "清空",
   "equipment.Clear filters": "清除篩選",
   "equipment.Completed": "已完成",
@@ -933,12 +934,17 @@
   "shared.System-recommended improvement starting point": "系統推薦的改造起點",
   "shared.Select a valid route before the system can recommend a starting point": "選擇有效路線後，系統才能推薦改造起點",
   "shared.Corresponding plan target": "對應計畫目標",
+  "shared.Current plan target": "目前計畫目標",
+  "shared.For plan": "用於",
   "shared.Related plans": "相關計畫",
   "shared.Consumable plan": "耗材計畫",
   "workbench.Plan targets": "計畫目標",
   "workbench.Plan targets available for improvement on selected day": "今日可改",
-  "workbench.No plan target is available for improvement on selected day": "當天沒有可改的未完成計畫目標",
+  "workbench.No plan target is available for improvement on selected day": "當天沒有需要處理的未完成計畫目標",
   "app.Left shows Plan targets that satisfy the selected day's improvement conditions.": "左側顯示當天符合改修條件的計畫目標。",
+  "app.Review Current Plan actions today": "查看今天的目前計畫動作",
+  "app.Left shows the next Current Plan action, including acquisition before improvement.": "左側顯示目前計畫的下一動作，包括改修前需要先取得裝備的情況。",
+  "app.Right shows the selected Current Start; low-cost acquisition and equipment-conversion Alternatives remain user-selectable.": "右側顯示已選擇的目前起點；低成本取得與裝備改修轉換備選都保留給使用者選擇。",
   "data.Data management": "資料管理",
   "data.Export plans, route choices, and interface settings to a data file": "匯出改修計畫、路線選擇與介面設定。",
   "data.Import plans, route choices, and interface settings from a data file": "從資料檔案匯入改修計畫、路線選擇與介面設定。",
@@ -955,7 +961,7 @@
   "equipment.Search and sort": "搜尋與排序",
   "workbench.Clear filters": "清除篩選",
   "workbench.Display scope": "顯示範圍",
-  "workbench.Today improvable": "今日可改",
+  "workbench.Today improvable": "今天改什麼",
   "equipment.Plan %d": "計畫 %d",
   "workbench.Available dates": "可改日期",
   "workbench.Expected materials for this upgrade": "本次升級期望材料",
@@ -969,6 +975,11 @@
   "workbench.Improvement source": "改修來源",
   "workbench.Periodic quest": "週期任務",
   "workbench.Ship source": "艦娘來源",
+  "workbench.Acquire Current start": "取得目前起點",
+  "workbench.Obtain this Current start before improvement": "改修前先取得這個 Current 起點",
+  "workbench.The selected Current start is not owned yet; acquire it first, then continue the selected route.": "目前尚未持有所選的起點裝備；請先透過下列方式取得，再繼續所選路線。",
+  "workbench.Ship remodel at Lv.%d": "Lv.%d 艦娘改造取得",
+  "workbench.Ship initial equipment": "初始裝備",
   "workbench.Sources": "來源",
   "workbench.No known source": "暫無已知來源",
   "workbench.Search sources": "搜尋來源",
@@ -1194,12 +1205,12 @@
   "workbench.Select an item to choose its Current start": "選擇一件裝備，為它確定 Current 起點",
   "workbench.The item stays outside Today until its Current start is resolved": "目前起點確定之前，此裝備不會進入「今天改什麼」",
   "shared.Choose a Current start before this plan can enter Today": "選擇目前起點後，此計畫才能進入「今天改什麼」",
-  "shared.Current improvement starting point": "目前改造起點",
+  "shared.Current improvement starting point": "目前改修起點",
   "plan.Choose a Current start candidate before calculating the current execution cost.": "請先選擇 Current 起點候選，再計算目前執行成本。",
   "plan.Current start selection is still incomplete": "目前起點尚未選擇",
   "workbench.Choose a temporary Current start": "選擇臨時 Current 起點",
-  "workbench.Current improvement starting point": "目前改造起點",
-  "app.Review the current improvement starting point": "查看目前改造起點",
+  "workbench.Current improvement starting point": "目前改修起點",
+  "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.": "查看低優先原因，加入建議或手動項目，並可批次移除。"

package/package.json

@@ -99,5 +99,5 @@
     "title": "改修助手"
   },
   "private": false,
-  "version": "1.0.1065-beta"
+  "version": "1.0.1069-beta"
 }

package/views/app/changelog-modal.js

@@ -34,13 +34,13 @@ const HELP_AREAS = [{
 }, {
   key: 'targets',
   icon: 'list',
-  title: 'Review plan targets available today',
-  description: "Left shows Plan targets that satisfy the selected day's improvement conditions."
+  title: 'Review Current Plan actions today',
+  description: 'Left shows the next Current Plan action, including acquisition before improvement.'
 }, {
   key: 'starting-point',
   icon: 'play-circle',
   title: 'Review the current improvement starting point',
-  description: 'Right shows the Current Start selected from conservative candidates and current inventory.'
+  description: 'Right shows the selected Current Start; low-cost acquisition and equipment-conversion Alternatives remain user-selectable.'
 }, {
   key: 'materials',
   icon: 'stats',

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

@@ -846,6 +846,8 @@ const selectWorkbenchItems = (items, options = {}) => {
   const resolved = actionable.filter(item => !item.routeSelectionRequired && !item.routeSelectionInvalid);
 
   const availableOnSelectedDay = item => {
+    const acquisitionAction = item && item.todayStage && item.todayStage.kind === 'missing-source' && item.currentStartAcquisition && item.currentStartAcquisition.available === true;
+    if (acquisitionAction) return true;
     if (selectedDay === null) return item.availability.availableToday;
     const availability = item.availability || {};
     const availableDays = availability.theoreticalDays;

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

@@ -168,12 +168,6 @@ class EquipmentList extends _react.Component {
           className: "decision-equipment-icon",
           masterEquips: masterEquips
         }), _react.default.createElement("span", {
-          className: "decision-equipment-meta decision-workbench-tag-column"
-        }, materialShortage && _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"
-        }, __('Consumable plan'))), _react.default.createElement("span", {
           className: "decision-equipment-main decision-workbench-name-column"
         }, _react.default.createElement("span", {
           className: "decision-equipment-title"
@@ -182,7 +176,15 @@ class EquipmentList extends _react.Component {
           title: localizedEquipmentName
         }, _react.default.createElement(EquipmentName, {
           name: localizedEquipmentName
-        })))));
+        })))), _react.default.createElement("span", {
+          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", {
+          className: "decision-pill decision-pill-warning"
+        }, __('Materials insufficient')), activePlan.planKind === 'consumable' && _react.default.createElement("span", {
+          className: "decision-pill decision-pill-primary"
+        }, __('Consumable plan'))));
       }
 
       return _react.default.createElement("button", {

package/views/new-interface/equipment/domain/acquisition-domain.js

@@ -294,44 +294,23 @@ const buildCommonEquipmentAcquisitionIndex = staticItems => Object.keys(staticIt
   return result;
 }, {}); // Current Start candidate search intentionally optimizes for recall rather than
 // automatic route choice. This Acquisition Domain function is the single
-// authority for which external source facts are conservative enough to surface
-// as a selectable Current start candidate. It does not rank or select them.
+// authority for which external source facts are low-cost enough to make an
+// unowned ★0 a formal Current Start Alternative. It does not rank or select
+// among those alternatives; recommendation/presentation must not prune them.
 
 
 exports.buildCommonEquipmentAcquisitionIndex = buildCommonEquipmentAcquisitionIndex;
 
 const currentStartEquipmentAcquisition = section => {
-  const acquisition = section || {};
-  const sources = [];
-
-  if (acquisition.developmentAvailable === true) {
-    sources.push({
-      kind: COMMON_ACQUISITION_KIND.DEVELOPMENT
-    });
-  }
-
-  ;
-  (acquisition.periodicQuests || []).forEach(quest => {
-    sources.push({
-      kind: COMMON_ACQUISITION_KIND.PERIODIC_QUEST,
-      questKey: questKeyOf(quest && (quest.questKey || quest.questId || quest.id || quest.code)),
-      quest: quest || null
-    });
-  });
-  (acquisition.shipSources || []).forEach(source => {
-    sources.push({
-      kind: COMMON_ACQUISITION_KIND.SHIP_EQUIPMENT,
-      shipId: Number(source && source.shipId) || 0,
-      shipName: String(source && source.shipName || ''),
-      method: source && source.method === 'remodel' ? 'remodel' : 'initial',
-      quantity: Number(source && source.quantity) || 0,
-      remodelLevel: Number(source && source.remodelLevel) || 0,
-      shipAvailability: Array.isArray(source && source.shipAvailability) ? source.shipAvailability.slice() : []
-    });
-  });
+  // Current Start may treat an unowned ★0 state as a formal route entry only
+  // when Acquisition Value already classifies the source as low-cost. Reuse
+  // that authority verbatim: this view must not independently reinterpret raw
+  // development / quest / ship facts or surface known expensive ship stages as
+  // if they were equivalent entry points.
+  const lowCost = evaluateEquipmentAcquisitionValue(section).lowCost;
   return Object.freeze({
-    available: sources.length > 0,
-    sources: Object.freeze(sources)
+    available: lowCost.available === true,
+    sources: Object.freeze((lowCost.sources || []).slice())
   });
 };
 

package/views/new-interface/plan/domain/consumable-plan-domain.js

@@ -53,6 +53,7 @@ const parentIdentity = entry => {
 
 const collectConsumablePlanDemands = (workbenchItems, acquisitionValueIndex = {}) => {
   const grouped = {};
+  const frontParentPlanIdByEquipment = {};
   (workbenchItems || []).forEach(entry => {
     const parent = parentIdentity(entry);
     if (!parent) return;
@@ -69,7 +70,15 @@ const collectConsumablePlanDemands = (workbenchItems, acquisitionValueIndex = {}
 
       const acquisitionValue = acquisitionValueIndex[equipmentId] || {};
       const lowCost = acquisitionValue.lowCost || acquisitionValue;
-      if (lowCost.available === true) return;
+      if (lowCost.available === true) return; // A derived Consumable Plan is a local dependency of one Current parent,
+      // not a cross-Plan reservation system. For the same missing equipment,
+      // only the first Current parent in the Base Workbench projection owns the
+      // derived demand. Later parents remain visible as their own future demand
+      // and will become eligible after the front parent disappears or advances.
+
+      const frontParentPlanId = frontParentPlanIdByEquipment[equipmentId];
+      if (frontParentPlanId && frontParentPlanId !== parent.planId) return;
+      if (!frontParentPlanId) frontParentPlanIdByEquipment[equipmentId] = parent.planId;
       const key = `${parent.planId}:${equipmentId}:${CONSUMABLE_PLAN_STAR}`;
 
       if (!grouped[key]) {

package/views/new-interface/plan/domain/current-start-candidate-domain.js

@@ -432,12 +432,15 @@ const buildCurrentStartPlanningStates = input => {
       id: analysis.id,
       level: Number(analysis.goal && analysis.goal.star) || 0
     };
-    const targetKnown = graphContainsNode(graph, target);
-    const crossEquipment = targetKnown && hasCrossEquipmentPredecessor(graph, target);
+    const targetKnownInGraph = graphContainsNode(graph, target);
+    const hasAcquisitionStart = currentStartOptions.some(option => option && option.currentStartKind === CURRENT_START_KIND.ACQUISITION);
+    const targetKnown = targetKnownInGraph || hasAcquisitionStart;
+    const crossEquipment = targetKnownInGraph && hasCrossEquipmentPredecessor(graph, target);
     const requirement = currentStartSelectionRequirement({
       analysis
     });
-    const status = !targetKnown ? CURRENT_START_PLANNING_STATUS.UNREACHABLE : crossEquipment ? currentStartOptions.length > 0 ? CURRENT_START_PLANNING_STATUS.READY : CURRENT_START_PLANNING_STATUS.UNREACHABLE : CURRENT_START_PLANNING_STATUS.DIRECT_ONLY;
+    const needsCurrentStartPlanning = crossEquipment || hasAcquisitionStart;
+    const status = !targetKnown ? CURRENT_START_PLANNING_STATUS.UNREACHABLE : needsCurrentStartPlanning ? currentStartOptions.length > 0 ? CURRENT_START_PLANNING_STATUS.READY : CURRENT_START_PLANNING_STATUS.UNREACHABLE : CURRENT_START_PLANNING_STATUS.DIRECT_ONLY;
     return {
       id: analysis.id,
       status,

package/views/new-interface/shared/components/detail-panel.js

@@ -21,8 +21,6 @@ var _improvementPlanDomain = require("../../plan/domain/improvement-plan-domain"
 
 var _currentPlanExecutionDomain = require("../../plan/domain/current-plan-execution-domain");
 
-var _planRoutePresentation = require("../../plan/model/plan-route-presentation");
-
 var _workbenchDetail = require("../../workbench/components/workbench-detail");
 
 var _upgradeRouteModal = require("../../chain/full/upgrade-route-modal");
@@ -53,12 +51,23 @@ const currentExecutionLevel = item => {
     return stage.sourceLevel;
   }
 
+  if (stage && stage.kind === 'missing-source' && item && item.requiredStart && item.requiredStart.level !== null && item.requiredStart.level !== undefined) {
+    return Number(item.requiredStart.level);
+  }
+
   const action = item && item.action;
   return action ? action.sourceLevel : null;
 };
 
 const planReferenceLevelText = level => Number(level) === 10 ? '+max' : `+${Math.max(Number(level) || 0, 0)}`;
 
+const equipmentPlanText = (masterEquips, equipmentId, star) => {
+  const id = Number(equipmentId) || 0;
+  const master = masterEquips && (masterEquips[id] || masterEquips[String(id)]) || {};
+  const name = master.api_name ? localizedName(master.api_name) : `#${id}`;
+  return `${name} ${planReferenceLevelText(star)}`.trim();
+};
+
 const buildRelatedPlanReferences = item => {
   const planState = item && item.planState ? item.planState : {};
   const goals = Array.isArray(planState.configuredGoals) ? planState.configuredGoals : [];
@@ -70,18 +79,53 @@ const buildRelatedPlanReferences = item => {
     const normalTarget = consumable && star === consumableStar ? Math.max(Number(consumable.baseTarget) || 0, 0) : target;
     return normalTarget > 0 ? result.concat({
       kind: 'normal',
+      equipmentId: Number(item && item.id) || 0,
       star,
       count: normalTarget
     }) : result;
   }, []);
 
   if (consumable && Number(consumable.consumableTarget) > 0) {
-    references.push({
-      kind: 'consumable',
-      star: consumableStar,
-      count: Number(consumable.consumableTarget),
-      parentPlanIds: Array.isArray(consumable.parentPlanIds) ? consumable.parentPlanIds.slice() : []
-    });
+    const demands = Array.isArray(consumable.consumableDemands) ? consumable.consumableDemands : [];
+    const parentReferences = demands.reduce((result, demand) => {
+      const parentEquipmentId = Number(demand && demand.parentEquipmentId) || 0;
+      const parentStar = Number(demand && demand.parentStar);
+      const count = Number(demand && demand.count) || 0;
+      const parentPlanId = String(demand && demand.parentPlanId || '');
+
+      if (!parentEquipmentId || !Number.isInteger(parentStar) || parentStar < 0 || !count) {
+        return result;
+      }
+
+      const key = parentPlanId || `${parentEquipmentId}:${parentStar}`;
+      const current = result[key] || {
+        kind: 'consumable',
+        equipmentId: Number(consumable.equipmentId || item && item.id) || 0,
+        star: consumableStar,
+        count: 0,
+        parentPlanId,
+        parentEquipmentId,
+        parentStar
+      };
+      return _extends({}, result, {
+        [key]: _extends({}, current, {
+          count: current.count + count
+        })
+      });
+    }, {});
+    const resolved = Object.keys(parentReferences).sort().map(key => parentReferences[key]);
+
+    if (resolved.length > 0) {
+      references.push(...resolved);
+    } else {
+      references.push({
+        kind: 'consumable',
+        equipmentId: Number(consumable.equipmentId || item && item.id) || 0,
+        star: consumableStar,
+        count: Number(consumable.consumableTarget),
+        parentPlanIds: Array.isArray(consumable.parentPlanIds) ? consumable.parentPlanIds.slice() : []
+      });
+    }
   }
 
   return references;
@@ -92,8 +136,7 @@ exports.buildRelatedPlanReferences = buildRelatedPlanReferences;
 const planTargetSummary = item => {
   const goal = item && item.planState ? item.planState.activeGoal : null;
   const level = item && item.finalTargetLevel !== null && item.finalTargetLevel !== undefined ? item.finalTargetLevel : goal ? goal.star : null;
-  const count = (0, _planRoutePresentation.projectedPlanTargetCount)(item);
-  return `${localizedName(item && item.row && item.row.api_name)} ${levelText(level)}${count === null ? '' : ` ×${count}`}`.trim();
+  return `${localizedName(item && item.row && item.row.api_name)} ${levelText(level)}`.trim();
 };
 
 class DetailPanel extends _react.Component {
@@ -315,7 +358,7 @@ class DetailPanel extends _react.Component {
       className: "decision-detail-current-level"
     }, levelText(executionLevel))), isPlanWorkbenchItem && _react.default.createElement("div", {
       className: "decision-detail-plan-target"
-    }, _react.default.createElement("span", null, __('Corresponding plan target')), _react.default.createElement("strong", null, planTargetSummary(item)))), isPlanWorkbenchItem && relatedPlans.length > 0 && _react.default.createElement("div", {
+    }, _react.default.createElement("span", null, __('Current plan target')), _react.default.createElement("strong", null, planTargetSummary(item)))), isPlanWorkbenchItem && relatedPlans.length > 0 && _react.default.createElement("div", {
       className: "decision-detail-related-plans"
     }, _react.default.createElement("span", {
       className: "decision-detail-related-plans-label"
@@ -324,7 +367,9 @@ class DetailPanel extends _react.Component {
     }, relatedPlans.map((reference, index) => _react.default.createElement("span", {
       className: `decision-detail-related-plan${reference.kind === 'consumable' ? ' is-consumable' : ''}`,
       key: `${reference.kind}-${reference.star}-${index}`
-    }, reference.kind === 'consumable' && _react.default.createElement("em", null, __('Consumable plan')), _react.default.createElement("strong", null, `${planReferenceLevelText(reference.star)} ×${reference.count}`)))))), this.renderDetail(item, this.getActiveRouteIndex(item))) : _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("span", {
+    }, reference.kind === 'consumable' && _react.default.createElement("em", null, __('Consumable plan')), _react.default.createElement("strong", null, `${equipmentPlanText(masterEquips, reference.equipmentId || item.id, reference.star)} ×${reference.count}`), reference.kind === 'consumable' && reference.parentEquipmentId && _react.default.createElement("span", {
+      className: "decision-detail-related-plan-parent"
+    }, `→ ${__('For plan')} ${equipmentPlanText(masterEquips, reference.parentEquipmentId, reference.parentStar)}`)))))), this.renderDetail(item, this.getActiveRouteIndex(item))) : _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("span", {
       className: "glyphicon glyphicon-hand-left",
       "aria-hidden": "true"
     }), _react.default.createElement("strong", null, __('Select equipment to see the decision details')))))), _react.default.createElement(_upgradeRouteModal.UpgradeRouteModal, {

package/views/new-interface/workbench/components/workbench-detail.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.WorkbenchDetail = exports.TodaySummarySection = exports.AssistantSection = void 0;
+exports.currentStartAcquisitionLines = exports.WorkbenchDetail = exports.TodaySummarySection = exports.CurrentStartAcquisitionSection = exports.AssistantSection = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -139,6 +139,58 @@ TodaySummarySection.propTypes = {
   currentDay: _propTypes.default.number.isRequired
 };
 
+const currentStartAcquisitionLines = acquisition => {
+  const lines = [];
+  (acquisition && acquisition.sources || []).forEach(source => {
+    if (!source) return;
+
+    if (source.kind === 'development') {
+      lines.push(__('Development'));
+      return;
+    }
+
+    if (source.kind === 'periodic-quest') {
+      const quest = source.quest || {};
+      const label = quest.name || quest.title || quest.questName || source.questKey || '?';
+      lines.push(`${__('Periodic quest')}: ${label}`);
+      return;
+    }
+
+    if (source.kind === 'ship-equipment') {
+      const shipName = String(source.shipName || '').trim() || `#${Number(source.shipId) || 0}`;
+      const remodelLevel = Number(source.remodelLevel) || 0;
+      const sourceDetail = source.method === 'remodel' ? __('Ship remodel at Lv.%d').replace('%d', remodelLevel || '?') : __('Ship initial equipment');
+      lines.push(`${__('Ship source')}: ${shipName} · ${sourceDetail}`);
+    }
+  });
+  return Array.from(new Set(lines));
+};
+
+exports.currentStartAcquisitionLines = currentStartAcquisitionLines;
+
+const CurrentStartAcquisitionSection = ({
+  acquisition
+}) => {
+  const lines = currentStartAcquisitionLines(acquisition);
+  return _react.default.createElement("section", {
+    className: "decision-workbench-detail-section decision-workbench-current-start-acquisition"
+  }, _react.default.createElement("div", {
+    className: "decision-guidance-callout is-info"
+  }, _react.default.createElement("span", {
+    className: "glyphicon glyphicon-download-alt",
+    "aria-hidden": "true"
+  }), _react.default.createElement("div", null, _react.default.createElement("strong", null, __('Obtain this Current start before improvement')), _react.default.createElement("span", null, __('The selected Current start is not owned yet; acquire it first, then continue the selected route.')), lines.length > 0 && _react.default.createElement("ul", {
+    className: "decision-workbench-acquisition-source-list"
+  }, lines.map(line => _react.default.createElement("li", {
+    key: line
+  }, line))))));
+};
+
+exports.CurrentStartAcquisitionSection = CurrentStartAcquisitionSection;
+CurrentStartAcquisitionSection.propTypes = {
+  acquisition: _propTypes.default.object.isRequired
+};
+
 const WorkbenchDetail = ({
   item,
   targetItem,
@@ -165,6 +217,8 @@ const WorkbenchDetail = ({
     selectedEquipmentIds,
     selectedConnections
   } = planResolution;
+  const currentStartAcquisition = targetItem.currentStartAcquisition || item && item.currentStartAcquisition || null;
+  const acquisitionRequired = Boolean(targetItem.todayStage && targetItem.todayStage.kind === 'missing-source' && currentStartAcquisition && currentStartAcquisition.available === true);
 
   if (targetItem.routeSelectionRequired || targetItem.routeSelectionInvalid) {
     return _react.default.createElement("div", {
@@ -210,7 +264,13 @@ const WorkbenchDetail = ({
     active: routeIndex === index,
     key: candidate.routeId || `route-${index + 1}`,
     onClick: () => onRouteSelect(index)
-  }, __('Route %d').replace('%d', index + 1))))), _react.default.createElement(_detailPlugin.DetailPlugin, {
+  }, __('Route %d').replace('%d', index + 1))))), acquisitionRequired && _react.default.createElement(_detailPlugin.DetailPlugin, {
+    pluginKey: "workbench-current-start-acquisition",
+    icon: "download-alt",
+    title: __('Acquire Current start')
+  }, _react.default.createElement(CurrentStartAcquisitionSection, {
+    acquisition: currentStartAcquisition
+  })), !acquisitionRequired && _react.default.createElement(_react.default.Fragment, null, _react.default.createElement(_detailPlugin.DetailPlugin, {
     pluginKey: "workbench-assistant",
     icon: "user",
     title: __('Assistant ship')
@@ -242,7 +302,7 @@ const WorkbenchDetail = ({
     resourceBudget: resourceBudget,
     staticItems: staticItems,
     onOpenMaterialDetail: onOpenMaterialDetail
-  }))), _react.default.createElement(_detailPlugin.DetailPlugin, {
+  })))), _react.default.createElement(_detailPlugin.DetailPlugin, {
     pluginKey: "workbench-evolution-chain",
     icon: "random",
     title: __('Evolution chain')