yaver-feedback-react-native 0.8.13 → 0.9.2

package/src/YaverFeedback.ts

@@ -1,9 +1,14 @@
-import { NativeModules } from 'react-native';
+import { NativeModules, Platform } from 'react-native';
 import { FeedbackConfig, CapturedError } from './types';
 import { YaverDiscovery } from './Discovery';
 import { BlackBox } from './BlackBox';
-import { P2PClient } from './P2PClient';
+import { P2PClient, resolveReportIdentity } from './P2PClient';
 import { ShakeDetector } from './ShakeDetector';
+import {
+  captureStoreScreenshots,
+  CaptureStoreScreenshotsOptions,
+  CaptureStoreScreenshotsResult,
+} from './storeShots';
 import {
   configureAuthEndpoints,
   setStrictNativeAuth,
@@ -23,6 +28,13 @@ import {
   QuickIconColorPreset,
 } from './preferences';
 
+function unrefTimer(timer: ReturnType<typeof setTimeout>): void {
+  const maybeNodeTimer = timer as unknown as { unref?: () => void };
+  if (typeof maybeNodeTimer.unref === 'function') {
+    maybeNodeTimer.unref();
+  }
+}
+
 // Is this JS runtime the Yaver mobile app's super-host bridge? The
 // YaverInfo native module is only registered inside Yaver's container
 // (mobile/ios/Yaver/YaverInfo.{swift,m} + Android counterpart); a
@@ -147,9 +159,16 @@ let config: FeedbackConfig | null = null;
 let enabled = false;
 let p2pClient: P2PClient | null = null;
 let shakeDetector: ShakeDetector | null = null;
+/** Unsubscribe for the BlackBox command handler registered by init(). Held so
+ *  a re-init (or destroy) can drop the old one instead of stacking. */
+let commandUnsubscribe: (() => void) | null = null;
 let p2pAuthToken: string | null = null;
 let p2pRelayPassword: string = '';
+/** Pending BlackBox auto-start retry. Held so destroy()/re-init can cancel it
+ *  instead of leaving a timer chain running against a torn-down config. */
+let autoStartTimer: ReturnType<typeof setTimeout> | null = null;
 let reportLaunchInFlight = false;
+let crashReportInFlight = false;
 
 /** Resolve the user's relay password by validating their auth token
  *  against Convex. Used whenever we (re)build the P2PClient so a
@@ -196,6 +215,7 @@ async function resolveRelayPassword(authToken: string, convexUrl?: string): Prom
 /** Ring buffer of captured errors. */
 let errorBuffer: CapturedError[] = [];
 let maxErrors = 5;
+let crashHandlerInstalled = false;
 
 /** Track whether BlackBox was running before disable (to restart on enable). */
 let blackBoxWasStreaming = false;
@@ -266,6 +286,79 @@ export class YaverFeedback {
    * If no `agentUrl` is provided, the SDK will attempt auto-discovery
    * via `YaverDiscovery` on the first `startReport()` call.
    */
+  /** The runtime lane, when running on web inside a Yaver preview WebView. */
+  static detectWebLane(): 'browser' | 'webrtc' | null {
+    try {
+      if (Platform.OS !== 'web' || typeof window === 'undefined') return null;
+      const l = String((window as unknown as { __yaverLane?: string }).__yaverLane || '').toLowerCase();
+      if (l === 'browser' || l === 'webrtc') return l;
+    } catch { /* noop */ }
+    return null;
+  }
+
+  /**
+   * Mount a draggable DOM floating "Y" icon for the BROWSER lane (RN-web). It
+   * lives in the WebView's document.body (position:fixed, max z-index), so it
+   * renders ON TOP of the page inside the WebView and is never occluded by the
+   * fullScreen preview modal — the one occlusion-proof affordance on iOS.
+   * Tap opens the SDK's existing report flow (the RN FeedbackModal renders in
+   * the same WebView DOM, also un-occluded). No-op off-web or off-lane, and
+   * idempotent (a re-init reuses the existing node).
+   */
+  static mountBrowserLaneIcon(): void {
+    if (YaverFeedback.detectWebLane() !== 'browser') return;
+    try {
+      const doc = (globalThis as unknown as { document?: Document }).document;
+      if (!doc || !doc.body) return;
+      if (doc.getElementById('yaver-feedback-btn')) return; // idempotent
+      const btn = doc.createElement('div');
+      btn.id = 'yaver-feedback-btn';
+      btn.textContent = 'Y';
+      btn.title = 'Yaver Feedback — drag to move · tap to report';
+      btn.style.cssText =
+        'position:fixed;bottom:20px;right:20px;width:44px;height:44px;border-radius:50%;' +
+        'background:#6366f1;color:#fff;display:flex;align-items:center;justify-content:center;' +
+        'cursor:pointer;z-index:99999;font-size:18px;font-weight:bold;touch-action:none;' +
+        'box-shadow:0 4px 12px rgba(99,102,241,0.4);transition:transform 0.2s;';
+      const drag = { on: false, moved: false, sx: 0, sy: 0, ox: 0, oy: 0 };
+      const w = window as unknown as { innerWidth: number; innerHeight: number };
+      const applyPos = (x: number, y: number) => {
+        const m = 8;
+        const nx = Math.max(m, Math.min(w.innerWidth - 44 - m, x));
+        const ny = Math.max(m, Math.min(w.innerHeight - 44 - m, y));
+        btn.style.left = nx + 'px'; btn.style.top = ny + 'px';
+        btn.style.right = 'auto'; btn.style.bottom = 'auto';
+        try { localStorage.setItem('yaver-feedback-btn-pos', JSON.stringify({ x: nx, y: ny })); } catch { /* noop */ }
+      };
+      try { const s = localStorage.getItem('yaver-feedback-btn-pos'); if (s) { const p = JSON.parse(s); if (typeof p?.x === 'number') applyPos(p.x, p.y); } } catch { /* noop */ }
+      btn.addEventListener('pointerdown', (e: PointerEvent) => {
+        drag.on = true; drag.moved = false;
+        const r = btn.getBoundingClientRect();
+        drag.sx = e.clientX; drag.sy = e.clientY; drag.ox = r.left; drag.oy = r.top;
+        btn.setPointerCapture(e.pointerId); btn.style.transition = 'none';
+      });
+      btn.addEventListener('pointermove', (e: PointerEvent) => {
+        if (!drag.on) return;
+        const dx = e.clientX - drag.sx, dy = e.clientY - drag.sy;
+        if (Math.abs(dx) + Math.abs(dy) > 5) drag.moved = true;
+        if (drag.moved) applyPos(drag.ox + dx, drag.oy + dy);
+      });
+      const end = (e: PointerEvent) => {
+        if (!drag.on) return;
+        drag.on = false; btn.style.transition = 'transform 0.2s';
+        try { btn.releasePointerCapture(e.pointerId); } catch { /* noop */ }
+        if (!drag.moved) { try { void YaverFeedback.startReport(); } catch { /* noop */ } }
+      };
+      btn.addEventListener('pointerup', end);
+      btn.addEventListener('pointercancel', end);
+      // Also answer the host's forwarded shake (Yaver injects yaver-feedback:launch).
+      const launch = () => { try { void YaverFeedback.startReport(); } catch { /* noop */ } };
+      window.addEventListener('yaver-feedback:launch', launch as EventListener);
+      (window as unknown as { __yaverFeedbackLaunch?: () => void }).__yaverFeedbackLaunch = launch;
+      doc.body.appendChild(btn);
+    } catch { /* noop — never break the guest app over a feedback affordance */ }
+  }
+
   static init(cfg: FeedbackConfig): void {
     config = {
       trigger: 'shake',
@@ -293,6 +386,9 @@ export class YaverFeedback {
       }
       maxErrors = cfg.maxCapturedErrors ?? 5;
       errorBuffer = [];
+      if (cfg.crashReporting?.enabled && cfg.crashReporting?.installGlobalHandler) {
+        YaverFeedback.installCrashHandler();
+      }
       return;
     }
     if (config.disableShakeGesture && (!config.quickIcon || config.quickIcon === 'auto')) {
@@ -359,24 +455,25 @@ export class YaverFeedback {
     // Set up error capture buffer size
     maxErrors = cfg.maxCapturedErrors ?? 5;
     errorBuffer = [];
-
-    // Wire up shake detection when trigger is 'shake'
-    if (shakeDetector) {
-      shakeDetector.stop();
-      shakeDetector = null;
-    }
-    if (enabled && config.trigger === 'shake' && !config.disableShakeGesture) {
-      shakeDetector = new ShakeDetector();
-      shakeDetector.start(() => {
-        YaverFeedback.notifyShake();
-        if (config?.reportingOnly) {
-          YaverFeedback.sendAutoReport();
-        } else {
-          YaverFeedback.startReport();
-        }
-      });
+    if (cfg.crashReporting?.enabled && cfg.crashReporting?.installGlobalHandler) {
+      YaverFeedback.installCrashHandler();
     }
 
+    // Wire up shake detection when trigger is 'shake'. Rebuild from scratch:
+    // config was just replaced, so the old detector may be closing over stale
+    // settings.
+    YaverFeedback.stopShakeDetector();
+    YaverFeedback.syncShakeDetector();
+
+    // Browser lane (RN-web inside Yaver's fullScreen WebView preview): the
+    // native shake module doesn't exist on web, and Yaver's own container
+    // overlay is OCCLUDED behind the WebView modal on iOS. So mount an
+    // occlusion-proof DRAGGABLE DOM icon INSIDE the WebView — same pattern as
+    // yaver-feedback-web. Lane is stamped by Yaver via
+    // window.__yaverLane='browser' (mobile PREVIEW_LANE_SCRIPT). See
+    // docs/audits/feedback-sdk-lanes-audit-2026-07-28.md.
+    if (enabled) YaverFeedback.mountBrowserLaneIcon();
+
     // Wire up BlackBox command handlers for reload + status signals from
     // the agent. Opens an SSE channel the agent uses to:
     //   - broadcast reload_bundle so the phone picks up a fresh Hermes
@@ -385,7 +482,14 @@ export class YaverFeedback {
     //     assets…", "Done") so the SDK can surface it like a normal
     //     "Working…" spinner instead of a silent 60-second freeze.
     if (enabled) {
-      BlackBox.onCommand((cmd) => {
+      // onCommand appends to a static array and hands back an unsubscribe.
+      // Dropping that unsubscribe meant every re-init stacked another handler
+      // on top of the last, so an app that re-initialised (say, a settings
+      // toggle) reloaded twice per agent command, then three times, and so on.
+      // destroy() never cleared them either. Drop the previous registration
+      // first so init() is idempotent here.
+      commandUnsubscribe?.();
+      commandUnsubscribe = BlackBox.onCommand((cmd) => {
         if (cmd.command === 'reload') {
           if (cfg.onReload) {
             cfg.onReload();
@@ -447,16 +551,24 @@ export class YaverFeedback {
       // SFMG used to call BlackBox.start() inside YaverFeedbackWidget
       // after auth — that path still works (start() is idempotent), so
       // upgrading SDK without removing the manual call is safe.
+      //   4. RETRY, rather than checking once. This was a single 500ms
+      //      timeout, and on a cold start it could not succeed: an app that
+      //      passes neither agentUrl nor authToken to init() (the normal
+      //      case — they're restored from storage) gets its session from
+      //      `void hydrateSession()`, which reads two AsyncStorage keys and
+      //      then awaits discoverAgent(), a Convex round trip plus LAN
+      //      probing. That does not finish in 500ms, so the check found no
+      //      agentUrl, gave up, and BlackBox never started — meaning no SSE
+      //      channel, so the agent's `reload_bundle` command had nowhere to
+      //      land and Hermes hot reload silently did nothing until the user
+      //      shook the device and drove discovery by hand.
+      //
+      //      The both-conditions guard is what keeps the 401 retry storm
+      //      from coming back, so it is preserved exactly; we only re-check
+      //      it over time instead of once. Bounded so a device that never
+      //      signs in doesn't poll forever.
       if (cfg.autoStartBlackBox !== false) {
-        setTimeout(() => {
-          if (config?.agentUrl && (config?.authToken || p2pAuthToken)) {
-            try {
-              BlackBox.start();
-            } catch (err) {
-              console.warn('[YaverFeedback] BlackBox auto-start failed:', err);
-            }
-          }
-        }, 500);
+        YaverFeedback.scheduleBlackBoxAutoStart();
       }
     }
 
@@ -471,6 +583,40 @@ export class YaverFeedback {
     //     pass-through wrapper they insert into their own error chain
   }
 
+  /**
+   * Opt-in global crash handler. This wraps the existing React Native
+   * ErrorUtils handler and still calls it, so Sentry/Crashlytics/Bugsnag can
+   * remain the system of record. The SDK only uploads a crash report and,
+   * when configured, asks the agent to create a fix task.
+   */
+  static installCrashHandler(): void {
+    if (crashHandlerInstalled) return;
+    try {
+      const errorUtils = (globalThis as any)?.ErrorUtils;
+      if (!errorUtils?.getGlobalHandler || !errorUtils?.setGlobalHandler) {
+        return;
+      }
+      const next = errorUtils.getGlobalHandler();
+      errorUtils.setGlobalHandler((error: Error, isFatal?: boolean) => {
+        YaverFeedback.attachError(error, {
+          source: 'global-handler',
+          crashAware: true,
+        });
+        if (errorBuffer.length > 0) {
+          errorBuffer[errorBuffer.length - 1].isFatal = isFatal ?? true;
+        }
+        void YaverFeedback.reportCrash(error, {
+          isFatal: isFatal ?? true,
+          source: 'global-handler',
+        });
+        next?.(error, isFatal);
+      });
+      crashHandlerInstalled = true;
+    } catch (err) {
+      console.warn('[YaverFeedback] installCrashHandler failed:', err);
+    }
+  }
+
   /**
    * Run agent discovery in the background.
    * Called automatically from init() when no agentUrl is provided.
@@ -564,6 +710,12 @@ export class YaverFeedback {
     } else {
       await YaverFeedback.discoverAgent();
     }
+    // Signing in is the event the auto-start was waiting for. If its bounded
+    // retry already gave up (device left signed out past the window), this is
+    // what brings the command channel up without requiring an app restart.
+    if (config.autoStartBlackBox !== false && !BlackBox.isStreaming) {
+      YaverFeedback.scheduleBlackBoxAutoStart();
+    }
   }
 
   /** Returns true once the SDK has a session token it can use. */
@@ -571,6 +723,59 @@ export class YaverFeedback {
     return Boolean(config?.authToken);
   }
 
+  /**
+   * On-device App Store screenshot capture (Engine 2). Walks the routes
+   * the host hands us, screenshots each, and uploads to the agent which
+   * runs the App Store Connect backend. agentUrl / authToken / relay
+   * password default to the SDK's resolved session; the host only has to
+   * supply a navigation ref + the ordered route list.
+   *
+   *   YaverFeedback.captureStoreScreenshots({
+   *     app: 'sfmg',
+   *     navigationRef,
+   *     routes: ['/(tabs)/dashboard', '/(tabs)/messages', '/(tabs)/clients'],
+   *     submit: true,
+   *   })
+   */
+  static async captureStoreScreenshots(
+    opts: Omit<CaptureStoreScreenshotsOptions, 'agentUrl' | 'authToken' | 'relayPassword'> &
+      Partial<Pick<CaptureStoreScreenshotsOptions, 'agentUrl' | 'authToken' | 'relayPassword'>>,
+  ): Promise<CaptureStoreScreenshotsResult> {
+    const agentUrl = opts.agentUrl ?? config?.agentUrl ?? '';
+    const authToken = opts.authToken ?? config?.authToken ?? p2pAuthToken ?? '';
+    const relayPassword = opts.relayPassword ?? p2pRelayPassword;
+    if (!agentUrl || !authToken) {
+      return {
+        ok: false,
+        captured: 0,
+        uploaded: 0,
+        message: 'YaverFeedback not connected to an agent — init() with agentUrl + authToken first.',
+      };
+    }
+    return captureStoreScreenshots({ ...opts, agentUrl, authToken, relayPassword });
+  }
+
+  /**
+   * Let the mobile app / CLI kick THIS device into self-capturing. Registers
+   * a BlackBox command listener that fires captureStoreScreenshots when the
+   * agent pushes a `capture_store_shots` command (its `data` may override
+   * `submit` / `locale`). Returns an unsubscribe fn. Call once after init,
+   * passing the app's navigation ref + the routes to walk.
+   */
+  static enableStoreShotsOnCommand(
+    opts: Omit<CaptureStoreScreenshotsOptions, 'agentUrl' | 'authToken' | 'relayPassword'>,
+  ): () => void {
+    return BlackBox.onCommand((cmd) => {
+      if (cmd?.command !== 'capture_store_shots') return;
+      const data = (cmd as any).data ?? {};
+      void YaverFeedback.captureStoreScreenshots({
+        ...opts,
+        submit: typeof data.submit === 'boolean' ? data.submit : opts.submit,
+        locale: typeof data.locale === 'string' ? data.locale : opts.locale,
+      });
+    });
+  }
+
   /**
    * Request the embedded FeedbackModal to show the login screen. Works by
    * emitting an event the modal listens for — avoids forcing the host app
@@ -779,32 +984,145 @@ export class YaverFeedback {
       }
       BlackBox.unwrapConsole(); // ensure console is restored even if BlackBox wasn't started
       errorBuffer = [];
-      if (shakeDetector) {
-        shakeDetector.stop();
-        shakeDetector = null;
-      }
+      YaverFeedback.stopShakeDetector();
     } else {
       // === ENABLE ===
       if (blackBoxWasStreaming) {
         BlackBox.start(); // restart with previous config
       }
-      // Restart shake detector if trigger is 'shake'
-      if (config?.trigger === 'shake' && !config?.disableShakeGesture && !shakeDetector) {
-        shakeDetector = new ShakeDetector();
-        shakeDetector.start(() => {
-          YaverFeedback.notifyShake();
-          if (config?.reportingOnly) {
-            YaverFeedback.sendAutoReport();
-          } else {
-            YaverFeedback.startReport();
-          }
-        });
-      }
+      enabled = true; // syncShakeDetector reads this
+      YaverFeedback.syncShakeDetector();
     }
 
     enabled = value;
   }
 
+  /**
+   * Turn shake-to-report on or off without tearing the SDK down.
+   *
+   * `trigger` is read only inside init(), so before this the only ways to
+   * stop listening for a shake were setEnabled(false) — which also kills the
+   * flight recorder and the agent command channel — or a re-init, which used
+   * to stack a duplicate command handler. Neither is what "turn the shake
+   * catcher off" should cost.
+   *
+   * Persists onto config.disableShakeGesture, so a later setEnabled(true)
+   * honours it rather than resurrecting the listener.
+   */
+  static setShakeEnabled(value: boolean): void {
+    if (!config) return;
+    config.disableShakeGesture = !value;
+    YaverFeedback.syncShakeDetector();
+  }
+
+  /** Whether the shake listener is currently armed. */
+  static isShakeEnabled(): boolean {
+    return shakeDetector !== null;
+  }
+
+  /**
+   * Bring the shake listener in line with the current config. Idempotent —
+   * safe to call whenever `enabled`, `trigger`, or `disableShakeGesture`
+   * moves.
+   */
+  private static syncShakeDetector(): void {
+    const want =
+      enabled && config?.trigger === 'shake' && !config?.disableShakeGesture;
+    if (want && !shakeDetector) {
+      shakeDetector = new ShakeDetector();
+      shakeDetector.start(() => {
+        YaverFeedback.notifyShake();
+        if (config?.reportingOnly) {
+          YaverFeedback.sendAutoReport();
+        } else {
+          YaverFeedback.startReport();
+        }
+      });
+    } else if (!want && shakeDetector) {
+      YaverFeedback.stopShakeDetector();
+    }
+  }
+
+  private static stopShakeDetector(): void {
+    if (shakeDetector) {
+      shakeDetector.stop();
+      shakeDetector = null;
+    }
+  }
+
+  /** Cancel a pending BlackBox auto-start retry chain. */
+  private static cancelBlackBoxAutoStart(): void {
+    if (autoStartTimer) {
+      clearTimeout(autoStartTimer);
+      autoStartTimer = null;
+    }
+  }
+
+  /**
+   * Start BlackBox as soon as we have BOTH an agentUrl and a token, polling
+   * until then.
+   *
+   * Both conditions are mandatory and deliberate: starting without a token
+   * makes the SSE channel 401 and retry with backoff, which is the tight
+   * string-concat + JSON-parse loop that used to SIGSEGV Hermes on iOS 18.3.1
+   * during Screenshot & Fix. This only re-checks that same guard over time.
+   *
+   * Bounded at ~60s: long enough for AsyncStorage hydration plus a Convex
+   * discovery round trip on a cold, off-LAN start, short enough that a device
+   * whose user never signs in stops polling. Giving up here costs nothing —
+   * setAuthToken() and startReport() both reschedule, so signing in later
+   * still brings the channel up.
+   */
+  private static scheduleBlackBoxAutoStart(attempt = 0): void {
+    const MAX_ATTEMPTS = 60;
+    const FIRST_DELAY_MS = 500;
+    const RETRY_DELAY_MS = 1000;
+    // Re-run discovery every Nth tick rather than every tick: it is a Convex
+    // round trip plus LAN probing, so once a second would hammer both. Every
+    // 3s is responsive enough that waking the dev machine reconnects the phone
+    // on its own, without the user wondering whether to restart the app.
+    const REDISCOVER_EVERY = 3;
+
+    YaverFeedback.cancelBlackBoxAutoStart();
+    if (!enabled || attempt >= MAX_ATTEMPTS) return;
+
+    const timer = setTimeout(() => {
+      autoStartTimer = null;
+      // A destroy() or setEnabled(false) between scheduling and firing.
+      if (!enabled || !config) return;
+      if (BlackBox.isStreaming) return;
+
+      if (config.agentUrl && (config.authToken || p2pAuthToken)) {
+        try {
+          // Pass the host's BlackBox config through. This used to call
+          // start() bare, so a host that configured the flight recorder
+          // — as the README itself shows — had it silently replaced by
+          // defaults, and appName came out ''.
+          BlackBox.start(config.blackBox);
+        } catch (err) {
+          console.warn('[YaverFeedback] BlackBox auto-start failed:', err);
+        }
+        return;
+      }
+
+      // No agent yet. Re-attempt discovery instead of only re-reading the
+      // flag: hydrateSession() runs discoverAgent() exactly once at init, so
+      // if the dev machine was unreachable at that moment — asleep, phone
+      // still on cellular before the relay came up, agent not yet serving —
+      // agentUrl stayed null for the whole process lifetime and only an app
+      // restart could recover it. discoverAgent() self-guards on "already
+      // have a URL" and "no token", so calling it again is cheap and safe.
+      if (!config.agentUrl && attempt > 0 && attempt % REDISCOVER_EVERY === 0) {
+        void YaverFeedback.discoverAgent();
+      }
+
+      YaverFeedback.scheduleBlackBoxAutoStart(attempt + 1);
+    }, attempt === 0 ? FIRST_DELAY_MS : RETRY_DELAY_MS);
+
+    autoStartTimer = timer;
+    unrefTimer(timer);
+  }
+
   /** Returns whether the SDK is currently enabled. */
   static isEnabled(): boolean {
     return enabled;
@@ -883,6 +1201,113 @@ export class YaverFeedback {
     };
   }
 
+  /**
+   * Upload a crash-aware feedback bundle. Apps can call this from their own
+   * error boundary/global handler. If crashReporting.autoFix is true, the SDK
+   * also triggers the agent's feedback-fix task; reload delivery still happens
+   * through the existing BlackBox command stream.
+   */
+  static async reportCrash(
+    error: Error,
+    opts?: {
+      isFatal?: boolean;
+      source?: 'manual' | 'global-handler';
+      metadata?: Record<string, unknown>;
+      autoFix?: boolean;
+    },
+  ): Promise<{ reportId?: string; taskId?: string }> {
+    if (!config || !enabled || !config.crashReporting?.enabled) return {};
+    if (crashReportInFlight) return {};
+    crashReportInFlight = true;
+    try {
+      YaverFeedback.attachError(error, {
+        ...(config.crashReporting.metadata || {}),
+        ...(opts?.metadata || {}),
+        crashAware: true,
+      });
+      if (errorBuffer.length > 0) {
+        errorBuffer[errorBuffer.length - 1].isFatal = opts?.isFatal ?? true;
+      }
+
+      if (!config.agentUrl) {
+        await YaverFeedback.discoverAgent();
+      }
+      if (!config.agentUrl) {
+        console.warn('[YaverFeedback] No agent URL — cannot send crash report.');
+        return {};
+      }
+
+      const { Platform, Dimensions } = require('react-native');
+      const { uploadFeedback } = require('./upload');
+      const { width, height } = Dimensions.get('window');
+      let screenshotPath: string | undefined;
+      if (config.crashReporting.captureScreenshot !== false) {
+        try {
+          const { captureScreenshot } = require('./capture');
+          screenshotPath = await captureScreenshot();
+        } catch {}
+      }
+
+      const autoFix = opts?.autoFix ?? config.crashReporting.autoFix === true;
+      const identity = resolveReportIdentity({
+        projectName: config?.projectName,
+        bundleId: config?.bundleId,
+        surface: config?.surface,
+        surfaces: config?.surfaces,
+        stack: config?.stack,
+        stacks: config?.stacks,
+        testSurfaces: config?.testSurfaces,
+        feedbackSdk: config?.feedbackSdk,
+        feedbackTransport: config?.feedbackTransport,
+        voiceCapabilities: config?.voiceCapabilities,
+        sttProvider: config?.sttProvider,
+        ttsProvider: config?.ttsProvider,
+      });
+      const bundle = {
+        metadata: {
+          timestamp: new Date().toISOString(),
+          reportKind: 'crash',
+          deviceInfo: {
+            platform: Platform.OS,
+            osVersion: String(Platform.Version),
+            model: Platform.OS === 'ios' ? 'iOS Device' : 'Android Device',
+            screenWidth: width,
+            screenHeight: height,
+            appName: identity.appName,
+          },
+          app: identity.app,
+          project: identity.project,
+          userNote: '[Crash report]',
+          crash: {
+            message: error.message,
+            isFatal: opts?.isFatal ?? true,
+            source: opts?.source ?? 'manual',
+            autoFixRequested: autoFix,
+          },
+        },
+        screenshots: screenshotPath ? [screenshotPath] : [],
+        errors: errorBuffer.length > 0 ? [...errorBuffer] : undefined,
+      };
+
+      const uploaded = await uploadFeedback(config.agentUrl, config.authToken ?? '', bundle, p2pRelayPassword);
+      const reportId =
+        (uploaded as { id?: string; reportId?: string } | null | undefined)?.id ??
+        (uploaded as { reportId?: string } | null | undefined)?.reportId;
+      let taskId: string | undefined;
+      if (autoFix && reportId) {
+        const client = p2pClient ?? new P2PClient(config.agentUrl, config.authToken ?? '', p2pRelayPassword);
+        const fix = await client.triggerFix(reportId);
+        taskId = fix?.taskId;
+      }
+      return { reportId, taskId };
+    } catch (err) {
+      console.warn('[YaverFeedback] Crash report failed:', err);
+      return {};
+    } finally {
+      crashReportInFlight = false;
+    }
+  }
+
   /**
    * Returns the P2P client instance.
    * Available after init if agentUrl is set, or after first successful discovery.
@@ -1033,17 +1458,33 @@ export class YaverFeedback {
         // Screenshot capture may fail (e.g. no view ref) — continue without it
       }
 
+      const identity = resolveReportIdentity({
+        projectName: config?.projectName,
+        bundleId: config?.bundleId,
+        surface: config?.surface,
+        surfaces: config?.surfaces,
+        stack: config?.stack,
+        stacks: config?.stacks,
+        testSurfaces: config?.testSurfaces,
+        feedbackSdk: config?.feedbackSdk,
+        feedbackTransport: config?.feedbackTransport,
+        voiceCapabilities: config?.voiceCapabilities,
+        sttProvider: config?.sttProvider,
+        ttsProvider: config?.ttsProvider,
+      });
       const bundle = {
         metadata: {
           timestamp: new Date().toISOString(),
-          device: {
+          deviceInfo: {
             platform: Platform.OS,
             osVersion: String(Platform.Version),
             model: Platform.OS === 'ios' ? 'iOS Device' : 'Android Device',
             screenWidth: width,
             screenHeight: height,
+            appName: identity.appName,
           },
-          app: {},
+          app: identity.app,
+          project: identity.project,
           userNote: '[Auto-report via shake]',
         },
         screenshots: screenshotPath ? [screenshotPath] : [],
@@ -1211,6 +1652,17 @@ export class YaverFeedback {
       shakeDetector.stop();
       shakeDetector = null;
     }
+    // Drop the agent command handler and un-monkey-patch console. Without
+    // these, destroy() left the SDK half-alive: console stayed wrapped, and
+    // the reload handler kept firing on a "destroyed" SDK — then a later
+    // init() stacked a second one on top.
+    commandUnsubscribe?.();
+    commandUnsubscribe = null;
+    // Before `enabled = false` / `config = null` below, so an in-flight retry
+    // can't fire against a torn-down config.
+    YaverFeedback.cancelBlackBoxAutoStart();
+    BlackBox.stop();
+    BlackBox.unwrapConsole();
     firstShakeFired = false;
     enabled = false;
     config = null;