yaver-feedback-react-native 0.9.0 → 0.9.2

package/src/P2PClient.ts

@@ -1,7 +1,9 @@
 import { Platform } from 'react-native';
 import {
+  AppInfo,
   CapabilitySnapshot,
   FeedbackBundle,
+  FeedbackProjectRef,
   IncidentEvent,
   OpenCodeConfigSummary,
   OperationState,
@@ -10,6 +12,16 @@ import {
   TestSession,
   VoiceCapability,
 } from './types';
+import { AGENT_ENDPOINTS } from './_core/endpoints';
+import { RELOAD_PATH, describeReloadFailure } from './reloadActions';
+import type { DevServerSnapshot, ReloadWireMode } from './reloadActions';
+
+function unrefTimer(timer: ReturnType<typeof setTimeout>): void {
+  const maybeNodeTimer = timer as unknown as { unref?: () => void };
+  if (typeof maybeNodeTimer.unref === 'function') {
+    maybeNodeTimer.unref();
+  }
+}
 
 export interface FeedbackEvent {
   type: string;
@@ -76,6 +88,148 @@ export function resolveAppIdentity(opts?: {
   return out;
 }
 
+/**
+ * Is this JS running inside Yaver's own container as a pushed Hermes guest?
+ *
+ * The YaverInfo native module is registered only by Yaver's app, so its
+ * presence means the ambient runtime describes Yaver rather than the app
+ * whose code is executing. Mirrors the checks in YaverFeedback.ts,
+ * ShakeDetector.ts and QuickActionIcon.tsx.
+ */
+function isInsideYaverContainer(): boolean {
+  try {
+    const { NativeModules } = require('react-native');
+    return !!NativeModules?.YaverInfo;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Read the guest project Yaver's host shell pinned for this bundle.
+ *
+ * When an app's JS is pushed into Yaver's container as a Hermes guest, the
+ * ambient runtime describes the HOST — `expo-constants` and `SettingsManager`
+ * both answer `Yaver` / `io.yaver.mobile`. Auto-resolution would therefore
+ * file every guest report against Yaver's own repo, and the fix task would
+ * edit the SDK instead of the app under test.
+ *
+ * Yaver already knows the right answer: picking a project in the Hot Reload
+ * tab calls `YaverInfo.setInheritedGuestProject(name, path)`. Only the name
+ * is used here — the agent resolves the path itself and deliberately ignores
+ * client-supplied ones on feedback reports.
+ */
+function resolveInheritedGuestProjectName(): string | undefined {
+  try {
+    const { NativeModules } = require('react-native');
+    const name = String(NativeModules?.YaverInfo?.inheritedGuestProjectName || '').trim();
+    return name || undefined;
+  } catch {
+    // Not inside Yaver's container, or react-native unavailable (unit tests).
+    return undefined;
+  }
+}
+
+/**
+ * Build the app-identity half of a feedback report's metadata.
+ *
+ * `resolveAppIdentity()` has always fed /vibing/execute and /dev/reload-app,
+ * so the agent could route a "vibe on THIS app" request to the right repo —
+ * but nothing fed /feedback. Reports arrived with no identity at all, so the
+ * agent's fix router fell through to its own working directory and edited
+ * whichever repo it happened to be sitting in. This closes that gap by
+ * reusing the same resolver for the feedback path.
+ *
+ * Precedence, most to least trustworthy:
+ *   1. What the host app declared (`FeedbackConfig.projectName`/`bundleId`).
+ *      An app knows its own identity; nothing should override it.
+ *   2. The guest project Yaver's host shell pinned, when running as a Hermes
+ *      guest. Ambient lookups describe Yaver there, not the guest.
+ *   3. Ambient expo-constants / native modules — correct for a standalone
+ *      build, which is the common case.
+ *
+ * Every lookup is best-effort: a bare RN app with no expo-constants still
+ * produces a report, just one the agent resolves by its own means.
+ */
+export function resolveReportIdentity(opts?: {
+  projectName?: string;
+  bundleId?: string;
+  surface?: FeedbackProjectRef['surface'];
+  surfaces?: FeedbackProjectRef['surfaces'];
+  stack?: string;
+  stacks?: string[];
+  testSurfaces?: string[];
+  feedbackSdk?: string;
+  feedbackTransport?: string;
+  voiceCapabilities?: string[];
+  sttProvider?: string;
+  ttsProvider?: string;
+}): {
+  appName?: string;
+  app: AppInfo;
+  project?: FeedbackProjectRef;
+} {
+  let projectName = (opts?.projectName || '').trim() || undefined;
+  let bundleId = (opts?.bundleId || '').trim() || undefined;
+  let version: string | undefined;
+  let buildNumber: string | undefined;
+
+  if (isInsideYaverContainer()) {
+    // Every ambient lookup answers for the HOST here. Because the agent
+    // routes on bundle id first, letting Yaver's id through would resolve
+    // straight to Yaver's own repo and the guest's name would never be
+    // consulted — so nothing ambient is trusted in the container. The
+    // version is Yaver's too, and reporting it would only mislabel which
+    // build the report came from.
+    projectName = projectName || resolveInheritedGuestProjectName();
+  } else {
+    const ambient = resolveAppIdentity({ projectName, bundleId });
+    projectName = ambient.projectName;
+    bundleId = ambient.bundleId;
+    try {
+      const Constants = require('expo-constants').default ?? require('expo-constants');
+      const cfg = Constants?.expoConfig ?? Constants?.manifest ?? {};
+      version = Constants?.nativeAppVersion || cfg?.version;
+      buildNumber =
+        Constants?.nativeBuildVersion ||
+        cfg?.ios?.buildNumber ||
+        (cfg?.android?.versionCode != null ? String(cfg.android.versionCode) : undefined);
+    } catch {
+      // expo-constants not installed (bare RN). Version is cosmetic — the
+      // router keys off appName/bundleId, both of which survive without it.
+    }
+  }
+
+  const app: AppInfo = {};
+  if (bundleId) app.bundleId = bundleId;
+  if (version) app.version = version;
+  if (buildNumber) app.buildNumber = buildNumber;
+
+  if (!projectName && !bundleId) {
+    return { app };
+  }
+
+  const project: FeedbackProjectRef = { surface: opts?.surface ?? 'mobile' };
+  if (projectName) {
+    project.projectName = projectName;
+    project.appName = projectName;
+  }
+  // Note: projectPath is intentionally omitted — the agent ignores
+  // client-supplied paths on feedback reports and resolves them itself.
+  if (bundleId) project.bundleId = bundleId;
+  if (opts?.surfaces) project.surfaces = opts.surfaces;
+  if (opts?.stack) project.stack = opts.stack;
+  if (opts?.stacks) project.stacks = opts.stacks;
+  if (opts?.testSurfaces) project.testSurfaces = opts.testSurfaces;
+  if (opts?.feedbackSdk) project.feedbackSdk = opts.feedbackSdk;
+  if (opts?.feedbackTransport) project.feedbackTransport = opts.feedbackTransport;
+  if (opts?.voiceCapabilities) project.voiceCapabilities = opts.voiceCapabilities;
+  if (opts?.sttProvider) project.sttProvider = opts.sttProvider;
+  if (opts?.ttsProvider) project.ttsProvider = opts.ttsProvider;
+
+  return { appName: projectName, app, project };
+}
+
 /**
  * Translate a raw Go-agent error into something a user can act on.
  *
@@ -360,19 +514,22 @@ export class P2PClient {
 
   /** Health check — returns true if the agent is reachable. */
   async health(): Promise<boolean> {
+    let timeoutId: ReturnType<typeof setTimeout> | null = null;
     try {
       const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), 3000);
+      timeoutId = setTimeout(() => controller.abort(), 3000);
+      unrefTimer(timeoutId);
 
       const response = await fetch(`${this.baseUrl}/health`, {
         method: 'GET',
         signal: controller.signal,
       });
 
-      clearTimeout(timeoutId);
       return response.ok;
     } catch {
       return false;
+    } finally {
+      if (timeoutId) clearTimeout(timeoutId);
     }
   }
 
@@ -545,6 +702,82 @@ export class P2PClient {
    * via the BlackBox command channel.
    * @param mode - "dev" for hot reload, "bundle" for native bundle rebuild
    */
+  /**
+   * Read the dev server's state so the overlay can decide WHICH reload
+   * actions to offer, and disable the rest with a reason.
+   *
+   * Returns null when the machine cannot be reached at all — which the
+   * caller must render as "not connected", never as "no dev server".
+   * Those are two different problems with two different fixes.
+   */
+  async getDevServerStatus(): Promise<DevServerSnapshot | null> {
+    try {
+      const resp = await fetch(`${this.baseUrl}${AGENT_ENDPOINTS.devStatus}`, {
+        headers: this.authHeaders(),
+      });
+      if (!resp.ok) return null;
+      const data = await resp.json().catch(() => ({} as Record<string, unknown>));
+      return {
+        running: data.running === true,
+        building: data.building === true,
+        framework: typeof data.framework === 'string' ? data.framework : undefined,
+      };
+    } catch {
+      return null;
+    }
+  }
+
+  /**
+   * Trigger a reload with an EXPLICIT fast/full mode — no bundle fallback.
+   *
+   * `reloadApp('dev')` silently falls through to a bundle rebuild when the
+   * dev server is down, which is right for a one-button UX and wrong the
+   * moment the user picks between two named actions: someone who pressed
+   * "Full Reload" must not get a 60-second bundle rebuild without being
+   * told. So this method reports the failure instead, with a named cause.
+   *
+   * Auth: the SAME bearer used for the feedback POST. `/dev/reload` is
+   * registered under `authSDKOrGuest` in desktop/agent/httpserver.go and is
+   * already in the `guest-reload` SDK-token scope list — nothing widens.
+   */
+  async reloadWithMode(
+    mode: ReloadWireMode,
+    snapshot?: DevServerSnapshot | null,
+  ): Promise<ReloadAck> {
+    if (mode === 'bundle') return this.reloadApp('bundle');
+
+    let resp: Response;
+    try {
+      resp = await fetch(`${this.baseUrl}${RELOAD_PATH}`, {
+        method: 'POST',
+        headers: this.authHeaders({ 'Content-Type': 'application/json' }),
+        body: JSON.stringify({ mode }),
+      });
+    } catch (err) {
+      throw new Error(
+        describeReloadFailure(0, err instanceof Error ? err.message : '', snapshot),
+      );
+    }
+    if (!resp.ok) {
+      const text = await resp.text().catch(() => '');
+      throw new Error(describeReloadFailure(resp.status, text, snapshot));
+    }
+    const payload = await resp.json().catch(() => ({} as Record<string, unknown>));
+    const nativeChangesDetected = payload.nativeChangesDetected === true;
+    return {
+      ok: true,
+      mode: 'dev',
+      acknowledged: true,
+      nativeChangesDetected,
+      changeClass: typeof payload.changeClass === 'string' ? payload.changeClass : undefined,
+      message: nativeChangesDetected
+        ? 'Reload accepted, but native files changed — a rebuild is required.'
+        : mode === 'full'
+          ? 'Full reload requested.'
+          : 'Hot reload requested.',
+    };
+  }
+
   async reloadApp(
     mode: 'dev' | 'bundle' = 'bundle',
     opts?: { projectName?: string; bundleId?: string; projectPath?: string },

package/src/ShakeDetector.ts

@@ -83,6 +83,7 @@ export class ShakeDetector {
    * the `ShakeEvent` name a handful of third-party shake libraries emit.
    */
   private subscribeDevMenu(onShake: () => void): void {
+    if (typeof DeviceEventEmitter?.addListener !== 'function') return;
     const eventName = Platform.OS === 'ios' ? 'shakeEvent' : 'ShakeEvent';
     this.devMenuSub = DeviceEventEmitter.addListener(eventName, () => {
       this.fire(onShake);