@nextclaw/ui 0.15.25 → 0.15.26

package/src/features/chat/features/input/utils/chat-inline-token-composer.utils.ts

@@ -0,0 +1,134 @@
+import type { ChatComposerNode } from '@nextclaw/agent-chat-ui';
+import {
+  CHAT_CONVERSATION_EXCERPT_TOKEN_KIND,
+  CHAT_PROJECT_TOKEN_KIND,
+  CHAT_SYSTEM_OBJECT_TOKEN_KIND,
+  CHAT_WORKSPACE_DIRECTORY_TOKEN_KIND,
+  CHAT_WORKSPACE_EXCERPT_TOKEN_KIND,
+  CHAT_WORKSPACE_FILE_TOKEN_KIND,
+  type ChatInlineTokenMetadata,
+  type ChatSkillSource,
+} from '@nextclaw/shared';
+
+import { serializeChatComposerTokenText } from './chat-composer-token-protocol.utils';
+import { buildConversationExcerptInlineToken } from './chat-conversation-excerpt-token.utils';
+import { readSystemObjectResolvedReference } from './chat-system-object-reference.utils';
+
+export type ChatSkillReferenceSnapshot = {
+  ref: string;
+  name: string;
+  source: ChatSkillSource;
+  path: string;
+};
+
+function readOptionalString(value: unknown): string | null {
+  return typeof value === 'string' && value.trim() ? value.trim() : null;
+}
+
+function readOptionalLine(value: unknown): number | null {
+  return typeof value === 'number' && Number.isInteger(value) && value > 0
+    ? value
+    : null;
+}
+
+function dedupeInlineTokens(tokens: readonly ChatInlineTokenMetadata[]): ChatInlineTokenMetadata[] {
+  const seen = new Set<string>();
+  return tokens.filter((token) => {
+    const identity = 'ref' in token ? token.ref : token.key;
+    const dedupeKey = `${token.kind}:${identity}:${token.rawText}`;
+    if (seen.has(dedupeKey)) return false;
+    seen.add(dedupeKey);
+    return true;
+  });
+}
+
+function buildWorkspaceExcerptToken(
+  node: Extract<ChatComposerNode, { type: 'token' }>,
+  rawText: string,
+): ChatInlineTokenMetadata | null {
+  const path = readOptionalString(node.data?.path);
+  const excerpt = readOptionalString(node.data?.excerpt);
+  if (!path || !excerpt) return null;
+  return {
+    kind: CHAT_WORKSPACE_EXCERPT_TOKEN_KIND,
+    key: node.tokenKey,
+    path,
+    label: node.label,
+    excerpt,
+    startLine: readOptionalLine(node.data?.startLine),
+    endLine: readOptionalLine(node.data?.endLine),
+    rawText,
+  };
+}
+
+function buildStructuredReferenceToken(
+  node: Extract<ChatComposerNode, { type: 'token' }>,
+  rawText: string,
+): ChatInlineTokenMetadata | null | undefined {
+  if (node.tokenKind === CHAT_WORKSPACE_EXCERPT_TOKEN_KIND) {
+    return buildWorkspaceExcerptToken(node, rawText);
+  }
+  if (node.tokenKind === CHAT_CONVERSATION_EXCERPT_TOKEN_KIND) {
+    return buildConversationExcerptInlineToken(node, rawText);
+  }
+  if (node.tokenKind === CHAT_SYSTEM_OBJECT_TOKEN_KIND) {
+    const reference = readSystemObjectResolvedReference(node.data?.reference);
+    return reference?.uri === node.tokenKey
+      ? {
+        kind: CHAT_SYSTEM_OBJECT_TOKEN_KIND,
+        key: node.tokenKey,
+        label: node.label,
+        rawText,
+        reference,
+      }
+      : null;
+  }
+  return undefined;
+}
+
+export function buildInlineTokensFromComposer(
+  nodes: readonly ChatComposerNode[],
+  skillRecords: readonly ChatSkillReferenceSnapshot[] = [],
+): ChatInlineTokenMetadata[] {
+  const skillByRef = new Map(skillRecords.map((record) => [record.ref, record]));
+  const tokens: ChatInlineTokenMetadata[] = [];
+  for (const node of nodes) {
+    if (node.type !== 'token') continue;
+    const rawText = serializeChatComposerTokenText(node);
+    if (!rawText) continue;
+    if (node.tokenKind === 'skill') {
+      const skill = skillByRef.get(node.tokenKey);
+      if (skill?.path.trim()) {
+        tokens.push({
+          kind: 'skill',
+          ref: skill.ref,
+          name: skill.name,
+          source: skill.source,
+          path: skill.path,
+          label: node.label,
+          rawText,
+        });
+      }
+      continue;
+    }
+    if (node.tokenKind === CHAT_PROJECT_TOKEN_KIND) {
+      tokens.push({ kind: CHAT_PROJECT_TOKEN_KIND, key: node.tokenKey, label: node.label, rawText });
+      continue;
+    }
+    const structuredReference = buildStructuredReferenceToken(node, rawText);
+    if (structuredReference !== undefined) {
+      if (structuredReference) tokens.push(structuredReference);
+      continue;
+    }
+    if (
+      node.tokenKind === CHAT_WORKSPACE_FILE_TOKEN_KIND ||
+      node.tokenKind === CHAT_WORKSPACE_DIRECTORY_TOKEN_KIND
+    ) {
+      const workspaceKind = node.tokenKind === CHAT_WORKSPACE_FILE_TOKEN_KIND
+        ? CHAT_WORKSPACE_FILE_TOKEN_KIND
+        : CHAT_WORKSPACE_DIRECTORY_TOKEN_KIND;
+      tokens.push({ kind: workspaceKind, key: node.tokenKey, label: node.label, rawText });
+    }
+  }
+  return dedupeInlineTokens(tokens);
+}

package/src/features/chat/features/input/utils/chat-inline-token.utils.ts

@@ -1,18 +1,23 @@
-import type { ChatComposerNode } from '@nextclaw/agent-chat-ui';
 import {
   CHAT_CONVERSATION_EXCERPT_TOKEN_KIND,
   CHAT_INLINE_TOKENS_METADATA_KEY,
   CHAT_INLINE_TOKENS_SCHEMA_VERSION,
   CHAT_PROJECT_TOKEN_KIND,
+  CHAT_SYSTEM_OBJECT_TOKEN_KIND,
   CHAT_WORKSPACE_DIRECTORY_TOKEN_KIND,
   CHAT_WORKSPACE_EXCERPT_TOKEN_KIND,
   CHAT_WORKSPACE_FILE_TOKEN_KIND,
   type ChatInlineTokenMetadata,
   type ChatInlineTokensMetadata,
   type ChatSkillSource,
+  type SystemObjectResolvedReference,
 } from '@nextclaw/shared';
-import { serializeChatComposerTokenText } from './chat-composer-token-protocol.utils';
-import { buildConversationExcerptInlineToken, readConversationExcerptInlineToken } from './chat-conversation-excerpt-token.utils';
+import { readConversationExcerptInlineToken } from './chat-conversation-excerpt-token.utils';
+import { readSystemObjectResolvedReference } from './chat-system-object-reference.utils';
+export {
+  buildInlineTokensFromComposer,
+  type ChatSkillReferenceSnapshot,
+} from './chat-inline-token-composer.utils';
 
 export { CHAT_INLINE_TOKENS_METADATA_KEY };
 const CHAT_PANEL_APP_TOKEN_PREFIX = '@panel-app:';
@@ -20,13 +25,7 @@ const CHAT_PANEL_APP_TOKEN_PATTERN = /@panel-app:([A-Za-z0-9_-]+)/g;
 const CHAT_PROJECT_TOKEN_PATTERN = /@project:([^\s]+)/g;
 const CHAT_WORKSPACE_FILE_TOKEN_PATTERN = /@file:([^\s]+)/g;
 const CHAT_WORKSPACE_DIRECTORY_TOKEN_PATTERN = /@folder:([^\s]+)/g;
-
-export type ChatSkillReferenceSnapshot = {
-  ref: string;
-  name: string;
-  source: ChatSkillSource;
-  path: string;
-};
+const CHAT_SYSTEM_OBJECT_TOKEN_PATTERN = /@object:([^\s]+)/g;
 
 export type ChatInlineTokenSource =
   | {
@@ -62,6 +61,13 @@ export type ChatInlineTokenSource =
       key: string;
       label: string;
       rawText: string;
+    }
+  | {
+      kind: typeof CHAT_SYSTEM_OBJECT_TOKEN_KIND;
+      key: string;
+      label: string;
+      rawText: string;
+      reference: SystemObjectResolvedReference;
     };
 
 export function resolveWorkspaceReferencePath(params: {
@@ -114,100 +120,10 @@ function dedupeInlineTokens<T extends ChatInlineTokenSource>(tokens: readonly T[
   return output;
 }
 
-function appendWorkspaceExcerptToken(
-  tokens: ChatInlineTokenMetadata[],
-  node: Extract<ChatComposerNode, { type: 'token' }>,
-  rawText: string,
-): void {
-  const path = readOptionalString(node.data?.path);
-  const excerpt = readOptionalString(node.data?.excerpt);
-  if (!path || !excerpt) return;
-  tokens.push({
-    kind: CHAT_WORKSPACE_EXCERPT_TOKEN_KIND,
-    key: node.tokenKey,
-    path,
-    label: node.label,
-    excerpt,
-    startLine: readOptionalLine(node.data?.startLine),
-    endLine: readOptionalLine(node.data?.endLine),
-    rawText,
-  });
-}
-
-export function buildInlineTokensFromComposer(
-  nodes: readonly ChatComposerNode[],
-  skillRecords: readonly ChatSkillReferenceSnapshot[] = [],
-): ChatInlineTokenMetadata[] {
-  const skillByRef = new Map(skillRecords.map((record) => [record.ref, record]));
-  const tokens: ChatInlineTokenMetadata[] = [];
-  for (const node of nodes) {
-    if (node.type !== 'token') {
-      continue;
-    }
-    if (
-      node.tokenKind !== 'skill' &&
-      node.tokenKind !== CHAT_PROJECT_TOKEN_KIND &&
-      node.tokenKind !== CHAT_WORKSPACE_FILE_TOKEN_KIND &&
-      node.tokenKind !== CHAT_WORKSPACE_DIRECTORY_TOKEN_KIND &&
-      node.tokenKind !== CHAT_WORKSPACE_EXCERPT_TOKEN_KIND &&
-      node.tokenKind !== CHAT_CONVERSATION_EXCERPT_TOKEN_KIND
-    ) {
-      continue;
-    }
-    const rawText = serializeChatComposerTokenText(node);
-    if (!rawText) {
-      continue;
-    }
-    if (node.tokenKind === 'skill') {
-      const skill = skillByRef.get(node.tokenKey);
-      if (!skill?.path.trim()) {
-        continue;
-      }
-      tokens.push({
-        kind: 'skill',
-        ref: skill.ref,
-        name: skill.name,
-        source: skill.source,
-        path: skill.path,
-        label: node.label,
-        rawText,
-      });
-      continue;
-    }
-    if (node.tokenKind === CHAT_PROJECT_TOKEN_KIND) {
-      tokens.push({
-        kind: CHAT_PROJECT_TOKEN_KIND,
-        key: node.tokenKey,
-        label: node.label,
-        rawText,
-      });
-      continue;
-    }
-    if (node.tokenKind === CHAT_WORKSPACE_EXCERPT_TOKEN_KIND) {
-      appendWorkspaceExcerptToken(tokens, node, rawText);
-      continue;
-    }
-    if (node.tokenKind === CHAT_CONVERSATION_EXCERPT_TOKEN_KIND) {
-      const token = buildConversationExcerptInlineToken(node, rawText);
-      if (token) tokens.push(token);
-      continue;
-    }
-    const workspaceKind = node.tokenKind === CHAT_WORKSPACE_FILE_TOKEN_KIND
-      ? CHAT_WORKSPACE_FILE_TOKEN_KIND
-      : CHAT_WORKSPACE_DIRECTORY_TOKEN_KIND;
-    tokens.push({
-      kind: workspaceKind,
-      key: node.tokenKey,
-      label: node.label,
-      rawText,
-    });
-  }
-  return dedupeInlineTokens(tokens);
-}
-
 function appendEncodedKeyTokens(params: {
   kind:
     | typeof CHAT_PROJECT_TOKEN_KIND
+    | typeof CHAT_SYSTEM_OBJECT_TOKEN_KIND
     | typeof CHAT_WORKSPACE_FILE_TOKEN_KIND
     | typeof CHAT_WORKSPACE_DIRECTORY_TOKEN_KIND;
   pattern: RegExp;
@@ -255,6 +171,12 @@ export function buildInlineTokensFromTextProtocol(text: string): ChatInlineToken
     text,
     tokens,
   });
+  appendEncodedKeyTokens({
+    kind: CHAT_SYSTEM_OBJECT_TOKEN_KIND,
+    pattern: CHAT_SYSTEM_OBJECT_TOKEN_PATTERN,
+    text,
+    tokens,
+  });
   appendEncodedKeyTokens({
     kind: CHAT_WORKSPACE_FILE_TOKEN_KIND,
     pattern: CHAT_WORKSPACE_FILE_TOKEN_PATTERN,
@@ -340,6 +262,13 @@ function readInlineTokenEntry(entry: unknown): ChatInlineTokenSource | null {
   if (kind === CHAT_CONVERSATION_EXCERPT_TOKEN_KIND) {
     return readConversationExcerptInlineToken({ entry, label, rawText });
   }
+  if (kind === CHAT_SYSTEM_OBJECT_TOKEN_KIND) {
+    const key = readOptionalString(entry.key);
+    const reference = readSystemObjectResolvedReference(entry.reference);
+    return key && reference && reference.uri === key
+      ? { kind, key, label, rawText, reference }
+      : null;
+  }
   const key = readOptionalString(entry.key);
   return key ? { kind, key, rawText, label } : null;
 }

package/src/features/chat/features/input/utils/chat-system-object-reference.utils.test.ts

@@ -0,0 +1,44 @@
+import { describe, expect, it } from 'vitest';
+import { CHAT_SYSTEM_OBJECT_TOKEN_KIND, type SystemObjectResolvedReference } from '@nextclaw/shared';
+import {
+  appendSystemObjectReferenceToken,
+  readSystemObjectReferenceFromToken,
+} from './chat-system-object-reference.utils';
+
+const reference: SystemObjectResolvedReference = {
+  uri: 'nextclaw://objects/cron-job/cron-1',
+  objectType: 'cron-job',
+  objectId: 'cron-1',
+  label: 'Daily review',
+  description: 'Review reports',
+  updatedAt: '2026-08-11T00:00:00.000Z',
+  version: 'a'.repeat(64),
+  assetUri: 'asset://store/cron-1',
+  fileName: 'daily-review.md',
+  mimeType: 'text/markdown',
+  sizeBytes: 42,
+};
+
+describe('system object reference composer utilities', () => {
+  it('creates one visible generic token and deduplicates the same snapshot', () => {
+    const first = appendSystemObjectReferenceToken([], reference);
+    const second = appendSystemObjectReferenceToken(first, reference);
+
+    expect(second).toHaveLength(first.length);
+    expect(second.find((node) => node.type === 'token')).toMatchObject({
+      tokenKind: CHAT_SYSTEM_OBJECT_TOKEN_KIND,
+      tokenKey: reference.uri,
+      label: reference.label,
+    });
+    expect(readSystemObjectReferenceFromToken(second[0]!)).toEqual(reference);
+  });
+
+  it('rejects metadata whose URI identity disagrees with its object fields', () => {
+    const [node] = appendSystemObjectReferenceToken([], {
+      ...reference,
+      objectId: 'different-cron',
+    });
+
+    expect(readSystemObjectReferenceFromToken(node!)).toBeNull();
+  });
+});

package/src/features/chat/features/input/utils/chat-system-object-reference.utils.ts

@@ -0,0 +1,46 @@
+import {
+  createChatComposerTokenNode,
+  normalizeChatComposerNodes,
+  type ChatComposerNode,
+} from '@nextclaw/agent-chat-ui';
+import {
+  CHAT_SYSTEM_OBJECT_TOKEN_KIND,
+  readSystemObjectResolvedReference,
+  type SystemObjectResolvedReference,
+} from '@nextclaw/shared';
+
+export { readSystemObjectResolvedReference } from '@nextclaw/shared';
+
+export function createSystemObjectReferenceTokenNode(
+  reference: SystemObjectResolvedReference,
+): ChatComposerNode {
+  return createChatComposerTokenNode({
+    tokenKind: CHAT_SYSTEM_OBJECT_TOKEN_KIND,
+    tokenKey: reference.uri,
+    label: reference.label,
+    data: { reference },
+  });
+}
+
+export function appendSystemObjectReferenceToken(
+  nodes: readonly ChatComposerNode[],
+  reference: SystemObjectResolvedReference,
+): ChatComposerNode[] {
+  const exists = nodes.some((node) =>
+    node.type === 'token' &&
+    node.tokenKind === CHAT_SYSTEM_OBJECT_TOKEN_KIND &&
+    node.tokenKey === reference.uri &&
+    readSystemObjectResolvedReference(node.data?.reference)?.version === reference.version
+  );
+  return exists
+    ? normalizeChatComposerNodes([...nodes])
+    : normalizeChatComposerNodes([...nodes, createSystemObjectReferenceTokenNode(reference)]);
+}
+
+export function readSystemObjectReferenceFromToken(
+  node: ChatComposerNode,
+): SystemObjectResolvedReference | null {
+  return node.type === 'token' && node.tokenKind === CHAT_SYSTEM_OBJECT_TOKEN_KIND
+    ? readSystemObjectResolvedReference(node.data?.reference)
+    : null;
+}

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

@@ -169,6 +169,7 @@ beforeEach(() => {
   });
   mocks.refetchBrowse.mockResolvedValue(undefined);
   useChatThreadStore.getState().setSnapshot({
+    workspaceExplorerOpen: false,
     workspaceExplorerWidth: CHAT_WORKSPACE_EXPLORER_DEFAULT_WIDTH,
   });
 });
@@ -626,7 +627,81 @@ it('preserves project tree expansion and scroll while visiting another workspace
   expect(tree.scrollTop).toBe(128);
 });
 
-it('reuses the Explorer beside a file and persists a dragged compact width', () => {
+it('selects and reveals the active file when it is opened outside the Explorer', 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 sourceDirectory = screen.getByRole('treeitem', { name: 'Open directory: src' });
+  const packageEntry = screen.getByRole('treeitem', { name: 'Open file: package.json' });
+  await user.click(screen.getByRole('button', { name: 'src' }));
+  expect(sourceDirectory.getAttribute('aria-selected')).toBe('true');
+
+  rerender(
+    <ChatSessionWorkspacePanelContent
+      {...projectFilesProps}
+      activeSelection={{
+        kind: 'file',
+        file: {
+          key: 'parent-1::preview::package.json',
+          parentSessionKey: 'parent-1',
+          path: 'package.json',
+          label: 'package.json',
+          viewMode: 'preview',
+          previewViewer: 'source',
+        },
+      }}
+    />,
+  );
+
+  await waitFor(() => {
+    expect(packageEntry.getAttribute('aria-selected')).toBe('true');
+    expect(sourceDirectory.getAttribute('aria-selected')).toBe('false');
+  });
+  expect(mocks.scrollIntoView).toHaveBeenCalled();
+  expect(document.activeElement).not.toBe(screen.getByRole('button', { name: 'package.json' }));
+});
+
+it('expands active-file ancestors like an auto-revealing Explorer', async () => {
+  useChatThreadStore.getState().setSnapshot({ workspaceExplorerOpen: true });
+  render(
+    <ChatSessionWorkspacePanelContent
+      activeSelection={{
+        kind: 'file',
+        file: {
+          key: 'parent-1::preview::src/index.ts',
+          parentSessionKey: 'parent-1',
+          path: '/Users/peiwang/Projects/nextbot/src/index.ts',
+          label: 'index.ts',
+          viewMode: 'preview',
+          previewViewer: 'source',
+        },
+      }}
+      childSessionTabs={[]}
+      filePreviewRefreshVersion={0}
+      sessionKey="parent-1"
+      sessionCronJobs={[]}
+      sessionProjectRoot="/Users/peiwang/Projects/nextbot"
+      sessionWorkingDir="/Users/peiwang/Projects/nextbot"
+    />,
+  );
+
+  const sourceDirectory = within(screen.getByTestId('workspace-shared-explorer')).getAllByRole('treeitem', {
+    name: 'Open directory: src',
+  })[0];
+  await waitFor(() => {
+    expect(sourceDirectory.getAttribute('aria-expanded')).toBe('true');
+  });
+});
+
+it('keeps the file Explorer closed by default and reuses it after an explicit open', () => {
   const projectFilesProps = {
     activeSelection: { kind: 'project-files' as const },
     childSessionTabs: [],
@@ -659,6 +734,9 @@ it('reuses the Explorer beside a file and persists a dragged compact width', ()
   const explorer = screen.getByTestId('workspace-shared-explorer');
   const breadcrumbs = screen.getByTestId('workspace-file-breadcrumbs');
   const toggle = screen.getByTestId('workspace-explorer-toggle');
+  expect(explorer.getAttribute('aria-hidden')).toBe('true');
+  fireEvent.click(toggle);
+  expect(useChatThreadStore.getState().snapshot.workspaceExplorerOpen).toBe(true);
   expect(screen.getByRole('tree', { name: 'Project files' })).toBe(tree);
   expect(explorer.getAttribute('data-mode')).toBe('side');
   expect(explorer.style.width).toBe('224px');
@@ -674,7 +752,7 @@ it('reuses the Explorer beside a file and persists a dragged compact width', ()
   expect(mocks.setWorkspaceExplorerWidth).toHaveBeenCalledWith(300);
 });
 
-it('uses an overlay only below the compact threshold and closes it without unmounting', () => {
+it('uses an overlay only below the compact threshold and persists closing it without unmounting', () => {
   HTMLElement.prototype.getBoundingClientRect = () => ({
     bottom: 600,
     height: 600,
@@ -686,6 +764,7 @@ it('uses an overlay only below the compact threshold and closes it without unmou
     y: 0,
     toJSON: () => ({}),
   });
+  useChatThreadStore.getState().setSnapshot({ workspaceExplorerOpen: true });
   render(
     <ChatSessionWorkspacePanelContent
       activeSelection={{
@@ -714,6 +793,7 @@ it('uses an overlay only below the compact threshold and closes it without unmou
   expect(screen.queryByTestId('workspace-explorer-resize-handle')).toBeNull();
 
   fireEvent.click(screen.getByTestId('workspace-explorer-scrim'));
+  expect(useChatThreadStore.getState().snapshot.workspaceExplorerOpen).toBe(false);
   expect(explorer.getAttribute('aria-hidden')).toBe('true');
   expect(tree.isConnected).toBe(true);
 });

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

@@ -22,14 +22,18 @@ 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>
-  ),
-}));
+vi.mock("@nextclaw/agent-chat-ui", async (importOriginal) => {
+  const actual = await importOriginal();
+  return {
+    ...(actual as object),
+    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();

package/src/features/chat/features/workspace/components/chat-session-workspace-directory-browser.tsx

@@ -24,6 +24,7 @@ import { hostCapabilityManager } from '@/shared/lib/host-capabilities';
 import { t } from '@/shared/lib/i18n';
 
 type ChatSessionWorkspaceDirectoryBrowserProps = {
+  activeRelativePath?: string | null;
   browseQuery: ReturnType<typeof useServerPathBrowse>;
   onFileOpen: (action: ChatFileOpenActionViewModel) => void;
   sessionKey?: string | null;
@@ -36,6 +37,7 @@ function readPathName(path: string): string {
 }
 
 function WorkspaceDirectoryEntries({
+  activeRelativePath,
   busy,
   collapseVersion,
   createTarget,
@@ -59,6 +61,7 @@ function WorkspaceDirectoryEntries({
   selectedPath,
   showRoot,
 }: {
+  activeRelativePath: string | null;
   busy: boolean;
   collapseVersion: number;
   createTarget: WorkspaceDirectoryActionTarget | null;
@@ -87,6 +90,7 @@ function WorkspaceDirectoryEntries({
   }
   return entries.map((entry) => (
     <WorkspaceDirectoryTreeEntry
+      activeRelativePath={activeRelativePath}
       key={entry.path}
       browseParentRefresh={refresh}
       busy={busy}
@@ -243,6 +247,7 @@ function WorkspaceProjectTree({
 }
 
 function WorkspaceDirectoryBrowserReady({
+  activeRelativePath,
   browseQuery,
   ConfirmDialog,
   controller,
@@ -254,6 +259,7 @@ function WorkspaceDirectoryBrowserReady({
   rootPath,
   showRoot,
 }: {
+  activeRelativePath: string | null;
   browseQuery: ReturnType<typeof useServerPathBrowse>;
   ConfirmDialog: () => ReactNode;
   controller: ReturnType<typeof useWorkspaceProjectFilesController>;
@@ -266,30 +272,32 @@ function WorkspaceDirectoryBrowserReady({
   showRoot: boolean;
 }) {
   const {
-    actions,
     cancelCreateFolder,
     clearSelection,
     completeReveal,
     submitCreate,
-    createError,
-    createKind,
-    createName,
-    createTarget,
     deleteEntry,
-    fileInputRef,
     openCreateFile,
     openCreateFolder,
     requestUpload,
     renameEntry,
-    revealPath,
     selectEntry,
-    selectedCreateTarget,
-    selectedPath,
     setCreateError,
     setCreateName,
     uploadFiles,
-  } = controller;
-  const busy = actions.pendingAction !== null;
+  } = controller.actions;
+  const { fileInputRef } = controller.refs;
+  const {
+    createError,
+    createKind,
+    createName,
+    createTarget,
+    pendingAction,
+    revealPath,
+    selectedCreateTarget,
+    selectedPath,
+  } = controller.state;
+  const busy = pendingAction !== null;
   const [collapseVersion, setCollapseVersion] = useState(0);
   const rootRefresh = () => browseQuery.refetch();
   const rootTarget: WorkspaceDirectoryActionTarget | null = rootPath
@@ -300,7 +308,7 @@ function WorkspaceDirectoryBrowserReady({
     <WorkspaceNewFolderTreeItem
       error={createError}
       kind={createKind}
-      isCreating={actions.pendingAction === 'create-directory' || actions.pendingAction === 'create-file'}
+      isCreating={pendingAction === 'create-directory' || pendingAction === 'create-file'}
       level={level}
       name={createName}
       onCancel={cancelCreateFolder}
@@ -318,6 +326,7 @@ function WorkspaceDirectoryBrowserReady({
   };
   const treeEntries = (
     <WorkspaceDirectoryEntries
+      activeRelativePath={activeRelativePath}
       busy={busy}
       collapseVersion={collapseVersion}
       createTarget={createTarget}
@@ -406,6 +415,7 @@ function WorkspaceDirectoryBrowserReady({
 }
 
 export function ChatSessionWorkspaceDirectoryBrowser({
+  activeRelativePath = null,
   browseQuery,
   onFileOpen,
   sessionKey,
@@ -419,6 +429,7 @@ export function ChatSessionWorkspaceDirectoryBrowser({
   const rootPath = showRoot ? (browseQuery.data?.currentPath ?? null) : null;
   const rootLabel = rootPath ? readPathName(rootPath) : '';
   const controller = useWorkspaceProjectFilesController({
+    activeRelativePath,
     confirm,
     onEntryDeleted: presenter.chatThreadManager.removeWorkspacePath,
     onEntryRenamed: presenter.chatThreadManager.renameWorkspacePath,
@@ -457,6 +468,7 @@ export function ChatSessionWorkspaceDirectoryBrowser({
   }
   return (
     <WorkspaceDirectoryBrowserReady
+      activeRelativePath={activeRelativePath}
       browseQuery={browseQuery}
       ConfirmDialog={ConfirmDialog}
       controller={controller}