refactor agent route for draft→chat transition

packages/app/e2e/checkout-ship.spec.ts

@@ -242,7 +242,7 @@ test('checkout-first Changes panel ship loop', async ({ page }) => {
     ).toBeTruthy();
 
     await page.getByTestId('sidebar-new-agent').click();
-    await expect(page).toHaveURL(/\/$/);
+    await expect(page).toHaveURL(/\/agent\/?$/);
 
     await setWorkingDirectory(page, repo.path);
     await ensureHostSelected(page);
@@ -339,7 +339,7 @@ test('checkout-first Changes panel ship loop', async ({ page }) => {
     await expect(page.getByTestId('changes-menu-archive')).toBeVisible();
     await page.getByTestId('changes-menu-archive').click();
     // Archiving a worktree deletes agents and redirects to home
-    await expect(page).toHaveURL(/\/$/, { timeout: 30000 });
+    await expect(page).toHaveURL(/\/agent\/?$/, { timeout: 30000 });
     await setWorkingDirectory(page, repo.path);
     await ensureHostSelected(page);
     await page.getByTestId('worktree-attach-toggle').click();
@@ -350,13 +350,13 @@ test('checkout-first Changes panel ship loop', async ({ page }) => {
       await attachSheetBackdrop.click({ force: true });
     }
     await page.getByTestId('worktree-attach-toggle').click();
-    await expect(page.getByTestId('worktree-attach-picker')).toHaveCount(0);
+    await expect(page.getByTestId('worktree-attach-picker')).toBeHidden({ timeout: 30000 });
 
     await setWorkingDirectory(page, nonGitDir);
     const attachPicker = page.getByTestId('worktree-attach-picker');
     if (await attachPicker.isVisible()) {
       await page.getByTestId('worktree-attach-toggle').click();
-      await expect(attachPicker).toHaveCount(0);
+      await expect(attachPicker).toBeHidden({ timeout: 30000 });
     }
     await createAgentAndWait(page, 'Respond with exactly: NON-GIT');
     await waitForAssistantText(page, 'NON-GIT');

packages/app/e2e/dictation-web.spec.ts

@@ -203,7 +203,7 @@ test('dictation confirm+send does not dispatch after navigating away', async ({
     const newAgentButton = page.getByText('New Agent', { exact: true }).first();
     await expect(newAgentButton).toBeVisible();
     await newAgentButton.click();
-    await expect(page).toHaveURL(/\/$/);
+    await expect(page).toHaveURL(/\/agent\/?$/);
 
     await page.waitForTimeout(10_000);
 

packages/app/e2e/helpers/app.ts

@@ -135,7 +135,7 @@ async function assertE2EUsesSeededTestDaemon(page: Page): Promise<void> {
 }
 
 export const gotoHome = async (page: Page) => {
-  await page.goto('/');
+  await page.goto('/agent');
   await ensureE2EStorageSeeded(page);
   await expect(page.getByText('New Agent', { exact: true }).first()).toBeVisible();
   await expect(page.getByRole('textbox', { name: 'Message agent...' })).toBeVisible();
@@ -151,6 +151,7 @@ export const openSettings = async (page: Page) => {
 export const setWorkingDirectory = async (page: Page, directory: string) => {
   const workingDirectoryLabel = page.getByText('WORKING DIRECTORY', { exact: true }).first();
   await expect(workingDirectoryLabel).toBeVisible();
+  const workingDirectorySelect = page.getByTestId('working-directory-select').first();
 
   const input = page.getByRole('textbox', { name: '/path/to/project' });
   const worktreePicker = page.getByTestId('worktree-attach-picker');
@@ -199,30 +200,45 @@ export const setWorkingDirectory = async (page: Page, directory: string) => {
 
   if (!(await input.isVisible())) {
     await closeBottomSheet();
-    await workingDirectoryLabel.click({ force: true });
+    await workingDirectorySelect.click({ force: true });
     if (!(await input.isVisible())) {
       await closeBottomSheet();
-      await workingDirectoryLabel.click({ force: true });
+      await workingDirectorySelect.click({ force: true });
     }
     await expect(input).toBeVisible();
   }
 
-  await input.fill(directory);
+  const trimmedDirectory = directory.replace(/\/+$/, '');
+  await input.fill(trimmedDirectory);
   await input.press('Enter');
 
-  const useOption = page.getByText(`Use "${directory}"`);
-  await expect(useOption).toBeVisible();
-  await useOption.click({ force: true });
-  // Wait for UI to update after clicking "Use"
-  await page.waitForTimeout(500);
-  const normalizedDirectory = directory.startsWith('/var/')
-    ? `/private${directory}`
-    : directory;
-  const workingDirectoryContainer = workingDirectoryLabel.locator('..');
+  // Desktop web supports selecting via Enter; mobile may require clicking the explicit option.
+  const useOption = page.getByTestId('working-directory-custom-option').first();
+  if (await useOption.isVisible().catch(() => false)) {
+    await expect(useOption).toContainText(`Use "${trimmedDirectory}"`);
+    await useOption.click({ force: true });
+  }
+
+  // Wait for the sheet to close after clicking "Use"
+  await expect(input).not.toBeVisible({ timeout: 10000 });
+
+  const directoryCandidates = new Set<string>([trimmedDirectory]);
+  if (trimmedDirectory.startsWith('/var/')) {
+    directoryCandidates.add(`/private${trimmedDirectory}`);
+  }
+  if (trimmedDirectory.startsWith('/private/var/')) {
+    directoryCandidates.add(trimmedDirectory.replace(/^\/private/, ''));
+  }
+  const basename = trimmedDirectory.split('/').filter(Boolean).pop() ?? trimmedDirectory;
+
   await expect.poll(async () => {
-    const text = await workingDirectoryContainer.innerText();
-    return text.includes(directory) || text.includes(normalizedDirectory);
-  }, { timeout: 15000 }).toBe(true);
+    const text = await workingDirectorySelect.innerText().catch(() => '');
+    if (text.includes(basename)) return true;
+    for (const candidate of directoryCandidates) {
+      if (text.includes(candidate)) return true;
+    }
+    return false;
+  }, { timeout: 30000 }).toBe(true);
 };
 
 export const ensureHostSelected = async (page: Page) => {
@@ -296,7 +312,8 @@ export const createAgent = async (page: Page, message: string) => {
   await input.fill(message);
   await input.press('Enter');
 
-  await page.waitForURL(/\/agent\//);
+  // Expo Router navigations can be "same-document" updates, so avoid waiting for a full `load`.
+  await page.waitForURL(/\/agent\//, { waitUntil: 'commit' });
   await expect(page.getByText(message, { exact: true })).toBeVisible();
 };
 

packages/app/e2e/sidebar-new-agent-clones-selected.spec.ts

@@ -15,7 +15,7 @@ test('sidebar New Agent opens a fresh create screen', async ({ page }) => {
 
     // Click sidebar New Agent and assert it does not carry over agent settings via URL.
     await page.getByTestId('sidebar-new-agent').click();
-    await expect(page).toHaveURL(/\/$/);
+    await expect(page).toHaveURL(/\/agent\/?$/);
     await expect(page).not.toHaveURL(new RegExp(encodeURIComponent(repoA.path)));
   } finally {
     await repoA.cleanup();