fix: enhance exports with new assigned nodes

Author: rockfactory

.gitignore

@@ -153,4 +153,4 @@ scratch/
 tmp/
 temp/
 playground/
-.claude/settings.local.json
+.claude/

src/factories/inputs/input-row/FactoryInputRow.tsx

@@ -119,6 +119,15 @@ export function FactoryInputRow(props: IFactoryInputRowProps) {
   const handleFactoryChange = useCallback(
     (selectedFactoryId: string | null) => {
       onChangeHandler(`inputs.${index}.factoryId`)(selectedFactoryId);
+
+      // `nodeIds` is only meaningful for World inputs. If the user
+      // moves the source away from WORLD, drop any dormant assignment
+      // so a future toggle back to WORLD doesn't silently reactivate
+      // node bindings the user had effectively abandoned.
+      if (selectedFactoryId !== WORLD_SOURCE_ID) {
+        useStore.getState().clearInputAssignment(factoryId, index);
+      }
+
       if (
         !selectedFactoryId ||
         selectedFactoryId === WORLD_SOURCE_ID ||
@@ -138,7 +147,7 @@ export function FactoryInputRow(props: IFactoryInputRowProps) {
         );
       }
     },
-    [onChangeHandler, index, input.resource],
+    [onChangeHandler, index, input.resource, factoryId],
   );
 
   const isVisible = useIsFactoryVisible(factoryId, false, input.resource);

src/factories/store/factoryNodeAssignmentsSelectors.ts

@@ -67,7 +67,7 @@ export const useNodeAssignments = (
         if (!input.nodeIds || input.nodeIds.length === 0) return;
         if (!input.resource) return;
 
-        // One row per assigned node — the resolution step below joins
+        // One row per assigned node. The resolution step below joins
         // each row back to a NodeAssignmentRef.
         for (const nodeId of input.nodeIds) {
           parts.push(
@@ -119,7 +119,7 @@ export const useNodeAssignments = (
         resource,
       };
 
-      // Multiple inputs/factories CAN share the same node — keep them
+      // Multiple inputs/factories CAN share the same node, keep them
       // as an array so the popup can list all of them.
       const arr = result[nodeId] ?? [];
       arr.push(ref);
@@ -148,7 +148,7 @@ export const useFactoryInputAssignedNodes = (
   );
 
   // Encode `[resource, ...nodeIds]` as a single string. Empty when
-  // there's nothing to render — the consumer can short-circuit.
+  // there's nothing to render, the consumer can short-circuit.
   const signature = useStore(state => {
     if (!factoryId || inputIndex == null) return '';
     const input = state.factories.factories[factoryId]?.inputs?.[inputIndex];
@@ -171,7 +171,7 @@ export const useFactoryInputAssignedNodes = (
     const out: WorldResourceNode[] = [];
     for (const id of ids) {
       const node = byId.get(id);
-      if (!node) continue; // orphan — node removed by a savegame import
+      if (!node) continue; // orphan: node removed by a savegame import
       if (node.resource !== resource) continue; // resource swap auto-heal
       out.push(node);
     }

src/games/store/gameFactoriesActions.ts

@@ -149,10 +149,16 @@ export const gameFactoriesActions = createActions({
         name: disambiguateFactoryName(payload.factory.name, existingNames),
         // Cross-factory references don't exist in the target game, so drop
         // them to avoid orphan links pointing at unrelated factories.
-        inputs: (payload.factory.inputs ?? []).map(input => ({
-          ...input,
-          factoryId: null,
-        })),
+        // `nodeIds` are also game-specific (resource node ids belong to the
+        // source game, especially after savegame randomizer overrides), so
+        // strip them to prevent dormant assignments reactivating if the
+        // user later toggles the source back to WORLD.
+        inputs: (payload.factory.inputs ?? []).map(
+          ({ nodeIds: _nodeIds, ...rest }) => ({
+            ...rest,
+            factoryId: null,
+          }),
+        ),
       };
       state.factories.factories[newFactoryId] = importedFactory;
 
@@ -271,8 +277,11 @@ export function serializeFactory(factoryId: string): SerializedFactory {
 
   const cleanedFactory: Factory = {
     ...cloneDeep(factory),
-    inputs: (factory.inputs ?? []).map(input => ({
-      ...input,
+    // Same scrub as the importer side: drop cross-factory `factoryId`
+    // links AND the game-specific `nodeIds` so the serialized blob has
+    // no dangling references back to the source game.
+    inputs: (factory.inputs ?? []).map(({ nodeIds: _nodeIds, ...rest }) => ({
+      ...rest,
       factoryId: null,
     })),
   };

src/map/AssignNodesToInputModal.tsx

@@ -27,7 +27,7 @@ export interface AssignNodesToInputModalProps {
 }
 
 // Sentinel for the "Create new World input" option in the input
-// dropdown — never collides with a real input index.
+// dropdown: never collides with a real input index.
 const CREATE_NEW_VALUE = '__create__';
 
 interface ExistingAssignment {
@@ -46,7 +46,7 @@ interface ExistingAssignment {
  *      Hitting "Add" assigns and resets the dropdowns WITHOUT closing,
  *      so the user can chain "this node is fed by 3 factories" in one
  *      session.
- *   3. "Done" closes. Selection is intentionally NOT cleared here —
+ *   3. "Done" closes. Selection is intentionally NOT cleared here:
  *      the caller decides whether the multi-select stays alive after
  *      assignment (e.g. the sum-mode summary keeps it).
  */
@@ -191,7 +191,7 @@ export function AssignNodesToInputModal({
 
   // ─── Remove handler: unassigns ALL matched nodes from a single
   //     (factory, input) pair. The action mutates one node at a time
-  //     because the underlying store action is per-node — this is fine
+  //     because the underlying store action is per-node, this is fine
   //     in practice, the loop runs inside one React render.
   const handleRemove = (entry: ExistingAssignment) => {
     const state = useStore.getState();
@@ -245,7 +245,7 @@ export function AssignNodesToInputModal({
             </Text>
             {existingAssignments.length === 0 ? (
               <Text size="xs" c="dimmed">
-                No assignments yet — pick a factory and input below.
+                No assignments yet. Pick a factory and input below.
               </Text>
             ) : (
               <Table withRowBorders={false} verticalSpacing={4}>
@@ -306,7 +306,7 @@ export function AssignNodesToInputModal({
 
             {factoryOptions.length === 0 ? (
               <Text size="xs" c="dimmed">
-                No factories in this game yet — create one first.
+                No factories in this game yet. Create one first.
               </Text>
             ) : (
               <Group gap="xs" align="flex-end" wrap="nowrap">

src/map/ResourceMarkersLayer.tsx

@@ -148,7 +148,7 @@ function buildPopupHtml(
     .filter(Boolean)
     .join(' ');
 
-  // "Assigned to: X · Y" line — only rendered when there's an actual
+  // "Assigned to: X · Y" line, only rendered when there's an actual
   // label to show. Reuses `__method` styling to match the other
   // metadata lines visually.
   const assignmentLine =

src/map/WorldMapView.tsx

@@ -144,6 +144,7 @@ export function WorldMapView({ gameId }: WorldMapViewProps) {
     hideUsedNodes,
     usedNodesList,
     sumMode,
+    selectedNodeIdsList,
     collectibleVisibility,
     hideCollectedCollectibles,
     collectedList,
@@ -156,6 +157,13 @@ export function WorldMapView({ gameId }: WorldMapViewProps) {
       hideUsedNodes: mapState?.hideUsedNodes ?? false,
       usedNodesList: game?.usedNodes ?? EMPTY_USED_NODES,
       sumMode: state.mapSelection?.sumMode ?? false,
+      // Subscribed here so the filter memo invalidates when the user
+      // navigates in from the input row's "View on map" button. The
+      // selection seed has to bypass `hideUsedNodes` (assignment
+      // automatically marks nodes as used, otherwise the markers
+      // would arrive on a map that immediately hides them).
+      selectedNodeIdsList:
+        state.mapSelection?.selectedNodeIds ?? EMPTY_USED_NODES,
       collectibleVisibility:
         mapState?.collectibleVisibility ?? EMPTY_COLLECTIBLE_VISIBILITY,
       hideCollectedCollectibles: mapState?.hideCollectedCollectibles ?? false,
@@ -170,6 +178,10 @@ export function WorldMapView({ gameId }: WorldMapViewProps) {
 
   const usedNodes = useMemo(() => new Set(usedNodesList), [usedNodesList]);
   const collectedIds = useMemo(() => new Set(collectedList), [collectedList]);
+  const selectedNodeIdsSet = useMemo(
+    () => new Set(selectedNodeIdsList),
+    [selectedNodeIdsList],
+  );
 
   // ─── Node-to-factory assignments. The selector returns the
   //     full per-node ref array (already filtered for orphans and
@@ -195,8 +207,8 @@ export function WorldMapView({ gameId }: WorldMapViewProps) {
 
   // ─── Assignment modal state. Owned here (not in the marker
   //     layer) so the same modal instance is reused regardless of
-  //     entry point — popup action, sum-mode summary, or future
-  //     callers — and so the modal renders inside the React tree
+  //     entry point (popup action, sum-mode summary, or future
+  //     callers), and so the modal renders inside the React tree
   //     instead of the imperative Leaflet layer.
   const [assignTarget, setAssignTarget] = useState<WorldResourceNode | null>(
     null,
@@ -213,11 +225,27 @@ export function WorldMapView({ gameId }: WorldMapViewProps) {
   // biome-ignore lint/correctness/useExhaustiveDependencies: savegameOverrides is read indirectly via getWorldResourceNodes' useStore.getState() lookup; the dep is required to invalidate the memo on import.
   const filteredNodes = useMemo(() => {
     return getWorldResourceNodes(gameId).filter(node => {
+      // Selection always wins. Reason: the user got here either via
+      // "View on map" from a factory input row (we just programmatic-
+      // ally selected the assigned nodes) or via an explicit click on
+      // the marker. Either way, hiding the very thing they pointed
+      // at would be hostile UX. This also covers the assignment side-
+      // effect: assigning a node marks it as used, so without this
+      // override the freshly-assigned nodes would vanish under
+      // `hideUsedNodes`.
+      if (selectedNodeIdsSet.has(node.id)) return true;
       if (!resourceFilters[node.resource]?.includes(node.purity)) return false;
       if (hideUsedNodes && usedNodes.has(node.id)) return false;
       return true;
     });
-  }, [gameId, resourceFilters, hideUsedNodes, usedNodes, savegameOverrides]);
+  }, [
+    gameId,
+    resourceFilters,
+    hideUsedNodes,
+    usedNodes,
+    selectedNodeIdsSet,
+    savegameOverrides,
+  ]);
 
   const filteredCollectibles = useMemo(() => {
     return getWorldCollectibles().filter(collectible => {

src/solver/store/solverFactoriesActions.ts

@@ -173,7 +173,7 @@ export const solverFactoriesActions = createActions({
 
       // ─── Step 3: also mark the nodes as "used" at the game level
       //     so the map's "hide used" filter behaves consistently.
-      //     Add-only by design — see the action JSDoc for why we
+      //     Add-only by design: see the action JSDoc for why we
       //     never remove from `usedNodes` on unassign.
       if (gameId) {
         const game = state.games.games[gameId];