Merge branch 'main' of github.com:getpaseo/paseo

packages/app/src/components/message.tsx

@@ -420,6 +420,7 @@ export const assistantMessageStylesheet = StyleSheet.create((theme) => ({
     color: theme.colors.foreground,
     fontFamily: Fonts.mono,
     fontSize: 13,
+    userSelect: Platform.OS === "web" ? "text" : "auto",
   },
 }));
 
@@ -821,7 +822,7 @@ export const AssistantMessage = memo(function AssistantMessage({
             <Text
               key={node.key}
               onPress={() => parsed && onInlinePathPress?.(parsed)}
-              selectable={false}
+              selectable={Platform.OS === "web" ? undefined : false}
               style={[assistantMessageStylesheet.pathChip, assistantMessageStylesheet.pathChipText]}
             >
               {content}

packages/app/src/panels/draft-panel.tsx

@@ -17,8 +17,15 @@ function useDraftPanelDescriptor() {
 }
 
 function DraftPanel() {
-  const { serverId, workspaceId, tabId, target, openFileInWorkspace, retargetCurrentTab } =
-    usePaneContext();
+  const {
+    serverId,
+    workspaceId,
+    tabId,
+    target,
+    isPaneFocused,
+    openFileInWorkspace,
+    retargetCurrentTab,
+  } = usePaneContext();
   invariant(target.kind === "draft", "DraftPanel requires draft target");
 
   return (
@@ -27,6 +34,7 @@ function DraftPanel() {
       workspaceId={workspaceId}
       tabId={tabId}
       draftId={target.draftId}
+      isPaneFocused={isPaneFocused}
       onOpenWorkspaceFile={({ filePath }) => {
         openFileInWorkspace(filePath);
       }}

packages/app/src/screens/workspace/workspace-draft-agent-tab.tsx

@@ -12,6 +12,7 @@ import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-
 import { buildDraftStoreKey } from "@/stores/draft-keys";
 import type { Agent } from "@/stores/session-store";
 import { encodeImages } from "@/utils/encode-images";
+import { shouldAutoFocusWorkspaceDraftComposer } from "@/screens/workspace/workspace-draft-pane-focus";
 import type {
   AgentCapabilityFlags,
   AgentSessionConfig,
@@ -33,6 +34,7 @@ type WorkspaceDraftAgentTabProps = {
   workspaceId: string;
   tabId: string;
   draftId: string;
+  isPaneFocused: boolean;
   onCreated: (snapshot: AgentSnapshotPayload) => void;
   onOpenWorkspaceFile: (input: { filePath: string }) => void;
 };
@@ -42,6 +44,7 @@ export function WorkspaceDraftAgentTab({
   workspaceId,
   tabId,
   draftId,
+  isPaneFocused,
   onCreated,
   onOpenWorkspaceFile,
 }: WorkspaceDraftAgentTabProps) {
@@ -251,7 +254,7 @@ export function WorkspaceDraftAgentTab({
             images={draftInput.images}
             onChangeImages={draftInput.setImages}
             clearDraft={draftInput.clear}
-            autoFocus={!isSubmitting}
+            autoFocus={shouldAutoFocusWorkspaceDraftComposer({ isPaneFocused, isSubmitting })}
             onAddImages={handleAddImagesCallback}
             commandDraftConfig={draftCommandConfig}
             statusControls={{

packages/app/src/screens/workspace/workspace-draft-pane-focus.test.ts

@@ -0,0 +1,31 @@
+import { describe, expect, it } from "vitest";
+import { shouldAutoFocusWorkspaceDraftComposer } from "./workspace-draft-pane-focus";
+
+describe("shouldAutoFocusWorkspaceDraftComposer", () => {
+  it("focuses the draft composer when the pane is focused and idle", () => {
+    expect(
+      shouldAutoFocusWorkspaceDraftComposer({
+        isPaneFocused: true,
+        isSubmitting: false,
+      }),
+    ).toBe(true);
+  });
+
+  it("does not focus the draft composer when the pane is unfocused", () => {
+    expect(
+      shouldAutoFocusWorkspaceDraftComposer({
+        isPaneFocused: false,
+        isSubmitting: false,
+      }),
+    ).toBe(false);
+  });
+
+  it("does not focus the draft composer while the draft is submitting", () => {
+    expect(
+      shouldAutoFocusWorkspaceDraftComposer({
+        isPaneFocused: true,
+        isSubmitting: true,
+      }),
+    ).toBe(false);
+  });
+});

packages/app/src/screens/workspace/workspace-draft-pane-focus.ts

@@ -0,0 +1,6 @@
+export function shouldAutoFocusWorkspaceDraftComposer(input: {
+  isPaneFocused: boolean;
+  isSubmitting: boolean;
+}): boolean {
+  return input.isPaneFocused && !input.isSubmitting;
+}

packages/app/src/styles/markdown-styles.test.ts

@@ -37,4 +37,36 @@ describe("createMarkdownStyles", () => {
       overflowWrap: "anywhere",
     });
   });
+
+  it("keeps assistant markdown text selectable on web", () => {
+    const styles = createMarkdownStyles(darkTheme);
+
+    expect(styles.body).toMatchObject({
+      userSelect: "text",
+    });
+    expect(styles.text).toMatchObject({
+      userSelect: "text",
+    });
+    expect(styles.heading1).toMatchObject({
+      userSelect: "text",
+    });
+    expect(styles.link).toMatchObject({
+      userSelect: "text",
+    });
+    expect(styles.code_inline).toMatchObject({
+      userSelect: "text",
+    });
+    expect(styles.code_block).toMatchObject({
+      userSelect: "text",
+    });
+    expect(styles.fence).toMatchObject({
+      userSelect: "text",
+    });
+    expect(styles.bullet_list_icon).toMatchObject({
+      userSelect: "text",
+    });
+    expect(styles.ordered_list_icon).toMatchObject({
+      userSelect: "text",
+    });
+  });
 });

packages/app/src/styles/markdown-styles.ts

@@ -1,6 +1,9 @@
+import { Platform } from "react-native";
 import type { Theme } from "./theme";
 import { Fonts } from "@/constants/theme";
 
+const webSelectableTextStyle = Platform.OS === "web" ? { userSelect: "text" as const } : {};
+
 /**
  * Creates comprehensive markdown styles for react-native-markdown-display.
  *
@@ -15,6 +18,7 @@ export function createMarkdownStyles(theme: Theme) {
     // =========================================================================
 
     body: {
+      ...webSelectableTextStyle,
       color: theme.colors.foreground,
       fontSize: theme.fontSize.base,
       lineHeight: 22,
@@ -24,6 +28,7 @@ export function createMarkdownStyles(theme: Theme) {
     },
 
     text: {
+      ...webSelectableTextStyle,
       color: theme.colors.foreground,
       flexShrink: 1,
       minWidth: 0,
@@ -47,6 +52,7 @@ export function createMarkdownStyles(theme: Theme) {
     // =========================================================================
 
     heading1: {
+      ...webSelectableTextStyle,
       fontSize: theme.fontSize["3xl"],
       fontWeight: theme.fontWeight.bold,
       color: theme.colors.foreground,
@@ -59,6 +65,7 @@ export function createMarkdownStyles(theme: Theme) {
     },
 
     heading2: {
+      ...webSelectableTextStyle,
       fontSize: theme.fontSize["2xl"],
       fontWeight: theme.fontWeight.bold,
       color: theme.colors.foreground,
@@ -71,6 +78,7 @@ export function createMarkdownStyles(theme: Theme) {
     },
 
     heading3: {
+      ...webSelectableTextStyle,
       fontSize: theme.fontSize.xl,
       fontWeight: theme.fontWeight.semibold,
       color: theme.colors.foreground,
@@ -80,6 +88,7 @@ export function createMarkdownStyles(theme: Theme) {
     },
 
     heading4: {
+      ...webSelectableTextStyle,
       fontSize: theme.fontSize.lg,
       fontWeight: theme.fontWeight.semibold,
       color: theme.colors.foreground,
@@ -89,6 +98,7 @@ export function createMarkdownStyles(theme: Theme) {
     },
 
     heading5: {
+      ...webSelectableTextStyle,
       fontSize: theme.fontSize.base,
       fontWeight: theme.fontWeight.semibold,
       color: theme.colors.foreground,
@@ -98,6 +108,7 @@ export function createMarkdownStyles(theme: Theme) {
     },
 
     heading6: {
+      ...webSelectableTextStyle,
       fontSize: theme.fontSize.base,
       fontWeight: theme.fontWeight.semibold,
       color: theme.colors.foregroundMuted,
@@ -113,19 +124,23 @@ export function createMarkdownStyles(theme: Theme) {
     // =========================================================================
 
     strong: {
+      ...webSelectableTextStyle,
       fontWeight: theme.fontWeight.medium,
     },
 
     em: {
+      ...webSelectableTextStyle,
       fontStyle: "italic" as const,
     },
 
     s: {
+      ...webSelectableTextStyle,
       textDecorationLine: "line-through" as const,
       color: theme.colors.foregroundMuted,
     },
 
     link: {
+      ...webSelectableTextStyle,
       color: theme.colors.accentBright,
       textDecorationLine: "none" as const,
       flexShrink: 1,
@@ -134,6 +149,7 @@ export function createMarkdownStyles(theme: Theme) {
     },
 
     blocklink: {
+      ...webSelectableTextStyle,
       color: theme.colors.accentBright,
       textDecorationLine: "none" as const,
       flexShrink: 1,
@@ -146,6 +162,7 @@ export function createMarkdownStyles(theme: Theme) {
     // =========================================================================
 
     code_inline: {
+      ...webSelectableTextStyle,
       backgroundColor: theme.colors.surface2,
       color: theme.colors.foreground,
       paddingHorizontal: theme.spacing[1],
@@ -157,6 +174,7 @@ export function createMarkdownStyles(theme: Theme) {
     },
 
     code_block: {
+      ...webSelectableTextStyle,
       backgroundColor: theme.colors.surface2,
       color: theme.colors.foreground,
       padding: theme.spacing[3],
@@ -167,6 +185,7 @@ export function createMarkdownStyles(theme: Theme) {
     },
 
     fence: {
+      ...webSelectableTextStyle,
       backgroundColor: theme.colors.surface2,
       color: theme.colors.foreground,
       padding: theme.spacing[3],
@@ -200,6 +219,7 @@ export function createMarkdownStyles(theme: Theme) {
     tbody: {},
 
     th: {
+      ...webSelectableTextStyle,
       padding: theme.spacing[2],
       borderBottomWidth: 1,
       borderRightWidth: 1,
@@ -218,6 +238,7 @@ export function createMarkdownStyles(theme: Theme) {
     },
 
     td: {
+      ...webSelectableTextStyle,
       padding: theme.spacing[2],
       borderRightWidth: 1,
       borderColor: theme.colors.border,
@@ -260,6 +281,7 @@ export function createMarkdownStyles(theme: Theme) {
     },
 
     bullet_list_icon: {
+      ...webSelectableTextStyle,
       color: theme.colors.foregroundMuted,
       marginRight: 4,
       fontSize: theme.fontSize.base,
@@ -267,6 +289,7 @@ export function createMarkdownStyles(theme: Theme) {
     },
 
     ordered_list_icon: {
+      ...webSelectableTextStyle,
       color: theme.colors.foregroundMuted,
       marginRight: 4,
       fontSize: theme.fontSize.base,

packages/app/src/utils/web-focus.test.ts

@@ -0,0 +1,99 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { focusWithRetries } from "./web-focus";
+
+describe("focusWithRetries", () => {
+  let frameQueue: FrameRequestCallback[] = [];
+  let originalRequestAnimationFrame: typeof requestAnimationFrame | undefined;
+
+  beforeEach(() => {
+    frameQueue = [];
+    originalRequestAnimationFrame = globalThis.requestAnimationFrame;
+    globalThis.requestAnimationFrame = vi.fn((callback: FrameRequestCallback) => {
+      frameQueue.push(callback);
+      return frameQueue.length;
+    }) as typeof requestAnimationFrame;
+  });
+
+  afterEach(() => {
+    if (originalRequestAnimationFrame) {
+      globalThis.requestAnimationFrame = originalRequestAnimationFrame;
+      return;
+    }
+
+    delete (globalThis as { requestAnimationFrame?: typeof requestAnimationFrame })
+      .requestAnimationFrame;
+  });
+
+  function flushAnimationFrames(count: number): void {
+    for (let index = 0; index < count; index += 1) {
+      const callbacks = frameQueue;
+      frameQueue = [];
+      for (const callback of callbacks) {
+        callback(index);
+      }
+    }
+  }
+
+  it("tries to focus immediately before waiting for animation frames", () => {
+    let focused = false;
+    const focus = vi.fn(() => {
+      focused = true;
+    });
+    const onSuccess = vi.fn();
+
+    focusWithRetries({
+      focus,
+      isFocused: () => focused,
+      onSuccess,
+    });
+
+    expect(focus).toHaveBeenCalledTimes(1);
+    expect(onSuccess).toHaveBeenCalledTimes(1);
+    expect(frameQueue).toHaveLength(0);
+  });
+
+  it("keeps retrying on later animation frames until focus succeeds", () => {
+    let focused = false;
+    let attempts = 0;
+    const focus = vi.fn(() => {
+      attempts += 1;
+      if (attempts >= 3) {
+        focused = true;
+      }
+    });
+    const onSuccess = vi.fn();
+
+    focusWithRetries({
+      focus,
+      isFocused: () => focused,
+      onSuccess,
+    });
+
+    expect(focus).toHaveBeenCalledTimes(1);
+    expect(onSuccess).not.toHaveBeenCalled();
+
+    flushAnimationFrames(2);
+    expect(focus).toHaveBeenCalledTimes(2);
+    expect(onSuccess).not.toHaveBeenCalled();
+
+    flushAnimationFrames(2);
+    expect(focus).toHaveBeenCalledTimes(3);
+    expect(onSuccess).toHaveBeenCalledTimes(1);
+  });
+
+  it("stops retrying after cancellation", () => {
+    const focus = vi.fn();
+
+    const cancel = focusWithRetries({
+      focus,
+      isFocused: () => false,
+    });
+
+    expect(focus).toHaveBeenCalledTimes(1);
+
+    cancel();
+    flushAnimationFrames(4);
+
+    expect(focus).toHaveBeenCalledTimes(1);
+  });
+});

packages/app/src/utils/web-focus.ts

@@ -40,9 +40,7 @@ export function focusWithRetries({
     });
   };
 
-  requestAnimationFrame(() => {
-    requestAnimationFrame(tick);
-  });
+  tick();
 
   return () => {
     cancelled = true;