fix: handling desktop non-matching cwd scenarios for projectPath

Author: mshanemc

src/client/deployMessages.ts

@@ -117,8 +117,10 @@ export const createResponses =
         ...response,
         filePath:
           // deployResults will produce filePaths relative to cwd, which might not be set in all environments
-          // if our CS had a projectDir set, we'll make the results relative to that path
-          projectPath && process.cwd() === projectPath ? response.filePath : join(projectPath ?? '', response.filePath),
+          // if our CS had a projectDir set, we'll make the results relative to that path unless it already is
+          projectPath && process.cwd() !== projectPath && !response.filePath.startsWith(projectPath)
+            ? join(projectPath, response.filePath)
+            : response.filePath,
       })) satisfies FileResponseSuccess[];
     });
 

src/resolve/treeContainers.ts

@@ -63,7 +63,7 @@ export abstract class TreeContainer {
 
   /** if the container has cwd set, apply it to the path */
   protected getUpdatedFsPath(fsPath: SourcePath): string {
-    return this.cwd ? join(this.cwd, fsPath) : fsPath;
+    return this.cwd && !fsPath.startsWith(this.cwd) ? join(this.cwd, fsPath) : fsPath;
   }
 
   /**

test/resolve/treeContainers.test.ts

@@ -141,6 +141,34 @@ describe('Tree Containers', () => {
       env.stub(fs, 'existsSync').returns(true);
       expect(tree.stream(path)).to.deep.equal(readable);
     });
+
+    describe('with projectPath/cwd', () => {
+      let projectPath: string;
+      // mocking fs will defeat the goal of these tests, so we'll use the real one and clean it up
+      before(async () => {
+        projectPath = join('path', 'to', 'project');
+        await fs.promises.mkdir(projectPath, { recursive: true });
+        await fs.promises.writeFile(join(projectPath, 'test.txt'), 'test');
+      });
+
+      after(async () => {
+        await fs.promises.rm(projectPath, { recursive: true });
+      });
+
+      it('should return the path as is if it is already relative to the project path', () => {
+        const tree = new NodeFSTreeContainer(projectPath);
+        const path = join(projectPath, 'test.txt');
+        expect(tree.exists(path)).to.be.true;
+        expect(tree.readDirectory(projectPath)).to.deep.equal(['test.txt']);
+      });
+
+      it('should add the project path to the path if it is not already relative to the project path', () => {
+        const tree = new NodeFSTreeContainer(projectPath);
+        const path = 'test.txt';
+        expect(tree.exists(path)).to.be.true;
+        expect(tree.readDirectory(projectPath)).to.deep.equal(['test.txt']);
+      });
+    });
   });
 
   describe('ZipTreeContainer', () => {