yaver-feedback-react-native 0.9.10 → 0.9.12

package/dist/__tests__/DogfoodRuntime.test.js

@@ -78,6 +78,37 @@ describe('DogfoodController', () => {
         await controller.stop();
         expect(stopSecond).toHaveBeenCalledTimes(1);
     });
+    test('keeps a failed preferred lane in the console and automatically recovers through browser', async () => {
+        const stopPreferred = jest.fn();
+        const lanes = [];
+        const controller = new DogfoodRuntime_1.DogfoodController({
+            ...expo,
+            lane: 'hermes',
+            fallbackLane: 'browser',
+        }, {
+            async start(ctx) {
+                lanes.push(ctx.project.lane);
+                if (ctx.project.lane === 'hermes') {
+                    ctx.registerCleanup(stopPreferred);
+                    throw new DogfoodRuntime_1.DogfoodRuntimeError({
+                        code: 'DOGFOOD_HERMES_BUILD_FAILED',
+                        error: 'Hermes build failed',
+                        remedy: 'Use the browser build.',
+                        retryable: true,
+                    });
+                }
+                return { lane: 'browser', url: 'http://agent/dev/', metadata: { recovered: true } };
+            },
+        });
+        await expect(controller.trigger()).resolves.toMatchObject({
+            lane: 'browser',
+            metadata: { fallbackFrom: 'hermes', fallbackReason: 'DOGFOOD_HERMES_BUILD_FAILED' },
+        });
+        expect(lanes).toEqual(['hermes', 'browser']);
+        expect(stopPreferred).toHaveBeenCalledTimes(1);
+        expect(controller.snapshot()).toMatchObject({ phase: 'ready', project: { lane: 'browser' } });
+        expect(controller.snapshot().logs.map((line) => line.text)).toContain('[fallback] hermes failed (DOGFOOD_HERMES_BUILD_FAILED); trying browser');
+    });
 });
 describe('Dogfood lanes and console events', () => {
     test('Flutter is first-class on browser but cannot be mislabeled Hermes', () => {
@@ -95,6 +126,20 @@ describe('Dogfood lanes and console events', () => {
         expect((0, DogfoodRuntime_1.defaultDogfoodLane)('flutter')).toBe('browser');
         expect(flutter.find((option) => option.lane === 'hermes')?.supported).toBe(false);
     });
+    test('uses browser as the framework-aware default and as second choice after an explicit native preference', () => {
+        expect((0, DogfoodRuntime_1.dogfoodLanePlan)('flutter', { nativeRuntimeAvailable: true })).toMatchObject({
+            preferred: 'browser', fallback: undefined,
+        });
+        expect((0, DogfoodRuntime_1.dogfoodLanePlan)('expo', { nativeRuntimeAvailable: true }, 'hermes')).toMatchObject({
+            preferred: 'hermes', fallback: 'browser',
+        });
+        expect((0, DogfoodRuntime_1.dogfoodLanePlan)('flutter', { nativeRuntimeAvailable: true }, 'webrtc')).toMatchObject({
+            preferred: 'webrtc', fallback: 'browser',
+        });
+        expect((0, DogfoodRuntime_1.dogfoodLanePlan)('swift', { nativeRuntimeAvailable: true }, 'webrtc')).toMatchObject({
+            preferred: 'webrtc', fallback: undefined,
+        });
+    });
     test('keeps Yaver self-development on the same RN three-lane contract', () => {
         const options = (0, DogfoodRuntime_1.dogfoodLaneOptions)('expo', { nativeRuntimeAvailable: true, selfDevelopment: true });
         expect(options).toHaveLength(3);

package/dist/__tests__/FeedbackModalContract.test.js

@@ -39,11 +39,16 @@ describe('FeedbackModal authenticated chat contract', () => {
             .toBeGreaterThanOrEqual(4.5);
     });
     it('uses Chat as the authenticated entry surface without legacy command buttons', () => {
-        expect(source).toContain("setActiveTab(authenticated ? 'chat' : 'settings')");
+        expect(source).toContain("useState<'chat' | 'settings'>('chat')");
         expect(source).toContain('setShowVibeInput(authenticated || directDogfood)');
         expect(source).not.toContain('Screenshot & Fix');
         expect(source).not.toContain('<DeployPanel');
     });
+    it('opens explicit Dogfood onboarding on setup and makes the runtime console the first live surface', () => {
+        expect(source).toContain("setActiveTab('settings')");
+        expect(source).toContain("setDogfoodSetupStage('runtime')");
+        expect(source).toMatch(/dogfoodSetupStage === 'runtime'[\s\S]*?<DogfoodLiveConsole/);
+    });
     it('keeps Dogfood setup to box, runner, and checkout before asking for a runtime', () => {
         const setupSteps = source.match(/const dogfoodSetupSteps = \[([\s\S]*?)\n  \];/)?.[1] || '';
         expect([...setupSteps.matchAll(/key: '([^']+)'/g)].map((match) => match[1]))
@@ -53,16 +58,21 @@ describe('FeedbackModal authenticated chat contract', () => {
         expect(setupSteps).not.toContain("key: 'model'");
         expect(setupSteps).not.toContain("key: 'lane'");
         expect(source).toContain("type DogfoodSetupStage = 'setup' | 'lane' | 'runtime'");
-        expect(source).toContain('label="Choose runtime"');
+        expect(source).toContain("label={dogfoodSetupReady ? 'Continue to runtime' : 'Complete the choices above'}");
+        expect(source).toContain('{!dogfoodOnboarding ? <>');
+        expect(source).toContain("? `Set up ${dogfoodOnboarding.projectName || dogfoodOnboarding.label || 'this app'} Dogfood`");
     });
     it('passes the selected native target and labels the live log source', () => {
-        expect(source).toContain("nativeTargetId: dogfoodLane === 'webrtc' ? dogfoodNativeTargetId : undefined");
+        expect(source).toContain("nativeTargetId: lanePlan.preferred === 'webrtc' ? dogfoodNativeTargetId : undefined");
+        expect(source).toContain('fallbackLane: lanePlan.fallback');
+        expect(source).toContain('fallbackLane={dogfoodLanePolicy.fallback}');
         expect(source).toMatch(/<DogfoodLiveConsole[\s\S]*?sourceLabel=\{dogfoodSourceLabel\}/);
         expect(source).toContain('Simulator, emulator, or device');
     });
-    it('has one iOS keyboard inset owner and no gesture-stealing sheet Pressable', () => {
-        expect(source).toContain('automaticallyAdjustKeyboardInsets={Platform.OS === \'ios\'}');
-        expect(source).not.toContain('<KeyboardAvoidingView');
+    it('has one keyboard inset owner and no gesture-stealing sheet Pressable', () => {
+        expect(source).toContain("behavior={Platform.OS === 'ios' ? 'padding' : 'height'}");
+        expect(source).toContain('automaticallyAdjustKeyboardInsets={false}');
+        expect(source).toContain('<KeyboardAvoidingView');
         expect(source).not.toContain('keyboardInset');
         expect(source).toContain('<Pressable style={styles.backdrop} onPress={handleClose}');
         expect(source).toMatch(/<View[\s\S]{0,300}?style=\{\[\s*styles\.modal/);

package/dist/__tests__/MachinePickerScreenContract.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/__tests__/MachinePickerScreenContract.test.js

@@ -0,0 +1,25 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const source = fs_1.default.readFileSync(path_1.default.join(__dirname, '..', 'MachinePickerScreen.tsx'), 'utf8');
+describe('MachinePickerScreen progressive reachability contract', () => {
+    it('makes heartbeat-online machines immediately selectable', () => {
+        expect(source).toContain("const direct = device.isOnline");
+        expect(source).toContain("? { reachable: true } as DeviceReachability");
+        expect(source).not.toContain("statusLine = 'Checking connection…'");
+        expect(source).toContain("statusLine = device.platform || 'Online'");
+    });
+    it('does not hold every row behind the slowest direct probe', () => {
+        expect(source).not.toContain('Promise.allSettled');
+        expect(source).toContain("filter((candidate) => !candidate.isOnline)");
+        expect(source).toContain("setReachability((prev) => ({ ...prev, [device.deviceId]: probe }))");
+    });
+    it('names the selected machine connection operation', () => {
+        expect(source).toContain("statusLine = 'Connecting…'");
+        expect(source).toContain('disabled={selectingDeviceId !== null}');
+    });
+});

package/dist/index.d.ts

@@ -56,8 +56,8 @@ export { resolveSDKDogfood } from './dogfoodPolicy';
 export type { DogfoodAccessSnapshot, DogfoodFlowSnapshot, SDKDogfoodConfig, SDKDogfoodStatus } from './dogfoodPolicy';
 export { YaverDeviceDogfood } from './deviceDogfood';
 export type { DeviceDogfoodOptions, DeviceDogfoodSession, DeviceDogfoodState } from './deviceDogfood';
-export { DogfoodController, DogfoodRuntimeError, defaultDogfoodLane, dogfoodLaneOptions, dogfoodLogLinesFromDevEvent, runtimeLogLinesFromDevEvent, validateDogfoodProject, } from './DogfoodRuntime';
-export type { DogfoodControllerOptions, DogfoodDriver, DogfoodFailure, DogfoodLane, DogfoodLaneOption, DogfoodLogLine, DogfoodPhase, DogfoodProject, DogfoodResult, DogfoodRunContext, DogfoodSnapshot, } from './DogfoodRuntime';
+export { DogfoodController, DogfoodRuntimeError, defaultDogfoodLane, dogfoodLanePlan, dogfoodLaneOptions, dogfoodLogLinesFromDevEvent, runtimeLogLinesFromDevEvent, validateDogfoodProject, } from './DogfoodRuntime';
+export type { DogfoodControllerOptions, DogfoodDriver, DogfoodFailure, DogfoodLane, DogfoodLaneOption, DogfoodLanePlan, DogfoodLogLine, DogfoodPhase, DogfoodProject, DogfoodResult, DogfoodRunContext, DogfoodSnapshot, } from './DogfoodRuntime';
 export { DogfoodLanePicker, DogfoodLiveConsole, DogfoodStatusRail } from './DogfoodSessionUi';
 export type { DogfoodStatusStep, DogfoodStatusTone, DogfoodUiColors, } from './DogfoodSessionUi';
 export { FeedbackModal } from './FeedbackModal';

package/dist/index.js

@@ -28,8 +28,8 @@
  * ```
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getToken = exports.getWebBaseUrl = exports.getConvexSiteUrl = exports.configureAuthEndpoints = exports.setPreferredDogfoodLane = exports.getPreferredDogfoodLane = exports.clearQuickIconDisabled = exports.setQuickIconDisabled = exports.getQuickIconDisabled = exports.FixReport = exports.QuickActionIcon = exports.DogfoodQuickControls = exports.FeedbackModal = exports.DogfoodStatusRail = exports.DogfoodLiveConsole = exports.DogfoodLanePicker = exports.validateDogfoodProject = exports.runtimeLogLinesFromDevEvent = exports.dogfoodLogLinesFromDevEvent = exports.dogfoodLaneOptions = exports.defaultDogfoodLane = exports.DogfoodRuntimeError = exports.DogfoodController = exports.YaverDeviceDogfood = exports.resolveSDKDogfood = exports.isYaverModeBadgeHidden = exports.showYaverModeBadge = exports.hideYaverModeBadge = exports.YaverModeBadge = exports.FloatingButton = exports.ShakeDetector = exports.AuthOverlay = exports.PairDeviceModal = exports.YaverMachinePickerScreen = exports.YaverLoginScreen = exports.YaverConnectionScreen = exports.RELOAD_APP_PATH = exports.RELOAD_PATH = exports.describeReloadFailure = exports.reloadFrameworkFamily = exports.reloadRequest = exports.reloadActions = exports.createP2PDogfoodDriver = exports.P2PClient = exports.YaverDiscovery = exports.initExpo = exports.YaverUpdates = exports.BlackBox = exports.captureStoreScreenshots = exports.YaverFeedback = void 0;
-exports.uploadFeedback = exports.isVideoRecording = exports.stopVideoRecording = exports.startVideoRecording = exports.pickFeedbackFile = exports.captureScreenshot = exports.DEFAULT_OAUTH_REDIRECT = exports.DEFAULT_WEB_BASE_URL = exports.DEFAULT_CONVEX_SITE_URL = exports.listReachableDevices = exports.loginWithEmail = exports.signupWithEmail = exports.signInWithOAuth = exports.signInWithApple = exports.validateToken = exports.clearSelectedDeviceId = exports.saveSelectedDeviceId = exports.getDogfoodAccountAccess = exports.getSelectedDeviceId = exports.saveUser = exports.getUser = exports.clearToken = exports.saveToken = void 0;
+exports.getWebBaseUrl = exports.getConvexSiteUrl = exports.configureAuthEndpoints = exports.setPreferredDogfoodLane = exports.getPreferredDogfoodLane = exports.clearQuickIconDisabled = exports.setQuickIconDisabled = exports.getQuickIconDisabled = exports.FixReport = exports.QuickActionIcon = exports.DogfoodQuickControls = exports.FeedbackModal = exports.DogfoodStatusRail = exports.DogfoodLiveConsole = exports.DogfoodLanePicker = exports.validateDogfoodProject = exports.runtimeLogLinesFromDevEvent = exports.dogfoodLogLinesFromDevEvent = exports.dogfoodLaneOptions = exports.dogfoodLanePlan = exports.defaultDogfoodLane = exports.DogfoodRuntimeError = exports.DogfoodController = exports.YaverDeviceDogfood = exports.resolveSDKDogfood = exports.isYaverModeBadgeHidden = exports.showYaverModeBadge = exports.hideYaverModeBadge = exports.YaverModeBadge = exports.FloatingButton = exports.ShakeDetector = exports.AuthOverlay = exports.PairDeviceModal = exports.YaverMachinePickerScreen = exports.YaverLoginScreen = exports.YaverConnectionScreen = exports.RELOAD_APP_PATH = exports.RELOAD_PATH = exports.describeReloadFailure = exports.reloadFrameworkFamily = exports.reloadRequest = exports.reloadActions = exports.createP2PDogfoodDriver = exports.P2PClient = exports.YaverDiscovery = exports.initExpo = exports.YaverUpdates = exports.BlackBox = exports.captureStoreScreenshots = exports.YaverFeedback = void 0;
+exports.uploadFeedback = exports.isVideoRecording = exports.stopVideoRecording = exports.startVideoRecording = exports.pickFeedbackFile = exports.captureScreenshot = exports.DEFAULT_OAUTH_REDIRECT = exports.DEFAULT_WEB_BASE_URL = exports.DEFAULT_CONVEX_SITE_URL = exports.listReachableDevices = exports.loginWithEmail = exports.signupWithEmail = exports.signInWithOAuth = exports.signInWithApple = exports.validateToken = exports.clearSelectedDeviceId = exports.saveSelectedDeviceId = exports.getDogfoodAccountAccess = exports.getSelectedDeviceId = exports.saveUser = exports.getUser = exports.clearToken = exports.saveToken = exports.getToken = void 0;
 var YaverFeedback_1 = require("./YaverFeedback");
 Object.defineProperty(exports, "YaverFeedback", { enumerable: true, get: function () { return YaverFeedback_1.YaverFeedback; } });
 var storeShots_1 = require("./storeShots");
@@ -83,6 +83,7 @@ var DogfoodRuntime_1 = require("./DogfoodRuntime");
 Object.defineProperty(exports, "DogfoodController", { enumerable: true, get: function () { return DogfoodRuntime_1.DogfoodController; } });
 Object.defineProperty(exports, "DogfoodRuntimeError", { enumerable: true, get: function () { return DogfoodRuntime_1.DogfoodRuntimeError; } });
 Object.defineProperty(exports, "defaultDogfoodLane", { enumerable: true, get: function () { return DogfoodRuntime_1.defaultDogfoodLane; } });
+Object.defineProperty(exports, "dogfoodLanePlan", { enumerable: true, get: function () { return DogfoodRuntime_1.dogfoodLanePlan; } });
 Object.defineProperty(exports, "dogfoodLaneOptions", { enumerable: true, get: function () { return DogfoodRuntime_1.dogfoodLaneOptions; } });
 Object.defineProperty(exports, "dogfoodLogLinesFromDevEvent", { enumerable: true, get: function () { return DogfoodRuntime_1.dogfoodLogLinesFromDevEvent; } });
 Object.defineProperty(exports, "runtimeLogLinesFromDevEvent", { enumerable: true, get: function () { return DogfoodRuntime_1.runtimeLogLinesFromDevEvent; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaver-feedback-react-native",
-  "version": "0.9.10",
+  "version": "0.9.12",
   "description": "Visual feedback SDK for Yaver — bug reports, screen recording, voice vibe coding, and local-first developer workflows",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/AuthOverlay.tsx

@@ -11,6 +11,8 @@ export const AuthOverlay: React.FC = () => {
   const [pickerVisible, setPickerVisible] = useState(false);
   const [token, setToken] = useState<string | null>(null);
   const activeOverlayRef = useRef<'none' | 'login' | 'picker'>('none');
+  const onboarding = YaverFeedback.getDogfoodOnboarding();
+  const dogfoodLabel = onboarding?.projectName || onboarding?.label || 'this app';
 
   const openLogin = useCallback(() => {
     activeOverlayRef.current = 'login';
@@ -94,13 +96,18 @@ export const AuthOverlay: React.FC = () => {
   return (
     <>
       <Modal visible={loginVisible} animationType="slide" presentationStyle="fullScreen" onRequestClose={closeAll}>
-        <YaverLoginScreen onLoggedIn={handleLoggedIn} onCancel={closeAll} />
+        <YaverLoginScreen
+          onLoggedIn={handleLoggedIn}
+          onCancel={closeAll}
+          subtitle={onboarding ? `Sign in to set up ${dogfoodLabel} Dogfood` : undefined}
+        />
       </Modal>
       <Modal visible={pickerVisible && !!token} animationType="slide" presentationStyle="fullScreen" onRequestClose={closeAll}>
         {token && (
           <YaverMachinePickerScreen
             token={token}
             currentDeviceId={YaverFeedback.getConfig()?.preferredDeviceId}
+            title={onboarding ? `Choose a machine for ${dogfoodLabel}` : undefined}
             onPick={handleDevicePicked}
             onCancel={closeAll}
           />

package/src/DogfoodRuntime.ts

@@ -27,6 +27,13 @@ export interface DogfoodProject {
   workDir: string;
   framework: string;
   lane: DogfoodLane;
+  /**
+   * Optional automatic recovery lane. The shared onboarding flow uses the
+   * browser lane here when a user prefers Hermes or WebRTC for a project that
+   * can also render in a browser. The failed preferred attempt remains in the
+   * live console; the fallback is never silent.
+   */
+  fallbackLane?: DogfoodLane;
   /** Optional source URL for drivers that can clone missing source. */
   repositoryUrl?: string;
   /** Optional native target from /remote-runtime/capabilities for WebRTC. */
@@ -41,6 +48,13 @@ export interface DogfoodLaneOption {
   reason?: string;
 }
 
+export interface DogfoodLanePlan {
+  preferred: DogfoodLane;
+  /** Browser is the cheap, portable recovery lane for RN/Expo/Flutter/web. */
+  fallback?: DogfoodLane;
+  options: DogfoodLaneOption[];
+}
+
 /** One framework-to-lane matrix for Yaver and third-party consumers. */
 export function dogfoodLaneOptions(
   framework: string,
@@ -89,6 +103,36 @@ export function defaultDogfoodLane(
     || 'browser';
 }
 
+/**
+ * Resolve one ordered lane policy for Yaver and embedded SDK hosts.
+ *
+ * Browser is the onboarding default for browser-capable React Native, Expo,
+ * Flutter, and web projects. When the user explicitly prefers Hermes or
+ * WebRTC, browser becomes the automatic second attempt. Native-only projects
+ * remain WebRTC-only and never advertise a browser recovery they cannot run.
+ */
+export function dogfoodLanePlan(
+  framework: string,
+  capabilities: {
+    nativeRuntimeAvailable?: boolean;
+    browserRuntimeAvailable?: boolean;
+    selfDevelopment?: boolean;
+  } = {},
+  preferred?: DogfoodLane | null,
+): DogfoodLanePlan {
+  const options = dogfoodLaneOptions(framework, capabilities);
+  const supported = (lane: DogfoodLane | null | undefined) =>
+    !!lane && options.some((option) => option.lane === lane && option.supported);
+  const resolved = supported(preferred)
+    ? preferred!
+    : defaultDogfoodLane(framework, capabilities);
+  return {
+    preferred: resolved,
+    fallback: resolved !== 'browser' && supported('browser') ? 'browser' : undefined,
+    options,
+  };
+}
+
 export interface DogfoodLogLine {
   text: string;
   at: number;
@@ -291,8 +335,8 @@ export class DogfoodController {
       message: `Preparing ${this.project.name}…`, logs: [], startedAt: Date.now(),
     });
 
-    const context: DogfoodRunContext = {
-      project: this.project,
+    const makeContext = (project: DogfoodProject): DogfoodRunContext => ({
+      project,
       attempt,
       log: (line) => {
         if (generation !== this.generation) return;
@@ -316,16 +360,69 @@ export class DogfoodController {
         this.cleanups.set(generation, owned);
       },
       isCurrent: () => generation === this.generation,
-    };
+    });
+
+    let activeProject = this.project;
+    let context = makeContext(activeProject);
 
     try {
-      await this.driver.prepare?.(context);
-      if (!context.isCurrent()) throw new DogfoodRuntimeError({
-        code: 'DOGFOOD_ATTEMPT_REPLACED', error: 'A newer Dogfood attempt replaced this one.',
-        remedy: 'Wait for the newer attempt.', retryable: true,
-      });
-      context.setPhase('starting', `Starting ${this.project.name} on the ${this.project.lane} lane…`);
-      const result = await this.driver.start(context);
+      const start = async (): Promise<DogfoodResult> => {
+        await this.driver.prepare?.(context);
+        if (!context.isCurrent()) throw new DogfoodRuntimeError({
+          code: 'DOGFOOD_ATTEMPT_REPLACED', error: 'A newer Dogfood attempt replaced this one.',
+          remedy: 'Wait for the newer attempt.', retryable: true,
+        });
+        context.setPhase('starting', `Starting ${activeProject.name} on the ${activeProject.lane} lane…`);
+        return this.driver.start(context);
+      };
+
+      let result: DogfoodResult;
+      try {
+        result = await start();
+      } catch (primaryError) {
+        const primaryFailure = failureFrom(primaryError);
+        const fallbackLane = activeProject.fallbackLane;
+        const mayFallback = !!fallbackLane
+          && fallbackLane !== activeProject.lane
+          && primaryFailure.retryable
+          && primaryFailure.code !== 'DOGFOOD_ATTEMPT_REPLACED';
+        if (!mayFallback) throw primaryError;
+
+        await this.runCleanups('all', generation);
+        const fallbackProject: DogfoodProject = {
+          ...activeProject,
+          lane: fallbackLane!,
+          fallbackLane: undefined,
+        };
+        const fallbackInvalid = validateDogfoodProject(fallbackProject);
+        if (fallbackInvalid) throw primaryError;
+        const fallbackLine: DogfoodLogLine = {
+          text: `[fallback] ${activeProject.lane} failed (${primaryFailure.code}); trying ${fallbackLane}`,
+          at: Date.now(),
+          stream: 'system',
+        };
+        activeProject = fallbackProject;
+        this.replace({
+          ...this.state,
+          project: activeProject,
+          phase: 'preparing',
+          message: `Recovering ${activeProject.name} in the ${fallbackLane} lane…`,
+          logs: [...this.state.logs, fallbackLine].slice(-this.maxLogLines),
+          lastOutputAt: fallbackLine.at,
+          failure: undefined,
+        });
+        context = makeContext(activeProject);
+        result = await start();
+        result = {
+          ...result,
+          metadata: {
+            ...result.metadata,
+            preferredLane: this.project.lane,
+            fallbackFrom: this.project.lane,
+            fallbackReason: primaryFailure.code,
+          },
+        };
+      }
       if (!context.isCurrent()) {
         await this.runCleanups('all', generation);
         throw new DogfoodRuntimeError({
@@ -333,7 +430,7 @@ export class DogfoodController {
           remedy: 'Wait for the newer attempt.', retryable: true,
         });
       }
-      this.replace({ ...this.state, phase: 'ready', message: `${this.project.name} is ready`, result, failure: undefined });
+      this.replace({ ...this.state, project: activeProject, phase: 'ready', message: `${activeProject.name} is ready`, result, failure: undefined });
       return result;
     } catch (error) {
       const failure = failureFrom(error);

package/src/DogfoodSessionUi.tsx

@@ -101,10 +101,11 @@ export const DogfoodStatusRail: React.FC<{
 export const DogfoodLanePicker: React.FC<{
   options: readonly DogfoodLaneOption[];
   selected: DogfoodLane;
+  fallbackLane?: DogfoodLane;
   onSelect: (lane: DogfoodLane) => void;
   colors?: Partial<DogfoodUiColors>;
   showUnsupportedReasons?: boolean;
-}> = ({ options, selected, onSelect, colors: colorOverrides, showUnsupportedReasons = true }) => {
+}> = ({ options, selected, fallbackLane, onSelect, colors: colorOverrides, showUnsupportedReasons = true }) => {
   const colors = resolvedColors(colorOverrides);
   return (
     <View accessibilityRole="radiogroup" accessibilityLabel="Dogfood runtime lane">
@@ -128,7 +129,8 @@ export const DogfoodLanePicker: React.FC<{
               ]}
             >
               <Text style={[styles.choiceText, { color: colors.text }, active && styles.choiceTextActive]}>
-                {option.label}{option.default ? ' · default' : ''}
+                {option.label}
+                {active ? ' · preferred' : fallbackLane === option.lane ? ' · automatic fallback' : option.default ? ' · default' : ''}
               </Text>
             </Pressable>
           );

package/src/FeedbackModal.tsx

@@ -2,6 +2,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 import {
   ActivityIndicator,
   DeviceEventEmitter,
+  KeyboardAvoidingView,
   Linking,
   Modal,
   Platform,
@@ -40,6 +41,7 @@ import {
 import {
   DogfoodController,
   defaultDogfoodLane,
+  dogfoodLanePlan,
   dogfoodLaneOptions,
   type DogfoodLane,
   type DogfoodSnapshot,
@@ -389,12 +391,17 @@ export const FeedbackModal: React.FC = () => {
     if (!client || !dogfoodProject || !onboarding) return;
     await dogfoodControllerRef.current?.stop().catch(() => {});
     const framework = dogfoodProject.framework || onboarding.framework || 'expo';
+    const lanePlan = dogfoodLanePlan(framework, {
+      nativeRuntimeAvailable: dogfoodNativeAvailable,
+      browserRuntimeAvailable: dogfoodBrowserAvailable,
+    }, dogfoodLane);
     const controller = new DogfoodController({
       name: dogfoodProject.name,
       workDir: dogfoodProject.path,
       framework,
-      lane: dogfoodLane,
-      nativeTargetId: dogfoodLane === 'webrtc' ? dogfoodNativeTargetId : undefined,
+      lane: lanePlan.preferred,
+      fallbackLane: lanePlan.fallback,
+      nativeTargetId: lanePlan.preferred === 'webrtc' ? dogfoodNativeTargetId : undefined,
     }, createP2PDogfoodDriver(client), {
       onChange: (snapshot) => { if (mountedRef.current) setDogfoodRuntime(snapshot); },
     });
@@ -493,9 +500,6 @@ export const FeedbackModal: React.FC = () => {
       } else if (device.needsAuth) {
         status = 'attention';
         detail = 'Machine needs pairing again before feedback actions can run.';
-      } else if (device.runnerDown) {
-        status = 'attention';
-        detail = 'Machine is online but the coding agent is down.';
       } else if (reachable === false) {
         status = 'offline';
         detail = 'Machine selected, but the agent is not responding.';
@@ -608,7 +612,11 @@ export const FeedbackModal: React.FC = () => {
         setShowVibeInput(authenticated || directDogfood);
         setVibePrompt('');
         if (onboarding) {
-          setActiveTab(authenticated ? 'chat' : 'settings');
+          // A Dogfood shortcut is an explicit setup/runtime intent. Opening on
+          // Chat hid the machine/runner/checkout gate for signed-in SFMG users;
+          // keep the SDK-owned Dogfood surface visible, then show its live logs
+          // immediately when Start is tapped.
+          setActiveTab('settings');
           setDogfoodSetupStage('setup');
           setDogfoodExpandedStep(null);
           setDogfoodRuntime(null);
@@ -1052,10 +1060,15 @@ export const FeedbackModal: React.FC = () => {
   const dogfoodModelReady = !selectedDogfoodRunner?.models?.length
     || !!preferredModel && selectedDogfoodRunner.models.some((model) => model.id === preferredModel);
   const dogfoodFramework = dogfoodProject?.framework || YaverFeedback.getDogfoodOnboarding()?.framework || 'expo';
+  const dogfoodOnboarding = YaverFeedback.getDogfoodOnboarding();
   const dogfoodLaneChoices = dogfoodLaneOptions(dogfoodFramework, {
     nativeRuntimeAvailable: dogfoodNativeAvailable,
     browserRuntimeAvailable: dogfoodBrowserAvailable,
   });
+  const dogfoodLanePolicy = dogfoodLanePlan(dogfoodFramework, {
+    nativeRuntimeAvailable: dogfoodNativeAvailable,
+    browserRuntimeAvailable: dogfoodBrowserAvailable,
+  }, dogfoodLane);
   const selectedDogfoodNativeTarget = dogfoodNativeTargets.find((target) => target.id === dogfoodNativeTargetId) || null;
   const dogfoodLaneReady = dogfoodLaneChoices.some((option) => option.lane === dogfoodLane && option.supported)
     && (dogfoodLane !== 'webrtc' || !!selectedDogfoodNativeTarget?.enabled);
@@ -1092,11 +1105,12 @@ export const FeedbackModal: React.FC = () => {
     },
   ];
   const dogfoodStartBlocked = !dogfoodSetupReady || !dogfoodLaneReady;
-  const dogfoodSourceLabel = dogfoodLane === 'webrtc'
+  const activeDogfoodLane = dogfoodRuntime?.project.lane || dogfoodLane;
+  const dogfoodSourceLabel = activeDogfoodLane === 'webrtc'
     ? selectedDogfoodNativeTarget
       ? [selectedDogfoodNativeTarget.label, selectedDogfoodNativeTarget.platform].filter(Boolean).join(' · ')
       : 'Native simulator, emulator, or device'
-    : dogfoodLane === 'hermes'
+    : activeDogfoodLane === 'hermes'
       ? `Hermes build · ${machineCard.title}`
       : `${dogfoodFramework === 'flutter' ? 'Flutter web compiler' : 'Metro / browser build'} · ${machineCard.title}`;
 
@@ -1161,7 +1175,10 @@ export const FeedbackModal: React.FC = () => {
           transparent
           onRequestClose={handleClose}
         >
-          <View style={styles.overlay}>
+          <KeyboardAvoidingView
+            style={styles.overlay}
+            behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+          >
             <Pressable style={styles.backdrop} onPress={handleClose} accessibilityLabel="Close feedback" />
             <View
               // Tablet: cap modal width and center as a card-style
@@ -1187,11 +1204,18 @@ export const FeedbackModal: React.FC = () => {
                 keyboardShouldPersistTaps="handled"
                 keyboardDismissMode={Platform.OS === 'ios' ? 'interactive' : 'on-drag'}
                 contentInsetAdjustmentBehavior="always"
-                automaticallyAdjustKeyboardInsets={Platform.OS === 'ios'}
+                // KeyboardAvoidingView is the single inset owner. Letting the
+                // ScrollView add a second UIKit inset lifts the composer twice
+                // on short phones and still leaves its action row clipped.
+                automaticallyAdjustKeyboardInsets={false}
               >
               <View style={styles.header}>
                 <Text style={styles.title}>
-                  {dogfoodActive ? `${YaverFeedback.getDogfoodStatus().label || 'App'} Developer Mode` : 'Send Feedback'}
+                  {dogfoodOnboarding
+                    ? `Set up ${dogfoodOnboarding.projectName || dogfoodOnboarding.label || 'this app'} Dogfood`
+                    : dogfoodActive
+                      ? `${YaverFeedback.getDogfoodStatus().label || 'App'} Developer Mode`
+                      : 'Send Feedback'}
                 </Text>
                 <Pressable
                   onPress={handleClose}
@@ -1204,6 +1228,7 @@ export const FeedbackModal: React.FC = () => {
                 </Pressable>
               </View>
 
+              {(!dogfoodOnboarding || dogfoodSetupStage === 'runtime') ? (
               <View style={styles.tabs} accessibilityRole="tablist">
                 {(['chat', 'settings'] as const).map((tab) => (
                   <Pressable
@@ -1217,15 +1242,16 @@ export const FeedbackModal: React.FC = () => {
                   </Pressable>
                 ))}
               </View>
+              ) : null}
 
               <View style={[styles.tabContent, activeTab !== 'settings' && styles.hidden]}>
               <>
-              {YaverFeedback.getDogfoodOnboarding() ? (
+              {dogfoodOnboarding ? (
                 <View style={styles.dogfoodWizard}>
-                  <Text style={styles.dogfoodWizardTitle}>Dogfood this app</Text>
+                  <Text style={styles.dogfoodWizardTitle}>Connect the app to its checkout</Text>
                   <Text style={styles.dogfoodWizardHint}>
                     {dogfoodEnrollment?.status === 'active'
-                      ? 'Signed in · this installation is approved'
+                      ? 'Choose one development machine, coding runner, and checkout. Then choose how to preview it.'
                       : `Signed in · installation ${dogfoodEnrollment?.status || 'checking'}`}
                   </Text>
                   {dogfoodEnrollment?.status === 'active' && dogfoodSetupStage === 'setup' ? (
@@ -1322,7 +1348,7 @@ export const FeedbackModal: React.FC = () => {
                             </View>
                           ) : null}
                           <ActionRow
-                            label="Choose runtime"
+                            label={dogfoodSetupReady ? 'Continue to runtime' : 'Complete the choices above'}
                             tint="#5645d8"
                             onPress={() => {
                               setDogfoodExpandedStep(null);
@@ -1347,6 +1373,7 @@ export const FeedbackModal: React.FC = () => {
                           <DogfoodLanePicker
                             options={dogfoodLaneChoices}
                             selected={dogfoodLane}
+                            fallbackLane={dogfoodLanePolicy.fallback}
                             colors={FEEDBACK_DOGFOOD_LIGHT_COLORS}
                             onSelect={(lane) => {
                               setDogfoodLane(lane);
@@ -1425,6 +1452,7 @@ export const FeedbackModal: React.FC = () => {
                   )}
                 </View>
               ) : null}
+              {!dogfoodOnboarding ? <>
               <Pressable
                 onPress={() => {
                   if (!YaverFeedback.isAuthed()) {
@@ -1702,6 +1730,7 @@ export const FeedbackModal: React.FC = () => {
                   </Text>
                 </View>
               ))}
+              </> : null}
               </>
               </View>
 
@@ -1789,7 +1818,7 @@ export const FeedbackModal: React.FC = () => {
               </Pressable>
               </ScrollView>
             </View>
-          </View>
+          </KeyboardAvoidingView>
         </Modal>
       )}
       {runnerAuthModal ? (

package/src/LoginScreen.tsx

@@ -116,6 +116,8 @@ export interface YaverLoginScreenProps {
   onLoggedIn: (token: string) => void;
   /** Optional cancel button shown in header. */
   onCancel?: () => void;
+  /** Intent shown under the Yaver mark. Defaults to ordinary feedback. */
+  subtitle?: string;
 }
 
 /**
@@ -126,6 +128,7 @@ export interface YaverLoginScreenProps {
 export const YaverLoginScreen: React.FC<YaverLoginScreenProps> = ({
   onLoggedIn,
   onCancel,
+  subtitle = 'Sign in to send feedback',
 }) => {
   const [busyProvider, setBusyProvider] = useState<OAuthProvider | 'apple' | null>(null);
   const [showEmailForm, setShowEmailForm] = useState(false);
@@ -242,7 +245,7 @@ export const YaverLoginScreen: React.FC<YaverLoginScreenProps> = ({
 
           <View style={styles.header}>
             <Text style={styles.logo}>Yaver</Text>
-            <Text style={styles.subtitle}>Sign in to send feedback</Text>
+            <Text style={styles.subtitle}>{subtitle}</Text>
           </View>
 
           <View style={styles.buttons}>