fix(solver): derive rates from stock goals

Author: ApocDev

app/src/db/queries.server.ts

@@ -1911,7 +1911,7 @@ function recipeSignature(name: string): string {
  * save time; a mismatch on a later check means the block's own inputs changed. */
 /** Bumped when solver semantics change — folded into the reference fingerprint
  * so every cache from an older solver reads stale and re-solves on first touch. */
-const SOLVER_VERSION = "sv3";
+const SOLVER_VERSION = "sv4";
 
 export function blockReferenceFingerprint(data: BlockData): string {
   const parts: string[] = [`S ${SOLVER_VERSION}`];

app/src/lib/goals.test.ts

@@ -51,6 +51,14 @@ describe("normalizeBlockData", () => {
     expect(normalizeBlockData(data)).toEqual(data);
   });
 
+  it("repairs a stale stock-goal rate from its amount and refill window", () => {
+    expect(
+      normalizeBlockData({
+        goals: [{ name: "belt", rate: 1, stock: 100, window: 600 }],
+      }).goals,
+    ).toEqual([{ name: "belt", rate: 1 / 6, stock: 100, window: 600 }]);
+  });
+
   it("yields an empty goal list for an empty block", () => {
     expect(normalizeBlockData({ recipes: [] }).goals).toEqual([]);
   });

app/src/lib/goals.ts

@@ -23,7 +23,7 @@ export type RawBlockData = Partial<Omit<BlockData, "goals">> & {
   target?: string;
   rate?: number;
   extraGoals?: string[];
-  goals?: Array<{ name: string; rate: number | null }>;
+  goals?: Array<Omit<Goal, "rate"> & { rate: number | null }>;
 };
 
 /** Migrate a possibly-legacy block doc to the `goals` shape. Idempotent: a doc that
@@ -33,7 +33,13 @@ export function normalizeBlockData<T extends RawBlockData>(d: T): BlockData {
   const { target, rate, extraGoals: _extraGoals, goals, ...rest } = d;
   if (Array.isArray(goals)) {
     // Drop any rate-less goals (old "unpinned co-products") — they're byproducts now.
-    const kept = goals.filter((g): g is Goal => !!g.name && g.rate != null);
+    const kept = goals
+      .filter((g): g is Goal => !!g.name && g.rate != null)
+      .map((g) => {
+        if (g.stock == null) return g;
+        const window = g.window ?? STOCK_WINDOW_DEFAULT;
+        return { ...g, window, rate: g.stock / window };
+      });
     return { ...(rest as object), goals: kept } as BlockData;
   }
   const next: Goal[] = [];

app/src/server/agent-tools-goals.test.ts

@@ -121,6 +121,14 @@ describe("submitBlock/submitPlan/buildingBill: multi-goal + keep-in-stock goals
     expect(res.goals).toEqual([{ name: "iron-plate", rate: 0.1, stock: 60, window: 600 }]);
   });
 
+  it("stock/window wins when a stale explicit rate is also present", async () => {
+    const res = await draft({
+      goals: [{ name: "iron-plate", rate: 1, stock: 100, window: 600 }],
+      recipes: ["iron-plate"],
+    });
+    expect(res.goals).toEqual([{ name: "iron-plate", rate: 1 / 6, stock: 100, window: 600 }]);
+  });
+
   it("supports multiple goals in one block — a rate goal and a stock goal together", async () => {
     const res = await draft({
       goals: [

app/src/server/agent-tools.server.ts

@@ -772,7 +772,7 @@ function resolveGoals(input: {
   if (input.goals?.length) {
     return input.goals.map((g) => {
       const window = g.window ?? STOCK_WINDOW_DEFAULT;
-      const rate = g.rate ?? g.stock! / window;
+      const rate = g.stock != null ? g.stock / window : g.rate!;
       return { name: g.name, rate, ...(g.stock != null ? { stock: g.stock, window } : {}) };
     });
   }

docs/development/solver.md

@@ -63,6 +63,8 @@ from the Block balance Imports list rather than rendering the same contract twic
 A stock goal stores an amount and replenishment window. The compute layer converts it to
 `amount / window` for solving, then tags its persisted factory flow as stock replenishment
 rather than continuous output.
+Normalization derives that rate on every read, making `stock` plus `window` authoritative even
+if an older document also contains a stale explicit rate.
 
 The first goal anchors the block's name, scaling controls, and default icon. Additional
 goals participate in the same solve without changing that identity.

docs/guide/blocks.md

@@ -29,6 +29,8 @@ Select **New block**, then use **+ goal** to choose an item or fluid.
 Right-click a goal and select **Keep in stock instead (buffer, not throughput)** when the
 intent is to refill a quantity over time rather than sustain a continuous rate. Stock-only
 production appears separately in Factory.
+The solver rate is always the stock amount divided by its refill window; an older saved rate
+cannot turn a buffer goal back into continuous production.
 
 A negative goal is already the block's visible import contract, so Block balance does not
 repeat that good under **Imports**. Other ingredients the block needs still appear there.