From aa70afbd7e7c6f44fe8ecaa6063407062984cf5c Mon Sep 17 00:00:00 2001
From: Harivansh Rathi <rathiharivansh@gmail.com>
Date: Sun, 8 Mar 2026 20:14:24 -0700
Subject: [PATCH] align skills to pi native

---
 .../coding-agent/src/core/package-manager.ts  | 48 -------------------
 .../coding-agent/test/package-manager.test.ts | 32 -------------
 2 files changed, 80 deletions(-)

diff --git a/packages/coding-agent/src/core/package-manager.ts b/packages/coding-agent/src/core/package-manager.ts
index 26410de..e8c9f45 100644
--- a/packages/coding-agent/src/core/package-manager.ts
+++ b/packages/coding-agent/src/core/package-manager.ts
@@ -368,47 +368,6 @@ function collectAncestorAgentsSkillDirs(startDir: string): string[] {
   return skillDirs;
 }
 
-function collectCompanionWorkspaceSkillDirs(
-  startDir: string,
-  agentDir: string,
-): string[] {
-  const skillDirs: string[] = [];
-  const seen = new Set<string>();
-  const configDir = dirname(resolve(agentDir));
-  const defaultWorkspaceDir = join(configDir, "workspace");
-
-  const addDir = (dir: string): void => {
-    const skillDir = join(resolve(dir), ".agents", "skills");
-    if (seen.has(skillDir)) {
-      return;
-    }
-    skillDirs.push(skillDir);
-    seen.add(skillDir);
-  };
-
-  if (existsSync(defaultWorkspaceDir)) {
-    addDir(defaultWorkspaceDir);
-  }
-
-  let dir = resolve(startDir);
-  while (true) {
-    if (dirname(dir) === configDir) {
-      const dirName = basename(dir);
-      if (dirName === "workspace" || dirName.startsWith("workspace-")) {
-        addDir(dir);
-      }
-    }
-
-    const parent = dirname(dir);
-    if (parent === dir) {
-      break;
-    }
-    dir = parent;
-  }
-
-  return skillDirs;
-}
-
 function collectAutoPromptEntries(dir: string): string[] {
   const entries: string[] = [];
   if (!existsSync(dir)) return entries;
@@ -1938,10 +1897,6 @@ export class DefaultPackageManager implements PackageManager {
     };
     const userAgentsSkillsDir = join(homedir(), ".agents", "skills");
     const projectAgentsSkillDirs = collectAncestorAgentsSkillDirs(this.cwd);
-    const companionWorkspaceSkillDirs = collectCompanionWorkspaceSkillDirs(
-      this.cwd,
-      this.agentDir,
-    );
 
     const addResources = (
       resourceType: ResourceType,
@@ -1968,9 +1923,6 @@ export class DefaultPackageManager implements PackageManager {
       "skills",
       [
         ...collectAutoSkillEntries(projectDirs.skills),
-        ...companionWorkspaceSkillDirs.flatMap((dir) =>
-          collectAutoSkillEntries(dir),
-        ),
         ...projectAgentsSkillDirs.flatMap((dir) =>
           collectAutoSkillEntries(dir),
         ),
diff --git a/packages/coding-agent/test/package-manager.test.ts b/packages/coding-agent/test/package-manager.test.ts
index 5c84157..c3e10d7 100644
--- a/packages/coding-agent/test/package-manager.test.ts
+++ b/packages/coding-agent/test/package-manager.test.ts
@@ -322,38 +322,6 @@ Content`,
         result.skills.some((r) => r.path === middleSkill && r.enabled),
       ).toBe(true);
     });
-
-    it("should include default workspace skills when cwd is outside the workspace root", async () => {
-      const workspaceSkill = join(
-        tempDir,
-        "workspace",
-        ".agents",
-        "skills",
-        "build-app",
-        "SKILL.md",
-      );
-      mkdirSync(join(tempDir, "workspace", ".agents", "skills", "build-app"), {
-        recursive: true,
-      });
-      writeFileSync(
-        workspaceSkill,
-        "---\nname: build-app\ndescription: Build apps\n---\n",
-      );
-
-      const appCwd = join(tempDir, "apps", "portfolio");
-      mkdirSync(appCwd, { recursive: true });
-
-      const pm = new DefaultPackageManager({
-        cwd: appCwd,
-        agentDir,
-        settingsManager,
-      });
-
-      const result = await pm.resolve();
-      expect(
-        result.skills.some((r) => r.path === workspaceSkill && r.enabled),
-      ).toBe(true);
-    });
   });
 
   describe("ignore files", () => {