@civilization/dsh-workspace-files 0.3.0 → 0.3.1

package/lib/index.js

@@ -1,83 +1,119 @@
+import { exec, spawn } from "node:child_process";
+import { isAbsolute, join, relative, resolve } from "node:path";
 import Schema from "@deepseek-ai/schemastery";
 import { promises } from "node:fs";
-import { join, relative, resolve } from "node:path";
 //#region src/files.ts
 const DEFAULT_IGNORED_DIRS = /* @__PURE__ */ new Set([
 	".git",
 	".svn",
 	".hg",
 	"node_modules",
+	".pnpm-store",
 	".turbo",
 	".next",
+	".nuxt",
+	".output",
 	"dist",
 	"build",
-	".pnpm-store"
+	"out",
+	".cache",
+	".idea",
+	".vscode",
+	".husky",
+	"venv",
+	".venv",
+	"env",
+	"__pycache__",
+	"target",
+	".gradle",
+	".cargo",
+	"vendor",
+	"coverage",
+	"tmp",
+	"temp",
+	"logs",
+	".dsh"
 ]);
 function isWithin(parent, child) {
 	const rel = relative(parent, child);
 	return !rel.startsWith("..") && !rel.includes(":");
 }
+async function loadGitIgnoreNames(rootDir) {
+	const names = /* @__PURE__ */ new Set();
+	try {
+		const gitignorePath = join(rootDir, ".gitignore");
+		const content = await promises.readFile(gitignorePath, "utf8");
+		for (const rawLine of content.split(/\r?\n/)) {
+			const line = rawLine.trim();
+			if (!line || line.startsWith("#") || line.startsWith("!")) continue;
+			const clean = line.replace(/^\/+/, "").replace(/\/+$/, "");
+			if (clean && !clean.includes("*") && !clean.includes("?") && !clean.includes("/")) names.add(clean);
+		}
+	} catch {}
+	return names;
+}
 async function scanWorkspaceTree(cwd, options = {}) {
 	const root = resolve(cwd);
 	const maxDepth = options.maxDepth ?? 16;
 	const showHidden = options.showHidden ?? false;
 	const showIgnored = options.showIgnored ?? false;
+	const gitIgnoredNames = showIgnored ? /* @__PURE__ */ new Set() : await loadGitIgnoreNames(root);
 	let totalFiles = 0;
 	let totalDirs = 0;
+	let totalNodes = 0;
+	const MAX_NODES_SAFETY_LIMIT = 3e4;
 	async function walk(dirPath, currentDepth) {
-		if (currentDepth > maxDepth) return [];
+		if (currentDepth > maxDepth || totalNodes >= MAX_NODES_SAFETY_LIMIT) return [];
 		let dirents;
 		try {
 			dirents = await promises.readdir(dirPath, { withFileTypes: true });
 		} catch {
 			return [];
 		}
-		dirents.sort((a, b) => {
-			if (a.isDirectory() && !b.isDirectory()) return -1;
-			if (!a.isDirectory() && b.isDirectory()) return 1;
-			return a.name.localeCompare(b.name, void 0, {
-				numeric: true,
-				sensitivity: "base"
-			});
-		});
-		const items = [];
+		const dirTasks = [];
+		const fileItems = [];
 		for (const ent of dirents) {
+			if (totalNodes >= MAX_NODES_SAFETY_LIMIT) break;
 			const name = ent.name;
 			if (!showHidden && name.startsWith(".") && name !== ".gitignore" && name !== ".env") {
 				if (!showIgnored) continue;
 			}
-			if (!showIgnored && ent.isDirectory() && DEFAULT_IGNORED_DIRS.has(name)) continue;
+			if (!showIgnored) {
+				if (ent.isDirectory() && DEFAULT_IGNORED_DIRS.has(name)) continue;
+				if (gitIgnoredNames.has(name)) continue;
+			}
 			const fullPath = join(dirPath, name);
 			if (!isWithin(root, fullPath)) continue;
 			const relPath = relative(root, fullPath).replace(/\\/g, "/");
 			if (ent.isDirectory()) {
 				totalDirs += 1;
-				const children = await walk(fullPath, currentDepth + 1);
-				items.push({
+				totalNodes += 1;
+				dirTasks.push(walk(fullPath, currentDepth + 1).then((children) => ({
 					name,
 					path: relPath,
 					isDirectory: true,
 					children
-				});
+				})));
 			} else {
 				totalFiles += 1;
-				let size;
-				let mtime;
-				try {
-					const st = await promises.stat(fullPath);
-					size = st.size;
-					mtime = st.mtimeMs;
-				} catch {}
-				items.push({
+				totalNodes += 1;
+				fileItems.push({
 					name,
 					path: relPath,
-					isDirectory: false,
-					size,
-					mtime
+					isDirectory: false
 				});
 			}
 		}
-		return items;
+		const validDirs = (await Promise.all(dirTasks)).filter((d) => d !== null);
+		validDirs.sort((a, b) => a.name.localeCompare(b.name, void 0, {
+			numeric: true,
+			sensitivity: "base"
+		}));
+		fileItems.sort((a, b) => a.name.localeCompare(b.name, void 0, {
+			numeric: true,
+			sensitivity: "base"
+		}));
+		return [...validDirs, ...fileItems];
 	}
 	return {
 		root,
@@ -155,6 +191,8 @@ function resolveCwd(ctx, body) {
 	return process.cwd();
 }
 const SETTINGS_NS = "workspace-files";
+const scanCache = /* @__PURE__ */ new Map();
+const CACHE_TTL_MS = 2e4;
 function apply(ctx, config = {}) {
 	const liveConfig = {
 		maxDepth: typeof config?.maxDepth === "number" && config.maxDepth > 0 ? config.maxDepth : 16,
@@ -210,6 +248,59 @@ function apply(ctx, config = {}) {
 			}
 			return;
 		}
+		if (method === "files.open") {
+			try {
+				const body = await readJsonBody(req);
+				const cwd = resolveCwd(ctx, body);
+				const rawPath = String(body.path || "");
+				if (!rawPath) {
+					writeJson(res, 400, {
+						ok: false,
+						error: { message: "Missing path parameter" }
+					});
+					return;
+				}
+				const fullPath = isAbsolute(rawPath) ? rawPath : resolve(cwd, rawPath);
+				const action = body.action || "reveal";
+				const isDirectory = Boolean(body.isDirectory);
+				if (process.platform === "win32") {
+					const winPath = fullPath.replace(/\//g, "\\");
+					if (action === "reveal") {
+						if (isDirectory) spawn("explorer.exe", [winPath], {
+							detached: true,
+							stdio: "ignore"
+						}).unref();
+						else spawn("explorer.exe", [`/select,${winPath}`], {
+							detached: true,
+							stdio: "ignore"
+						}).unref();
+					} else exec(`start "" "${winPath.replace(/"/g, "\\\"")}"`, { windowsHide: true });
+				} else if (process.platform === "darwin") {
+					if (action === "reveal") spawn("open", [isDirectory ? fullPath : "-R", fullPath], {
+						detached: true,
+						stdio: "ignore"
+					}).unref();
+					else spawn("open", [fullPath], {
+						detached: true,
+						stdio: "ignore"
+					}).unref();
+				} else if (action === "reveal") spawn("xdg-open", [isDirectory ? fullPath : resolve(fullPath, "..")], {
+					detached: true,
+					stdio: "ignore"
+				}).unref();
+				else spawn("xdg-open", [fullPath], {
+					detached: true,
+					stdio: "ignore"
+				}).unref();
+				writeJson(res, 200, { ok: true });
+			} catch (err) {
+				writeJson(res, 500, {
+					ok: false,
+					error: { message: err?.message || String(err) }
+				});
+			}
+			return;
+		}
 		if (method !== "files.tree") {
 			writeJson(res, 404, {
 				ok: false,
@@ -219,13 +310,36 @@ function apply(ctx, config = {}) {
 		}
 		try {
 			const body = await readJsonBody(req);
+			const cwd = resolveCwd(ctx, body);
+			const showHidden = typeof body.showHidden === "boolean" ? body.showHidden : liveConfig.showHidden;
+			const showIgnored = Boolean(body.showIgnored);
+			const maxDepth = typeof body.maxDepth === "number" && body.maxDepth > 0 ? body.maxDepth : liveConfig.maxDepth;
+			const forceRefresh = Boolean(body.forceRefresh);
+			const cacheKey = `${cwd}::${showHidden}::${showIgnored}::${maxDepth}`;
+			const now = Date.now();
+			if (!forceRefresh) {
+				const cached = scanCache.get(cacheKey);
+				if (cached && now - cached.timestamp < CACHE_TTL_MS) {
+					writeJson(res, 200, {
+						ok: true,
+						value: cached.result,
+						cached: true
+					});
+					return;
+				}
+			}
+			const result = await scanWorkspaceTree(cwd, {
+				showHidden,
+				showIgnored,
+				maxDepth
+			});
+			scanCache.set(cacheKey, {
+				timestamp: now,
+				result
+			});
 			writeJson(res, 200, {
 				ok: true,
-				value: await scanWorkspaceTree(resolveCwd(ctx, body), {
-					showHidden: typeof body.showHidden === "boolean" ? body.showHidden : liveConfig.showHidden,
-					showIgnored: Boolean(body.showIgnored),
-					maxDepth: typeof body.maxDepth === "number" && body.maxDepth > 0 ? body.maxDepth : liveConfig.maxDepth
-				})
+				value: result
 			});
 		} catch (err) {
 			writeJson(res, 500, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civilization/dsh-workspace-files",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Enhanced workspace file tree explorer with fuzzy search and @-mention for DeepSeek Harness.",
   "type": "module",
   "main": "lib/index.js",

package/src/client/icons.tsx

@@ -167,3 +167,22 @@ export function IconChevronDown({ size = 14 }: { size?: number }): JSX.Element {
   )
 }
 
+export function IconExplorer({ size = 12 }: { size?: number }): JSX.Element {
+  return (
+    <svg width={size} height={size} viewBox="0 0 16 16" fill="currentColor" style={{ display: 'inline-block', verticalAlign: 'middle', flexShrink: 0 }}>
+      <path d="M1.75 2A1.75 1.75 0 000 3.75v8.5C0 13.216.784 14 1.75 14h12.5A1.75 1.75 0 0016 12.25v-6.5A1.75 1.75 0 0014.25 4H7.5a.25.25 0 01-.2-.1l-.9-1.2C6.07 2.26 5.55 2 5 2H1.75zM1.5 5.5h13v6.75a.25.25 0 01-.25.25H1.75a.25.25 0 01-.25-.25V5.5z" />
+    </svg>
+  )
+}
+
+export function IconExternalApp({ size = 12 }: { size?: number }): JSX.Element {
+  return (
+    <svg width={size} height={size} viewBox="0 0 16 16" fill="none" stroke="currentColor" strokeWidth="1.35" strokeLinecap="round" strokeLinejoin="round" style={{ display: 'inline-block', verticalAlign: 'middle', flexShrink: 0 }}>
+      <path d="M12.5 9.5v3.25a1.25 1.25 0 01-1.25 1.25H3.25A1.25 1.25 0 012 12.75V4.75A1.25 1.25 0 013.25 3.5H6.5" />
+      <polyline points="10 2 14 2 14 6" />
+      <line x1="6.5" y1="9.5" x2="13.5" y2="2.5" />
+    </svg>
+  )
+}
+
+

package/src/client/index.tsx

@@ -13,6 +13,8 @@ import {
   IconCollapseAll,
   IconCopy,
   IconExpandAll,
+  IconExplorer,
+  IconExternalApp,
   IconFolder,
   IconList,
   IconRefresh,
@@ -582,7 +584,7 @@ function WorkspaceFilesView({
     return () => window.removeEventListener('dsh-workspace-files:config-change', handleCfgChange)
   }, [])
 
-  const loadTree = useCallback(async (quiet = false) => {
+  const loadTree = useCallback(async (quiet = false, forceRefresh = false) => {
     if (!quiet) setLoading(true)
     setError(null)
     try {
@@ -591,6 +593,7 @@ function WorkspaceFilesView({
         cwd,
         showHidden,
         maxDepth: activeConfig.maxDepth,
+        forceRefresh,
       })
       setData(res)
 
@@ -725,6 +728,60 @@ function WorkspaceFilesView({
     })
   }
 
+  // 在文件资源管理器中定位/打开
+  const handleRevealInExplorer = (e: React.MouseEvent, item: FileItem) => {
+    e.stopPropagation()
+    fetch('/dsh-workspace-files/api/files.open', {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({
+        action: 'reveal',
+        path: item.path,
+        isDirectory: Boolean(item.isDirectory),
+        sessionId,
+        cwd,
+      }),
+    })
+      .then(res => res.json())
+      .then(data => {
+        if (data.ok) {
+          showToastMsg(`已在资源管理器中显示: ${item.name}`)
+        } else {
+          showToastMsg(`打开失败: ${data.error?.message || '未知错误'}`)
+        }
+      })
+      .catch(err => {
+        showToastMsg(`请求失败: ${err?.message || String(err)}`)
+      })
+  }
+
+  // 用系统默认应用打开
+  const handleOpenDefaultApp = (e: React.MouseEvent, item: FileItem) => {
+    e.stopPropagation()
+    fetch('/dsh-workspace-files/api/files.open', {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({
+        action: 'openDefault',
+        path: item.path,
+        isDirectory: Boolean(item.isDirectory),
+        sessionId,
+        cwd,
+      }),
+    })
+      .then(res => res.json())
+      .then(data => {
+        if (data.ok) {
+          showToastMsg(`已启动系统应用打开: ${item.name}`)
+        } else {
+          showToastMsg(`打开失败: ${data.error?.message || '未知错误'}`)
+        }
+      })
+      .catch(err => {
+        showToastMsg(`请求失败: ${err?.message || String(err)}`)
+      })
+  }
+
   const [searchViewMode, setSearchViewMode] = useState<'flat' | 'tree'>('flat')
   const [searchExpandedPaths, setSearchExpandedPaths] = useState<Set<string>>(() => new Set())
 
@@ -885,7 +942,7 @@ function WorkspaceFilesView({
           <button
             type="button"
             className="dsh-files-tool-btn"
-            onClick={() => void loadTree(true)}
+            onClick={() => void loadTree(false, true)}
             disabled={loading}
             title="刷新文件树"
           >
@@ -927,7 +984,10 @@ function WorkspaceFilesView({
           /* ── 扁平搜索结果列表 ── */
           <div className="dsh-files-search-container">
             <div className="dsh-files-search-header">
-              <span className="dsh-files-search-count">找到 {flatSearchResults.length} 个匹配项</span>
+              <span className="dsh-files-search-count">
+                找到 {flatSearchResults.length} 个匹配项
+                {flatSearchResults.length > 150 ? '（展示前 150 项）' : ''}
+              </span>
               <button
                 type="button"
                 className="dsh-files-view-toggle-btn"
@@ -939,7 +999,7 @@ function WorkspaceFilesView({
               </button>
             </div>
             <div className="dsh-files-flat-list">
-              {flatSearchResults.map(({ item, parentDir }) => (
+              {flatSearchResults.slice(0, 150).map(({ item, parentDir }) => (
                 <div
                   key={item.path}
                   className={`dsh-files-flat-row ${item.isDirectory ? 'is-directory' : ''}`}
@@ -984,6 +1044,22 @@ function WorkspaceFilesView({
                       <IconAt size={13} />
                       <span className="dsh-files-action-at-text">@引用</span>
                     </button>
+                    <button
+                      type="button"
+                      className="dsh-files-action-btn"
+                      onClick={e => handleRevealInExplorer(e, item)}
+                      title={`在文件资源管理器中显示此${item.isDirectory ? '目录' : '文件'}`}
+                    >
+                      <IconExplorer size={12} />
+                    </button>
+                    <button
+                      type="button"
+                      className="dsh-files-action-btn"
+                      onClick={e => handleOpenDefaultApp(e, item)}
+                      title={`用系统默认应用打开此${item.isDirectory ? '目录' : '文件'}`}
+                    >
+                      <IconExternalApp size={12} />
+                    </button>
                     <button
                       type="button"
                       className="dsh-files-action-btn"
@@ -995,6 +1071,11 @@ function WorkspaceFilesView({
                   </div>
                 </div>
               ))}
+              {flatSearchResults.length > 150 && (
+                <div style={{ padding: '10px 14px', fontSize: 11, textAlign: 'center', color: 'var(--dsw-alias-label-tertiary, #8b93a1)', borderTop: '1px dashed var(--dsw-alias-border-l2, #e5e7eb)' }}>
+                  匹配项较多，已限制展示前 150 项以保证流畅度，请输入更详细关键字
+                </div>
+              )}
             </div>
           </div>
         ) : (
@@ -1037,6 +1118,8 @@ function WorkspaceFilesView({
                 onOpenFile={onOpenFile}
                 onMention={handleMention}
                 onCopyPath={handleCopyPath}
+                onRevealInExplorer={handleRevealInExplorer}
+                onOpenDefaultApp={handleOpenDefaultApp}
               />
             ))}
           </div>
@@ -1065,8 +1148,22 @@ function FileTreeNode(props: {
   onOpenFile: (path: string) => void
   onMention: (e: React.MouseEvent, item: FileItem) => void
   onCopyPath: (e: React.MouseEvent, path: string) => void
+  onRevealInExplorer: (e: React.MouseEvent, item: FileItem) => void
+  onOpenDefaultApp: (e: React.MouseEvent, item: FileItem) => void
 }): JSX.Element {
-  const { item, depth, query, isSearchMode, expandedPaths, onToggleExpand, onOpenFile, onMention, onCopyPath } = props
+  const {
+    item,
+    depth,
+    query,
+    isSearchMode,
+    expandedPaths,
+    onToggleExpand,
+    onOpenFile,
+    onMention,
+    onCopyPath,
+    onRevealInExplorer,
+    onOpenDefaultApp,
+  } = props
   const isExpanded = expandedPaths.has(item.path)
 
   if (item.isDirectory) {
@@ -1098,6 +1195,22 @@ function FileTreeNode(props: {
               <IconAt size={13} />
               <span className="dsh-files-action-at-text">@引用</span>
             </button>
+            <button
+              type="button"
+              className="dsh-files-action-btn"
+              onClick={e => onRevealInExplorer(e, item)}
+              title="在文件资源管理器中打开此目录"
+            >
+              <IconExplorer size={12} />
+            </button>
+            <button
+              type="button"
+              className="dsh-files-action-btn"
+              onClick={e => onOpenDefaultApp(e, item)}
+              title="用系统默认应用打开此目录"
+            >
+              <IconExternalApp size={12} />
+            </button>
             <button
               type="button"
               className="dsh-files-action-btn"
@@ -1122,6 +1235,8 @@ function FileTreeNode(props: {
                 onOpenFile={onOpenFile}
                 onMention={onMention}
                 onCopyPath={onCopyPath}
+                onRevealInExplorer={onRevealInExplorer}
+                onOpenDefaultApp={onOpenDefaultApp}
               />
             ))}
           </div>
@@ -1161,6 +1276,22 @@ function FileTreeNode(props: {
           <IconAt size={13} />
           <span className="dsh-files-action-at-text">@引用</span>
         </button>
+        <button
+          type="button"
+          className="dsh-files-action-btn"
+          onClick={e => onRevealInExplorer(e, item)}
+          title="在文件资源管理器中显示此文件"
+        >
+          <IconExplorer size={12} />
+        </button>
+        <button
+          type="button"
+          className="dsh-files-action-btn"
+          onClick={e => onOpenDefaultApp(e, item)}
+          title="用系统默认应用打开此文件"
+        >
+          <IconExternalApp size={12} />
+        </button>
         <button
           type="button"
           className="dsh-files-action-btn"

package/src/files.ts

@@ -17,16 +17,37 @@ export interface WorkspaceFilesResult {
   totalDirs: number
 }
 
+// 常见大型构建产物、虚拟环境、开发缓存与三方依赖黑名单目录
 const DEFAULT_IGNORED_DIRS = new Set([
   '.git',
   '.svn',
   '.hg',
   'node_modules',
+  '.pnpm-store',
   '.turbo',
   '.next',
+  '.nuxt',
+  '.output',
   'dist',
   'build',
-  '.pnpm-store',
+  'out',
+  '.cache',
+  '.idea',
+  '.vscode',
+  '.husky',
+  'venv',
+  '.venv',
+  'env',
+  '__pycache__',
+  'target',      // Rust / Cargo / Maven
+  '.gradle',
+  '.cargo',
+  'vendor',      // PHP / Go
+  'coverage',
+  'tmp',
+  'temp',
+  'logs',
+  '.dsh',
 ])
 
 function isWithin(parent: string, child: string): boolean {
@@ -34,6 +55,24 @@ function isWithin(parent: string, child: string): boolean {
   return !rel.startsWith('..') && !rel.includes(':')
 }
 
+// 快速解析工作区根目录的 .gitignore，避免深入被 git 忽略的庞大目录
+async function loadGitIgnoreNames(rootDir: string): Promise<Set<string>> {
+  const names = new Set<string>()
+  try {
+    const gitignorePath = join(rootDir, '.gitignore')
+    const content = await fs.readFile(gitignorePath, 'utf8')
+    for (const rawLine of content.split(/\r?\n/)) {
+      const line = rawLine.trim()
+      if (!line || line.startsWith('#') || line.startsWith('!')) continue
+      const clean = line.replace(/^\/+/, '').replace(/\/+$/, '')
+      if (clean && !clean.includes('*') && !clean.includes('?') && !clean.includes('/')) {
+        names.add(clean)
+      }
+    }
+  } catch {}
+  return names
+}
+
 export async function scanWorkspaceTree(
   cwd: string,
   options: { maxDepth?: number; showHidden?: boolean; showIgnored?: boolean } = {},
@@ -43,11 +82,15 @@ export async function scanWorkspaceTree(
   const showHidden = options.showHidden ?? false
   const showIgnored = options.showIgnored ?? false
 
+  const gitIgnoredNames = showIgnored ? new Set<string>() : await loadGitIgnoreNames(root)
+
   let totalFiles = 0
   let totalDirs = 0
+  let totalNodes = 0
+  const MAX_NODES_SAFETY_LIMIT = 30000 // 防爆保护阈值
 
   async function walk(dirPath: string, currentDepth: number): Promise<FileItem[]> {
-    if (currentDepth > maxDepth) return []
+    if (currentDepth > maxDepth || totalNodes >= MAX_NODES_SAFETY_LIMIT) return []
 
     let dirents: import('node:fs').Dirent[]
     try {
@@ -56,26 +99,23 @@ export async function scanWorkspaceTree(
       return []
     }
 
-    // Sort: directories first, then files alphabetically
-    dirents.sort((a, b) => {
-      if (a.isDirectory() && !b.isDirectory()) return -1
-      if (!a.isDirectory() && b.isDirectory()) return 1
-      return a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'base' })
-    })
-
-    const items: FileItem[] = []
+    const dirTasks: Array<Promise<FileItem | null>> = []
+    const fileItems: FileItem[] = []
 
     for (const ent of dirents) {
+      if (totalNodes >= MAX_NODES_SAFETY_LIMIT) break
+
       const name = ent.name
 
-      // Hidden file filter (starts with .)
+      // 隐藏文件/文件夹过滤（以 . 开头）
       if (!showHidden && name.startsWith('.') && name !== '.gitignore' && name !== '.env') {
         if (!showIgnored) continue
       }
 
-      // Ignored directory filter
-      if (!showIgnored && ent.isDirectory() && DEFAULT_IGNORED_DIRS.has(name)) {
-        continue
+      // 忽略目录及 .gitignore 规则过滤
+      if (!showIgnored) {
+        if (ent.isDirectory() && DEFAULT_IGNORED_DIRS.has(name)) continue
+        if (gitIgnoredNames.has(name)) continue
       }
 
       const fullPath = join(dirPath, name)
@@ -85,34 +125,35 @@ export async function scanWorkspaceTree(
 
       if (ent.isDirectory()) {
         totalDirs += 1
-        const children = await walk(fullPath, currentDepth + 1)
-        items.push({
-          name,
-          path: relPath,
-          isDirectory: true,
-          children,
-        })
+        totalNodes += 1
+        dirTasks.push(
+          walk(fullPath, currentDepth + 1).then(children => ({
+            name,
+            path: relPath,
+            isDirectory: true,
+            children,
+          })),
+        )
       } else {
         totalFiles += 1
-        let size: number | undefined
-        let mtime: number | undefined
-        try {
-          const st = await fs.stat(fullPath)
-          size = st.size
-          mtime = st.mtimeMs
-        } catch {}
-
-        items.push({
+        totalNodes += 1
+        fileItems.push({
           name,
           path: relPath,
           isDirectory: false,
-          size,
-          mtime,
         })
       }
     }
 
-    return items
+    // 并行处理子目录
+    const dirResults = await Promise.all(dirTasks)
+    const validDirs = dirResults.filter((d): d is FileItem => d !== null)
+
+    // 目录优先，按自然字母排序
+    validDirs.sort((a, b) => a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'base' }))
+    fileItems.sort((a, b) => a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'base' }))
+
+    return [...validDirs, ...fileItems]
   }
 
   const items = await walk(root, 1)