forked from Blendman974/faceclaw
<summary>Prompts Used</summary> Act as a code reviewer for https://github.com/jimrandomh/faceclaw/pull/14 (checked out in this working directory). > * The review finished — 42 raw candidates were verified down to 10 confirmed findings. Reporting them now. > > * Code review(review · 10 findings) > ⎿ app/phone-ui/main-view-model.ts > ● 766 [correctness] mirrorFraction subtracts view.getLocationOnScreen() from tap coordinates that NativeScript already delivers > view-local, so every phone-mirror tap is shifted up/left and misroutes > ● 84 [resource-leak] MainViewModel's constructor registers onAnySettingChanged and discards the unsubscriber; a new view model is > built on every page navigation, leaking listeners and retained preview bitmaps > wear/app/src/main/kotlin/com/faceclaw/wear/MainActivity.kt > ● 52 [correctness] onStop abandons an in-progress stem-button hold without sending LONG_PRESS_RELEASE, so the glasses shell > escape menu opens by itself > wear/app/src/main/kotlin/com/faceclaw/wear/ui/TouchpadGestures.kt > ● 62 [correctness] Breaking out of the touchpad gesture loop on a consumed pointer event (or coroutine cancellation mid-hold) > skips onLongPressEnd, leaving a stuck long-press > wear/app/src/main/kotlin/com/faceclaw/wear/PhoneLink.kt > ● 270 [correctness] loadStateItem queries the Data Layer with a hostless Uri (`wear:/faceclaw/state`), which matches no stored > items, so the cached phone state is never read > app/ui/shell/modal-layer.ts > ● 14 [correctness] MODAL_INTERIOR is a module-level constant frozen at import time from the (now runtime-dynamic) display mode, > while modalRect() is computed live, so modals render corrupted after a display-mode switch > app/g2/dashboard-controller.ts > ● 1404 [correctness] handleMirrorTouch wakes the glasses display unconditionally, bypassing the watchWakesDisplaySetting gate > that the parallel injectSyntheticRingInput path honors > ● 1440 [correctness] A mirror tap while any second layer is stacked (e.g. an in-window long-press menu) degrades to a blind > synthetic click that activates whatever is highlighted, not what was tapped > App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawWearBridge.java > ● 147 [correctness] Watch gestures/commands queued while the JS listener is down are replayed up to 30 seconds later on listener > registration, executing stale non-idempotent input the watch already reported as failed > wear/app/src/main/kotlin/com/faceclaw/wear/ui/RemoteScreen.kt > ● 232 [efficiency] WristTwistDetector (gyroscope, default-on) samples at 100 Hz via DisposableEffect and is not stopped when > the activity stops, draining the watch battery while the process is cached > > * Review of PR #14 (Wear OS companion app + remote controls, 85 files, +5813/−102) is done — 10 confirmed findings reported above, ranked by > severity. The headline items are the phone-mirror tap coordinate double-correction (which misroutes every mirror tap in the default > configuration) and two independent paths on the watch that can drop LONG_PRESS_RELEASE, each of which makes the shell escape menu open on the > glasses by itself. > > A few things beyond the reported list, for context: > > Refuted during verification (looked like bugs, aren't): the watch ack-timeout-during-render theory (input injection never blocks on BLE > transmit), mirror swipes stealing page scroll (no enclosing ScrollView), and a suspected raw-settings-key notification gap (the store-level > broadcast covers raw keys). > > Confirmed but below the 10-finding cap — worth folding in if you're touching those areas anyway: > - shell.closeAssistant() no-ops via popIfTop when another layer sits above the assistant, yet still acks ok to the watch. > - Landscape preview sizing still assumes the old 260-wide panel after the XML moved to 360 (overlap under ~568 dip). > - The shell escape menu and tool-debug dialogs hardcode SIDEBAR_WIDTH + 8, wrong in the new full-panel mode. > - A CapabilityClient IPC fires every 250 ms during streamed assistant replies even on watchless phones; backgrounded preview updates bypass > their 150 ms floor. > - Cleanups: the sidebarWidth() > 0 || focus === "sidebar" predicate appears three times, sidebar slot math is duplicated in chrome-layer.ts, > dead protocol-version plumbing, dead padPointers field, and display-mode is missing from wear/PROTOCOL.md. > > If you'd like, I can apply fixes for any subset of these, or post the findings as inline PR comments (/code-review 14 --comment). <hr> Thanks, let's go ahead and write fixes for all of the issues you described. > Everything builds and tests pass. All 16 issues from the review are fixed — the 10 reported findings plus the six below-cap items. Here's what changed, by fix: > > **Watch app (Kotlin)** > - **Stuck long-press via onStop** — `MainActivity.onStop` now sends `LONG_PRESS_RELEASE` when a stem hold is in progress before dropping the link, so the phone's escape-menu countdown can't run to completion on its own. > - **Stuck long-press via the gesture loop** — `detectTouchpadGestures` wraps the loop in try/finally that pairs every `onLongPressStart` with an `onLongPressEnd`, covering both the consumed-event `break` and coroutine cancellation mid-hold. > - **Cached state never loading** — `PhoneLink.loadStateItem` now queries `wear://*/faceclaw/state` (wildcard host) instead of a hostless Uri that matched nothing, so the watch shows the cached dashboard state when the phone is unreachable. > - **Sensors draining battery while stopped** — the gyroscope/accelerometer/off-body detectors are now driven by a `WhileStartedEffect` helper tied to the activity lifecycle: they stop on `ON_STOP` (palmed screen, back to watch face) and restart on `ON_START`, instead of running at 100 Hz for as long as the process is cached. > - **Dead protocol plumbing** — removed the unused `Protocol.PROTOCOL_VERSION` const and the never-read `PhoneState.protocol` field; the wire field stays and PROTOCOL.md now documents it as reserved. > > **Phone Java** > - **Stale input replay** — `FaceclawWearBridge` now queues only idempotent `/faceclaw/state/request` messages for replay after the JS listener registers; gestures and commands that arrived while the dashboard was down are acked as failed and dropped, never executed up to 30 seconds later. > > **Phone TypeScript** > - **Mirror taps misrouting (the top finding)** — `mirrorFraction` no longer subtracts `getLocationOnScreen()`; NativeScript's `getX`/`getY` are view-local DIPs (I verified this in the installed `@nativescript/core` gesture source), so every mirror tap was being shifted up-left by the status bar + action bar. Taps now land where you touch. > - **Mirror touch ignoring the wake setting** — `handleMirrorTouch` now honours `watchWakesDisplaySetting`: with it off, only a double-tap reaches a dark display, matching the rest of the watch scheme. > - **Blind click through open menus** — `LayerStack.hitTest` now consumes a mirror tap when any layer is stacked (menu, dialog) instead of reporting a miss, so a tap on visible app content can no longer activate whatever menu row happened to be highlighted (e.g. "Close window"). > - **Modal corruption after display-mode switch** — `MODAL_INTERIOR` is now a live `modalInterior()` function, and `ShellModalLayer.paint` re-syncs the inner stack's size each paint, so notification modals render correctly after switching Band ↔ Full panel. > - **View-model leak** — `MainViewModel` keeps its controller/settings unsubscribers and exposes `attach()`/`dispose()`; `main-page.ts` disposes on unload and re-attaches on load (re-attach is needed because suspend/resume fires unloaded/loaded without a navigation, and `subscribe` delivers a fresh snapshot so nothing is missed). > - **`closeAssistant` no-op** — new `LayerStack.popThrough` closes the assistant overlay plus anything stacked above it (follow-up voice dialog, alert); the watch ack now says "The assistant was not open." when there was nothing to close. > - **Watchless-phone IPC churn** — assistant stream events and alerts are skipped when no watch is reachable, so a streaming reply no longer triggers a CapabilityClient lookup every 250 ms. > - **Backgrounded preview floor bypass** — the 150 ms floor check (and timestamp) in `updateCompositePreview` now runs before the foreground-activity check, so backgrounded per-frame refreshes actually throttle. > - **Full-panel hardcodes** — the shell escape menu and tool-debug dialogs position at `sidebarWidth() + 8` (0 in full-panel mode) instead of the fixed 64 px strip. > - **Cleanups** — the strip-visible predicate is now one `sidebarStripVisible()` helper in geometry.ts (used in three places); sidebar slot math is a single `slotPosition()` shared by drawing and hit-testing; dead `padPointers` removed; landscape preview sizing updated to the XML's 360 dp panel; `wear/PROTOCOL.md` documents the `display-mode` command and `displayMode` state field. > > Verification: `./build.sh` (webpack + Gradle) succeeds, `npx tsc --noEmit` is clean, the wear `:app:assembleDebug` builds, and all 59 tests pass. The behavioral fixes — especially mirror-tap coordinates, the two long-press-release paths, and the watch state cache — still need a hardware pass to confirm on device. </details>
157 lines
5.5 KiB
TypeScript
157 lines
5.5 KiB
TypeScript
import { G2_LENS_WIDTH, GrayImage } from "../../graphics/image";
|
|
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
|
import { wrapText } from "../../graphics/textwrap";
|
|
import { clamp } from "../../util/numeric-util";
|
|
import type { ToolDebugEntry } from "../../assistant/tool-registry";
|
|
import { DashboardInputEvent, Layer, LayerContext, PaintBelow } from "../layers";
|
|
import { MenuLayer, drawListScrollbar, type MenuItem } from "../menu";
|
|
import { MIN_WINDOW_HEIGHT, minWindowTop, sidebarWidth, TOP_BAR_HEIGHT } from "./geometry";
|
|
import { lineStep } from "../metrics";
|
|
|
|
/**
|
|
* Shell-overlay debug dialog (escape menu > Debug): lists the voice assistant
|
|
* tools registered for the foreground window's app, including ones whose
|
|
* availability gate currently blocks them. Selecting a tool opens a detail
|
|
* page with its full name, gating state, and description.
|
|
*/
|
|
|
|
const DIALOG_WIDTH = 420;
|
|
// Shell overlays align to the min-height window band; the detail box fills
|
|
// the band below the top bar with an 8px margin on each side.
|
|
const DETAIL_HEIGHT = MIN_WINDOW_HEIGHT - TOP_BAR_HEIGHT - 16;
|
|
|
|
/** Dialog left edge: past the sidebar strip where one reserves width. */
|
|
function dialogX(): number {
|
|
return sidebarWidth() + 8;
|
|
}
|
|
|
|
function detailWidth(): number {
|
|
return G2_LENS_WIDTH - dialogX() - 8;
|
|
}
|
|
|
|
/** Dialog top edge, aligned to the min-height band's content area. */
|
|
function dialogY(): number {
|
|
return minWindowTop() + TOP_BAR_HEIGHT + 8;
|
|
}
|
|
const DETAIL_PADDING = 14;
|
|
|
|
export class ToolDebugMenuLayer extends MenuLayer {
|
|
constructor(appId: string | null, entries: ToolDebugEntry[], private readonly onClosed: () => void) {
|
|
super(appId ? `Assistant tools: ${appId}` : "Assistant tools", buildItems(appId, entries), {
|
|
x: dialogX(),
|
|
y: dialogY(),
|
|
width: DIALOG_WIDTH,
|
|
minHeight: 0,
|
|
});
|
|
}
|
|
|
|
onRemoved(): void {
|
|
this.onClosed();
|
|
}
|
|
}
|
|
|
|
function buildItems(appId: string | null, entries: ToolDebugEntry[]): MenuItem[] {
|
|
if (!entries.length) {
|
|
return [{ label: "(no tools registered)", onSelect: (ctx) => ctx.stack.pop() }];
|
|
}
|
|
const prefix = appId ? `app.${appId}.` : "";
|
|
return entries.map((entry) => {
|
|
const name = prefix && entry.spec.name.startsWith(prefix)
|
|
? entry.spec.name.slice(prefix.length)
|
|
: entry.spec.name;
|
|
return {
|
|
label: name,
|
|
onSelect: (ctx) => {
|
|
ctx.stack.push(new ToolDetailLayer(entry));
|
|
},
|
|
render: ({ image, x, y, width, selected }) => {
|
|
const font = getDefaultSmallFont();
|
|
const nameValue = selected ? 255 : entry.live ? 200 : 110;
|
|
const status = entry.live ? entry.spec.availability : `${entry.spec.availability} (off)`;
|
|
const statusValue = entry.live ? (selected ? 200 : 150) : 100;
|
|
image.drawText(font, x, y + 3, name, nameValue);
|
|
image.drawText(font, x + width - font.measureText(status) - 2, y + 3, status, statusValue);
|
|
},
|
|
};
|
|
});
|
|
}
|
|
|
|
/** Full-detail page for one tool: canonical name, gating, and description. */
|
|
class ToolDetailLayer implements Layer {
|
|
private scrollRow = 0;
|
|
|
|
constructor(private readonly entry: ToolDebugEntry) {}
|
|
|
|
paint(_ctx: LayerContext, paintBelow: PaintBelow): GrayImage {
|
|
const image = paintBelow();
|
|
const font = getDefaultSmallFont();
|
|
const left = dialogX();
|
|
const width = detailWidth();
|
|
const top = dialogY();
|
|
image.fillRoundedRect(left, top, width, DETAIL_HEIGHT, 1, 10);
|
|
image.drawRoundedRect(left, top, width, DETAIL_HEIGHT, 72, 10);
|
|
|
|
const textX = left + DETAIL_PADDING;
|
|
const textWidth = width - 2 * DETAIL_PADDING - 8;
|
|
const lines = this.buildLines(textWidth);
|
|
const detailLineH = lineStep(font);
|
|
const visibleRowCount = Math.max(1, ((DETAIL_HEIGHT - 2 * DETAIL_PADDING) / detailLineH) | 0);
|
|
this.scrollRow = clamp(this.scrollRow, 0, Math.max(0, lines.length - visibleRowCount));
|
|
|
|
const lastVisibleRow = Math.min(lines.length, this.scrollRow + visibleRowCount);
|
|
for (let index = this.scrollRow; index < lastVisibleRow; index++) {
|
|
const line = lines[index]!;
|
|
const y = top + DETAIL_PADDING + (index - this.scrollRow) * detailLineH;
|
|
image.drawText(font, textX, y, line.text, line.value);
|
|
}
|
|
if (lines.length > visibleRowCount) {
|
|
drawListScrollbar(
|
|
image,
|
|
left + width - 7,
|
|
top + DETAIL_PADDING,
|
|
DETAIL_HEIGHT - 2 * DETAIL_PADDING,
|
|
this.scrollRow,
|
|
visibleRowCount,
|
|
lines.length,
|
|
);
|
|
}
|
|
return image;
|
|
}
|
|
|
|
private buildLines(width: number): { text: string; value: number }[] {
|
|
const font = getDefaultSmallFont();
|
|
const spec = this.entry.spec;
|
|
const lines: { text: string; value: number }[] = [];
|
|
for (const text of wrapText(font, spec.name, width)) {
|
|
lines.push({ text, value: 235 });
|
|
}
|
|
lines.push({
|
|
text: `${spec.availability}${this.entry.live ? ", live" : ", not live"}${spec.proactive ? ", proactive" : ""}`,
|
|
value: 160,
|
|
});
|
|
if (this.entry.windowId) {
|
|
lines.push({ text: `window: ${this.entry.windowId}`, value: 160 });
|
|
}
|
|
lines.push({ text: "", value: 0 });
|
|
for (const text of wrapText(font, spec.description, width)) {
|
|
lines.push({ text, value: 190 });
|
|
}
|
|
return lines;
|
|
}
|
|
|
|
handleInput(event: DashboardInputEvent, ctx: LayerContext): void {
|
|
switch (event.type) {
|
|
case "scroll-up":
|
|
this.scrollRow = Math.max(0, this.scrollRow - 1);
|
|
return;
|
|
case "scroll-down":
|
|
this.scrollRow++;
|
|
return;
|
|
case "click":
|
|
case "double-click":
|
|
ctx.stack.pop();
|
|
return;
|
|
}
|
|
}
|
|
}
|