@weasel-js/routing 1.9.3 → 1.9.4

package/README.md

@@ -21,11 +21,12 @@ scene graph, the renderer and the concrete dependency interfaces all live in
 
 ## The dependency schema
 
-`DepSchema` is declared here as an empty interface. Everything that names a
-dependency — `Action.requires`, `DepRegistry.get`, `useDepSource` — is keyed on
-`keyof DepSchema`, so the set of legal names is whatever has been merged into
-it. `@weasel-js/core` merges the kit's own 24 deps; a consumer adds its own the
-same way:
+`DepSchema` is declared here with one entry, `activeTool`, the dep routing's own
+`tool.offhand` action requires. Everything that names a dependency —
+`Action.requires`, `DepRegistry.get`, `useDepSource` — is keyed on
+`keyof DepSchema`, so the set of legal names is that entry plus whatever has
+been merged in. `@weasel-js/core` merges the kit's own deps; a consumer adds its
+own the same way:
 
 ```ts
 declare module '@weasel-js/core' {

package/dist/{chunk-LOP2JTTA.js → chunk-Y5RURZBH.js}

@@ -1,4 +1,4 @@
-import { RESERVED_ID_PREFIXES, RESERVED_ID_NAMES, parseTargetSpec, matchSpec, routeGestureForSpecKind, getGestureDescriptor, formatRoute, canonicalModifiers, specificity } from '@weasel-js/gestures';
+import { RESERVED_ID_PREFIXES, RESERVED_ID_NAMES, parseTargetSpec, matchSpec, routeGestureForSpecKind, getGestureDescriptor, formatRoute, canonicalModifiers, VALID_MOD_NAMES, specificity } from '@weasel-js/gestures';
 export { GESTURE_DESCRIPTORS, RESERVED_ID_NAMES, RESERVED_ID_PREFIXES, ROUTE_FIELD_DEFINITIONS, ROUTE_TERMS, canonicalModifiers, collapseShiftPairs, describeRoute, describeRouteParts, formatPhaseAtom, formatRoute, getGestureDescriptor, isKnownGestureName, matchKey, matchModifiers, matchPhase, matchSpec, matchTarget, parseRoute, routeGestureForSpecKind, specKindForRouteGesture, specificity } from '@weasel-js/gestures';
 import { activeModeOf, NORMAL, DEFAULT_MODES } from '@weasel-js/modes';
 import { resolveCursor } from '@weasel-js/cursor';
@@ -155,6 +155,7 @@ var DepNode = class extends ScopeNode {
       const stack = this.sources.get(key);
       if (stack) stack.push(entry);
       else this.sources.set(key, [entry]);
+      this.changed();
       let released = false;
       return () => {
         if (released) return;
@@ -165,6 +166,7 @@ var DepNode = class extends ScopeNode {
         if (i === -1) return;
         cur.splice(i, 1);
         if (cur.length === 0) this.sources.delete(key);
+        this.changed();
       };
     },
     get: (name) => {
@@ -173,7 +175,14 @@ var DepNode = class extends ScopeNode {
         if (source) return source();
       }
       return void 0;
-    }
+    },
+    subscribe: (listener) => {
+      this.tree.listeners.add(listener);
+      return () => {
+        this.tree.listeners.delete(listener);
+      };
+    },
+    changed: () => this.changed()
   };
   constructor(parent, descends) {
     super(parent, descends);
@@ -248,11 +257,15 @@ function offhandKeyFor(trigger) {
   }
 }
 function buildToolOffhandBindings(specs) {
-  return specs.map(({ toolId, key }) => ({
-    spec: { kind: "key-held", key },
-    opts: { params: { toolId } }
-  }));
+  return specs.map(({ toolId, key }) => ({ spec: heldKeySpec(key), opts: { params: { toolId } } }));
 }
+function heldKeySpec(key) {
+  const isModifier = [key].flat().some((k) => MODIFIER_KEYS.has(k));
+  return { kind: "key-held", key, mods: { ...isModifier ? ANY_MODS : SHIFT_OR_ALT } };
+}
+var MODIFIER_KEYS = /* @__PURE__ */ new Set(["Alt", "Control", "Meta", "Shift"]);
+var ANY_MODS = { alt: "optional", ctrl: "optional", meta: "optional", shift: "optional" };
+var SHIFT_OR_ALT = { alt: "optional", shift: "optional" };
 function makeToolOffhandAction(bindings) {
   return {
     id: TOOL_OFFHAND_ID,
@@ -299,6 +312,26 @@ function scopeBindings(entries, state) {
   }
   return out;
 }
+function assembleEntries(entries, inputs) {
+  const all = [...entries];
+  const ordered = [];
+  for (let i = inputs.hotkeyStack.length - 1; i >= 0; i--) {
+    const entry = all.find((e) => e.id === inputs.hotkeyStack[i]);
+    if (entry && !ordered.includes(entry)) ordered.push(entry);
+  }
+  for (const entry of all) {
+    if (!ordered.includes(entry)) ordered.push(entry);
+  }
+  const allowed = inputs.allowedCapabilities;
+  return {
+    ordered,
+    state: {
+      focusedId: inputs.focusedId,
+      engagedIds: new Set(inputs.hotkeyStack),
+      ...allowed ? { allows: (tags) => tags.every((tag) => allowed.has(tag)) } : {}
+    }
+  };
+}
 
 // src/devFlag.ts
 function isDev() {
@@ -313,7 +346,7 @@ function targetConsultsAffordance(specTarget) {
   if (form === null) return false;
   switch (form.form) {
     case "predicate":
-      return form.kindOf.readsAffordance !== false;
+      return form.kindOf.readsAffordance === true;
     case "affordance":
       return true;
     case "body":
@@ -739,9 +772,8 @@ function buildRuleCtx(args) {
     device: args.device
   };
 }
-function pointerGestureId(pointerId) {
-  return `pointer-${pointerId ?? "mouse"}`;
-}
+
+// src/interactions/dispatcher/dispatchTrace.ts
 var DEV2 = (() => {
   try {
     return Boolean(import.meta.env?.DEV);
@@ -770,6 +802,25 @@ function recordModeSwitch(mode, from, to, detail) {
     ...detail !== void 0 ? { detail } : {}
   });
 }
+
+// src/interactions/dispatcher/inputFacts.ts
+function modifiersOf(e) {
+  return { alt: e.altKey, ctrl: e.ctrlKey, meta: e.metaKey, shift: e.shiftKey };
+}
+function worldPointOf(event) {
+  switch (event.kind) {
+    case "pointerdown":
+    case "longpress":
+    case "click":
+    case "doubleclick":
+    case "contextmenu":
+      return event.x !== void 0 && event.y !== void 0 ? { x: event.x, y: event.y } : void 0;
+    default:
+      return void 0;
+  }
+}
+
+// src/interactions/dispatcher/ranking.ts
 function liveInView(binding, view) {
   const views = binding.opts?.views;
   return views === void 0 || views.includes(view);
@@ -833,22 +884,76 @@ function sameSpecificity(a, b) {
   const sb = specificity(b);
   return sa.every((v, i) => v === sb[i]);
 }
-var EMPTY_ENGAGED2 = /* @__PURE__ */ new Set();
-function modifiersOf(e) {
-  return { alt: e.altKey, ctrl: e.ctrlKey, meta: e.metaKey, shift: e.shiftKey };
+
+// src/interactions/dispatcher/buildDispatchRecord.ts
+function buildDispatchRecord(r, walked, event, ctx, predicted, outcome) {
+  const view = ctx.viewId ?? null;
+  const candidates = /* @__PURE__ */ new Map();
+  const candidateOf = (m) => {
+    let c = candidates.get(m);
+    if (!c) {
+      const eligible = r.actionMap.get(m.binding.actionId)?.eligible;
+      c = {
+        actionId: m.binding.actionId,
+        routes: routesForSpec(m.binding.spec),
+        scope: m.scope,
+        ownerId: m.ownerId,
+        namesView: namesView(m.binding, view),
+        specificity: specificity(m.binding.spec),
+        ...eligible !== void 0 ? { eligible: describeEligible(eligible) } : {}
+      };
+      candidates.set(m, c);
+    }
+    return c;
+  };
+  const dropped = [
+    ...r.barred.map((m) => ({
+      candidate: candidateOf(m),
+      filter: "claim",
+      ...r.claimOwner !== void 0 ? { owner: r.claimOwner } : {}
+    }))
+  ];
+  for (const m of r.ordered) {
+    if (r.eligible(m)) continue;
+    const c = candidateOf(m);
+    dropped.push({ candidate: c, filter: "ineligible", rule: c.eligible ?? "" });
+  }
+  const gated = (m) => r.actionMap.get(m.binding.actionId)?.eligible !== void 0;
+  const ranked = walked.steps.map(({ match, step }, i) => {
+    const prev = walked.steps[i - 1]?.match;
+    return {
+      candidate: candidateOf(match),
+      placedBy: prev ? placedBy(prev, match, view, r.ruleCtx !== void 0 && gated(prev) && !gated(match)) : { step: "first" },
+      walk: step
+    };
+  });
+  const eventKey = event.kind === "key" || event.kind === "key-held" ? event.key : void 0;
+  const world = worldPointOf(event);
+  return {
+    kind: "dispatch",
+    ts: Date.now(),
+    input: {
+      eventKind: event.kind,
+      ...eventKey !== void 0 ? { key: eventKey } : {},
+      modifiers: modifiersOf(event),
+      viewId: view,
+      ...world !== void 0 ? { world } : {},
+      ...r.ruleCtx !== void 0 ? { mode: r.ruleCtx.mode } : {}
+    },
+    matched: [...r.ordered, ...r.barred].map(candidateOf),
+    dropped,
+    ranked,
+    predicted,
+    fired: walked.winner?.action.id ?? null,
+    outcome
+  };
 }
-function worldPointOf(event) {
-  switch (event.kind) {
-    case "pointerdown":
-    case "longpress":
-    case "click":
-    case "doubleclick":
-    case "contextmenu":
-      return event.x !== void 0 && event.y !== void 0 ? { x: event.x, y: event.y } : void 0;
-    default:
-      return void 0;
-  }
+
+// src/interactions/dispatcher/dispatcher.ts
+function pointerGestureId(pointerId) {
+  return `pointer-${pointerId ?? "mouse"}`;
 }
+var EMPTY_ENGAGED2 = /* @__PURE__ */ new Set();
 function createDispatcher(opts) {
   const inFlightHandles = /* @__PURE__ */ new Map();
   const inFlightOwners = /* @__PURE__ */ new Map();
@@ -949,7 +1054,7 @@ function createDispatcher(opts) {
   }
   function gestureIdFor(event) {
     if (event.kind === "key-held") {
-      return `key-held-${event.key}`;
+      return `key-held-${event.code ?? event.key}`;
     }
     if (event.kind === "pointerdown" || event.kind === "pointermove" || event.kind === "pointerup" || event.kind === "pointercancel") {
       return pointerGestureId(event.pointerId);
@@ -960,23 +1065,14 @@ function createDispatcher(opts) {
     return `ongoing-${event.kind}`;
   }
   function assembleScopedBindings(ctx) {
-    const ordered = [];
-    for (let i = ctx.hotkeyStack.length - 1; i >= 0; i--) {
-      const id = ctx.hotkeyStack[i];
-      const entry = ctx.entriesById.get(id);
-      if (entry && !ordered.includes(entry)) ordered.push(entry);
-    }
-    for (const entry of ctx.entriesById.values()) {
-      if (!ordered.includes(entry)) ordered.push(entry);
-    }
-    const capsCtx = ctx.getRuleCtx?.();
-    const allows = capsCtx ? (tags) => tags.every((tag) => capsCtx.allowedCapabilities.has(tag)) : void 0;
-    const view = ctx.viewId ?? null;
-    const result = scopeBindings(ordered, {
+    const allowedCapabilities = ctx.getRuleCtx?.()?.allowedCapabilities;
+    const { ordered, state } = assembleEntries(ctx.entriesById.values(), {
       focusedId: ctx.activeToolId,
-      engagedIds: new Set(ctx.hotkeyStack),
-      ...allows ? { allows } : {}
-    }).filter((sb) => liveInView(sb.binding, view));
+      hotkeyStack: ctx.hotkeyStack,
+      ...allowedCapabilities ? { allowedCapabilities } : {}
+    });
+    const view = ctx.viewId ?? null;
+    const result = scopeBindings(ordered, state).filter((sb) => liveInView(sb.binding, view));
     for (const action of ctx.actions.list()) {
       const targetScope = action.scope === "hotkey" ? "hotkey" : "ambient";
       for (const binding of actionBindings(action)) {
@@ -1001,20 +1097,31 @@ function createDispatcher(opts) {
     }
     return map;
   }
+  function runOnEnd(gestureId, handle, endCtx, reason) {
+    try {
+      handle.onEnd?.(endCtx, reason);
+    } catch (err) {
+      console.error(`weasel dispatcher: gesture "${gestureId}" threw on onEnd`, err);
+    }
+  }
+  function endGesture(gestureId, event, reason) {
+    const handle = inFlightHandles.get(gestureId);
+    if (!handle) return false;
+    const endCtx = buildInvocationCtx(event, {}, gestureId);
+    inFlightHandles.delete(gestureId);
+    inFlightOwners.delete(gestureId);
+    inFlightActions.delete(gestureId);
+    dragOrigins.delete(gestureId);
+    dragPoints.delete(gestureId);
+    pinchStartSpreads.delete(gestureId);
+    runOnEnd(gestureId, handle, endCtx, reason);
+    return true;
+  }
   function handleInput(event, ctx) {
     routedView = ctx.viewId;
     if (event.kind === "key-held" && event.phase === "up") {
       const gestureId = gestureIdFor(event);
-      const handle = inFlightHandles.get(gestureId);
-      if (handle) {
-        const stubCtx = buildInvocationCtx(event, {}, gestureId);
-        handle.onEnd?.(stubCtx, "commit");
-        inFlightHandles.delete(gestureId);
-        inFlightOwners.delete(gestureId);
-        inFlightActions.delete(gestureId);
-        dragOrigins.delete(gestureId);
-      }
-      return handle ? "handled" : "unhandled";
+      return endGesture(gestureId, event, "commit") ? "handled" : "unhandled";
     }
     if (event.kind === "key-held" && event.phase === "down") {
       const gestureId = gestureIdFor(event);
@@ -1045,31 +1152,18 @@ function createDispatcher(opts) {
     }
     if (event.kind === "pointerup") {
       const gestureId = gestureIdFor(event);
-      const handle = inFlightHandles.get(gestureId);
-      if (handle) {
-        const endCtx = buildInvocationCtx(event, {}, gestureId);
-        handle.onEnd?.(endCtx, "commit");
-        inFlightHandles.delete(gestureId);
-        inFlightOwners.delete(gestureId);
-        inFlightActions.delete(gestureId);
-        dragOrigins.delete(gestureId);
-        dragPoints.delete(gestureId);
-      }
-      return handle ? "handled" : "unhandled";
+      return endGesture(gestureId, event, "commit") ? "handled" : "unhandled";
     }
     if (event.kind === "pointercancel") {
       const gestureId = gestureIdFor(event);
-      const handle = inFlightHandles.get(gestureId);
-      if (handle) {
-        const endCtx = buildInvocationCtx(event, {}, gestureId);
-        handle.onEnd?.(endCtx, "cancel");
-        inFlightHandles.delete(gestureId);
-        inFlightOwners.delete(gestureId);
-        inFlightActions.delete(gestureId);
-        dragOrigins.delete(gestureId);
-        dragPoints.delete(gestureId);
+      return endGesture(gestureId, event, "cancel") ? "handled" : "unhandled";
+    }
+    if (event.kind === "multitouch" && event.end !== void 0) {
+      let ended = false;
+      for (const id of [...inFlightHandles.keys()]) {
+        if (id.startsWith("multitouch-")) ended = endGesture(id, event, event.end) || ended;
       }
-      return handle ? "handled" : "unhandled";
+      return ended ? "handled" : "unhandled";
     }
     if (event.kind === "multitouch" && event.centroid !== void 0) {
       const gestureId = gestureIdFor(event);
@@ -1079,19 +1173,14 @@ function createDispatcher(opts) {
         handle.onMove(moveCtx);
         return "handled";
       }
-      for (const [id, other] of [...inFlightHandles]) {
-        if (!id.startsWith("multitouch-") || id === gestureId) continue;
-        other.onEnd?.(buildInvocationCtx(event, {}, id), "cancel");
-        inFlightHandles.delete(id);
-        inFlightOwners.delete(id);
-        inFlightActions.delete(id);
-        pinchStartSpreads.delete(id);
+      for (const id of [...inFlightHandles.keys()]) {
+        if (id.startsWith("multitouch-") && id !== gestureId) endGesture(id, event, "cancel");
       }
     }
     const r = rank(event, ctx, DEV2);
     const walked = walk(r, event, ctx, (match, action, deps) => invoke(event, match, action, deps), false);
     const outcome = walked.stop === "fired" ? "handled" : "unhandled";
-    if (DEV2) recordTrace(buildRecord(r, walked, event, ctx, false, outcome));
+    if (DEV2) recordTrace(buildDispatchRecord(r, walked, event, ctx, false, outcome));
     return outcome;
   }
   function invoke(event, match, action, deps) {
@@ -1296,68 +1385,6 @@ function createDispatcher(opts) {
     }
     return { steps, stop, winner };
   }
-  function buildRecord(r, walked, event, ctx, predicted, outcome) {
-    const view = ctx.viewId ?? null;
-    const candidates = /* @__PURE__ */ new Map();
-    const candidateOf = (m) => {
-      let c = candidates.get(m);
-      if (!c) {
-        const eligible = r.actionMap.get(m.binding.actionId)?.eligible;
-        c = {
-          actionId: m.binding.actionId,
-          routes: routesForSpec(m.binding.spec),
-          scope: m.scope,
-          ownerId: m.ownerId,
-          namesView: namesView(m.binding, view),
-          specificity: specificity(m.binding.spec),
-          ...eligible !== void 0 ? { eligible: describeEligible(eligible) } : {}
-        };
-        candidates.set(m, c);
-      }
-      return c;
-    };
-    const dropped = [
-      ...r.barred.map((m) => ({
-        candidate: candidateOf(m),
-        filter: "claim",
-        ...r.claimOwner !== void 0 ? { owner: r.claimOwner } : {}
-      }))
-    ];
-    for (const m of r.ordered) {
-      if (r.eligible(m)) continue;
-      const c = candidateOf(m);
-      dropped.push({ candidate: c, filter: "ineligible", rule: c.eligible ?? "" });
-    }
-    const gated = (m) => r.actionMap.get(m.binding.actionId)?.eligible !== void 0;
-    const ranked = walked.steps.map(({ match, step }, i) => {
-      const prev = walked.steps[i - 1]?.match;
-      return {
-        candidate: candidateOf(match),
-        placedBy: prev ? placedBy(prev, match, view, r.ruleCtx !== void 0 && gated(prev) && !gated(match)) : { step: "first" },
-        walk: step
-      };
-    });
-    const eventKey = event.kind === "key" || event.kind === "key-held" ? event.key : void 0;
-    const world = worldPointOf(event);
-    return {
-      kind: "dispatch",
-      ts: Date.now(),
-      input: {
-        eventKind: event.kind,
-        ...eventKey !== void 0 ? { key: eventKey } : {},
-        modifiers: modifiersOf(event),
-        viewId: view,
-        ...world !== void 0 ? { world } : {},
-        ...r.ruleCtx !== void 0 ? { mode: r.ruleCtx.mode } : {}
-      },
-      matched: [...r.ordered, ...r.barred].map(candidateOf),
-      dropped,
-      ranked,
-      predicted,
-      fired: walked.winner?.action.id ?? null,
-      outcome
-    };
-  }
   function resolveAll(event, ctx, resolveOpts) {
     const evaluateShadowed = resolveOpts?.evaluateShadowed ?? false;
     const r = rank(event, ctx, false);
@@ -1416,7 +1443,7 @@ function createDispatcher(opts) {
   function explain(event, ctx, explainOpts) {
     const r = rank(event, ctx, true);
     const walked = walk(r, event, ctx, null, explainOpts?.evaluateShadowed ?? false);
-    return buildRecord(r, walked, event, ctx, true, walked.winner ? "handled" : "unhandled");
+    return buildDispatchRecord(r, walked, event, ctx, true, walked.winner ? "handled" : "unhandled");
   }
   function cancelAll(reason) {
     const stubCtx = {
@@ -1424,9 +1451,7 @@ function createDispatcher(opts) {
       modifiers: { alt: false, ctrl: false, meta: false, shift: false },
       deps: {}
     };
-    for (const handle of inFlightHandles.values()) {
-      handle.onEnd?.(stubCtx, reason);
-    }
+    const ending = [...inFlightHandles];
     inFlightHandles.clear();
     inFlightOwners.clear();
     inFlightActions.clear();
@@ -1434,6 +1459,7 @@ function createDispatcher(opts) {
     dragOrigins.clear();
     dragPoints.clear();
     pinchStartSpreads.clear();
+    for (const [gestureId, handle] of ending) runOnEnd(gestureId, handle, stubCtx, reason);
   }
   function inFlight() {
     return inFlightHandles;
@@ -1441,8 +1467,8 @@ function createDispatcher(opts) {
   function inFlightCursor() {
     let cursor = null;
     for (const action of inFlightActions.values()) {
-      const c = resolveCursor(action.activeCursor ?? action.cursor);
-      if (c) cursor = c;
+      const spec = action.activeCursor ?? action.cursor;
+      if (spec !== void 0 && resolveCursor(spec)) cursor = spec;
     }
     return cursor;
   }
@@ -1469,13 +1495,20 @@ function createDispatcher(opts) {
     return { kind: lastHandle.kind ?? null, id: lastId };
   }
   const handleInputWithNotify = (event, ctx) => {
-    const out = handleInput(event, ctx);
-    notify();
-    return out;
+    const before = inFlightHandles.size;
+    try {
+      return handleInput(event, ctx);
+    } finally {
+      if (before > 0 || inFlightHandles.size > 0) notify();
+    }
   };
   const cancelAllWithNotify = (reason) => {
-    cancelAll(reason);
-    notify();
+    const before = inFlightHandles.size;
+    try {
+      cancelAll(reason);
+    } finally {
+      if (before > 0) notify();
+    }
   };
   function beginUiOngoing(actionId, deps, params) {
     const getAction = opts?.getAction;
@@ -1520,6 +1553,9 @@ function createDispatcher(opts) {
     const live = () => !ended && inFlightHandles.get(gestureId) === handle;
     return {
       gestureId,
+      get active() {
+        return live();
+      },
       update(nextParams) {
         if (!live()) return;
         if (!handle.onMove) return;
@@ -1688,33 +1724,45 @@ function findConflictsKeyed(entries, rules, modes = KIT_MODES) {
   const groups = /* @__PURE__ */ new Map();
   for (const entry of rows) {
     for (const arg of argKeysOf(entry)) {
-      const key = `${entry.phase}|${entry.gesture}|${arg}|${targetKey(entry)}|${canonicalModifiers(entry.modifiers)}`;
-      const bucket = groups.get(key);
-      if (bucket) {
-        if (!bucket.includes(entry)) bucket.push(entry);
-      } else groups.set(key, [entry]);
+      const base = `${entry.phase}|${entry.gesture}|${arg}|${targetKey(entry)}`;
+      for (const state of modifierTieKeys(entry)) {
+        const key = `${base}|${state}`;
+        const bucket = groups.get(key);
+        if (bucket) {
+          if (!bucket.members.includes(entry)) bucket.members.push(entry);
+        } else groups.set(key, { base, members: [entry] });
+      }
     }
   }
   const ruleOf = (entry) => rules?.get(entry.ownerId) ?? ALWAYS;
   const tie = (e, f) => viewsTie(e.views, f.views) && rulesCanHoldTogether(ruleOf(e), ruleOf(f), modes);
-  const conflicts = [];
-  for (const [key, all] of groups) {
-    const bucket = all.filter((e) => all.some((f) => f !== e && tie(e, f)));
+  const conflicts = /* @__PURE__ */ new Map();
+  for (const { base, members } of groups.values()) {
+    const bucket = members.filter((e) => members.some((f) => f !== e && tie(e, f)));
     if (bucket.length < 2) continue;
     const first = bucket[0];
-    conflicts.push({
-      key,
-      conflict: {
-        phase: first.phase,
-        gesture: first.gesture,
-        arg: first.arg,
-        target: first.target,
-        modifiers: first.modifiers,
-        ownerIds: bucket.map((e) => e.ownerId)
-      }
+    const key = `${base}|${bucket.map((e) => `${objectId(e.spec)}:${canonicalModifiers(e.modifiers)}`).join(";")}`;
+    if (conflicts.has(key)) continue;
+    conflicts.set(key, {
+      phase: first.phase,
+      gesture: first.gesture,
+      arg: first.arg,
+      target: first.target,
+      modifiers: first.modifiers,
+      ownerIds: bucket.map((e) => e.ownerId)
     });
   }
-  return conflicts;
+  return [...conflicts].map(([key, conflict]) => ({ key, conflict }));
+}
+function modifierTieKeys(entry) {
+  const optional = VALID_MOD_NAMES.filter((k) => entry.modifiers[k] === "optional");
+  const required = VALID_MOD_NAMES.filter((k) => entry.modifiers[k] === "required");
+  const keys = [];
+  for (let bits = 0; bits < 1 << optional.length; bits++) {
+    const held = [...required, ...optional.filter((_, i) => (bits & 1 << i) !== 0)].sort();
+    keys.push(`${held.join("+")}:${required.length}`);
+  }
+  return keys;
 }
 function viewsTie(a, b) {
   if (a === void 0 || b === void 0) return a === b;
@@ -1730,15 +1778,15 @@ function targetKey(entry) {
   const spec = entry.spec;
   const pred = spec.target;
   if (typeof pred !== "object" || pred === null) return PREDICATE_TARGET;
-  return `${PREDICATE_TARGET}#${predicateId(pred)}`;
+  return `${PREDICATE_TARGET}#${objectId(pred)}`;
 }
-var PREDICATE_IDS = /* @__PURE__ */ new WeakMap();
-var nextPredicateId = 0;
-function predicateId(pred) {
-  let id = PREDICATE_IDS.get(pred);
+var OBJECT_IDS = /* @__PURE__ */ new WeakMap();
+var nextObjectId = 0;
+function objectId(obj) {
+  let id = OBJECT_IDS.get(obj);
   if (id === void 0) {
-    id = nextPredicateId++;
-    PREDICATE_IDS.set(pred, id);
+    id = nextObjectId++;
+    OBJECT_IDS.set(obj, id);
   }
   return id;
 }
@@ -1788,7 +1836,7 @@ function findScopedConflicts(scopes) {
   if (ambient.length > 1) add(findConflictsKeyed(ambient, rules, modes));
   if (gatedActions.length > 1) add(findConflictsKeyed(gatedActions, rules, modes));
   const hotkey = [
-    ...registry.filter((t) => t.def?.hotkey !== void 0),
+    ...registry.filter((t) => t.eligibility?.offhand !== void 0 || t.def?.hotkey !== void 0),
     ...hotkeyActions
   ];
   if (hotkey.length > 1) add(findConflictsKeyed(hotkey, rules, modes));
@@ -1972,7 +2020,11 @@ function dlog(namespace, ...args) {
   if (!isDebugEnabled(namespace)) return;
   console.debug(`[${namespace}]`, ...args);
 }
+function dwarn(namespace, ...args) {
+  if (!isDebugEnabled(namespace)) return;
+  console.warn(`[${namespace}]`, ...args);
+}
 
-export { ALWAYS, COARSE_TARGET_SCALE, DEFAULT_ALLOWED_CAPABILITIES, DEFAULT_DEVICE_PROFILE, DepNode, INGEST_STRING_MIMES, LONG_PRESS_MS, NEVER, PREDICATE_TARGET, ScopeNode, TOOL_OFFHAND_ID, actionBindings, activatesFocusedControl, buildDepsFromRequires, buildRouteRegistry, buildRuleCtx, buildToolOffhandBindings, clientToCanvas, clientToCanvasRect, createDepRegistry, createDispatcher, createLongPressStore, depNodeOf, describeRule, dlog, evaluate, findConflicts, historyKey, isDev, isEditableTarget, isTool, itemsFromClipboardData, itemsFromDataTransfer, itemsFromFiles, liveScope, makeToolOffhandAction, matchBest, matchSorted, matchSortedWithBarred, matchesKeyBinding, offhandKeyFor, openPointerSession, pointerGestureId, publishLiveDispatch, pushOwner, recordModeSwitch, reportRouteConflicts, resolveDeviceProfile, resolveParams, routesForSpec, ruleCanHoldIn, rulesExclusive, scopeBindings, targetConsultsAffordance, validateActionDefaultBinding, validateActionId };
-//# sourceMappingURL=chunk-LOP2JTTA.js.map
-//# sourceMappingURL=chunk-LOP2JTTA.js.map
+export { ALWAYS, COARSE_TARGET_SCALE, DEFAULT_ALLOWED_CAPABILITIES, DEFAULT_DEVICE_PROFILE, DepNode, INGEST_STRING_MIMES, LONG_PRESS_MS, NEVER, PREDICATE_TARGET, ScopeNode, TOOL_OFFHAND_ID, actionBindings, activatesFocusedControl, assembleEntries, buildDepsFromRequires, buildRouteRegistry, buildRuleCtx, buildToolOffhandBindings, clientToCanvas, clientToCanvasRect, createDepRegistry, createDispatcher, createLongPressStore, depNodeOf, describeRule, dlog, dwarn, evaluate, findConflicts, heldKeySpec, historyKey, isDebugEnabled, isDev, isEditableTarget, isTool, itemsFromClipboardData, itemsFromDataTransfer, itemsFromFiles, liveScope, makeToolOffhandAction, matchBest, matchSorted, matchSortedWithBarred, matchesKeyBinding, offhandKeyFor, openPointerSession, pointerGestureId, publishLiveDispatch, pushOwner, recordModeSwitch, reportRouteConflicts, resolveDeviceProfile, resolveParams, routesForSpec, ruleCanHoldIn, rulesExclusive, scopeBindings, targetConsultsAffordance, validateActionDefaultBinding, validateActionId };
+//# sourceMappingURL=chunk-Y5RURZBH.js.map
+//# sourceMappingURL=chunk-Y5RURZBH.js.map