diff --git a/packages/app/e2e/composer-attachments.spec.ts b/packages/app/e2e/composer-attachments.spec.ts
index bfbb6bb6b..50cd328eb 100644
--- a/packages/app/e2e/composer-attachments.spec.ts
+++ b/packages/app/e2e/composer-attachments.spec.ts
@@ -24,9 +24,9 @@ import {
   openGithubWorkspace,
 } from "./helpers/composer";
 import {
-  clickNewWorkspaceButton,
   connectNewWorkspaceDaemonClient,
   delayBrowserAgentCreatedStatus,
+  openNewWorkspaceComposer,
   openProjectViaDaemon,
 } from "./helpers/new-workspace";
 import { gotoAppShell } from "./helpers/app";
@@ -255,10 +255,16 @@ test.describe("Composer attachments", () => {
         targetWorkspacePath: openedProject.workspaceId,
       });
 
-      await clickNewWorkspaceButton(page, {
+      await openNewWorkspaceComposer(page, {
         projectKey: openedProject.projectKey,
         projectDisplayName: openedProject.projectDisplayName,
       });
+      await fillComposerDraft(page, "lock test prompt");
+      const createButton = page
+        .getByTestId("message-input-root")
+        .getByRole("button", { name: "Create" });
+      await expect(createButton).toBeVisible({ timeout: 30_000 });
+      await createButton.click();
 
       await agentCreatedDelay.waitForCreateRequest();
       await agentCreatedDelay.waitForDelayedCreatedStatus();
diff --git a/packages/app/e2e/helpers/composer.ts b/packages/app/e2e/helpers/composer.ts
index 3001da742..774f136d0 100644
--- a/packages/app/e2e/helpers/composer.ts
+++ b/packages/app/e2e/helpers/composer.ts
@@ -22,7 +22,9 @@ export async function expectComposerVisible(
 }
 
 export async function expectComposerDisabled(page: Page): Promise<void> {
-  await expect(composerInput(page)).toBeDisabled({ timeout: 10_000 });
+  // React Native TextInput with editable={false} renders as <textarea readonly> on web,
+  // not <textarea disabled>. Use not.toBeEditable() to match either form.
+  await expect(composerInput(page)).not.toBeEditable({ timeout: 10_000 });
 }
 
 export async function expectComposerDraft(page: Page, text: string): Promise<void> {
diff --git a/packages/app/e2e/helpers/daemon-registry.ts b/packages/app/e2e/helpers/daemon-registry.ts
index b2e7e170d..6ef72ddc2 100644
--- a/packages/app/e2e/helpers/daemon-registry.ts
+++ b/packages/app/e2e/helpers/daemon-registry.ts
@@ -30,10 +30,15 @@ export function buildSeededHost(input: {
   };
 }
 
+export const TEST_MOCK_PROVIDER_PREFERENCES = {
+  ...TEST_PROVIDER_PREFERENCES,
+  mock: { model: "ten-second-stream" },
+} as const;
+
 export function buildCreateAgentPreferences(serverId: string) {
   return {
     serverId,
-    provider: "codex" as const,
-    providerPreferences: TEST_PROVIDER_PREFERENCES,
+    provider: "mock" as const,
+    providerPreferences: TEST_MOCK_PROVIDER_PREFERENCES,
   };
 }
diff --git a/packages/app/src/components/ui/switch.test.tsx b/packages/app/src/components/ui/switch.test.tsx
index 3d448c1cd..be5bb5dad 100644
--- a/packages/app/src/components/ui/switch.test.tsx
+++ b/packages/app/src/components/ui/switch.test.tsx
@@ -32,6 +32,7 @@ vi.mock("react-native-reanimated", () => ({
 
 vi.mock("react-native", () => ({
   Pressable: ({
+    "aria-checked": ariaChecked,
     accessibilityLabel,
     accessibilityRole,
     accessibilityState,
@@ -40,6 +41,7 @@ vi.mock("react-native", () => ({
     onPress,
     testID,
   }: {
+    "aria-checked"?: boolean;
     accessibilityLabel?: string;
     accessibilityRole?: string;
     accessibilityState?: { checked?: boolean; disabled?: boolean };
@@ -51,7 +53,7 @@ vi.mock("react-native", () => ({
     React.createElement(
       "button",
       {
-        "aria-checked": accessibilityState?.checked,
+        "aria-checked": ariaChecked ?? accessibilityState?.checked,
         "aria-disabled": accessibilityState?.disabled,
         "aria-label": accessibilityLabel,
         "data-disabled": disabled,
diff --git a/packages/app/src/components/ui/switch.tsx b/packages/app/src/components/ui/switch.tsx
index 66e0738d2..67ba7e8df 100644
--- a/packages/app/src/components/ui/switch.tsx
+++ b/packages/app/src/components/ui/switch.tsx
@@ -100,6 +100,7 @@ export function Switch({
       accessibilityRole="switch"
       accessibilityState={accessibilityState}
       accessibilityLabel={accessibilityLabel}
+      aria-checked={value}
       testID={testID}
       style={pressableStyle}
     >