diff --git a/src/cli/commands/dev/__tests__/browser-mode.test.ts b/src/cli/commands/dev/__tests__/browser-mode.test.ts
new file mode 100644
index 000000000..a3ec162c8
--- /dev/null
+++ b/src/cli/commands/dev/__tests__/browser-mode.test.ts
@@ -0,0 +1,138 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+const mockLoadProjectConfig = vi.fn();
+const mockGetWorkingDirectory = vi.fn().mockReturnValue('/fake/project');
+const mockFindConfigRoot = vi.fn().mockReturnValue('/fake/project');
+const mockStartOtelCollector = vi.fn().mockResolvedValue({ collector: {}, otelEnvVars: {} });
+const mockRunWebUI = vi.fn().mockResolvedValue(undefined);
+const mockLoadDevEnv = vi.fn().mockResolvedValue({ envVars: {} });
+const mockGetDevSupportedAgents = vi.fn().mockReturnValue([]);
+const mockIsPreviewEnabled = vi.fn();
+const mockRunCliDeploy = vi.fn().mockResolvedValue(undefined);
+
+vi.mock('../../../../lib', () => ({
+  findConfigRoot: (...args: unknown[]) => mockFindConfigRoot(...args),
+  getWorkingDirectory: () => mockGetWorkingDirectory(),
+  ConfigIO: class MockConfigIO {
+    configExists = vi.fn().mockReturnValue(false);
+  },
+}));
+
+vi.mock('../../../feature-flags', () => ({
+  isPreviewEnabled: () => mockIsPreviewEnabled(),
+}));
+
+vi.mock('../../../operations/dev', () => ({
+  loadProjectConfig: (...args: unknown[]) => mockLoadProjectConfig(...args),
+  getDevConfig: vi.fn(),
+  getDevSupportedAgents: (...args: unknown[]) => mockGetDevSupportedAgents(...args),
+  loadDevEnv: (...args: unknown[]) => mockLoadDevEnv(...args),
+}));
+
+vi.mock('../../../operations/dev/otel', () => ({
+  startOtelCollector: (...args: unknown[]) => mockStartOtelCollector(...args),
+}));
+
+vi.mock('../../../operations/dev/web-ui', () => ({
+  runWebUI: (...args: unknown[]) => mockRunWebUI(...args),
+}));
+
+vi.mock('../../../operations/memory', () => ({
+  listMemoryRecords: vi.fn(),
+  retrieveMemoryRecords: vi.fn(),
+}));
+
+vi.mock('../../../operations/resolve-agent', () => ({
+  loadDeployedProjectConfig: vi.fn(),
+  resolveAgentOrHarness: vi.fn(),
+}));
+
+vi.mock('../../../operations/traces', () => ({
+  fetchTraceRecords: vi.fn(),
+  listTraces: vi.fn(),
+}));
+
+vi.mock('../../deploy/progress', () => ({
+  runCliDeploy: (...args: unknown[]) => mockRunCliDeploy(...args),
+}));
+
+vi.mock('../../../tui/context', () => ({
+  LayoutProvider: ({ children }: { children: unknown }) => children,
+}));
+
+const mockRender = vi.fn();
+vi.mock('ink', () => ({
+  render: (...args: unknown[]) => mockRender(...args),
+}));
+
+vi.mock('react', () => ({
+  default: { createElement: vi.fn((_type, _props, ..._children) => ({ type: _type, props: _props })) },
+  createElement: vi.fn((_type, _props, ..._children) => ({ type: _type, props: _props })),
+}));
+
+const mockStdoutWrite = vi.fn();
+
+describe('launchBrowserDev', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockStdoutWrite.mockReturnValue(true);
+    vi.spyOn(process.stdout, 'write').mockImplementation(mockStdoutWrite);
+    vi.spyOn(process, 'exit').mockImplementation(() => {
+      throw new Error('process.exit called');
+    });
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it('uses TUI picker for deploy when preview enabled and harnesses present', async () => {
+    const { launchBrowserDev } = await import('../browser-mode');
+
+    mockIsPreviewEnabled.mockReturnValue(true);
+    mockLoadProjectConfig.mockResolvedValue({
+      runtimes: [{ name: 'my-agent', build: 'CodeZip', protocol: 'HTTP' }],
+      harnesses: [{ name: 'my-harness' }],
+    });
+    mockGetDevSupportedAgents.mockReturnValue([{ name: 'my-agent', build: 'CodeZip', protocol: 'HTTP' }]);
+
+    mockRender.mockImplementation((element: { props: Record<string, unknown> }) => {
+      const onLaunchBrowser = element.props?.onLaunchBrowser as
+        | ((selection?: { agentName?: string; harnessName?: string }) => void)
+        | undefined;
+      if (onLaunchBrowser) {
+        onLaunchBrowser({ agentName: 'my-agent', harnessName: 'my-harness' });
+      }
+      return { unmount: vi.fn(), waitUntilExit: () => Promise.resolve() };
+    });
+
+    await launchBrowserDev();
+
+    expect(mockStdoutWrite).toHaveBeenCalledWith('\x1B[?1049h\x1B[H');
+    expect(mockRender).toHaveBeenCalled();
+    expect(mockRunCliDeploy).not.toHaveBeenCalled();
+  });
+
+  it('does not launch browser mode when user backs out of TUI picker', async () => {
+    const { launchBrowserDev } = await import('../browser-mode');
+
+    mockIsPreviewEnabled.mockReturnValue(true);
+    mockLoadProjectConfig.mockResolvedValue({
+      runtimes: [{ name: 'my-agent', build: 'CodeZip', protocol: 'HTTP' }],
+      harnesses: [{ name: 'my-harness' }],
+    });
+    mockGetDevSupportedAgents.mockReturnValue([{ name: 'my-agent', build: 'CodeZip', protocol: 'HTTP' }]);
+
+    mockRender.mockImplementation((element: { props: Record<string, unknown> }) => {
+      const onBack = element.props?.onBack as (() => void) | undefined;
+      if (onBack) onBack();
+      return { unmount: vi.fn(), waitUntilExit: () => Promise.resolve() };
+    });
+
+    await launchBrowserDev();
+
+    expect(mockStdoutWrite).toHaveBeenCalledWith('\x1B[?1049h\x1B[H');
+    expect(mockStdoutWrite).toHaveBeenCalledWith('\x1B[?1049l');
+    expect(mockRunWebUI).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/cli/commands/dev/browser-mode.ts b/src/cli/commands/dev/browser-mode.ts
index 0a6b0885d..68084f20d 100644
--- a/src/cli/commands/dev/browser-mode.ts
+++ b/src/cli/commands/dev/browser-mode.ts
@@ -14,7 +14,6 @@ import { listMemoryRecords, retrieveMemoryRecords } from '../../operations/memor
 import { loadDeployedProjectConfig, resolveAgentOrHarness } from '../../operations/resolve-agent';
 import { fetchTraceRecords, listTraces } from '../../operations/traces';
 import { LayoutProvider } from '../../tui/context';
-import { runCliDeploy } from '../deploy/progress';
 import { render } from 'ink';
 import path from 'node:path';
 import React from 'react';
@@ -132,8 +131,14 @@ export async function launchBrowserDev(): Promise<void> {
     process.exit(1);
   }
 
+  let pickerResult: { agentName?: string; harnessName?: string } | undefined;
+
   if (hasHarnesses) {
-    await runCliDeploy();
+    pickerResult = await launchTuiDevScreenWithPicker(workingDir);
+
+    if (pickerResult == null) {
+      return;
+    }
   }
 
   const configRoot = findConfigRoot(workingDir);
@@ -144,6 +149,8 @@ export async function launchBrowserDev(): Promise<void> {
     workingDir,
     project,
     port: 8080,
+    agentName: pickerResult?.agentName,
+    harnessName: pickerResult?.harnessName,
     otelEnvVars,
     collector,
   });