revert(pi): reset carried vendored source deltas

third_party/pi/packages/coding-agent/src/core/package-manager.ts

@@ -459,14 +459,14 @@ function findGitRepoRoot(startDir: string): string | null {
 	}
 }
 
-function collectAncestorConfigDirs(startDir: string, configDirName: string): string[] {
+function collectAncestorAgentsSkillDirs(startDir: string): string[] {
-	const configDirs: string[] = [];
+	const skillDirs: string[] = [];
 	const resolvedStartDir = resolve(startDir);
 	const gitRepoRoot = findGitRepoRoot(resolvedStartDir);
 
 	let dir = resolvedStartDir;
 	while (true) {
-		configDirs.push(join(dir, configDirName));
+		skillDirs.push(join(dir, ".agents", "skills"));
 		if (gitRepoRoot && dir === gitRepoRoot) {
 			break;
 		}
@@ -477,7 +477,7 @@ function collectAncestorConfigDirs(startDir: string, configDirName: string): str
 		dir = parent;
 	}
 
-	return configDirs;
+	return skillDirs;
 }
 
 function collectAutoPromptEntries(dir: string): string[] {
@@ -2388,13 +2388,16 @@ export class DefaultPackageManager implements PackageManager {
 			prompts: join(globalBaseDir, "prompts"),
 			themes: join(globalBaseDir, "themes"),
 		};
+		const projectDirs = {
+			extensions: join(projectBaseDir, "extensions"),
+			skills: join(projectBaseDir, "skills"),
+			prompts: join(projectBaseDir, "prompts"),
+			themes: join(projectBaseDir, "themes"),
+		};
 		const userAgentsSkillsDir = join(getHomeDir(), ".agents", "skills");
 		const projectTrusted = this.settingsManager.isProjectTrusted();
-		const projectConfigDirs = projectTrusted
+		const projectAgentsSkillDirs = projectTrusted
-			? collectAncestorConfigDirs(this.cwd, CONFIG_DIR_NAME).filter((dir) => resolve(dir) !== resolve(globalBaseDir))
+			? collectAncestorAgentsSkillDirs(this.cwd).filter((dir) => resolve(dir) !== resolve(userAgentsSkillsDir))
-			: [];
-		const projectAgentsDirs = projectTrusted
-			? collectAncestorConfigDirs(this.cwd, ".agents").filter((dir) => resolve(dir) !== resolve(dirname(userAgentsSkillsDir)))
 			: [];
 
 		const addResources = (
@@ -2411,54 +2414,56 @@ export class DefaultPackageManager implements PackageManager {
 			}
 		};
 
-		// Project resources from .pi/ in cwd and ancestors.
+		if (projectTrusted) {
-		for (const configDir of projectConfigDirs) {
+			// Project extensions from .pi/
-			const configMetadata: PathMetadata = {
-				...projectMetadata,
-				baseDir: configDir,
-			};
 			addResources(
 				"extensions",
-				collectAutoExtensionEntries(join(configDir, "extensions")),
+				collectAutoExtensionEntries(projectDirs.extensions),
-				configMetadata,
+				projectMetadata,
 				projectOverrides.extensions,
-				configDir,
+				projectBaseDir,
 			);
+
+			// Project skills from .pi/
 			addResources(
 				"skills",
-				collectAutoSkillEntries(join(configDir, "skills"), "pi"),
+				collectAutoSkillEntries(projectDirs.skills, "pi"),
-				configMetadata,
+				projectMetadata,
 				projectOverrides.skills,
-				configDir,
+				projectBaseDir,
-			);
-			addResources(
-				"prompts",
-				collectAutoPromptEntries(join(configDir, "prompts")),
-				configMetadata,
-				projectOverrides.prompts,
-				configDir,
-			);
-			addResources(
-				"themes",
-				collectAutoThemeEntries(join(configDir, "themes")),
-				configMetadata,
-				projectOverrides.themes,
-				configDir,
 			);
 		}
 
-		// Project skills from .agents/ in cwd and ancestors.
+		// Project skills from .agents/ (each with its own baseDir)
-		for (const agentsDir of projectAgentsDirs) {
+		for (const agentsSkillsDir of projectAgentsSkillDirs) {
+			const agentsBaseDir = dirname(agentsSkillsDir); // the .agents directory
 			const agentsMetadata: PathMetadata = {
 				...projectMetadata,
-				baseDir: agentsDir,
+				baseDir: agentsBaseDir,
 			};
 			addResources(
 				"skills",
-				collectAutoSkillEntries(join(agentsDir, "skills"), "agents"),
+				collectAutoSkillEntries(agentsSkillsDir, "agents"),
 				agentsMetadata,
 				projectOverrides.skills,
-				agentsDir,
+				agentsBaseDir,
+			);
+		}
+
+		if (projectTrusted) {
+			addResources(
+				"prompts",
+				collectAutoPromptEntries(projectDirs.prompts),
+				projectMetadata,
+				projectOverrides.prompts,
+				projectBaseDir,
+			);
+			addResources(
+				"themes",
+				collectAutoThemeEntries(projectDirs.themes),
+				projectMetadata,
+				projectOverrides.themes,
+				projectBaseDir,
 			);
 		}
 

third_party/pi/packages/coding-agent/src/utils/tools-manager.ts

@@ -72,8 +72,8 @@ const TOOLS: Record<string, ToolConfig> = {
 function commandExists(cmd: string): boolean {
 	try {
 		const result = spawnSync(cmd, ["--version"], { stdio: "pipe" });
-		// Downloaded generic Linux binaries can exist but fail on NixOS before they print a version.
+		// Check for ENOENT error (command not found)
-		return (result.error === undefined || result.error === null) && result.status === 0;
+		return result.error === undefined || result.error === null;
 	} catch {
 		return false;
 	}
@@ -86,7 +86,7 @@ export function getToolPath(tool: "fd" | "rg"): string | null {
 
 	// Check our tools directory first
 	const localPath = join(TOOLS_DIR, config.binaryName + (platform() === "win32" ? ".exe" : ""));
-	if (existsSync(localPath) && commandExists(localPath)) {
+	if (existsSync(localPath)) {
 		return localPath;
 	}