feat: add threshold support and tagmap support to variable system

Introduce a `threshold` column to tag modifiers in CSV declarations,
allowing modifiers to activate only when a tag's count meets a minimum
requirement.

Implement support for "tagmap" variables (e.g., `#warrior:1;#druid:2`)
which allow for complex, multi-tag state tracking. These variables
can receive specialized tagmap modifications rather than simple
numeric additions.

src/cli/completions/declare-parser.ts

@@ -3,15 +3,16 @@
  *
  * Shared between CLI completions scanner and browser-side completions.
  *
- * Format (columns can be in any order; `tag` is optional):
+ * Format (columns can be in any order; `tag` and `threshold` are optional):
- *   tag,key,expr
+ *   tag,threshold,key,expr
- *   ,$hp,$con*5+$mod_hp          ← variable declaration
+ *   ,,$hp,$con*5+$mod_hp          ← variable declaration
- *   ,$ac,10+$dex                   ← variable declaration
+ *   ,,$ac,10+$dex                   ← variable declaration
- *   #warrior,$mod_hp,20           ← tag modifier
+ *   #warrior,2,$mod_hp,20           ← tag modifier (threshold 2)
- *   #warrior,$mod_str,1           ← tag modifier
+ *   #warrior,,$mod_str,1            ← tag modifier (threshold defaults to 1)
  *
  * When `tag` is empty: $key is a reactively computed variable.
- * When `tag` is present: when #tag is active, $key gets expr added to its base.
+ * When `tag` is present: when #tag met (source's tagmap value >= threshold),
+ *   $key gets expr added to its base.
  */
 
 import { parse } from "csv-parse/browser/esm/sync";
@@ -57,6 +58,7 @@ export interface TagModifier {
   tag: string;        // "#warrior"
   target: string;     // "$mod_hp"
   expression: string; // "20"
+  threshold: number;  // minimum tagmap count to activate (default 1)
 }
 
 export interface DeclareResult {
@@ -84,7 +86,7 @@ export function parseDeclareCsv(csv: string, source: string): DeclareResult {
     columns: true,
     trim: true,
     skipEmptyLines: true,
-  }) as Array<{ tag?: string; key: string; expr: string }>;
+  }) as Array<{ tag?: string; threshold?: string; key: string; expr: string }>;
 
   const variables: VarDeclaration[] = [];
   const tagModifiers: TagModifier[] = [];
@@ -111,7 +113,14 @@ export function parseDeclareCsv(csv: string, source: string): DeclareResult {
           `${source}: key must start with $, got "${key}"`,
         );
       }
-      tagModifiers.push({ tag, target: key, expression: expr });
+      const thresholdRaw = row.threshold?.trim() ?? "";
+      const threshold = thresholdRaw ? parseInt(thresholdRaw, 10) : 1;
+      if (isNaN(threshold) || threshold < 1) {
+        throw new Error(
+          `${source}: threshold must be a positive integer, got "${row.threshold}"`,
+        );
+      }
+      tagModifiers.push({ tag, target: key, expression: expr, threshold });
     } else {
       // Variable declaration
       if (!key.startsWith("$")) {

src/cli/completions/variable-system.test.ts

@@ -86,14 +86,44 @@ describe("parseDeclareCsv", () => {
       tag: "#warrior",
       target: "$mod_hp",
       expression: "20",
+      threshold: 1,
     });
     expect(result.tagModifiers[1]).toEqual({
       tag: "#mage",
       target: "$mod_mp",
       expression: "15",
+      threshold: 1,
     });
   });
 
+  test("parses tag modifiers with threshold", () => {
+    const csv = `tag,threshold,key,expr
+#warrior,2,$mod_hp,20
+#mage,,$mod_mp,15`;
+    const result = parseDeclareCsv(csv, "test.md");
+    expect(result.tagModifiers).toHaveLength(2);
+    expect(result.tagModifiers[0]).toEqual({
+      tag: "#warrior",
+      target: "$mod_hp",
+      expression: "20",
+      threshold: 2,
+    });
+    expect(result.tagModifiers[1]).toEqual({
+      tag: "#mage",
+      target: "$mod_mp",
+      expression: "15",
+      threshold: 1,
+    });
+  });
+
+  test("rejects invalid threshold", () => {
+    const csv = `tag,threshold,key,expr
+#warrior,0,$mod_hp,20`;
+    expect(() => parseDeclareCsv(csv, "test.md")).toThrow(
+      "threshold must be a positive integer",
+    );
+  });
+
   test("parses mixed declarations and tag modifiers", () => {
     const csv = `tag,key,expr
 ,$hp,$con*5
@@ -176,6 +206,7 @@ $con*5,$hp,
       tag: "#warrior",
       target: "$mod_hp",
       expression: "20",
+      threshold: 1,
     });
   });
 });
@@ -484,10 +515,10 @@ describe("var-reactivity", () => {
       expect(getCombined("$hp", { $hp: "99" })).toBe("99");
     });
 
-    test("returns tag value without numeric mods", () => {
+    test("returns tagmap value without numeric mods", () => {
       initReactivity({ declarations: [], tagModifiers: [] });
-      setBase("$class", "#warrior");
+      setBase("$class", "#warrior:1");
-      expect(getCombined("$class")).toBe("#warrior");
+      expect(getCombined("$class")).toBe("#warrior:1");
     });
   });
 
@@ -496,14 +527,14 @@ describe("var-reactivity", () => {
       initReactivity({
         declarations: [],
         tagModifiers: [
-          { tag: "#warrior", target: "$mod_hp", expression: "20" },
+          { tag: "#warrior", target: "$mod_hp", expression: "20", threshold: 1 },
-          { tag: "#warrior", target: "$mod_str", expression: "5" },
+          { tag: "#warrior", target: "$mod_str", expression: "5", threshold: 1 },
         ],
       });
 
-      // Set $class to #warrior — should activate both modifiers
+      // Set $class to #warrior:1 — should activate both modifiers
-      setBase("$class", "#warrior");
+      setBase("$class", "#warrior:1");
-      const cascade = computeCascade("$class", undefined, store({ $class: "#warrior" }));
+      const cascade = computeCascade("$class", undefined, store({ $class: "#warrior:1" }));
 
       // Should produce combined values for both targets
       const modHp = cascade.find((r) => r.key === "$mod_hp");
@@ -512,24 +543,24 @@ describe("var-reactivity", () => {
       expect(modStr?.value).toBe("5");
     });
 
-    test("deactivates tag modifiers when tag value changes", () => {
+    test("deactivates tag modifiers when tag is removed from tagmap", () => {
       initReactivity({
         declarations: [],
         tagModifiers: [
-          { tag: "#warrior", target: "$mod_hp", expression: "20" },
+          { tag: "#warrior", target: "$mod_hp", expression: "20", threshold: 1 },
         ],
       });
 
       // First activate
-      setBase("$class", "#warrior");
+      setBase("$class", "#warrior:1");
-      computeCascade("$class", undefined, store({ $class: "#warrior" }));
+      computeCascade("$class", undefined, store({ $class: "#warrior:1" }));
 
       // Now change to a different tag
-      setBase("$class", "#mage");
+      setBase("$class", "#mage:1");
       const cascade = computeCascade(
         "$class",
-        "#warrior",
+        "#warrior:1",
-        store({ $class: "#mage" }),
+        store({ $class: "#mage:1" }),
       );
 
       // Should deactivate #warrior mods (mod_hp goes back to 0)
@@ -541,21 +572,21 @@ describe("var-reactivity", () => {
       initReactivity({
         declarations: [],
         tagModifiers: [
-          { tag: "#warrior", target: "$mod_hp", expression: "20" },
+          { tag: "#warrior", target: "$mod_hp", expression: "20", threshold: 1 },
-          { tag: "#mage", target: "$mod_hp", expression: "10" },
+          { tag: "#mage", target: "$mod_hp", expression: "10", threshold: 1 },
         ],
       });
 
       // Activate #warrior
-      setBase("$class", "#warrior");
+      setBase("$class", "#warrior:1");
-      computeCascade("$class", undefined, store({ $class: "#warrior" }));
+      computeCascade("$class", undefined, store({ $class: "#warrior:1" }));
 
       // Switch to #mage
-      setBase("$class", "#mage");
+      setBase("$class", "#mage:1");
       const cascade = computeCascade(
         "$class",
-        "#warrior",
+        "#warrior:1",
-        store({ $class: "#mage" }),
+        store({ $class: "#mage:1" }),
       );
 
       // Cascade returns both deactivation ("0") and activation ("10") entries.
@@ -564,6 +595,69 @@ describe("var-reactivity", () => {
       const lastModHp = modHpEntries[modHpEntries.length - 1];
       expect(lastModHp?.value).toBe("10");
     });
+
+    test("respects threshold — activates only when count >= threshold", () => {
+      initReactivity({
+        declarations: [],
+        tagModifiers: [
+          { tag: "#warrior", target: "$mod_hp", expression: "20", threshold: 2 },
+        ],
+      });
+
+      // Count 1 < threshold 2 — should NOT activate
+      setBase("$class", "#warrior:1");
+      const cascade1 = computeCascade("$class", undefined, store({ $class: "#warrior:1" }));
+      const modHp1 = cascade1.find((r) => r.key === "$mod_hp");
+      expect(modHp1).toBeUndefined();
+
+      // Increase to count 2 >= threshold 2 — should activate
+      setBase("$class", "#warrior:2");
+      const cascade2 = computeCascade("$class", "#warrior:1", store({ $class: "#warrior:2" }));
+      const modHp2 = cascade2.find((r) => r.key === "$mod_hp");
+      expect(modHp2?.value).toBe("20");
+    });
+
+    test("deactivates when count drops below threshold", () => {
+      initReactivity({
+        declarations: [],
+        tagModifiers: [
+          { tag: "#warrior", target: "$mod_hp", expression: "20", threshold: 2 },
+        ],
+      });
+
+      // Activate with count 2
+      setBase("$class", "#warrior:2");
+      computeCascade("$class", undefined, store({ $class: "#warrior:2" }));
+      expect(getCombined("$mod_hp")).toBe("20");
+
+      // Drop to count 1 < threshold 2 — should deactivate
+      setBase("$class", "#warrior:1");
+      const cascade = computeCascade(
+        "$class",
+        "#warrior:2",
+        store({ $class: "#warrior:1" }),
+      );
+      const modHp = cascade.find((r) => r.key === "$mod_hp");
+      expect(modHp?.value).toBe("0");
+    });
+
+    test("handles multi-tag tagmaps", () => {
+      initReactivity({
+        declarations: [],
+        tagModifiers: [
+          { tag: "#warrior", target: "$mod_hp", expression: "20", threshold: 1 },
+          { tag: "#druid", target: "$mod_mp", expression: "15", threshold: 1 },
+        ],
+      });
+
+      setBase("$class", "#warrior:2;#druid:1");
+      const cascade = computeCascade("$class", undefined, store({ $class: "#warrior:2;#druid:1" }));
+
+      const modHp = cascade.find((r) => r.key === "$mod_hp");
+      const modMp = cascade.find((r) => r.key === "$mod_mp");
+      expect(modHp?.value).toBe("20");
+      expect(modMp?.value).toBe("15");
+    });
   });
 
   describe("computeCascade — declaration re-evaluation", () => {
@@ -605,29 +699,27 @@ describe("var-reactivity", () => {
       expect(cResult?.value).toBe("20"); // 10 + 10
     });
 
-    test("handles tag transition during re-evaluation", () => {
+    test("handles tagmap transition during re-evaluation", () => {
       initReactivity({
         declarations: [
-          { key: "$class", expression: "$level > 5 ? '#warrior' : '#novice'" },
+          { key: "$class", expression: "0" },
         ],
         tagModifiers: [
-          { tag: "#warrior", target: "$mod_hp", expression: "20" },
+          { tag: "#warrior", target: "$mod_hp", expression: "20", threshold: 1 },
-          { tag: "#novice", target: "$mod_hp", expression: "5" },
+          { tag: "#novice", target: "$mod_hp", expression: "5", threshold: 1 },
         ],
-        // Note: the expression above uses a ternary which isn't supported
-        // by the expression evaluator. We'll test with direct tag values.
       });
 
-      // Set $class directly to a tag
+      // Set $class directly to #novice:1
-      setBase("$class", "#novice");
+      setBase("$class", "#novice:1");
-      computeCascade("$class", undefined, store({ $class: "#novice" }));
+      computeCascade("$class", undefined, store({ $class: "#novice:1" }));
 
-      // Now change to #warrior
+      // Now change to #warrior:1
-      setBase("$class", "#warrior");
+      setBase("$class", "#warrior:1");
       const cascade = computeCascade(
         "$class",
-        "#novice",
+        "#novice:1",
-        store({ $class: "#warrior" }),
+        store({ $class: "#warrior:1" }),
       );
 
       // Cascade returns both deactivation and activation entries.
@@ -652,12 +744,12 @@ describe("var-reactivity", () => {
       initReactivity({
         declarations: [],
         tagModifiers: [
-          { tag: "#warrior", target: "$mod_hp", expression: "20" },
+          { tag: "#warrior", target: "$mod_hp", expression: "20", threshold: 1 },
         ],
       });
 
-      setBase("$class", "#warrior");
+      setBase("$class", "#warrior:1");
-      computeCascade("$class", undefined, store({ $class: "#warrior" }));
+      computeCascade("$class", undefined, store({ $class: "#warrior:1" }));
 
       const mods = getMods("$mod_hp");
       expect(mods).toHaveLength(1);

src/components/journal/command-dispatcher.ts

@@ -10,10 +10,25 @@ import { createSignal } from "solid-js";
 import { parseInput } from "./command-parser";
 import { resolveRollPayload } from "./types/roll";
 import { resolveSparkPayload } from "./types/spark";
-import { evaluateExpression, expressionIsTag } from "./variable-expression";
+import { evaluateExpression } from "./variable-expression";
 import { computeCascade, getCombined, setBase } from "./var-reactivity";
 import type { VarDeclaration, TagModifier } from "./declare-parser";
 
+// Tagmap pattern: "#warrior:1;#druid:2". Also accepts bare "#tag" as shorthand.
+const BARE_TAG_PATTERN = /^#[a-zA-Z_][a-zA-Z0-9_]*$/;
+const TAGMAP_PATTERN = /^#[a-zA-Z_][a-zA-Z0-9_]*:\d+(?:;#[a-zA-Z_][a-zA-Z0-9_]*:\d+)*$/;
+
+function isTagMapExpr(expr: string): boolean {
+  const t = expr.trim();
+  return BARE_TAG_PATTERN.test(t) || TAGMAP_PATTERN.test(t);
+}
+
+function normalizeTagMap(expr: string): string {
+  const t = expr.trim();
+  if (BARE_TAG_PATTERN.test(t)) return t + ":1";
+  return t;
+}
+
 // ---------------------------------------------------------------------------
 // Result
 // ---------------------------------------------------------------------------
@@ -174,12 +189,12 @@ function dispatchSet(
 
   try {
     if (p.tags && p.tags.length > 0) {
-      // Rolltag: pick random tag
+      // Rolltag: pick random tag, format as tagmap entry
       const idx = Math.floor(Math.random() * p.tags.length);
-      newValue = p.tags[idx];
+      newValue = normalizeTagMap(p.tags[idx]);
-    } else if (p.expr && expressionIsTag(p.expr)) {
+    } else if (p.expr && isTagMapExpr(p.expr)) {
-      // Bare tag value
+      // Tagmap value (e.g. "#warrior:1;#druid:2" or bare "#warrior")
-      newValue = p.expr.trim();
+      newValue = normalizeTagMap(p.expr);
     } else if (p.expr) {
       // Numeric expression — evaluate using combined values
       const result = evaluateExpression(p.expr, {

src/components/journal/var-reactivity.ts

@@ -5,11 +5,16 @@
  * Runs client-side (in the sender's tab, via command-dispatcher).
  * Uses a base/mod separation:
  *   - baseValues: what /set writes (or declaration evaluation produces)
- *   - activeMods: per-target list of {tag, value, source} from tag activations
+ *   - numericMods: per-target list of {tag, value, source} from tag activations
- *   - sourceActivations: per-source list of {tag, target, value} for deactivation
+ *   - tagMapMods: per-target list of {tag, value, source} for tagmap targets
+ *   - sourceActivations: per-source list of {tag, target, value, threshold, kind}
+ *     for deactivation
  *
- * Combined value = base + sum(activeMods). Tag values (starting with #)
+ * Variables have one of two types:
- * are not numeric and don't receive mods.
+ *   - numeric: base + sum(numericMods)
+ *   - tagmap (#warrior:1;#druid:2): the tagmap is used for threshold-gated
+ *     modifier activation; tagmap variables do not receive numeric mods but
+ *     can receive tagmap mods (adding/subtracting to specific tag counts).
  *
  * All functions that resolve variable values accept an explicit `fallback`
  * (the stream VariableStore) rather than relying on mutable module state.
@@ -35,6 +40,51 @@ export interface ActiveMod {
   tag: string;      // "#warrior"
   value: number;    // evaluated modifier expression result
   source: string;   // "$class" — which variable activated this tag
+  threshold: number; // the threshold that triggered this activation
+  kind: "numeric" | "tagmap";
+}
+
+// ---------------------------------------------------------------------------
+// Tagmap helpers
+// ---------------------------------------------------------------------------
+
+/** Tagmap serialization format: "#warrior:1;#druid:2" */
+const TAGMAP_RE = /^#([a-zA-Z_][a-zA-Z0-9_]*):(\d+)$/;
+
+/** Parse a tagmap string. Returns null if the value is not a valid tagmap. */
+function parseTagMap(value: string | undefined): Record<string, number> | null {
+  if (!value) return null;
+  const trimmed = value.trim();
+  if (!trimmed.startsWith("#")) return null;
+
+  const parts = trimmed.split(";");
+  const map: Record<string, number> = {};
+
+  for (const part of parts) {
+    const m = TAGMAP_RE.exec(part.trim());
+    if (!m) return null; // invalid entry
+    const tag = "#" + m[1];
+    const count = parseInt(m[2], 10);
+    if (count <= 0) continue; // skip zero/negative counts on parse
+    map[tag] = (map[tag] ?? 0) + count;
+  }
+
+  return Object.keys(map).length > 0 ? map : null;
+}
+
+/** Serialize a tagmap back to string. Returns empty string if map is empty. */
+function tagMapToString(map: Record<string, number>): string {
+  const entries = Object.entries(map).filter(([, c]) => c > 0);
+  if (entries.length === 0) return "";
+  return entries.map(([tag, count]) => `${tag}:${count}`).join(";");
+}
+
+/** Check if a value is a tagmap string. */
+function isTagMapValue(value: string | undefined): boolean {
+  if (!value) return false;
+  const trimmed = value.trim();
+  if (!trimmed.startsWith("#")) return false;
+  return parseTagMap(trimmed) !== null;
 }
 
 // ---------------------------------------------------------------------------
@@ -47,17 +97,26 @@ let depGraph: Map<string, Set<string>> | null = null;
 /** Reverse: $declaredVar → its expression */
 let declExprs: Map<string, string> | null = null;
 
-/** Tag modifiers from declare blocks: #tag → [{target, expression}] */
+/** Tag modifiers from declare blocks: #tag → [{target, expression, threshold}] */
-let tagModMap: Map<string, Array<{ target: string; expression: string }>> | null = null;
+let tagModMap: Map<string, Array<{ target: string; expression: string; threshold: number }>> | null = null;
 
 /** Base values set by /set or declaration evaluation */
 const baseValues = new Map<string, string>();
 
-/** Active mods per target: $target → [{tag, value, source}] */
+/** Numeric mods per target: $target → [{tag, value, source, ...}] */
-const activeMods = new Map<string, ActiveMod[]>();
+const numericMods = new Map<string, ActiveMod[]>();
 
-/** Activations per source: $source → [{tag, target, value}] */
+/** Tagmap mods per target: $target → [{tag, value, source, ...}] */
-const sourceActivations = new Map<string, Array<{ tag: string; target: string; value: number }>>();
+const tagMapMods = new Map<string, ActiveMod[]>();
+
+/** Activations per source: $source → [{tag, target, value, threshold, kind}] */
+const sourceActivations = new Map<string, Array<{
+  tag: string;
+  target: string;
+  value: number;
+  threshold: number;
+  kind: "numeric" | "tagmap";
+}>>();
 
 /** Set of $vars currently being re-evaluated (cycle guard) */
 const inFlight = new Set<string>();
@@ -77,7 +136,8 @@ export function initReactivity(state: VarReactivityState): void {
   declExprs = new Map();
   tagModMap = new Map();
   baseValues.clear();
-  activeMods.clear();
+  numericMods.clear();
+  tagMapMods.clear();
   sourceActivations.clear();
 
   // Index tag modifiers
@@ -87,7 +147,7 @@ export function initReactivity(state: VarReactivityState): void {
       list = [];
       tagModMap.set(tm.tag, list);
     }
-    list.push({ target: tm.target, expression: tm.expression });
+    list.push({ target: tm.target, expression: tm.expression, threshold: tm.threshold });
   }
 
   // Index declarations and build dependency graph
@@ -120,17 +180,30 @@ export function extractDependencies(expr: string): string[] {
 }
 
 /**
- * Get the combined value of a variable (base + sum of active mods).
+ * Get the combined value of a variable.
+ * - For tagmap variables: returns the serialized tagmap (base + tagmap mods).
+ * - For numeric variables: returns base + sum(numericMods).
  * Falls back to the provided stream store for variables not tracked locally.
  */
 export function getCombined(key: string, fallback?: VariableStore): string {
   const base = baseValues.get(key);
-  if (base !== undefined && isTagValue(base)) {
+
-    return base; // tag values don't receive numeric mods
+  if (base !== undefined && isTagMapValue(base)) {
+    // Tagmap variable: apply tagmap mods, then serialize
+    const baseMap = parseTagMap(base);
+    const mods = tagMapMods.get(key) ?? [];
+    if (baseMap && mods.length === 0) return base;
+    const resultMap: Record<string, number> = { ...(baseMap ?? {}) };
+    for (const m of mods) {
+      resultMap[m.tag] = (resultMap[m.tag] ?? 0) + m.value;
+      if (resultMap[m.tag] <= 0) delete resultMap[m.tag];
+    }
+    const serialized = tagMapToString(resultMap);
+    return serialized || "0";
   }
 
   const baseNum = base !== undefined ? parseFloat(base) : NaN;
-  const mods = activeMods.get(key) ?? [];
+  const mods = numericMods.get(key) ?? [];
   const modSum = mods.reduce((sum, m) => sum + m.value, 0);
 
   if (!isNaN(baseNum)) {
@@ -143,15 +216,35 @@ export function getCombined(key: string, fallback?: VariableStore): string {
   const fb = fallback?.[key];
   if (fb !== undefined) return fb;
 
-  // No base, but has mods
+  // No base, but has numeric mods
   if (mods.length > 0) return String(modSum);
 
   return "0";
 }
 
+/**
+ * Get the effective tagmap for a variable (base + tagmap mods).
+ * Returns null if the variable is not a tagmap variable.
+ */
+export function getTagMap(key: string): Record<string, number> | null {
+  const base = baseValues.get(key);
+  if (base === undefined || !isTagMapValue(base)) return null;
+  const baseMap = parseTagMap(base);
+  if (!baseMap) return null;
+  const mods = tagMapMods.get(key) ?? [];
+  const result: Record<string, number> = { ...baseMap };
+  for (const m of mods) {
+    result[m.tag] = (result[m.tag] ?? 0) + m.value;
+    if (result[m.tag] <= 0) delete result[m.tag];
+  }
+  return Object.keys(result).length > 0 ? result : null;
+}
+
 /** Get the active mods for a variable (for UI hover display). */
 export function getMods(key: string): ActiveMod[] {
-  return activeMods.get(key) ?? [];
+  const nums = numericMods.get(key) ?? [];
+  const tags = tagMapMods.get(key) ?? [];
+  return [...nums, ...tags];
 }
 
 /** Get the declaration expression for a variable, if any. */
@@ -168,7 +261,7 @@ export function setBase(key: string, value: string): void {
 }
 
 /**
- * Rebuild local reactivity state (baseValues, activeMods, sourceActivations)
+ * Rebuild local reactivity state (baseValues, mods, sourceActivations)
  * from the hydrated stream variable store. Must be called after replayReducers
  * so that tag activations are correctly tracked for subsequent cascade
  * computations.
@@ -181,9 +274,12 @@ export function rebuildReactivityFromStore(variables: VariableStore): void {
       baseValues.set(key, value);
     }
 
-    const tag = isTagValue(value);
+    const tagMap = isTagMapValue(value) ? parseTagMap(value) : null;
-    if (tag && !sourceActivations.has(key)) {
+    if (tagMap && !sourceActivations.has(key)) {
-      activateTagFromSource(key, tag, variables);
+      // Activate all tags in the tagmap
+      const added = applyTagMapActivations(key, {}, tagMap, variables);
+      // We don't return the added entries here — they'll be applied
+      // to the store separately
     }
   }
 }
@@ -209,26 +305,12 @@ export function computeCascade(
 
   // ---- Tag activation/deactivation ----
   const newValue = getCombined(changedVar, currentVars);
-  const newTag = isTagValue(newValue);
+  const oldTagMap = isTagMapValue(oldValue) ? parseTagMap(oldValue) : {};
-  const oldTag = isTagValue(oldValue);
+  const newTagMap = isTagMapValue(newValue) ? parseTagMap(newValue) : {};
 
-  if (newTag !== oldTag) {
+  // Diff tagmaps and apply changes
-    // Deactivate old tag
+  const tagResults = applyTagMapActivations(changedVar, oldTagMap ?? {}, newTagMap ?? {}, currentVars);
-    if (oldTag) {
+  results.push(...tagResults);
-      const removed = deactivateTagFromSource(changedVar, oldTag, currentVars);
-      for (const r of removed) {
-        results.push(r);
-      }
-    }
-
-    // Activate new tag
-    if (newTag) {
-      const added = activateTagFromSource(changedVar, newTag, currentVars);
-      for (const r of added) {
-        results.push(r);
-      }
-    }
-  }
 
   // ---- Declaration re-evaluation ----
   const reevaluated = reevaluateDependents(changedVar, currentVars);
@@ -270,10 +352,10 @@ export function computeInitialValues(
       const rawValue = String(result.value);
       baseValues.set(key, rawValue);
 
-      // Check if this is a tag value — if so, activate it
+      // Check if this is a tagmap value — if so, activate matching modifiers
-      const tag = isTagValue(rawValue);
+      const tagMap = isTagMapValue(rawValue) ? parseTagMap(rawValue) : null;
-      if (tag) {
+      if (tagMap) {
-        const added = activateTagFromSource(key, tag, currentVars);
+        const added = applyTagMapActivations(key, {}, tagMap, currentVars);
         for (const r of added) {
           if (!results.some((x) => x.key === r.key)) {
             results.push(r);
@@ -295,56 +377,89 @@ export function computeInitialValues(
 }
 
 // ---------------------------------------------------------------------------
-// Tag activation / deactivation (source-based)
+// Tag activation / deactivation (threshold-based)
 // ---------------------------------------------------------------------------
 
-function isTagValue(value: string | undefined): string | null {
+/**
-  if (!value) return null;
+ * Apply tagmap changes for a source variable. Compares old and new tagmaps,
-  const trimmed = value.trim();
+ * activating/deactivating modifiers whose threshold crossing state changed.
-  return trimmed.startsWith("#") ? trimmed : null;
+ */
-}
+function applyTagMapActivations(
-
-/** Activate a tag from a source variable. Evaluates modifiers once. */
-function activateTagFromSource(
   source: string,
-  tag: string,
+  oldTagMap: Record<string, number>,
+  newTagMap: Record<string, number>,
   fallback: VariableStore,
 ): Array<{ key: string; value: string }> {
   if (!tagModMap) return [];
 
-  const mods = tagModMap.get(tag);
-  if (!mods) return [];
-
   const results: Array<{ key: string; value: string }> = [];
-  const sourceEntries: Array<{ tag: string; target: string; value: number }> = [];
+  const allTags = new Set([...Object.keys(oldTagMap), ...Object.keys(newTagMap)]);
 
-  for (const mod of mods) {
+  for (const tag of allTags) {
+    const mods = tagModMap.get(tag);
+    if (!mods || mods.length === 0) continue;
+
+    const oldCount = oldTagMap[tag] ?? 0;
+    const newCount = newTagMap[tag] ?? 0;
+
+    for (let modIdx = 0; modIdx < mods.length; modIdx++) {
+      const mod = mods[modIdx];
+      const wasActive = oldCount >= mod.threshold;
+      const isActive = newCount >= mod.threshold;
+
+      if (!wasActive && isActive) {
+        // Activate this modifier
         try {
-      // Snapshot the target's current combined value as its base before
+          // Snapshot target's current value as base if needed
-      // adding the mod, so deactivation can restore it correctly.
           if (!baseValues.has(mod.target)) {
             baseValues.set(mod.target, getCombined(mod.target, fallback));
           }
 
-      const result = evaluateExpression(mod.expression, {
+          const evalResult = evaluateExpression(mod.expression, {
             lookup: (name: string) => {
               const k = "$" + name;
               return getCombined(k, fallback);
             },
           });
 
-      const entry: ActiveMod = { tag, value: result.value, source };
+          const value = evalResult.value;
+          const targetIsTagMap = isTagMapValue(baseValues.get(mod.target));
 
-      let targetMods = activeMods.get(mod.target);
+          if (targetIsTagMap) {
+            // Apply as tagmap mod to the target's tag count
+            const entry: ActiveMod = { tag, value, source, threshold: mod.threshold, kind: "tagmap" };
+            let targetMods = tagMapMods.get(mod.target);
             if (!targetMods) {
               targetMods = [];
-        activeMods.set(mod.target, targetMods);
+              tagMapMods.set(mod.target, targetMods);
             }
             targetMods.push(entry);
+          } else {
+            // Apply as numeric mod
+            const entry: ActiveMod = { tag, value, source, threshold: mod.threshold, kind: "numeric" };
+            let targetMods = numericMods.get(mod.target);
+            if (!targetMods) {
+              targetMods = [];
+              numericMods.set(mod.target, targetMods);
+            }
+            targetMods.push(entry);
+          }
 
-      sourceEntries.push({ tag, target: mod.target, value: result.value });
+          // Track in source activations for deactivation
+          let sourceEntries = sourceActivations.get(source);
+          if (!sourceEntries) {
+            sourceEntries = [];
+            sourceActivations.set(source, sourceEntries);
+          }
+          sourceEntries.push({
+            tag,
+            target: mod.target,
+            value,
+            threshold: mod.threshold,
+            kind: targetIsTagMap ? "tagmap" : "numeric",
+          });
 
-      // Emit new combined value for the target
+          // Emit new combined value
           const combined = getCombined(mod.target, fallback);
           const existing = results.findIndex((r) => r.key === mod.target);
           if (existing >= 0) {
@@ -355,52 +470,55 @@ function activateTagFromSource(
         } catch {
           // skip failed modifier
         }
-  }
+      } else if (wasActive && !isActive) {
+        // Deactivate this modifier
+        const sourceEntries = sourceActivations.get(source);
+        if (!sourceEntries) continue;
 
-  sourceActivations.set(source, sourceEntries);
+        const idx = sourceEntries.findIndex(
-  return results;
+          (e) => e.tag === tag && e.target === mod.target && e.threshold === mod.threshold,
-}
-
-/** Deactivate a tag from a source variable. Removes exactly the mods it created. */
-function deactivateTagFromSource(
-  source: string,
-  _tag: string,
-  fallback: VariableStore,
-): Array<{ key: string; value: string }> {
-  const entries = sourceActivations.get(source);
-  if (!entries) return [];
-
-  const results: Array<{ key: string; value: string }> = [];
-  const affectedTargets = new Set<string>();
-
-  // Remove mods from activeMods
-  for (const entry of entries) {
-    const targetMods = activeMods.get(entry.target);
-    if (!targetMods) continue;
-
-    const idx = targetMods.findIndex(
-      (m) => m.tag === entry.tag && m.source === source,
         );
-    if (idx >= 0) {
+        if (idx < 0) continue;
-      targetMods.splice(idx, 1);
+
-      affectedTargets.add(entry.target);
+        const entry = sourceEntries[idx];
+        sourceEntries.splice(idx, 1);
+
+        // Remove from the appropriate mod list
+        if (entry.kind === "tagmap") {
+          const targetMods = tagMapMods.get(entry.target);
+          if (targetMods) {
+            const modIdx = targetMods.findIndex(
+              (m) => m.tag === tag && m.source === source && m.threshold === mod.threshold,
+            );
+            if (modIdx >= 0) targetMods.splice(modIdx, 1);
+            if (targetMods.length === 0) tagMapMods.delete(entry.target);
+          }
+        } else {
+          const targetMods = numericMods.get(entry.target);
+          if (targetMods) {
+            const modIdx = targetMods.findIndex(
+              (m) => m.tag === tag && m.source === source && m.threshold === mod.threshold,
+            );
+            if (modIdx >= 0) targetMods.splice(modIdx, 1);
+            if (targetMods.length === 0) numericMods.delete(entry.target);
           }
         }
 
-  // Clean up empty arrays
+        // Emit updated combined value
-  for (const target of affectedTargets) {
+        const combined = getCombined(entry.target, fallback);
-    const mods = activeMods.get(target);
+        const existing = results.findIndex((r) => r.key === entry.target);
-    if (mods && mods.length === 0) {
+        if (existing >= 0) {
-      activeMods.delete(target);
+          results[existing] = { key: entry.target, value: combined };
+        } else {
+          results.push({ key: entry.target, value: combined });
+        }
+      }
     }
   }
 
-  // Remove source activations
+  // Clean up empty sourceActivations
+  if (sourceActivations.get(source)?.length === 0) {
     sourceActivations.delete(source);
-
-  // Emit new combined values for affected targets
-  for (const target of affectedTargets) {
-    results.push({ key: target, value: getCombined(target, fallback) });
   }
 
   return results;
@@ -455,32 +573,19 @@ function reevaluateDependents(
 
       const rawValue = String(result.value);
 
-      // Check for tag transition on this declared variable
+      // Check for tagmap transition on this declared variable
       const oldCombined = getCombined(key, fallback);
-      const oldTag = isTagValue(oldCombined);
+      const oldTagMap = isTagMapValue(oldCombined) ? parseTagMap(oldCombined) : {};
-      const newTag = isTagValue(rawValue);
+      const newTagMap = isTagMapValue(rawValue) ? parseTagMap(rawValue) : {};
 
-      if (oldTag !== newTag) {
+      if (JSON.stringify(oldTagMap) !== JSON.stringify(newTagMap)) {
-        // Deactivate old tag
+        const tagResults = applyTagMapActivations(key, oldTagMap ?? {}, newTagMap ?? {}, fallback);
-        if (oldTag) {
+        for (const r of tagResults) {
-          const removed = deactivateTagFromSource(key, oldTag, fallback);
-          for (const r of removed) {
           if (!results.some((x) => x.key === r.key)) {
             results.push(r);
           }
         }
       }
-        // Activate new tag
-        if (newTag) {
-          baseValues.set(key, rawValue);
-          const added = activateTagFromSource(key, newTag, fallback);
-          for (const r of added) {
-            if (!results.some((x) => x.key === r.key)) {
-              results.push(r);
-            }
-          }
-        }
-      }
 
       // Update base value
       baseValues.set(key, rawValue);