✨ feat: enhance search command with improved messaging for workspace root and dependencies, and refine relative path calculation for packages

Author: lennondotw

CHANGELOG.md

@@ -16,6 +16,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/), and this
 
 - Refactored workspace dependencies architecture for better code reusability
 
+### Fixed
+
+- Fixed workspace root path calculation to ensure proper relative paths for search functionality
+
 ## [0.2.1] - 2025-07-23
 
 ### Added

src/commands.ts

@@ -310,10 +310,6 @@ export function registerCommands(context: vscode.ExtensionContext) {
 
         // Get all paths (package + dependencies)
         const allPaths = await getPackageAndDependencyPaths(selected.package.name);
-        if (allPaths.length === 0) {
-          vscode.window.showInformationMessage(`No paths found for package "${selected.package.name}".`);
-          return;
-        }
 
         // Format paths for search (comma-space separated)
         const searchPaths = allPaths.join(', ');
@@ -325,9 +321,19 @@ export function registerCommands(context: vscode.ExtensionContext) {
           triggerSearch: false, // Don't auto-search, let user enter search term
         });
 
-        vscode.window.showInformationMessage(
-          `Opened search in ${allPaths.length} locations: ${selected.package.name} and its ${allPaths.length - 1} dependencies.`
-        );
+        // Show appropriate message based on whether workspace root is included
+        let message: string;
+        if (selected.package.isRoot && allPaths.length === 0) {
+          message = `Opened search in workspace root (${selected.package.name}) - no workspace dependencies found.`;
+        } else if (selected.package.isRoot) {
+          message = `Opened search in workspace root (${selected.package.name}) and its ${allPaths.length} dependencies.`;
+        } else {
+          const totalLocations = allPaths.length;
+          const dependencyCount = allPaths.length - 1;
+          message = `Opened search in ${totalLocations} locations: ${selected.package.name} and its ${dependencyCount} dependencies.`;
+        }
+
+        vscode.window.showInformationMessage(message);
       } catch (error) {
         logError('Failed to search in package and workspace dependencies', error);
         vscode.window.showErrorMessage('Failed to search in package and workspace dependencies');

src/package-scanner.ts

@@ -82,7 +82,27 @@ export async function loadPackageInfo(packageJsonUri: vscode.Uri): Promise<{ nam
 
     const packageDir = Utils.dirname(packageJsonUri);
     const workspaceFolder = vscode.workspace.getWorkspaceFolder(packageDir);
-    const relativePath = workspaceFolder ? vscode.workspace.asRelativePath(packageDir, false) : packageDir.path;
+
+    let relativePath: string;
+    if (workspaceFolder) {
+      // Use asRelativePath and ensure it's actually relative
+      const vsCodeRelativePath = vscode.workspace.asRelativePath(packageDir, false);
+      // If asRelativePath returns an absolute path (starts with / or drive letter), compute manually
+      if (vsCodeRelativePath.startsWith('/') || (vsCodeRelativePath.length > 1 && vsCodeRelativePath[1] === ':')) {
+        // Manually compute relative path from workspace folder to package directory
+        const workspacePath = workspaceFolder.uri.fsPath;
+        const packagePath = packageDir.fsPath;
+        if (packagePath.startsWith(workspacePath)) {
+          relativePath = packagePath.substring(workspacePath.length + 1).replace(/\\/g, '/');
+        } else {
+          relativePath = vsCodeRelativePath;
+        }
+      } else {
+        relativePath = vsCodeRelativePath;
+      }
+    } else {
+      relativePath = packageDir.path;
+    }
 
     log(`Package validation successful: ${validatedPackage.name} at ${relativePath}`);
     return {

src/pnpm-workspace.ts

@@ -46,9 +46,22 @@ export async function scanWorkspacePackages(): Promise<WorkspacePackage[]> {
       const rootInfo = await loadPackageInfo(rootPackageJson);
       if (rootInfo) {
         log(`Found workspace root package: ${rootInfo.name}`);
+
+        // For workspace root, determine the correct relative path
+        const workspaceFolder = vscode.workspace.getWorkspaceFolder(workspaceRoot);
+        let rootPath: string;
+        if (workspaceFolder && workspaceFolder.uri.toString() === workspaceRoot.toString()) {
+          // If this workspace root is the same as VS Code's workspace folder root, use "."
+          rootPath = '.';
+        } else {
+          // Otherwise, use the relative path from the current workspace folder
+          rootPath = workspaceFolder ? vscode.workspace.asRelativePath(workspaceRoot, false) : rootInfo.path;
+        }
+
+        log(`Workspace root path determined as: "${rootPath}"`);
         packages.push({
           name: rootInfo.name,
-          path: rootInfo.path,
+          path: rootPath,
           uri: workspaceRoot,
           isRoot: true,
         });
@@ -168,9 +181,13 @@ export async function getPackageAndDependencyPaths(packageName: string): Promise
 
   const allPaths: string[] = [];
 
-  // Add the target package path first
-  allPaths.push(targetPackage.path);
-  log(`Added target package path: ${targetPackage.path}`);
+  // Add the target package path first, but skip if it's the workspace root (current directory)
+  if (targetPackage.path && targetPackage.path !== '.') {
+    allPaths.push(targetPackage.path);
+    log(`Added target package path: ${targetPackage.path}`);
+  } else {
+    log(`Skipping target package path (workspace root): ${targetPackage.path}`);
+  }
 
   // Get workspace dependency paths
   const dependencyPaths = await getWorkspaceDependencyPathsFromPackage(packageName, packages);