@glassly/engine 0.3.5-dev.740 → 0.3.5-dev.745

package/build/generated/releaseMetadata.js

@@ -1,9 +1,9 @@
 export const ENGINE_RELEASE_METADATA = Object.freeze({
     "schemaVersion": 1,
     "familyBaseVersion": "0.3.5",
-    "releaseIdentity": "0.3.5-dev.740",
-    "releaseSetId": "glassly-0.3.5-dev.740",
-    "sourceCommit": "6c44d91e3f1ca0f107b0a955920d8ca6ac37b1f8",
+    "releaseIdentity": "0.3.5-dev.745",
+    "releaseSetId": "glassly-0.3.5-dev.745",
+    "sourceCommit": "b6849b5ae18b0c0130e311eecde2b39c05f467f0",
     "otaManifestUrl": null,
     "otaManifestSha256": null
 });

package/build/generated/releaseMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,uBAAuB,GAAoC,MAAM,CAAC,MAAM,CAAC;IACpF,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,eAAe;IAClC,cAAc,EAAE,uBAAuB;IACvC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface EngineReleaseMetadata {\n  schemaVersion: 1\n  familyBaseVersion: string | null\n  releaseIdentity: string | null\n  releaseSetId: string | null\n  sourceCommit: string | null\n  otaManifestUrl: string | null\n  otaManifestSha256: string | null\n}\n\nexport const ENGINE_RELEASE_METADATA: Readonly<EngineReleaseMetadata> = Object.freeze({\n  \"schemaVersion\": 1,\n  \"familyBaseVersion\": \"0.3.5\",\n  \"releaseIdentity\": \"0.3.5-dev.740\",\n  \"releaseSetId\": \"glassly-0.3.5-dev.740\",\n  \"sourceCommit\": \"6c44d91e3f1ca0f107b0a955920d8ca6ac37b1f8\",\n  \"otaManifestUrl\": null,\n  \"otaManifestSha256\": null\n})\n"]}
+{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,uBAAuB,GAAoC,MAAM,CAAC,MAAM,CAAC;IACpF,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,eAAe;IAClC,cAAc,EAAE,uBAAuB;IACvC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface EngineReleaseMetadata {\n  schemaVersion: 1\n  familyBaseVersion: string | null\n  releaseIdentity: string | null\n  releaseSetId: string | null\n  sourceCommit: string | null\n  otaManifestUrl: string | null\n  otaManifestSha256: string | null\n}\n\nexport const ENGINE_RELEASE_METADATA: Readonly<EngineReleaseMetadata> = Object.freeze({\n  \"schemaVersion\": 1,\n  \"familyBaseVersion\": \"0.3.5\",\n  \"releaseIdentity\": \"0.3.5-dev.745\",\n  \"releaseSetId\": \"glassly-0.3.5-dev.745\",\n  \"sourceCommit\": \"b6849b5ae18b0c0130e311eecde2b39c05f467f0\",\n  \"otaManifestUrl\": null,\n  \"otaManifestSha256\": null\n})\n"]}

package/build/services/GlassesTouchInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GlassesTouchInput.d.ts","sourceRoot":"","sources":["../../src/services/GlassesTouchInput.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,UAAU,EAAC,MAAM,wBAAwB,CAAA;AA4CpE;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CA4D1D;AAED,wBAAgB,eAAe,IAAI,IAAI,CAGtC;AAED,iFAAiF;AACjF,wBAAgB,WAAW,CACzB,WAAW,EACP,YAAY,GACZ,WAAW,GACX,YAAY,GACZ,SAAS,GACT,eAAe,GACf,YAAY,GACZ,UAAU,GACV,YAAY,GACZ,YAAY,GACZ,aAAa,GACb,YAAY,GACZ,SAAS,GACT,WAAW,GACX,SAAS,GACT,WAAW,GACd,IAAI,CAQN"}
+{"version":3,"file":"GlassesTouchInput.d.ts","sourceRoot":"","sources":["../../src/services/GlassesTouchInput.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,UAAU,EAAC,MAAM,wBAAwB,CAAA;AA0DpE;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CA4D1D;AAED,wBAAgB,eAAe,IAAI,IAAI,CAGtC;AAED,iFAAiF;AACjF,wBAAgB,WAAW,CACzB,WAAW,EACP,YAAY,GACZ,WAAW,GACX,YAAY,GACZ,SAAS,GACT,eAAe,GACf,YAAY,GACZ,UAAU,GACV,YAAY,GACZ,YAAY,GACZ,aAAa,GACb,YAAY,GACZ,SAAS,GACT,WAAW,GACX,SAAS,GACT,WAAW,GACd,IAAI,CAQN"}

package/build/services/GlassesTouchInput.js

@@ -4,6 +4,7 @@ import BluetoothSdk from "@glassly/bluetooth-sdk/internal";
 import { useAppStatusStore } from "../stores/apps";
 import { useGlassesStore } from "../stores/glasses";
 import { BgTimer } from "../utils/timers";
+import { hasInput2d } from "./controllers";
 import dashboardOpenTrace from "./debug/DashboardOpenTrace";
 import gestureDotsService from "./GestureDotsService";
 import { isGlassesConnected } from "./GlassesReadiness";
@@ -40,6 +41,19 @@ function shouldForwardScroll(event) {
     lastRingScrollAt.set(ring, event.timestamp);
     return true;
 }
+/**
+ * Miniapps' copy of the touch: `input2d: true` when it came from a controller
+ * that swipes in two dimensions (the Neural Band), the field absent otherwise,
+ * so a 1D swipe from the temples or the ring stays tellable while a band is
+ * connected under the same gesture names.
+ */
+function toMiniapps(event) {
+    const id = event.controllerId;
+    if (id === undefined)
+        return event;
+    const model = useGlassesStore.getState().controllers?.[id]?.model;
+    return model !== undefined && hasInput2d(model) ? { ...event, input2d: true } : event;
+}
 /**
  * Route both real glasses input and phone mirror controls through the same
  * policy. A claimed gesture goes to the app holding the claim, alone; an
@@ -82,7 +96,7 @@ export function dispatchTouchEvent(event) {
         gestureDotsService.noteGesture(gesture, true, event.index, event.controllerId);
         if (!shouldForwardScroll(event))
             return;
-        localMiniappRuntime.forwardEvent("touch_event", event, undefined, claimant);
+        localMiniappRuntime.forwardEvent("touch_event", toMiniapps(event), undefined, claimant);
         return;
     }
     // Gesture-dots debug indicator (any device, gated by its setting). It
@@ -91,7 +105,7 @@ export function dispatchTouchEvent(event) {
     gestureDotsService.noteGesture(gesture, false, event.index, event.controllerId);
     if (!shouldForwardScroll(event))
         return;
-    localMiniappRuntime.forwardEvent("touch_event", event);
+    localMiniappRuntime.forwardEvent("touch_event", toMiniapps(event));
     // Nobody claimed a double tap or a head-up: the glasses' native dashboard.
     // On eligible Glassly CFW glasses the dashboard miniapp claims both while it
     // runs (ADR-0006); stock firmware keeps its native dashboard (ADR-0002) and

package/build/services/GlassesTouchInput.js.map

@@ -1 +1 @@
-{"version":3,"file":"GlassesTouchInput.js","sourceRoot":"","sources":["../../src/services/GlassesTouchInput.ts"],"names":[],"mappings":"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","sourcesContent":["import {useDisplayStore} from \"../stores/display\"\nimport {DeviceModels, type TouchEvent} from \"@glassly/bluetooth-sdk\"\nimport BluetoothSdk from \"@glassly/bluetooth-sdk/internal\"\n\nimport {useAppStatusStore} from \"../stores/apps\"\nimport {useGlassesStore} from \"../stores/glasses\"\nimport {BgTimer} from \"../utils/timers\"\nimport dashboardOpenTrace from \"./debug/DashboardOpenTrace\"\nimport gestureDotsService from \"./GestureDotsService\"\nimport {isGlassesConnected} from \"./GlassesReadiness\"\nimport localDisplayManager from \"./LocalDisplayManager\"\nimport localMiniappRuntime from \"./LocalMiniappRuntime\"\nimport {MiniappExitGesture} from \"./MiniappExitGesture\"\nimport nativeNavigationService from \"./NativeNavigationService\"\nimport {isOverlayApp} from \"./pages/overlayApps\"\nimport {pagesEligible} from \"./pages/pageEligibility\"\n\nconst miniappExitGesture = new MiniappExitGesture({\n  getState: () => useAppStatusStore.getState(),\n  getTargetPackageName: () => localDisplayManager.getMiniappToLeave(),\n  beginExitNotice: (packageName, text) => localDisplayManager.beginMiniappExit(packageName, text),\n  finishExitNotice: (packageName) => localDisplayManager.finishMiniappExit(packageName),\n  cancelExitNotice: (packageName) => localDisplayManager.cancelMiniappExit(packageName),\n  setTimeout: (callback, delay) => BgTimer.setTimeout(callback, delay),\n  clearTimeout: (timerId) => BgTimer.clearTimeout(timerId),\n})\n\n// Raw ring reports include every scroll step, whether the CFW forwards them\n// (deviceModel G2) or the ring sends them to the phone itself (deviceModel R1);\n// both tag source 2. Rate-limit scroll actions separately from press/release\n// recognition, per ring, using native receipt timestamps so a JS backlog does\n// not collapse otherwise separate gestures.\nconst RING_SCROLL_INTERVAL_MS = 100\nconst lastRingScrollAt = new Map<string, number>()\n\nfunction shouldForwardScroll(event: TouchEvent): boolean {\n  if (event.source !== 2 || (event.gestureName !== \"swipe_up\" && event.gestureName !== \"swipe_down\")) return true\n  const ring = event.controllerId ?? `source:${event.source}`\n  const last = lastRingScrollAt.get(ring)\n  const elapsed = last === undefined ? null : event.timestamp - last\n  if (elapsed !== null && elapsed >= 0 && elapsed < RING_SCROLL_INTERVAL_MS) return false\n  lastRingScrollAt.set(ring, event.timestamp)\n  return true\n}\n\n/**\n * Route both real glasses input and phone mirror controls through the same\n * policy. A claimed gesture goes to the app holding the claim, alone; an\n * unclaimed one goes to every subscriber and then the engine's default. The\n * one rule ahead of the claims: an unclaimed double tap leaves the miniapp\n * the wearer is in — the one visibly on the glasses, else the running\n * standard app on an empty screen — whoever else claimed the gesture; the\n * dashboard's claim is for the screen with no app in it. Head position\n * (head_up / head_down) is a gesture like any other: the dashboard claims it\n * while it runs, and an unclaimed head_up on glasses that defer the dashboard\n * to the phone opens the native one, as it would with no app at all.\n */\nexport function dispatchTouchEvent(event: TouchEvent): void {\n  const gesture = event.gestureName\n  const claimant = localMiniappRuntime.gestureClaimant(gesture)\n  // The Neural Band's middle finger (index 1) shares the tap names but is left\n  // to miniapps: the engine's own double-tap behaviors are the index finger's.\n  const osDoubleTap = gesture === \"double_tap\" && event.index !== 1\n  const osHeadUp = gesture === \"head_up\"\n\n  if (osDoubleTap) {\n    // The app being left opts out of OS exit by registering double tap (the\n    // terminal's back-to-menu). The latest claimant still receives it. Otherwise\n    // the tap means \"leave the app\". The controller shows the bounded OS\n    // notice first, then uses the normal store stop path (and closes its\n    // phone overlay).\n    const leaving = localDisplayManager.getMiniappToLeave()\n    if (\n      leaving !== null &&\n      !localMiniappRuntime.hasGestureClaim(leaving, gesture) &&\n      miniappExitGesture.tryExitMiniapp()\n    ) {\n      gestureDotsService.noteGesture(gesture, true, event.index, event.controllerId)\n      return\n    }\n  }\n\n  if (claimant !== null) {\n    // An overlay app claims the double tap and head-up on an empty screen to open the dashboard.\n    if ((gesture === \"double_tap\" || osHeadUp) && isOverlayApp(claimant)) {\n      dashboardOpenTrace.trigger(osHeadUp ? \"head-up\" : \"double-tap\", event.timestamp)\n    }\n    // The press may have started before this app claimed its release edge.\n    gestureDotsService.noteGesture(gesture, true, event.index, event.controllerId)\n    if (!shouldForwardScroll(event)) return\n    localMiniappRuntime.forwardEvent(\"touch_event\", event, undefined, claimant)\n    return\n  }\n\n  // Gesture-dots debug indicator (any device, gated by its setting). It\n  // only paints while the screen is otherwise empty. Process even suppressed\n  // scroll repeats here so their completion still clears a held dot.\n  gestureDotsService.noteGesture(gesture, false, event.index, event.controllerId)\n\n  if (!shouldForwardScroll(event)) return\n  localMiniappRuntime.forwardEvent(\"touch_event\", event)\n\n  // Nobody claimed a double tap or a head-up: the glasses' native dashboard.\n  // On eligible Glassly CFW glasses the dashboard miniapp claims both while it\n  // runs (ADR-0006); stock firmware keeps its native dashboard (ADR-0002) and\n  // opens it on a head-up by itself, so only the double tap is relayed there.\n  // The modal nav UI owns the screen; showDashboard would fight it. Without\n  // glasses there is no dashboard to open, and the mirror keeps its frame.\n  // pagesEligible: connected Glassly CFW glasses, whose firmware leaves the\n  // dashboard to the phone; other firmware opens its own on a lift.\n  const opensNativeDashboard = osDoubleTap || (osHeadUp && pagesEligible())\n  if (opensNativeDashboard && !nativeNavigationService.isActive && isGlassesConnected(useGlassesStore.getState().connection)) {\n    useDisplayStore.getState().setDisplayEvent({layout: {layoutType: \"unavailable\", reason: \"firmware-dashboard\"}})\n    void Promise.resolve(BluetoothSdk.showDashboard()).catch((err) => {\n      console.error(\"DeviceEventRouter: showDashboard failed:\", err)\n    })\n  }\n}\n\nexport function resetTouchInput(): void {\n  miniappExitGesture.reset()\n  lastRingScrollAt.clear()\n}\n\n/** Phone mirror input uses the same dashboard/miniapp policy as real glasses. */\nexport function sendGesture(\n  gestureName:\n    | \"single_tap\"\n    | \"tap_start\"\n    | \"double_tap\"\n    | \"tap_end\"\n    | \"tap_then_hold\"\n    | \"touch_down\"\n    | \"swipe_up\"\n    | \"swipe_down\"\n    | \"swipe_left\"\n    | \"swipe_right\"\n    | \"long_press\"\n    | \"dial_up\"\n    | \"dial_down\"\n    | \"head_up\"\n    | \"head_down\",\n): void {\n  const model = useGlassesStore.getState().deviceModel\n  dispatchTouchEvent({\n    type: \"touch_event\",\n    gestureName,\n    deviceModel: Object.values(DeviceModels).find((candidate) => candidate === model) ?? DeviceModels.Simulated,\n    timestamp: Date.now(),\n  })\n}\n"]}
+{"version":3,"file":"GlassesTouchInput.js","sourceRoot":"","sources":["../../src/services/GlassesTouchInput.ts"],"names":[],"mappings":"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","sourcesContent":["import {useDisplayStore} from \"../stores/display\"\nimport {DeviceModels, type TouchEvent} from \"@glassly/bluetooth-sdk\"\nimport BluetoothSdk from \"@glassly/bluetooth-sdk/internal\"\n\nimport {useAppStatusStore} from \"../stores/apps\"\nimport {useGlassesStore} from \"../stores/glasses\"\nimport {BgTimer} from \"../utils/timers\"\nimport {hasInput2d} from \"./controllers\"\nimport dashboardOpenTrace from \"./debug/DashboardOpenTrace\"\nimport gestureDotsService from \"./GestureDotsService\"\nimport {isGlassesConnected} from \"./GlassesReadiness\"\nimport localDisplayManager from \"./LocalDisplayManager\"\nimport localMiniappRuntime from \"./LocalMiniappRuntime\"\nimport {MiniappExitGesture} from \"./MiniappExitGesture\"\nimport nativeNavigationService from \"./NativeNavigationService\"\nimport {isOverlayApp} from \"./pages/overlayApps\"\nimport {pagesEligible} from \"./pages/pageEligibility\"\n\nconst miniappExitGesture = new MiniappExitGesture({\n  getState: () => useAppStatusStore.getState(),\n  getTargetPackageName: () => localDisplayManager.getMiniappToLeave(),\n  beginExitNotice: (packageName, text) => localDisplayManager.beginMiniappExit(packageName, text),\n  finishExitNotice: (packageName) => localDisplayManager.finishMiniappExit(packageName),\n  cancelExitNotice: (packageName) => localDisplayManager.cancelMiniappExit(packageName),\n  setTimeout: (callback, delay) => BgTimer.setTimeout(callback, delay),\n  clearTimeout: (timerId) => BgTimer.clearTimeout(timerId),\n})\n\n// Raw ring reports include every scroll step, whether the CFW forwards them\n// (deviceModel G2) or the ring sends them to the phone itself (deviceModel R1);\n// both tag source 2. Rate-limit scroll actions separately from press/release\n// recognition, per ring, using native receipt timestamps so a JS backlog does\n// not collapse otherwise separate gestures.\nconst RING_SCROLL_INTERVAL_MS = 100\nconst lastRingScrollAt = new Map<string, number>()\n\nfunction shouldForwardScroll(event: TouchEvent): boolean {\n  if (event.source !== 2 || (event.gestureName !== \"swipe_up\" && event.gestureName !== \"swipe_down\")) return true\n  const ring = event.controllerId ?? `source:${event.source}`\n  const last = lastRingScrollAt.get(ring)\n  const elapsed = last === undefined ? null : event.timestamp - last\n  if (elapsed !== null && elapsed >= 0 && elapsed < RING_SCROLL_INTERVAL_MS) return false\n  lastRingScrollAt.set(ring, event.timestamp)\n  return true\n}\n\n/**\n * Miniapps' copy of the touch: `input2d: true` when it came from a controller\n * that swipes in two dimensions (the Neural Band), the field absent otherwise,\n * so a 1D swipe from the temples or the ring stays tellable while a band is\n * connected under the same gesture names.\n */\nfunction toMiniapps(event: TouchEvent): TouchEvent & {input2d?: true} {\n  const id = event.controllerId\n  if (id === undefined) return event\n  const model = useGlassesStore.getState().controllers?.[id]?.model\n  return model !== undefined && hasInput2d(model) ? {...event, input2d: true} : event\n}\n\n/**\n * Route both real glasses input and phone mirror controls through the same\n * policy. A claimed gesture goes to the app holding the claim, alone; an\n * unclaimed one goes to every subscriber and then the engine's default. The\n * one rule ahead of the claims: an unclaimed double tap leaves the miniapp\n * the wearer is in — the one visibly on the glasses, else the running\n * standard app on an empty screen — whoever else claimed the gesture; the\n * dashboard's claim is for the screen with no app in it. Head position\n * (head_up / head_down) is a gesture like any other: the dashboard claims it\n * while it runs, and an unclaimed head_up on glasses that defer the dashboard\n * to the phone opens the native one, as it would with no app at all.\n */\nexport function dispatchTouchEvent(event: TouchEvent): void {\n  const gesture = event.gestureName\n  const claimant = localMiniappRuntime.gestureClaimant(gesture)\n  // The Neural Band's middle finger (index 1) shares the tap names but is left\n  // to miniapps: the engine's own double-tap behaviors are the index finger's.\n  const osDoubleTap = gesture === \"double_tap\" && event.index !== 1\n  const osHeadUp = gesture === \"head_up\"\n\n  if (osDoubleTap) {\n    // The app being left opts out of OS exit by registering double tap (the\n    // terminal's back-to-menu). The latest claimant still receives it. Otherwise\n    // the tap means \"leave the app\". The controller shows the bounded OS\n    // notice first, then uses the normal store stop path (and closes its\n    // phone overlay).\n    const leaving = localDisplayManager.getMiniappToLeave()\n    if (\n      leaving !== null &&\n      !localMiniappRuntime.hasGestureClaim(leaving, gesture) &&\n      miniappExitGesture.tryExitMiniapp()\n    ) {\n      gestureDotsService.noteGesture(gesture, true, event.index, event.controllerId)\n      return\n    }\n  }\n\n  if (claimant !== null) {\n    // An overlay app claims the double tap and head-up on an empty screen to open the dashboard.\n    if ((gesture === \"double_tap\" || osHeadUp) && isOverlayApp(claimant)) {\n      dashboardOpenTrace.trigger(osHeadUp ? \"head-up\" : \"double-tap\", event.timestamp)\n    }\n    // The press may have started before this app claimed its release edge.\n    gestureDotsService.noteGesture(gesture, true, event.index, event.controllerId)\n    if (!shouldForwardScroll(event)) return\n    localMiniappRuntime.forwardEvent(\"touch_event\", toMiniapps(event), undefined, claimant)\n    return\n  }\n\n  // Gesture-dots debug indicator (any device, gated by its setting). It\n  // only paints while the screen is otherwise empty. Process even suppressed\n  // scroll repeats here so their completion still clears a held dot.\n  gestureDotsService.noteGesture(gesture, false, event.index, event.controllerId)\n\n  if (!shouldForwardScroll(event)) return\n  localMiniappRuntime.forwardEvent(\"touch_event\", toMiniapps(event))\n\n  // Nobody claimed a double tap or a head-up: the glasses' native dashboard.\n  // On eligible Glassly CFW glasses the dashboard miniapp claims both while it\n  // runs (ADR-0006); stock firmware keeps its native dashboard (ADR-0002) and\n  // opens it on a head-up by itself, so only the double tap is relayed there.\n  // The modal nav UI owns the screen; showDashboard would fight it. Without\n  // glasses there is no dashboard to open, and the mirror keeps its frame.\n  // pagesEligible: connected Glassly CFW glasses, whose firmware leaves the\n  // dashboard to the phone; other firmware opens its own on a lift.\n  const opensNativeDashboard = osDoubleTap || (osHeadUp && pagesEligible())\n  if (opensNativeDashboard && !nativeNavigationService.isActive && isGlassesConnected(useGlassesStore.getState().connection)) {\n    useDisplayStore.getState().setDisplayEvent({layout: {layoutType: \"unavailable\", reason: \"firmware-dashboard\"}})\n    void Promise.resolve(BluetoothSdk.showDashboard()).catch((err) => {\n      console.error(\"DeviceEventRouter: showDashboard failed:\", err)\n    })\n  }\n}\n\nexport function resetTouchInput(): void {\n  miniappExitGesture.reset()\n  lastRingScrollAt.clear()\n}\n\n/** Phone mirror input uses the same dashboard/miniapp policy as real glasses. */\nexport function sendGesture(\n  gestureName:\n    | \"single_tap\"\n    | \"tap_start\"\n    | \"double_tap\"\n    | \"tap_end\"\n    | \"tap_then_hold\"\n    | \"touch_down\"\n    | \"swipe_up\"\n    | \"swipe_down\"\n    | \"swipe_left\"\n    | \"swipe_right\"\n    | \"long_press\"\n    | \"dial_up\"\n    | \"dial_down\"\n    | \"head_up\"\n    | \"head_down\",\n): void {\n  const model = useGlassesStore.getState().deviceModel\n  dispatchTouchEvent({\n    type: \"touch_event\",\n    gestureName,\n    deviceModel: Object.values(DeviceModels).find((candidate) => candidate === model) ?? DeviceModels.Simulated,\n    timestamp: Date.now(),\n  })\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glassly/engine",
-  "version": "0.3.5-dev.740",
+  "version": "0.3.5-dev.745",
   "description": "Glassly Engine — miniapp registry, WebView bridge, and miniapp store",
   "main": "build/index.js",
   "react-native": "src/index.ts",
@@ -97,17 +97,17 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@glassly/bluetooth-sdk": "0.3.5-dev.740",
-    "@glassly/cloud-client": "0.3.5-dev.740",
-    "@glassly/cloud-protocol": "0.3.5-dev.740",
-    "@glassly/crust": "0.3.5-dev.740",
-    "@glassly/miniapp": "0.3.5-dev.740",
+    "@glassly/bluetooth-sdk": "0.3.5-dev.745",
+    "@glassly/cloud-client": "0.3.5-dev.745",
+    "@glassly/cloud-protocol": "0.3.5-dev.745",
+    "@glassly/crust": "0.3.5-dev.745",
+    "@glassly/miniapp": "0.3.5-dev.745",
     "buffer": "^6.0.3",
     "events": "^3.3.0",
     "react-native-marked": "8.1.1",
     "semver": "^7.7.4",
     "typesafe-ts": "^1.7.1",
-    "@glassly/llm-providers": "0.3.5-dev.740",
+    "@glassly/llm-providers": "0.3.5-dev.745",
     "@huggingface/jinja": "^0.5.9",
     "jsonrepair": "^3.12.0"
   },

package/src/generated/releaseMetadata.ts

@@ -12,9 +12,9 @@ export interface EngineReleaseMetadata {
 export const ENGINE_RELEASE_METADATA: Readonly<EngineReleaseMetadata> = Object.freeze({
   "schemaVersion": 1,
   "familyBaseVersion": "0.3.5",
-  "releaseIdentity": "0.3.5-dev.740",
-  "releaseSetId": "glassly-0.3.5-dev.740",
-  "sourceCommit": "6c44d91e3f1ca0f107b0a955920d8ca6ac37b1f8",
+  "releaseIdentity": "0.3.5-dev.745",
+  "releaseSetId": "glassly-0.3.5-dev.745",
+  "sourceCommit": "b6849b5ae18b0c0130e311eecde2b39c05f467f0",
   "otaManifestUrl": null,
   "otaManifestSha256": null
 })

package/src/services/GlassesTouchInput.ts

@@ -5,6 +5,7 @@ import BluetoothSdk from "@glassly/bluetooth-sdk/internal"
 import {useAppStatusStore} from "../stores/apps"
 import {useGlassesStore} from "../stores/glasses"
 import {BgTimer} from "../utils/timers"
+import {hasInput2d} from "./controllers"
 import dashboardOpenTrace from "./debug/DashboardOpenTrace"
 import gestureDotsService from "./GestureDotsService"
 import {isGlassesConnected} from "./GlassesReadiness"
@@ -43,6 +44,19 @@ function shouldForwardScroll(event: TouchEvent): boolean {
   return true
 }
 
+/**
+ * Miniapps' copy of the touch: `input2d: true` when it came from a controller
+ * that swipes in two dimensions (the Neural Band), the field absent otherwise,
+ * so a 1D swipe from the temples or the ring stays tellable while a band is
+ * connected under the same gesture names.
+ */
+function toMiniapps(event: TouchEvent): TouchEvent & {input2d?: true} {
+  const id = event.controllerId
+  if (id === undefined) return event
+  const model = useGlassesStore.getState().controllers?.[id]?.model
+  return model !== undefined && hasInput2d(model) ? {...event, input2d: true} : event
+}
+
 /**
  * Route both real glasses input and phone mirror controls through the same
  * policy. A claimed gesture goes to the app holding the claim, alone; an
@@ -88,7 +102,7 @@ export function dispatchTouchEvent(event: TouchEvent): void {
     // The press may have started before this app claimed its release edge.
     gestureDotsService.noteGesture(gesture, true, event.index, event.controllerId)
     if (!shouldForwardScroll(event)) return
-    localMiniappRuntime.forwardEvent("touch_event", event, undefined, claimant)
+    localMiniappRuntime.forwardEvent("touch_event", toMiniapps(event), undefined, claimant)
     return
   }
 
@@ -98,7 +112,7 @@ export function dispatchTouchEvent(event: TouchEvent): void {
   gestureDotsService.noteGesture(gesture, false, event.index, event.controllerId)
 
   if (!shouldForwardScroll(event)) return
-  localMiniappRuntime.forwardEvent("touch_event", event)
+  localMiniappRuntime.forwardEvent("touch_event", toMiniapps(event))
 
   // Nobody claimed a double tap or a head-up: the glasses' native dashboard.
   // On eligible Glassly CFW glasses the dashboard miniapp claims both while it