Skip to content

fix(core-tools): resolve defensive path resolution for at-reference files and fix macOS tests #28053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavidAPierce merged 4 commits into from
Jun 30, 2026
Merged

fix(core-tools): resolve defensive path resolution for at-reference files and fix macOS tests #28053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8f5a27
fix(core-tools): resolve defensive path resolution for at-reference f…
luisfelipe-alt Jun 19, 2026
f9dd9a4
Merge branch 'main' into bugfix/WT-engineer_495551283_full
luisfelipe-alt Jun 25, 2026
da94571
Merge branch 'main' into bugfix/WT-engineer_495551283_full
DavidAPierce Jun 26, 2026
021415f
Merge branch 'main' into bugfix/WT-engineer_495551283_full
luisfelipe-alt Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions packages/cli/src/ui/hooks/atCommandProcessor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ describe('handleAtCommand', () => {
vi.restoreAllMocks();
vi.resetAllMocks();

testRootDir = await fsPromises.mkdtemp(
path.join(os.tmpdir(), 'folder-structure-test-'),
testRootDir = await fsPromises.realpath(
await fsPromises.mkdtemp(
path.join(os.tmpdir(), 'folder-structure-test-'),
),
);

abortController = new AbortController();
Expand Down Expand Up @@ -1467,8 +1469,8 @@ describe('handleAtCommand', () => {
});

it('should resolve files in multiple workspace directories', async () => {
const secondRootDir = await fsPromises.mkdtemp(
path.join(os.tmpdir(), 'second-root-'),
const secondRootDir = await fsPromises.realpath(
await fsPromises.mkdtemp(path.join(os.tmpdir(), 'second-root-')),
);
try {
const fileContent = 'Second root content';
Expand Down Expand Up @@ -1649,8 +1651,10 @@ describe('checkPermissions', () => {

beforeEach(async () => {
vi.restoreAllMocks();
testRootDir = await fsPromises.mkdtemp(
path.join(os.tmpdir(), 'check-permissions-test-'),
testRootDir = await fsPromises.realpath(
await fsPromises.mkdtemp(
path.join(os.tmpdir(), 'check-permissions-test-'),
),
);

mockConfig = {
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/ui/hooks/atCommandProcessor_agents.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ describe('handleAtCommand with Agents', () => {
beforeEach(async () => {
vi.resetAllMocks();

testRootDir = await fsPromises.mkdtemp(
path.join(os.tmpdir(), 'agent-test-'),
testRootDir = await fsPromises.realpath(
await fsPromises.mkdtemp(path.join(os.tmpdir(), 'agent-test-')),
);

abortController = new AbortController();
Expand Down
13 changes: 12 additions & 1 deletion packages/core/src/test-utils/mockWorkspaceContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

import * as fs from 'node:fs';
import { vi } from 'vitest';
import type { WorkspaceContext } from '../utils/workspaceContext.js';

Expand All @@ -17,7 +18,17 @@ export function createMockWorkspaceContext(
rootDir: string,
additionalDirs: string[] = [],
): WorkspaceContext {
const allDirs = [rootDir, ...additionalDirs];
const resolveToRealPathSafe = (p: string) => {
try {
return fs.realpathSync(p);
} catch {
return p;
}
};

const resolvedRootDir = resolveToRealPathSafe(rootDir);
const resolvedAdditionalDirs = additionalDirs.map(resolveToRealPathSafe);
const allDirs = [resolvedRootDir, ...resolvedAdditionalDirs];

const mockWorkspaceContext = {
addDirectory: vi.fn(),
Expand Down
Loading
Loading