@nextclaw/ui 0.15.22 → 0.15.24

package/src/features/chat/features/workspace/utils/__tests__/chat-workspace-panel-view-model.utils.test.ts

@@ -153,6 +153,7 @@ describe("fixed workspace tabs", () => {
     };
     const onCloseTab = vi.fn();
     const tabs = buildWorkspaceTabsViewModel({
+      hasSession: true,
       resolvedChildTabs: [childTab],
       activeSideChatDraft: draft,
       closedWorkspaceTabEntries: [],
@@ -194,6 +195,7 @@ describe("fixed workspace tabs", () => {
 
   it("keeps fixed workspace tabs even when legacy closed entries exist", () => {
     const tabs = buildWorkspaceTabsViewModel({
+      hasSession: true,
       resolvedChildTabs: [createChildTab()],
       activeSideChatDraft: null,
       closedWorkspaceTabEntries: [
@@ -227,6 +229,7 @@ describe("fixed workspace tabs", () => {
     setLanguage("zh");
 
     const tabs = buildWorkspaceTabsViewModel({
+      hasSession: true,
       resolvedChildTabs: [],
       activeSideChatDraft: null,
       closedWorkspaceTabEntries: [],
@@ -264,6 +267,7 @@ describe("buildWorkspaceTabsViewModel", () => {
     const onSelectSession = vi.fn();
 
     const tabs = buildWorkspaceTabsViewModel({
+      hasSession: true,
       resolvedChildTabs: [childTab],
       activeSideChatDraft: null,
       closedWorkspaceTabEntries: [],
@@ -300,6 +304,7 @@ describe("buildWorkspaceTabsViewModel", () => {
     const childTab = createChildTab();
 
     const tabs = buildWorkspaceTabsViewModel({
+      hasSession: true,
       resolvedChildTabs: [childTab],
       activeSideChatDraft: draft,
       closedWorkspaceTabEntries: [],
@@ -353,6 +358,7 @@ describe("buildWorkspaceTabsViewModel", () => {
 
     const onOpenFileViewer = vi.fn();
     const tabs = buildWorkspaceTabsViewModel({
+      hasSession: true,
       resolvedChildTabs: [],
       activeSideChatDraft: null,
       closedWorkspaceTabEntries: [],
@@ -401,4 +407,78 @@ describe("buildWorkspaceTabsViewModel", () => {
       "rendered",
     );
   });
+
+  it("adds project files to chat with a normalized relative reference", () => {
+    const onAddFileToChat = vi.fn();
+    const projectFile = {
+      key: "project-file",
+      parentSessionKey: "parent-1",
+      path: "/workspace/docs/guide.md",
+      viewMode: "preview" as const,
+    };
+    const externalFile = {
+      key: "external-file",
+      parentSessionKey: "parent-1",
+      path: "/tmp/notes.md",
+      viewMode: "preview" as const,
+    };
+
+    const tabs = buildWorkspaceTabsViewModel({
+      hasSession: true,
+      resolvedChildTabs: [],
+      activeSideChatDraft: null,
+      closedWorkspaceTabEntries: [],
+      workspaceFileTabs: [projectFile, externalFile],
+      activeSelection: { kind: "file", file: projectFile },
+      optimisticReadAtBySessionKey: {},
+      sessionProjectRoot: "/workspace",
+      onAddFileToChat,
+      onSelectSession: vi.fn(),
+      onSelectFile: vi.fn(),
+      onOpenFileViewer: vi.fn(),
+      onCloseTab: vi.fn(),
+      onSelectOverview: vi.fn(),
+      onSelectChildSessions: vi.fn(),
+      onSelectProjectFiles: vi.fn(),
+      onSelectCronJobs: vi.fn(),
+    });
+
+    tabs.find((tab) => tab.key === "file:project-file")?.onAddToChat?.();
+
+    expect(onAddFileToChat).toHaveBeenCalledWith({
+      label: "guide.md",
+      tokenKey: "docs/guide.md",
+    });
+    expect(
+      tabs.find((tab) => tab.key === "file:external-file")?.onAddToChat,
+    ).toBeUndefined();
+  });
+
+  it("shows only project files before a draft session is materialized", () => {
+    const tabs = buildWorkspaceTabsViewModel({
+      hasSession: false,
+      resolvedChildTabs: [],
+      activeSideChatDraft: null,
+      closedWorkspaceTabEntries: [],
+      workspaceFileTabs: [],
+      activeSelection: { kind: "project-files" },
+      optimisticReadAtBySessionKey: {},
+      onSelectSession: vi.fn(),
+      onSelectFile: vi.fn(),
+      onOpenFileViewer: vi.fn(),
+      onCloseTab: vi.fn(),
+      onSelectOverview: vi.fn(),
+      onSelectChildSessions: vi.fn(),
+      onSelectProjectFiles: vi.fn(),
+      onSelectCronJobs: vi.fn(),
+    });
+
+    expect(tabs).toEqual([
+      expect.objectContaining({
+        key: "project-files",
+        kind: "project-files",
+        active: true,
+      }),
+    ]);
+  });
 });

package/src/features/chat/features/workspace/utils/__tests__/workspace-text-excerpt.utils.test.ts

@@ -0,0 +1,54 @@
+import { describe, expect, it } from "vitest";
+import { buildWorkspaceTextExcerpt } from "@/features/chat/features/workspace/utils/workspace-text-excerpt.utils";
+
+describe("buildWorkspaceTextExcerpt", () => {
+  it("keeps the exact snapshot and maps a cross-line selection", () => {
+    expect(buildWorkspaceTextExcerpt({
+      path: "docs/guide.md",
+      label: "guide.md",
+      selectedText: "second\nthird",
+      sourceText: "first\nsecond\nthird\nfourth",
+      sourceStartLine: 10,
+    })).toEqual({
+      path: "docs/guide.md",
+      label: "guide.md",
+      excerpt: "second\nthird",
+      startLine: 11,
+      endLine: 12,
+    });
+  });
+
+  it("keeps a rendered selection without inventing a source position", () => {
+    expect(buildWorkspaceTextExcerpt({
+      path: "README.md",
+      label: "README.md",
+      selectedText: "Rendered sentence",
+      sourceText: "**Rendered** sentence",
+    })).toMatchObject({
+      excerpt: "Rendered sentence",
+      startLine: null,
+      endLine: null,
+    });
+  });
+
+  it("omits a line number when repeated text makes the location ambiguous", () => {
+    expect(buildWorkspaceTextExcerpt({
+      path: "src/example.ts",
+      label: "example.ts",
+      selectedText: "return value;",
+      sourceText: "return value;\nnext();\nreturn value;",
+    })).toMatchObject({
+      startLine: null,
+      endLine: null,
+    });
+  });
+
+  it("rejects whitespace-only selections", () => {
+    expect(buildWorkspaceTextExcerpt({
+      path: "README.md",
+      label: "README.md",
+      selectedText: "  \n ",
+      sourceText: "content",
+    })).toBeNull();
+  });
+});

package/src/features/chat/features/workspace/utils/chat-thread-workspace-session.utils.ts

@@ -8,6 +8,7 @@ import {
   filterNavigationHistoryEntries,
   pushNavigationHistoryEntry,
 } from "@/shared/lib/navigation-history";
+import { reparentWorkspaceFileTab } from "@/features/chat/features/workspace/utils/chat-workspace-file-tab.utils";
 
 export function areWorkspaceNavigationEntriesEqual(
   current: ChatWorkspaceNavigationEntry,
@@ -206,6 +207,52 @@ export function upsertChildSessionTab(
   return nextTabs;
 }
 
+export function materializeDraftWorkspaceSnapshot(
+  snapshot: ChatThreadSnapshot,
+  sessionKey: string,
+): Partial<ChatThreadSnapshot> | null {
+  const normalizedSessionKey = sessionKey.trim();
+  if (!normalizedSessionKey) {
+    return null;
+  }
+  const materializedFileKeys = new Map<string, string>();
+  const workspaceFileTabs = snapshot.workspaceFileTabs.map((tab) => {
+    if (tab.parentSessionKey !== null) {
+      return tab;
+    }
+    const materializedTab = reparentWorkspaceFileTab(tab, normalizedSessionKey);
+    materializedFileKeys.set(tab.key, materializedTab.key);
+    return materializedTab;
+  });
+  const materializeNavigationEntry = (
+    entry: ChatWorkspaceNavigationEntry,
+  ): ChatWorkspaceNavigationEntry => {
+    if (entry.kind !== 'file') {
+      return entry;
+    }
+    const materializedKey = materializedFileKeys.get(entry.key);
+    return materializedKey ? { ...entry, key: materializedKey } : entry;
+  };
+  return {
+    draftProjectRoot: null,
+    workspaceFileTabs,
+    activeWorkspaceFileKey: snapshot.activeWorkspaceFileKey
+      ? materializedFileKeys.get(snapshot.activeWorkspaceFileKey) ??
+        snapshot.activeWorkspaceFileKey
+      : null,
+    closedWorkspaceTabEntries: snapshot.closedWorkspaceTabEntries.map(
+      materializeNavigationEntry,
+    ),
+    workspaceNavigationHistory: snapshot.workspaceNavigationHistory.map(
+      materializeNavigationEntry,
+    ),
+    workspacePanelParentKey:
+      snapshot.workspacePanelParentKey === null && snapshot.activeWorkspacePanelKind
+        ? normalizedSessionKey
+        : snapshot.workspacePanelParentKey,
+  };
+}
+
 export function materializeSideChatDraftSnapshot(params: {
   snapshot: ChatThreadSnapshot;
   draftKey: string;

package/src/features/chat/features/workspace/utils/chat-workspace-file-tab.utils.ts

@@ -65,3 +65,19 @@ export function upsertWorkspaceFileTab(
     ...tabs.slice(adjacentIndex + 1),
   ];
 }
+
+export function reparentWorkspaceFileTab(
+  tab: ChatWorkspaceFileTab,
+  parentSessionKey: string,
+): ChatWorkspaceFileTab {
+  const normalizedParentSessionKey = parentSessionKey.trim();
+  const identitySeparatorIndex = tab.key.indexOf('::');
+  const tabIdentity = identitySeparatorIndex >= 0
+    ? tab.key.slice(identitySeparatorIndex)
+    : `::${tab.key}`;
+  return {
+    ...tab,
+    key: `${normalizedParentSessionKey}${tabIdentity}`,
+    parentSessionKey: normalizedParentSessionKey,
+  };
+}

package/src/features/chat/features/workspace/utils/chat-workspace-panel-view-model.utils.ts

@@ -13,6 +13,7 @@ import {
   type ChatWorkspaceFileViewer,
 } from "@/features/chat/features/workspace/utils/chat-workspace-file-viewer.utils";
 import { areWorkspaceNavigationEntriesEqual } from "@/features/chat/features/workspace/utils/chat-thread-workspace-session.utils";
+import { resolveWorkspaceRelativePath } from "@/shared/lib/session-project";
 
 export type WorkspaceSelection =
   | {
@@ -56,6 +57,7 @@ export type WorkspaceTabViewModel = {
     viewer: ChatWorkspaceFileViewer;
     onSelect: () => void;
   } | null;
+  onAddToChat?: () => void;
   onSelect: () => void;
   onClose?: () => void;
 };
@@ -154,12 +156,15 @@ export function resolveWorkspaceSelection(params: {
 }
 
 type WorkspaceTabsViewModelParams = {
+  hasSession: boolean;
   resolvedChildTabs: ResolvedChildSessionTab[];
   activeSideChatDraft: ChatWorkspaceSideChatDraft | null;
   closedWorkspaceTabEntries: readonly ChatWorkspaceNavigationEntry[];
   workspaceFileTabs: readonly ChatWorkspaceFileTab[];
   activeSelection: WorkspaceSelection | null;
   optimisticReadAtBySessionKey: Record<string, string>;
+  sessionProjectRoot?: string | null;
+  onAddFileToChat?: (reference: { label: string; tokenKey: string }) => void;
   onSelectSession: (sessionKey: string) => void;
   onSelectFile: (fileKey: string) => void;
   onOpenFileViewer: (fileKey: string, viewer: ChatWorkspaceFileViewer) => void;
@@ -172,6 +177,7 @@ type WorkspaceTabsViewModelParams = {
 
 function buildWorkspacePageTabs({
   activeSelection,
+  hasSession,
   onSelectChildSessions,
   onSelectCronJobs,
   onSelectOverview,
@@ -179,12 +185,13 @@ function buildWorkspacePageTabs({
 }: Pick<
   WorkspaceTabsViewModelParams,
   | "activeSelection"
+  | "hasSession"
   | "onSelectChildSessions"
   | "onSelectCronJobs"
   | "onSelectOverview"
   | "onSelectProjectFiles"
 >): WorkspaceTabViewModel[] {
-  return [
+  const pageTabs: WorkspaceTabViewModel[] = [
     {
       key: "overview",
       kind: "overview",
@@ -218,18 +225,24 @@ function buildWorkspacePageTabs({
       onSelect: onSelectProjectFiles,
     },
   ];
+  return hasSession
+    ? pageTabs
+    : pageTabs.filter((tab) => tab.kind === "project-files");
 }
 
 export function buildWorkspaceTabsViewModel(
   params: WorkspaceTabsViewModelParams,
 ): WorkspaceTabViewModel[] {
   const {
+    hasSession,
     activeSideChatDraft,
     closedWorkspaceTabEntries,
     resolvedChildTabs,
     workspaceFileTabs,
     activeSelection,
     optimisticReadAtBySessionKey,
+    sessionProjectRoot,
+    onAddFileToChat,
     onSelectSession,
     onSelectFile,
     onOpenFileViewer,
@@ -242,6 +255,7 @@ export function buildWorkspaceTabsViewModel(
 
   const workspacePages = buildWorkspacePageTabs({
     activeSelection,
+    hasSession,
     onSelectChildSessions,
     onSelectCronJobs,
     onSelectOverview,
@@ -317,6 +331,10 @@ export function buildWorkspaceTabsViewModel(
       ? resolveAlternateWorkspaceFileViewer(file.path, file.previewViewer)
       : null;
     const fileTitle = readWorkspaceFileTitle(file);
+    const tokenKey = resolveWorkspaceRelativePath({
+      path: file.path,
+      sessionProjectRoot: sessionProjectRoot ?? null,
+    });
     return {
       key: `file:${file.key}`,
       kind: "file" as const,
@@ -336,6 +354,9 @@ export function buildWorkspaceTabsViewModel(
             onSelect: () => onOpenFileViewer(file.key, alternateViewer),
           }
         : null,
+      onAddToChat: tokenKey && onAddFileToChat
+        ? () => onAddFileToChat({ label: fileTitle, tokenKey })
+        : undefined,
       active:
         activeSelection?.kind === "file" && activeSelection.file.key === file.key,
       onSelect: () => onSelectFile(file.key),

package/src/features/chat/features/workspace/utils/workspace-text-excerpt.utils.ts

@@ -0,0 +1,53 @@
+export const WORKSPACE_TEXT_EXCERPT_MAX_CHARACTERS = 8_000;
+
+export type WorkspaceTextExcerpt = {
+  path: string;
+  label: string;
+  excerpt: string;
+  startLine: number | null;
+  endLine: number | null;
+};
+
+function countLineBreaks(value: string): number {
+  return value.match(/\n/g)?.length ?? 0;
+}
+
+export function buildWorkspaceTextExcerpt(params: {
+  path: string;
+  label: string;
+  selectedText: string;
+  sourceText: string;
+  sourceStartLine?: number | null;
+}): WorkspaceTextExcerpt | null {
+  const {
+    label: rawLabel,
+    path: rawPath,
+    selectedText,
+    sourceStartLine = 1,
+    sourceText,
+  } = params;
+  const path = rawPath.trim();
+  const label = rawLabel.trim();
+  const excerpt = selectedText.trim();
+  if (!path || !label || !excerpt) {
+    return null;
+  }
+
+  const sourceIndex = sourceText.indexOf(excerpt);
+  const hasUniqueSourceMatch = sourceIndex >= 0 && sourceIndex === sourceText.lastIndexOf(excerpt);
+  const baseLine = sourceStartLine ?? 1;
+  const startLine = hasUniqueSourceMatch
+    ? baseLine + countLineBreaks(sourceText.slice(0, sourceIndex))
+    : null;
+  const endLine = startLine === null
+    ? null
+    : startLine + countLineBreaks(excerpt);
+
+  return {
+    path,
+    label,
+    excerpt,
+    startLine,
+    endLine,
+  };
+}

package/src/features/chat/index.ts

@@ -5,6 +5,7 @@ export { usePresenter } from "./components/providers/chat-presenter.provider";
 export { ChatPresenter } from "./presenters/chat.presenter";
 export { ChatDraftIntentManager } from "./managers/chat-draft-intent.manager";
 export { ChatCompletionNotificationManager } from "./managers/chat-completion-notification.manager";
+export { buildSessionPath } from "./features/session/utils/chat-session-route.utils";
 export { useChatSessionListStore } from "./stores/chat-session-list.store";
 export { useChatThreadStore } from "./stores/chat-thread.store";
 export { useChatMessageLayoutStore } from "./stores/chat-message-layout.store";

package/src/features/chat/managers/__tests__/chat-composer-intent.manager.test.ts

@@ -0,0 +1,129 @@
+import { describe, expect, it, vi } from "vitest";
+import { ChatComposerIntentManager } from "@/features/chat/managers/chat-composer-intent.manager";
+
+describe("ChatComposerIntentManager", () => {
+  it("delivers a file reference only to the targeted composer", () => {
+    const manager = new ChatComposerIntentManager();
+    const draftListener = vi.fn();
+    const sessionListener = vi.fn();
+    manager.subscribe(null, draftListener);
+    manager.subscribe("session-1", sessionListener);
+
+    manager.requestFileReference({
+      targetSessionKey: null,
+      tokenKey: "docs/guide.md",
+      label: "guide.md",
+    });
+
+    expect(draftListener).toHaveBeenCalledWith(
+      expect.objectContaining({
+        targetSessionKey: null,
+        tokenKey: "docs/guide.md",
+        label: "guide.md",
+      }),
+    );
+    expect(sessionListener).not.toHaveBeenCalled();
+  });
+
+  it("keeps an intent pending until its matching composer mounts", () => {
+    const manager = new ChatComposerIntentManager();
+    manager.requestFileReference({
+      targetSessionKey: " session-1 ",
+      tokenKey: " src/index.ts ",
+      label: " index.ts ",
+    });
+
+    expect(manager.consumePending(null)).toBeNull();
+    expect(manager.consumePending("session-1")).toMatchObject({
+      targetSessionKey: "session-1",
+      tokenKey: "src/index.ts",
+      label: "index.ts",
+    });
+    expect(manager.consumePending("session-1")).toBeNull();
+  });
+
+  it("ignores incomplete file references", () => {
+    const manager = new ChatComposerIntentManager();
+    const listener = vi.fn();
+    manager.subscribe(null, listener);
+
+    manager.requestFileReference({
+      targetSessionKey: null,
+      tokenKey: " ",
+      label: "README.md",
+    });
+
+    expect(listener).not.toHaveBeenCalled();
+    expect(manager.consumePending(null)).toBeNull();
+  });
+
+  it("publishes a source-aware excerpt with a stable content identity", () => {
+    const manager = new ChatComposerIntentManager();
+    const listener = vi.fn();
+    manager.subscribe("session-1", listener);
+
+    manager.requestExcerptReference({
+      targetSessionKey: "session-1",
+      path: "docs/guide.md",
+      label: "guide.md",
+      excerpt: "selected text",
+      startLine: 12,
+      endLine: 13,
+    });
+
+    expect(listener).toHaveBeenCalledWith(expect.objectContaining({
+      kind: "workspace_excerpt",
+      path: "docs/guide.md",
+      label: "guide.md",
+      excerpt: "selected text",
+      startLine: 12,
+      endLine: 13,
+      tokenKey: expect.stringMatching(/^docs\/guide\.md#excerpt-/),
+    }));
+  });
+
+  it("delivers an excerpt to the unmaterialized new-chat composer", () => {
+    const manager = new ChatComposerIntentManager();
+    const draftListener = vi.fn();
+    manager.subscribe(null, draftListener);
+
+    manager.requestExcerptReference({
+      targetSessionKey: null,
+      path: "package.json",
+      label: "package.json",
+      excerpt: '"name": "nextclaw"',
+      startLine: 2,
+      endLine: 2,
+    });
+
+    expect(draftListener).toHaveBeenCalledWith(expect.objectContaining({
+      targetSessionKey: null,
+      kind: "workspace_excerpt",
+      path: "package.json",
+      excerpt: '"name": "nextclaw"',
+    }));
+  });
+
+  it("publishes a conversation excerpt with its source message identity", () => {
+    const manager = new ChatComposerIntentManager();
+    const listener = vi.fn();
+    manager.subscribe("session-1", listener);
+
+    manager.requestConversationExcerptReference({
+      targetSessionKey: "session-1",
+      messageId: "assistant-message-1",
+      role: "assistant",
+      label: "AI reply",
+      excerpt: "Keep the visible tag concise.",
+    });
+
+    expect(listener).toHaveBeenCalledWith(expect.objectContaining({
+      kind: "conversation_excerpt",
+      messageId: "assistant-message-1",
+      role: "assistant",
+      label: "AI reply",
+      excerpt: "Keep the visible tag concise.",
+      tokenKey: expect.stringMatching(/^assistant-message-1#excerpt-/),
+    }));
+  });
+});

package/src/features/chat/managers/__tests__/chat-session-list.manager.test.ts

@@ -55,6 +55,7 @@ function resetChatSessionListManagerState() {
   useChatThreadStore.setState({
     snapshot: {
       ...useChatThreadStore.getState().snapshot,
+      draftProjectRoot: null,
       workspacePanelParentKey: "session-1",
       activeWorkspacePanelKind: "child-session",
       activeChildSessionKey: "child-session-1",
@@ -121,7 +122,7 @@ describe("ChatSessionListManager draft and selection flow", () => {
     } as unknown as ConstructorParameters<typeof ChatSessionListManager>[0];
 
     const manager = new ChatSessionListManager(uiManager);
-    manager.startAgentDraftChat("researcher", "codex");
+    manager.startAgentDraftChat("researcher", "codex", "Create an agent");
 
     expect(uiManager.navigateTo).toHaveBeenCalledWith("/chat/draft", {
       replace: true,
@@ -129,7 +130,7 @@ describe("ChatSessionListManager draft and selection flow", () => {
         chatDraft: {
           sessionType: "codex",
           projectRoot: null,
-          prompt: null,
+          prompt: "Create an agent",
         },
       },
     });
@@ -169,6 +170,41 @@ describe("ChatSessionListManager draft and selection flow", () => {
         },
       },
     });
+    expect(useChatThreadStore.getState().snapshot.draftProjectRoot).toBe(
+      "/tmp/project-alpha",
+    );
+  });
+
+  it("drops file tabs from an abandoned draft while preserving real session tabs", () => {
+    useChatThreadStore.getState().setSnapshot({
+      workspaceFileTabs: [
+        {
+          key: "draft::preview::old.md",
+          parentSessionKey: null,
+          path: "old.md",
+          viewMode: "preview",
+        },
+        {
+          key: "session-1::preview::kept.md",
+          parentSessionKey: "session-1",
+          path: "kept.md",
+          viewMode: "preview",
+        },
+      ],
+    });
+    const manager = new ChatSessionListManager({
+      navigateTo: vi.fn(),
+      isAtChatRoot: vi.fn(() => true),
+    } as unknown as ConstructorParameters<typeof ChatSessionListManager>[0]);
+
+    manager.createSession({ projectRoot: "/tmp/new-project" });
+
+    expect(useChatThreadStore.getState().snapshot.workspaceFileTabs).toEqual([
+      expect.objectContaining({
+        key: "session-1::preview::kept.md",
+        parentSessionKey: "session-1",
+      }),
+    ]);
   });
 
   it("carries an initial prompt through the draft route state", () => {