@nextclaw/ui 0.15.21 → 0.15.23

package/src/features/chat/features/welcome/utils/__tests__/chat-welcome-project-options.utils.test.ts

@@ -18,7 +18,7 @@ function createSummary(
 }
 
 describe("buildChatWelcomeProjectOptions", () => {
-  it("builds recent project options without treating the default workspace as a project", () => {
+  it("keeps the default workspace selectable without treating it as an explicit override", () => {
     const options = buildChatWelcomeProjectOptions({
       defaultProjectRoot: "/Users/demo/.nextclaw/workspace",
       sessionSummaries: [
@@ -41,10 +41,17 @@ describe("buildChatWelcomeProjectOptions", () => {
     });
 
     expect(options).toEqual([
+      {
+        projectRoot: "/Users/demo/.nextclaw/workspace",
+        projectName: "workspace",
+        sessionCount: 0,
+        isDefault: true,
+      },
       {
         projectRoot: "/tmp/project-alpha",
         projectName: "project-alpha",
         sessionCount: 2,
+        isDefault: false,
       },
     ]);
   });
@@ -62,10 +69,19 @@ describe("buildChatWelcomeProjectOptions", () => {
       sessionSummaries: [],
     });
 
-    expect(options).toEqual([{
-      projectRoot: "/tmp/knowledge",
-      projectName: "Knowledge",
-      sessionCount: 0,
-    }]);
+    expect(options).toEqual([
+      {
+        projectRoot: "/Users/demo/.nextclaw/workspace",
+        projectName: "workspace",
+        sessionCount: 0,
+        isDefault: true,
+      },
+      {
+        projectRoot: "/tmp/knowledge",
+        projectName: "Knowledge",
+        sessionCount: 0,
+        isDefault: false,
+      },
+    ]);
   });
 });

package/src/features/chat/features/welcome/utils/chat-welcome-project-options.utils.ts

@@ -6,6 +6,7 @@ export type ChatWelcomeProjectOption = {
   projectRoot: string;
   projectName: string;
   sessionCount: number;
+  isDefault: boolean;
 };
 
 function readSessionActivityAt(session: {
@@ -34,6 +35,7 @@ export function buildChatWelcomeProjectOptions(params: {
       projectRoot: project.rootPath,
       projectName: project.name,
       sessionCount: 0,
+      isDefault: false,
       latestUpdatedAt: new Date(project.updatedAt).getTime(),
     });
   }
@@ -57,10 +59,21 @@ export function buildChatWelcomeProjectOptions(params: {
         getSessionProjectName(projectRoot) ||
         projectRoot,
       sessionCount: 1,
+      isDefault: false,
       latestUpdatedAt,
     });
   }
 
+  if (defaultProjectRoot) {
+    groups.set(defaultProjectRoot, {
+      projectRoot: defaultProjectRoot,
+      projectName: getSessionProjectName(defaultProjectRoot) || defaultProjectRoot,
+      sessionCount: 0,
+      isDefault: true,
+      latestUpdatedAt: Number.POSITIVE_INFINITY,
+    });
+  }
+
   return [...groups.values()]
     .sort((left, right) => {
       return right.latestUpdatedAt - left.latestUpdatedAt;

package/src/features/chat/features/workspace/components/__tests__/chat-session-workspace-panel-content.test.tsx

@@ -1,4 +1,4 @@
-import { render, screen } from "@testing-library/react";
+import { fireEvent, render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { expect, it, vi } from "vitest";
 import { ChatSessionWorkspacePanelContent } from "@/features/chat/features/workspace/components/chat-session-workspace-panel-content";
@@ -6,6 +6,7 @@ import type { ResolvedChildSessionTab } from "@/features/chat/features/ncp/hooks
 
 const mocks = vi.hoisted(() => ({
   materializeSideChatDraft: vi.fn(),
+  requestFileReference: vi.fn(),
   openChildSessions: vi.fn(),
   openFilePreview: vi.fn(),
   openProjectFiles: vi.fn(),
@@ -18,6 +19,9 @@ vi.mock("@/features/chat/components/providers/chat-presenter.provider", () => ({
     chatThreadManager: {
       ...mocks,
     },
+    chatComposerIntentManager: {
+      requestFileReference: mocks.requestFileReference,
+    },
   }),
 }));
 
@@ -43,7 +47,7 @@ vi.mock("@/shared/hooks/use-server-path-browse", () => ({
         },
         {
           name: "package.json",
-          path: "/Users/peiwang/Projects/nextbot/package.json",
+          path: "/private/resolved-worktree/package.json",
           kind: "file",
           hidden: false,
         },
@@ -113,7 +117,7 @@ it("shows all session workspace entries in the overview", async () => {
     name: /Child sessions/,
   });
   const cronJobsButton = screen.getByRole("button", {
-    name: /Session cron jobs/,
+    name: /Scheduled tasks/,
   });
 
   expect((childSessionsButton as HTMLButtonElement).disabled).toBe(false);
@@ -164,3 +168,69 @@ it("shows the selected session project as a hierarchical file tree", () => {
   ).toBeTruthy();
   expect(document.querySelector('[data-file-type-icon="npm"]')).toBeTruthy();
 });
+
+it("adds a project file to the targeted chat from its context menu", async () => {
+  const user = userEvent.setup();
+  mocks.requestFileReference.mockReset();
+  render(
+    <ChatSessionWorkspacePanelContent
+      activeSelection={{ kind: "project-files" }}
+      childSessionTabs={[]}
+      filePreviewRefreshVersion={0}
+      sessionKey={null}
+      sessionCronJobs={[]}
+      sessionProjectRoot="/Users/peiwang/Projects/nextbot"
+      sessionWorkingDir="/Users/peiwang/Projects/nextbot"
+    />,
+  );
+
+  fireEvent.contextMenu(
+    screen.getByRole("button", { name: "package.json" }),
+  );
+
+  expect(screen.getByRole("menuitem", { name: "Copy path" })).toBeTruthy();
+  expect(screen.getByRole("menuitem", { name: "Copy relative path" })).toBeTruthy();
+  await user.click(screen.getByRole("menuitem", { name: "Add to chat" }));
+
+  expect(mocks.requestFileReference).toHaveBeenCalledWith({
+    targetSessionKey: null,
+    tokenKey: "package.json",
+    label: "package.json",
+  });
+});
+
+it("preserves project tree expansion and scroll while visiting another workspace tab", async () => {
+  const user = userEvent.setup();
+  const projectFilesProps = {
+    activeSelection: { kind: "project-files" as const },
+    childSessionTabs: [],
+    filePreviewRefreshVersion: 0,
+    sessionKey: "parent-1",
+    sessionCronJobs: [],
+    sessionProjectRoot: "/Users/peiwang/Projects/nextbot",
+    sessionWorkingDir: "/Users/peiwang/Projects/nextbot",
+  };
+  const { rerender } = render(
+    <ChatSessionWorkspacePanelContent {...projectFilesProps} />,
+  );
+  const tree = screen.getByRole("tree", { name: "Project files" });
+  const sourceDirectory = screen.getByRole("treeitem", {
+    name: "Open directory: src",
+  });
+  await user.click(screen.getByRole("button", { name: "src" }));
+  tree.scrollTop = 128;
+  expect(sourceDirectory.getAttribute("aria-expanded")).toBe("true");
+
+  rerender(
+    <ChatSessionWorkspacePanelContent
+      {...projectFilesProps}
+      activeSelection={{ kind: "overview" }}
+    />,
+  );
+  rerender(<ChatSessionWorkspacePanelContent {...projectFilesProps} />);
+
+  expect(screen.getByRole("tree", { name: "Project files" })).toBe(tree);
+  expect(sourceDirectory.isConnected).toBe(true);
+  expect(sourceDirectory.getAttribute("aria-expanded")).toBe("true");
+  expect(tree.scrollTop).toBe(128);
+});

package/src/features/chat/features/workspace/components/__tests__/chat-session-workspace-panel.test.tsx

@@ -16,6 +16,7 @@ const mocks = vi.hoisted(() => ({
   closeWorkspacePanel: vi.fn(),
   setWorkspacePanelWidth: vi.fn(),
   invalidateQueries: vi.fn(),
+  requestFileReference: vi.fn(),
 }));
 
 vi.mock("@tanstack/react-query", async (importOriginal) => ({
@@ -28,6 +29,9 @@ vi.mock("@tanstack/react-query", async (importOriginal) => ({
 vi.mock("@/features/chat/components/providers/chat-presenter.provider", () => ({
   usePresenter: () => ({
     chatThreadManager: mocks,
+    chatComposerIntentManager: {
+      requestFileReference: mocks.requestFileReference,
+    },
   }),
 }));
 
@@ -77,7 +81,7 @@ function renderPanel(displayMode: "docked" | "overlay" = "docked") {
       workspaceNavigationHistoryIndex={0}
       activePanelKind="file"
       sessionCronJobs={[]}
-      sessionProjectRoot={null}
+      sessionProjectRoot="/workspace"
       sessionWorkingDir={null}
       displayMode={displayMode}
     />,
@@ -96,7 +100,7 @@ describe("ChatSessionWorkspacePanel", () => {
     await user.click(screen.getByRole("button", { name: "Refresh preview" }));
 
     expect(mocks.invalidateQueries).toHaveBeenCalledWith({
-      queryKey: ["server-path-read", "README.md", null],
+      queryKey: ["server-path-read", "README.md", null, null],
     });
     expect(mocks.invalidateQueries).toHaveBeenCalledWith({
       queryKey: ["server-path-browse", "README.md", "", true],
@@ -108,6 +112,22 @@ describe("ChatSessionWorkspacePanel", () => {
     ).toBe("1");
   });
 
+  it("adds an opened project file to the active chat from its action menu", async () => {
+    const user = userEvent.setup();
+    renderPanel();
+
+    await user.click(
+      screen.getByRole("button", { name: "File actions" }),
+    );
+    await user.click(screen.getByRole("menuitem", { name: "Add to chat" }));
+
+    expect(mocks.requestFileReference).toHaveBeenCalledWith({
+      targetSessionKey: "session-1",
+      tokenKey: "README.md",
+      label: "README.md",
+    });
+  });
+
   it("maximizes and restores the docked workspace panel within its container", async () => {
     const user = userEvent.setup();
     renderPanel();

package/src/features/chat/features/workspace/components/__tests__/chat-session-workspace-text-selection.test.tsx

@@ -0,0 +1,75 @@
+import { fireEvent, render, screen } from "@testing-library/react";
+import { expect, it, vi } from "vitest";
+import type { ChatFileOperationBlockViewModel } from "@nextclaw/agent-chat-ui";
+import { ChatSessionWorkspaceFilePreview } from "@/features/chat/features/workspace/components/chat-session-workspace-file-preview";
+
+vi.mock("@/shared/hooks/use-server-path-read", () => ({
+  useServerPathRead: () => ({
+    data: {
+      kind: "text",
+      languageHint: "json",
+      resolvedPath: "/tmp/package.json",
+      startLine: 1,
+      text: '{\n  "name": "nextclaw"\n}',
+      truncated: false,
+    },
+    error: null,
+    isLoading: false,
+  }),
+}));
+
+vi.mock("@/shared/hooks/use-server-path-browse", () => ({
+  useServerPathBrowse: () => ({ data: null, error: null, isLoading: false }),
+}));
+
+vi.mock("@nextclaw/agent-chat-ui", () => ({
+  ChatMessageMarkdown: ({ text }: { text: string }) => <div>{text}</div>,
+  FileOperationCodeSurface: ({ block }: { block: ChatFileOperationBlockViewModel }) => (
+    <div data-testid="json-source-preview">
+      {block.lines.map(({ text }, index) => <span key={index}>{text}{"\n"}</span>)}
+    </div>
+  ),
+}));
+
+it("supports the first text selection in a JSON preview", async () => {
+  const onTextExcerptAdd = vi.fn();
+  render(
+    <ChatSessionWorkspaceFilePreview
+      file={{
+        key: "package-json",
+        label: "package.json",
+        parentSessionKey: null,
+        path: "/tmp/package.json",
+        viewMode: "preview",
+      }}
+      sessionProjectRoot="/tmp"
+      sessionWorkingDir="/tmp"
+      onFileOpen={vi.fn()}
+      onTextExcerptAdd={onTextExcerptAdd}
+    />,
+  );
+
+  const selectedLine = screen.getByText(/"name": "nextclaw"/);
+  const range = document.createRange();
+  range.selectNodeContents(selectedLine);
+  Object.defineProperty(range, "getClientRects", {
+    value: () => [
+      { bottom: 80, height: 20, left: 40, right: 220, top: 60, width: 180 },
+    ],
+  });
+  window.getSelection()?.removeAllRanges();
+  window.getSelection()?.addRange(range);
+  document.dispatchEvent(new Event("selectionchange"));
+
+  fireEvent.click(await screen.findByRole("button", {
+    name: /Add to chat|添加到聊天/,
+  }));
+
+  expect(onTextExcerptAdd).toHaveBeenCalledWith({
+    path: "package.json",
+    label: "package.json",
+    excerpt: '"name": "nextclaw"',
+    startLine: 2,
+    endLine: 2,
+  });
+});

package/src/features/chat/features/workspace/components/__tests__/workspace-text-selection-menu.test.tsx

@@ -0,0 +1,102 @@
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import { WorkspaceTextSelectionMenu } from "@/features/chat/features/workspace/components/workspace-text-selection-menu";
+
+describe("WorkspaceTextSelectionMenu", () => {
+  it("adds the selected text snapshot with its source lines", async () => {
+    const onAddToChat = vi.fn();
+    render(
+      <WorkspaceTextSelectionMenu
+        fileLabel="guide.md"
+        filePath="docs/guide.md"
+        sourceStartLine={20}
+        sourceText={"first line\nselected text\nlast line"}
+        onAddToChat={onAddToChat}
+      >
+        <p>selected text</p>
+      </WorkspaceTextSelectionMenu>,
+    );
+
+    const textNode = screen.getByText("selected text").firstChild;
+    expect(textNode).toBeTruthy();
+    const range = document.createRange();
+    range.selectNodeContents(textNode!);
+    range.getBoundingClientRect = () => ({
+      bottom: 80,
+      height: 20,
+      left: 100,
+      right: 200,
+      top: 60,
+      width: 100,
+      x: 100,
+      y: 60,
+      toJSON: () => ({}),
+    });
+    window.getSelection()?.removeAllRanges();
+    window.getSelection()?.addRange(range);
+
+    fireEvent.mouseUp(screen.getByText("selected text"));
+    fireEvent.click(await screen.findByRole("button", { name: /Add to chat|添加到聊天/ }));
+
+    expect(onAddToChat).toHaveBeenCalledWith({
+      path: "docs/guide.md",
+      label: "guide.md",
+      excerpt: "selected text",
+      startLine: 21,
+      endLine: 21,
+    });
+  });
+
+  it("handles the first selectionchange after mount and keeps the menu inside the viewport", async () => {
+    const widthSpy = vi.spyOn(window, "innerWidth", "get").mockReturnValue(320);
+    const heightSpy = vi.spyOn(window, "innerHeight", "get").mockReturnValue(240);
+    const buttonRectSpy = vi.spyOn(HTMLElement.prototype, "getBoundingClientRect").mockReturnValue({
+      bottom: 36,
+      height: 36,
+      left: 0,
+      right: 120,
+      top: 0,
+      width: 120,
+      x: 0,
+      y: 0,
+      toJSON: () => ({}),
+    });
+    render(
+      <WorkspaceTextSelectionMenu
+        fileLabel="guide.md"
+        filePath="docs/guide.md"
+        sourceText={"first selected line\nlast selected line"}
+        onAddToChat={vi.fn()}
+      >
+        <p>first selected line<br />last selected line</p>
+      </WorkspaceTextSelectionMenu>,
+    );
+
+    const paragraph = screen.getByText((_, element) =>
+      element?.tagName === "P" && element.textContent === "first selected linelast selected line"
+    );
+    expect(paragraph).toBeTruthy();
+    const range = document.createRange();
+    range.selectNodeContents(paragraph!);
+    Object.defineProperty(range, "getClientRects", {
+      value: () => [
+        { bottom: 40, height: 20, left: 20, right: 180, top: 20, width: 160 },
+        { bottom: 120, height: 20, left: 280, right: 320, top: 100, width: 40 },
+      ],
+    });
+    window.getSelection()?.removeAllRanges();
+    window.getSelection()?.addRange(range);
+
+    document.dispatchEvent(new Event("selectionchange"));
+
+    const menu = await screen.findByRole("button", { name: /Add to chat|添加到聊天/ });
+    await waitFor(() => expect(menu.style.visibility).toBe("visible"));
+    expect(menu.style.left).toBe("188px");
+    expect(menu.style.top).toBe("130px");
+    expect(menu.className).toContain("whitespace-nowrap");
+
+    buttonRectSpy.mockRestore();
+    widthSpy.mockRestore();
+    heightSpy.mockRestore();
+  });
+});