dsh-explorer 0.1.0 → 0.1.1

package/src/git-status.ts

@@ -52,7 +52,6 @@ function parsePorcelainLines(stdout: string, prefix = ''): { branch?: string; en
     if (p.startsWith('"') && p.endsWith('"')) {
       p = p.slice(1, -1)
     }
-    // Handle renamed files: "R  old -> new"
     if (xy.startsWith('R') || xy.endsWith('R')) {
       const arrowIdx = p.indexOf(' -> ')
       if (arrowIdx !== -1) {
@@ -62,8 +61,9 @@ function parsePorcelainLines(stdout: string, prefix = ''): { branch?: string; en
         }
       }
     }
-    const cleanPath = p.replace(/\\/g, '/')
-    const finalPath = prefix ? `${prefix.replace(/\\/g, '/').replace(/\/+$/, '')}/${cleanPath}` : cleanPath
+    const cleanPath = p.replace(/\\/g, '/').replace(/^\.\//, '')
+    const cleanPrefix = prefix ? prefix.replace(/\\/g, '/').replace(/\/+$/, '').replace(/^\.\//, '') : ''
+    const finalPath = cleanPrefix ? `${cleanPrefix}/${cleanPath}` : cleanPath
     entries.push({ path: finalPath, xy })
   }
 
@@ -87,7 +87,6 @@ function findSubRepos(root: string, depth = 1, maxDepth = 3): string[] {
       }
     }
   } catch {
-    // Ignore read errors
   }
   return repos
 }
@@ -99,13 +98,23 @@ export async function getGitStatus(cwd: string): Promise<GitStatusResult> {
     return cached.data
   }
 
-  // 1. Try running git directly in cwd
   try {
-    const { stdout } = await execFileAsync(
-      'git',
-      ['status', '--porcelain', '-b', '-unormal', '--ignored=matching'],
-      { cwd, maxBuffer: 10 * 1024 * 1024, timeout: 3500 }
-    )
+    let stdout = ''
+    try {
+      const res = await execFileAsync(
+        'git',
+        ['status', '--porcelain', '-b', '-unormal', '--ignored=matching'],
+        { cwd, maxBuffer: 10 * 1024 * 1024, timeout: 3500 }
+      )
+      stdout = res.stdout
+    } catch {
+      const res = await execFileAsync(
+        'git',
+        ['status', '--porcelain', '-b', '-unormal'],
+        { cwd, maxBuffer: 10 * 1024 * 1024, timeout: 3500 }
+      )
+      stdout = res.stdout
+    }
 
     const parsed = parsePorcelainLines(stdout)
     const data: GitStatusResult = {
@@ -116,10 +125,8 @@ export async function getGitStatus(cwd: string): Promise<GitStatusResult> {
     gitCache.set(cwd, { at: now, data })
     return data
   } catch {
-    // cwd is not a git repo or direct command failed. Check for nested/sub repositories.
   }
 
-  // 2. Discover sub-repositories within cwd (for workspaces containing multiple repos)
   try {
     const subRepos = findSubRepos(cwd)
     if (subRepos.length > 0) {
@@ -152,7 +159,6 @@ export async function getGitStatus(cwd: string): Promise<GitStatusResult> {
       return data
     }
   } catch {
-    // Ignore
   }
 
   const fallback: GitStatusResult = { isRepo: false, entries: [] }

package/src/index.ts

@@ -3,6 +3,7 @@ import type { Duplex } from 'node:stream'
 import { Config, type ExplorerConfig } from './config.ts'
 import { createFsWatcherServer } from './fs-watch.ts'
 import { listDirectory, listDirectoryBatch } from './fs-tree.ts'
+import { searchDirectory } from './fs-search.ts'
 import { createDirectory, createNewFile, readFileText, removeEntry, renameEntry, writeUpload } from './fs-operations.ts'
 import { getGitStatus } from './git-status.ts'
 import { resolveTarget } from './path-security.ts'
@@ -102,6 +103,17 @@ export function apply(ctx: Context, config?: ExplorerConfig): void {
             return true
           }
 
+          if (pathname === '/dsh-explorer/api/search') {
+            const sessionId = url.searchParams.get('sessionId') ?? undefined
+            const cwd = resolveSessionCwd(ctx, sessionId)
+            const dirParam = url.searchParams.get('dir')
+            const q = url.searchParams.get('q') ?? ''
+            const targetDir = resolveTarget(cwd, dirParam ?? cwd)
+            const result = await searchDirectory(targetDir, q)
+            writeOk(res, { result })
+            return true
+          }
+
           if (pathname === '/dsh-explorer/api/read-file') {
             const pathParam = url.searchParams.get('path')
             if (!pathParam) {