Skip to content

The open-source app everyone uses to manage agents at work

fix(adapter-utils): repair referenced-source ignore resolution type break and symlink descendant check (#12201)

Devin Foleya5c2add7be16
diff --git a/packages/adapter-utils/src/sandbox-managed-runtime.test.ts b/packages/adapter-utils/src/sandbox-managed-runtime.test.ts
index 9eb425002d..a889f6b34f 100644
--- a/packages/adapter-utils/src/sandbox-managed-runtime.test.ts
+++ b/packages/adapter-utils/src/sandbox-managed-runtime.test.ts
@@ -2281,7 +2281,7 @@ describe("sandbox managed runtime", () => {
adapterKey: "test-adapter",
client,
workspaceLocalDir: localWorkspaceDir,
- additionalSources: [{ localPath: referencedDir, projectId: "proj-first" }],
+ additionalSources: [{ localPath: referencedDir, projectId: "proj-first", ignoreResolution: { kind: "other" } }],
onProgress: (line) => { lines.push(line); },
});
diff --git a/packages/adapter-utils/src/sandbox-managed-runtime.ts b/packages/adapter-utils/src/sandbox-managed-runtime.ts
index c409533af0..bd5d5c5e71 100644
--- a/packages/adapter-utils/src/sandbox-managed-runtime.ts
+++ b/packages/adapter-utils/src/sandbox-managed-runtime.ts
@@ -212,6 +212,23 @@ export function referencedSourceIgnoreExcludeEntries(resolution: ReferencedSourc
* are otherwise not comparable. The caller treats `null` as a resolution
* failure (fail closed), never as "nothing to exclude".
*/
+/**
+ * Physical (symlink-resolved) form of a path, falling back to the plain
+ * resolved form when realpath fails (e.g. the path vanished mid-run — the
+ * downstream descendant check then fails closed on the string form).
+ * Git prints physical toplevels, so both sides of the descendant comparison
+ * must be physical too; comparing a logical path against a physical one makes
+ * any symlinked project or temp directory (macOS `/var` → `/private/var`)
+ * fail resolution spuriously.
+ */
+async function physicalPath(input: string): Promise<string> {
+ try {
+ return await fs.realpath(input);
+ } catch {
+ return path.resolve(input);
+ }
+}
+
function relativizeUnderGitToplevel(input: { toplevel: string; localPath: string }): string | null {
const toplevel = path.resolve(input.toplevel);
const localPath = path.resolve(input.localPath);
@@ -263,7 +280,10 @@ export async function resolveReferencedSourceIgnore(localPath: string): Promise<
if (!scan) {
return { kind: "other" };
}
- const offset = relativizeUnderGitToplevel({ toplevel: scan.toplevel, localPath });
+ const offset = relativizeUnderGitToplevel({
+ toplevel: await physicalPath(scan.toplevel),
+ localPath: await physicalPath(localPath),
+ });
if (offset === null) {
return {
kind: "failed",