@synapsync/synk 1.0.0 → 1.1.0

package/dist/cli.mjs

@@ -15,7 +15,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { basename, dirname, isAbsolute, join, normalize, relative, resolve, sep } from "path";
 import { fileURLToPath } from "url";
 import { homedir, platform, tmpdir } from "os";
-import { access, cp, lstat, mkdir, mkdtemp, readFile, readdir, readlink, rm, stat, symlink, writeFile } from "fs/promises";
+import { access, cp, lstat, mkdir, mkdtemp, readFile, readdir, readlink, rename, rm, stat, symlink, writeFile } from "fs/promises";
 import "crypto";
 import { execSync, spawnSync } from "child_process";
 import * as readline from "readline";
@@ -110,6 +110,17 @@ const logger = {
 		console.log(`  ${message}`);
 	}
 };
+const COGNITIVE_SUBDIRS = {
+	skill: "skills",
+	agent: "agents",
+	prompt: "prompts"
+};
+const COGNITIVE_FILE_NAMES = {
+	skill: "SKILL.md",
+	agent: "AGENT.md",
+	prompt: "PROMPT.md"
+};
+const AGENTS_DIR$1 = ".agents";
 function getOwnerRepo(parsed) {
 	if (parsed.type === "local") return null;
 	if (!parsed.url.startsWith("http://") && !parsed.url.startsWith("https://")) return null;
@@ -140,9 +151,14 @@ async function isRepoPrivate(owner, repo) {
 function isLocalPath(input) {
 	return isAbsolute(input) || input.startsWith("./") || input.startsWith("../") || input === "." || input === ".." || /^[a-zA-Z]:[/\\]/.test(input);
 }
-function isDirectSkillUrl(input) {
+const cognitiveFileNamesLower = new Set(Object.values(COGNITIVE_FILE_NAMES).map((n) => n.toLowerCase()));
+function endsWithCognitiveFile(input) {
+	const lower = input.toLowerCase();
+	return [...cognitiveFileNamesLower].some((f) => lower.endsWith("/" + f));
+}
+function isDirectCognitiveUrl(input) {
 	if (!input.startsWith("http://") && !input.startsWith("https://")) return false;
-	if (!input.toLowerCase().endsWith("/skill.md")) return false;
+	if (!endsWithCognitiveFile(input)) return false;
 	if (input.includes("github.com/") && !input.includes("raw.githubusercontent.com")) {
 		if (!input.includes("/blob/") && !input.includes("/raw/")) return false;
 	}
@@ -158,7 +174,7 @@ function parseSource(input) {
 			localPath: resolvedPath
 		};
 	}
-	if (isDirectSkillUrl(input)) return {
+	if (isDirectCognitiveUrl(input)) return {
 		type: "direct-url",
 		url: input
 	};
@@ -253,7 +269,7 @@ function isWellKnownUrl(input) {
 			"huggingface.co",
 			"raw.githubusercontent.com"
 		].includes(parsed.hostname)) return false;
-		if (input.toLowerCase().endsWith("/skill.md")) return false;
+		if (endsWithCognitiveFile(input)) return false;
 		if (input.endsWith(".git")) return false;
 		return true;
 	} catch {
@@ -265,41 +281,86 @@ const configHome = xdgConfig ?? join(home, ".config");
 const codexHome = process.env.CODEX_HOME?.trim() || join(home, ".codex");
 const claudeHome = process.env.CLAUDE_CONFIG_DIR?.trim() || join(home, ".claude");
 const agents = {
-	amp: {
+	"adal": {
+		name: "adal",
+		displayName: "AdaL",
+		dirs: {
+			skill: {
+				local: ".adal/skills",
+				global: join(join(home, ".adal"), "skills")
+			},
+			agent: {
+				local: ".adal/agents",
+				global: join(join(home, ".adal"), "agents")
+			},
+			prompt: {
+				local: ".adal/prompts",
+				global: join(join(home, ".adal"), "prompts")
+			}
+		},
+		detectInstalled: async () => {
+			return existsSync(join(home, ".adal"));
+		}
+	},
+	"amp": {
 		name: "amp",
 		displayName: "Amp",
-		skillsDir: ".agents/skills",
-		globalSkillsDir: join(configHome, "agents/skills"),
-		agentsDir: ".agents/agents",
-		globalAgentsDir: join(configHome, "agents/agents"),
-		promptsDir: ".agents/prompts",
-		globalPromptsDir: join(configHome, "agents/prompts"),
+		dirs: {
+			skill: {
+				local: ".agents/skills",
+				global: join(join(configHome, "agents"), "skills")
+			},
+			agent: {
+				local: ".agents/agents",
+				global: join(join(configHome, "agents"), "agents")
+			},
+			prompt: {
+				local: ".agents/prompts",
+				global: join(join(configHome, "agents"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(configHome, "amp"));
 		}
 	},
-	antigravity: {
+	"antigravity": {
 		name: "antigravity",
 		displayName: "Antigravity",
-		skillsDir: ".agent/skills",
-		globalSkillsDir: join(home, ".gemini/antigravity/skills"),
-		agentsDir: ".agent/agents",
-		globalAgentsDir: join(home, ".gemini/antigravity/agents"),
-		promptsDir: ".agent/prompts",
-		globalPromptsDir: join(home, ".gemini/antigravity/prompts"),
+		dirs: {
+			skill: {
+				local: ".agent/skills",
+				global: join(join(home, ".gemini/antigravity"), "skills")
+			},
+			agent: {
+				local: ".agent/agents",
+				global: join(join(home, ".gemini/antigravity"), "agents")
+			},
+			prompt: {
+				local: ".agent/prompts",
+				global: join(join(home, ".gemini/antigravity"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(process.cwd(), ".agent")) || existsSync(join(home, ".gemini/antigravity"));
 		}
 	},
-	augment: {
+	"augment": {
 		name: "augment",
 		displayName: "Augment",
-		skillsDir: ".augment/skills",
-		globalSkillsDir: join(home, ".augment/skills"),
-		agentsDir: ".augment/agents",
-		globalAgentsDir: join(home, ".augment/agents"),
-		promptsDir: ".augment/prompts",
-		globalPromptsDir: join(home, ".augment/prompts"),
+		dirs: {
+			skill: {
+				local: ".augment/skills",
+				global: join(join(home, ".augment"), "skills")
+			},
+			agent: {
+				local: ".augment/agents",
+				global: join(join(home, ".augment"), "agents")
+			},
+			prompt: {
+				local: ".augment/prompts",
+				global: join(join(home, ".augment"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".augment"));
 		}
@@ -307,64 +368,83 @@ const agents = {
 	"claude-code": {
 		name: "claude-code",
 		displayName: "Claude Code",
-		skillsDir: ".claude/skills",
-		globalSkillsDir: join(claudeHome, "skills"),
-		agentsDir: ".claude/agents",
-		globalAgentsDir: join(claudeHome, "agents"),
-		promptsDir: ".claude/prompts",
-		globalPromptsDir: join(claudeHome, "prompts"),
+		dirs: {
+			skill: {
+				local: ".claude/skills",
+				global: join(claudeHome, "skills")
+			},
+			agent: {
+				local: ".claude/agents",
+				global: join(claudeHome, "agents")
+			},
+			prompt: {
+				local: ".claude/prompts",
+				global: join(claudeHome, "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(claudeHome);
 		}
 	},
-	openclaw: {
-		name: "openclaw",
-		displayName: "OpenClaw",
-		skillsDir: "skills",
-		globalSkillsDir: existsSync(join(home, ".openclaw")) ? join(home, ".openclaw/skills") : existsSync(join(home, ".clawdbot")) ? join(home, ".clawdbot/skills") : join(home, ".moltbot/skills"),
-		agentsDir: "agents",
-		globalAgentsDir: existsSync(join(home, ".openclaw")) ? join(home, ".openclaw/agents") : existsSync(join(home, ".clawdbot")) ? join(home, ".clawdbot/agents") : join(home, ".moltbot/agents"),
-		promptsDir: "prompts",
-		globalPromptsDir: existsSync(join(home, ".openclaw")) ? join(home, ".openclaw/prompts") : existsSync(join(home, ".clawdbot")) ? join(home, ".clawdbot/prompts") : join(home, ".moltbot/prompts"),
-		detectInstalled: async () => {
-			return existsSync(join(home, ".openclaw")) || existsSync(join(home, ".clawdbot")) || existsSync(join(home, ".moltbot"));
-		}
-	},
-	cline: {
+	"cline": {
 		name: "cline",
 		displayName: "Cline",
-		skillsDir: ".cline/skills",
-		globalSkillsDir: join(home, ".cline/skills"),
-		agentsDir: ".cline/agents",
-		globalAgentsDir: join(home, ".cline/agents"),
-		promptsDir: ".cline/prompts",
-		globalPromptsDir: join(home, ".cline/prompts"),
+		dirs: {
+			skill: {
+				local: ".cline/skills",
+				global: join(join(home, ".cline"), "skills")
+			},
+			agent: {
+				local: ".cline/agents",
+				global: join(join(home, ".cline"), "agents")
+			},
+			prompt: {
+				local: ".cline/prompts",
+				global: join(join(home, ".cline"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".cline"));
 		}
 	},
-	codebuddy: {
+	"codebuddy": {
 		name: "codebuddy",
 		displayName: "CodeBuddy",
-		skillsDir: ".codebuddy/skills",
-		globalSkillsDir: join(home, ".codebuddy/skills"),
-		agentsDir: ".codebuddy/agents",
-		globalAgentsDir: join(home, ".codebuddy/agents"),
-		promptsDir: ".codebuddy/prompts",
-		globalPromptsDir: join(home, ".codebuddy/prompts"),
+		dirs: {
+			skill: {
+				local: ".codebuddy/skills",
+				global: join(join(home, ".codebuddy"), "skills")
+			},
+			agent: {
+				local: ".codebuddy/agents",
+				global: join(join(home, ".codebuddy"), "agents")
+			},
+			prompt: {
+				local: ".codebuddy/prompts",
+				global: join(join(home, ".codebuddy"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(process.cwd(), ".codebuddy")) || existsSync(join(home, ".codebuddy"));
 		}
 	},
-	codex: {
+	"codex": {
 		name: "codex",
 		displayName: "Codex",
-		skillsDir: ".agents/skills",
-		globalSkillsDir: join(codexHome, "skills"),
-		agentsDir: ".agents/agents",
-		globalAgentsDir: join(codexHome, "agents"),
-		promptsDir: ".agents/prompts",
-		globalPromptsDir: join(codexHome, "prompts"),
+		dirs: {
+			skill: {
+				local: ".agents/skills",
+				global: join(codexHome, "skills")
+			},
+			agent: {
+				local: ".agents/agents",
+				global: join(codexHome, "agents")
+			},
+			prompt: {
+				local: ".agents/prompts",
+				global: join(codexHome, "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(codexHome) || existsSync("/etc/codex");
 		}
@@ -372,64 +452,104 @@ const agents = {
 	"command-code": {
 		name: "command-code",
 		displayName: "Command Code",
-		skillsDir: ".commandcode/skills",
-		globalSkillsDir: join(home, ".commandcode/skills"),
-		agentsDir: ".commandcode/agents",
-		globalAgentsDir: join(home, ".commandcode/agents"),
-		promptsDir: ".commandcode/prompts",
-		globalPromptsDir: join(home, ".commandcode/prompts"),
+		dirs: {
+			skill: {
+				local: ".commandcode/skills",
+				global: join(join(home, ".commandcode"), "skills")
+			},
+			agent: {
+				local: ".commandcode/agents",
+				global: join(join(home, ".commandcode"), "agents")
+			},
+			prompt: {
+				local: ".commandcode/prompts",
+				global: join(join(home, ".commandcode"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".commandcode"));
 		}
 	},
-	continue: {
+	"continue": {
 		name: "continue",
 		displayName: "Continue",
-		skillsDir: ".continue/skills",
-		globalSkillsDir: join(home, ".continue/skills"),
-		agentsDir: ".continue/agents",
-		globalAgentsDir: join(home, ".continue/agents"),
-		promptsDir: ".continue/prompts",
-		globalPromptsDir: join(home, ".continue/prompts"),
+		dirs: {
+			skill: {
+				local: ".continue/skills",
+				global: join(join(home, ".continue"), "skills")
+			},
+			agent: {
+				local: ".continue/agents",
+				global: join(join(home, ".continue"), "agents")
+			},
+			prompt: {
+				local: ".continue/prompts",
+				global: join(join(home, ".continue"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(process.cwd(), ".continue")) || existsSync(join(home, ".continue"));
 		}
 	},
-	crush: {
+	"crush": {
 		name: "crush",
 		displayName: "Crush",
-		skillsDir: ".crush/skills",
-		globalSkillsDir: join(home, ".config/crush/skills"),
-		agentsDir: ".crush/agents",
-		globalAgentsDir: join(home, ".config/crush/agents"),
-		promptsDir: ".crush/prompts",
-		globalPromptsDir: join(home, ".config/crush/prompts"),
+		dirs: {
+			skill: {
+				local: ".crush/skills",
+				global: join(join(home, ".config/crush"), "skills")
+			},
+			agent: {
+				local: ".crush/agents",
+				global: join(join(home, ".config/crush"), "agents")
+			},
+			prompt: {
+				local: ".crush/prompts",
+				global: join(join(home, ".config/crush"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".config/crush"));
 		}
 	},
-	cursor: {
+	"cursor": {
 		name: "cursor",
 		displayName: "Cursor",
-		skillsDir: ".cursor/skills",
-		globalSkillsDir: join(home, ".cursor/skills"),
-		agentsDir: ".cursor/agents",
-		globalAgentsDir: join(home, ".cursor/agents"),
-		promptsDir: ".cursor/prompts",
-		globalPromptsDir: join(home, ".cursor/prompts"),
+		dirs: {
+			skill: {
+				local: ".cursor/skills",
+				global: join(join(home, ".cursor"), "skills")
+			},
+			agent: {
+				local: ".cursor/agents",
+				global: join(join(home, ".cursor"), "agents")
+			},
+			prompt: {
+				local: ".cursor/prompts",
+				global: join(join(home, ".cursor"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".cursor"));
 		}
 	},
-	droid: {
+	"droid": {
 		name: "droid",
 		displayName: "Droid",
-		skillsDir: ".factory/skills",
-		globalSkillsDir: join(home, ".factory/skills"),
-		agentsDir: ".factory/agents",
-		globalAgentsDir: join(home, ".factory/agents"),
-		promptsDir: ".factory/prompts",
-		globalPromptsDir: join(home, ".factory/prompts"),
+		dirs: {
+			skill: {
+				local: ".factory/skills",
+				global: join(join(home, ".factory"), "skills")
+			},
+			agent: {
+				local: ".factory/agents",
+				global: join(join(home, ".factory"), "agents")
+			},
+			prompt: {
+				local: ".factory/prompts",
+				global: join(join(home, ".factory"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".factory"));
 		}
@@ -437,12 +557,20 @@ const agents = {
 	"gemini-cli": {
 		name: "gemini-cli",
 		displayName: "Gemini CLI",
-		skillsDir: ".agents/skills",
-		globalSkillsDir: join(home, ".gemini/skills"),
-		agentsDir: ".agents/agents",
-		globalAgentsDir: join(home, ".gemini/agents"),
-		promptsDir: ".agents/prompts",
-		globalPromptsDir: join(home, ".gemini/prompts"),
+		dirs: {
+			skill: {
+				local: ".agents/skills",
+				global: join(join(home, ".gemini"), "skills")
+			},
+			agent: {
+				local: ".agents/agents",
+				global: join(join(home, ".gemini"), "agents")
+			},
+			prompt: {
+				local: ".agents/prompts",
+				global: join(join(home, ".gemini"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".gemini"));
 		}
@@ -450,64 +578,104 @@ const agents = {
 	"github-copilot": {
 		name: "github-copilot",
 		displayName: "GitHub Copilot",
-		skillsDir: ".agents/skills",
-		globalSkillsDir: join(home, ".copilot/skills"),
-		agentsDir: ".agents/agents",
-		globalAgentsDir: join(home, ".copilot/agents"),
-		promptsDir: ".agents/prompts",
-		globalPromptsDir: join(home, ".copilot/prompts"),
+		dirs: {
+			skill: {
+				local: ".agents/skills",
+				global: join(join(home, ".copilot"), "skills")
+			},
+			agent: {
+				local: ".agents/agents",
+				global: join(join(home, ".copilot"), "agents")
+			},
+			prompt: {
+				local: ".agents/prompts",
+				global: join(join(home, ".copilot"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(process.cwd(), ".github")) || existsSync(join(home, ".copilot"));
 		}
 	},
-	goose: {
+	"goose": {
 		name: "goose",
 		displayName: "Goose",
-		skillsDir: ".goose/skills",
-		globalSkillsDir: join(configHome, "goose/skills"),
-		agentsDir: ".goose/agents",
-		globalAgentsDir: join(configHome, "goose/agents"),
-		promptsDir: ".goose/prompts",
-		globalPromptsDir: join(configHome, "goose/prompts"),
+		dirs: {
+			skill: {
+				local: ".goose/skills",
+				global: join(join(configHome, "goose"), "skills")
+			},
+			agent: {
+				local: ".goose/agents",
+				global: join(join(configHome, "goose"), "agents")
+			},
+			prompt: {
+				local: ".goose/prompts",
+				global: join(join(configHome, "goose"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(configHome, "goose"));
 		}
 	},
-	junie: {
-		name: "junie",
-		displayName: "Junie",
-		skillsDir: ".junie/skills",
-		globalSkillsDir: join(home, ".junie/skills"),
-		agentsDir: ".junie/agents",
-		globalAgentsDir: join(home, ".junie/agents"),
-		promptsDir: ".junie/prompts",
-		globalPromptsDir: join(home, ".junie/prompts"),
-		detectInstalled: async () => {
-			return existsSync(join(home, ".junie"));
-		}
-	},
 	"iflow-cli": {
 		name: "iflow-cli",
 		displayName: "iFlow CLI",
-		skillsDir: ".iflow/skills",
-		globalSkillsDir: join(home, ".iflow/skills"),
-		agentsDir: ".iflow/agents",
-		globalAgentsDir: join(home, ".iflow/agents"),
-		promptsDir: ".iflow/prompts",
-		globalPromptsDir: join(home, ".iflow/prompts"),
+		dirs: {
+			skill: {
+				local: ".iflow/skills",
+				global: join(join(home, ".iflow"), "skills")
+			},
+			agent: {
+				local: ".iflow/agents",
+				global: join(join(home, ".iflow"), "agents")
+			},
+			prompt: {
+				local: ".iflow/prompts",
+				global: join(join(home, ".iflow"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".iflow"));
 		}
 	},
-	kilo: {
+	"junie": {
+		name: "junie",
+		displayName: "Junie",
+		dirs: {
+			skill: {
+				local: ".junie/skills",
+				global: join(join(home, ".junie"), "skills")
+			},
+			agent: {
+				local: ".junie/agents",
+				global: join(join(home, ".junie"), "agents")
+			},
+			prompt: {
+				local: ".junie/prompts",
+				global: join(join(home, ".junie"), "prompts")
+			}
+		},
+		detectInstalled: async () => {
+			return existsSync(join(home, ".junie"));
+		}
+	},
+	"kilo": {
 		name: "kilo",
 		displayName: "Kilo Code",
-		skillsDir: ".kilocode/skills",
-		globalSkillsDir: join(home, ".kilocode/skills"),
-		agentsDir: ".kilocode/agents",
-		globalAgentsDir: join(home, ".kilocode/agents"),
-		promptsDir: ".kilocode/prompts",
-		globalPromptsDir: join(home, ".kilocode/prompts"),
+		dirs: {
+			skill: {
+				local: ".kilocode/skills",
+				global: join(join(home, ".kilocode"), "skills")
+			},
+			agent: {
+				local: ".kilocode/agents",
+				global: join(join(home, ".kilocode"), "agents")
+			},
+			prompt: {
+				local: ".kilocode/prompts",
+				global: join(join(home, ".kilocode"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".kilocode"));
 		}
@@ -515,12 +683,20 @@ const agents = {
 	"kimi-cli": {
 		name: "kimi-cli",
 		displayName: "Kimi Code CLI",
-		skillsDir: ".agents/skills",
-		globalSkillsDir: join(home, ".config/agents/skills"),
-		agentsDir: ".agents/agents",
-		globalAgentsDir: join(home, ".config/agents/agents"),
-		promptsDir: ".agents/prompts",
-		globalPromptsDir: join(home, ".config/agents/prompts"),
+		dirs: {
+			skill: {
+				local: ".agents/skills",
+				global: join(join(home, ".config/agents"), "skills")
+			},
+			agent: {
+				local: ".agents/agents",
+				global: join(join(home, ".config/agents"), "agents")
+			},
+			prompt: {
+				local: ".agents/prompts",
+				global: join(join(home, ".config/agents"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".kimi"));
 		}
@@ -528,38 +704,62 @@ const agents = {
 	"kiro-cli": {
 		name: "kiro-cli",
 		displayName: "Kiro CLI",
-		skillsDir: ".kiro/skills",
-		globalSkillsDir: join(home, ".kiro/skills"),
-		agentsDir: ".kiro/agents",
-		globalAgentsDir: join(home, ".kiro/agents"),
-		promptsDir: ".kiro/prompts",
-		globalPromptsDir: join(home, ".kiro/prompts"),
+		dirs: {
+			skill: {
+				local: ".kiro/skills",
+				global: join(join(home, ".kiro"), "skills")
+			},
+			agent: {
+				local: ".kiro/agents",
+				global: join(join(home, ".kiro"), "agents")
+			},
+			prompt: {
+				local: ".kiro/prompts",
+				global: join(join(home, ".kiro"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".kiro"));
 		}
 	},
-	kode: {
+	"kode": {
 		name: "kode",
 		displayName: "Kode",
-		skillsDir: ".kode/skills",
-		globalSkillsDir: join(home, ".kode/skills"),
-		agentsDir: ".kode/agents",
-		globalAgentsDir: join(home, ".kode/agents"),
-		promptsDir: ".kode/prompts",
-		globalPromptsDir: join(home, ".kode/prompts"),
+		dirs: {
+			skill: {
+				local: ".kode/skills",
+				global: join(join(home, ".kode"), "skills")
+			},
+			agent: {
+				local: ".kode/agents",
+				global: join(join(home, ".kode"), "agents")
+			},
+			prompt: {
+				local: ".kode/prompts",
+				global: join(join(home, ".kode"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".kode"));
 		}
 	},
-	mcpjam: {
+	"mcpjam": {
 		name: "mcpjam",
 		displayName: "MCPJam",
-		skillsDir: ".mcpjam/skills",
-		globalSkillsDir: join(home, ".mcpjam/skills"),
-		agentsDir: ".mcpjam/agents",
-		globalAgentsDir: join(home, ".mcpjam/agents"),
-		promptsDir: ".mcpjam/prompts",
-		globalPromptsDir: join(home, ".mcpjam/prompts"),
+		dirs: {
+			skill: {
+				local: ".mcpjam/skills",
+				global: join(join(home, ".mcpjam"), "skills")
+			},
+			agent: {
+				local: ".mcpjam/agents",
+				global: join(join(home, ".mcpjam"), "agents")
+			},
+			prompt: {
+				local: ".mcpjam/prompts",
+				global: join(join(home, ".mcpjam"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".mcpjam"));
 		}
@@ -567,77 +767,188 @@ const agents = {
 	"mistral-vibe": {
 		name: "mistral-vibe",
 		displayName: "Mistral Vibe",
-		skillsDir: ".vibe/skills",
-		globalSkillsDir: join(home, ".vibe/skills"),
-		agentsDir: ".vibe/agents",
-		globalAgentsDir: join(home, ".vibe/agents"),
-		promptsDir: ".vibe/prompts",
-		globalPromptsDir: join(home, ".vibe/prompts"),
+		dirs: {
+			skill: {
+				local: ".vibe/skills",
+				global: join(join(home, ".vibe"), "skills")
+			},
+			agent: {
+				local: ".vibe/agents",
+				global: join(join(home, ".vibe"), "agents")
+			},
+			prompt: {
+				local: ".vibe/prompts",
+				global: join(join(home, ".vibe"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".vibe"));
 		}
 	},
-	mux: {
+	"mux": {
 		name: "mux",
 		displayName: "Mux",
-		skillsDir: ".mux/skills",
-		globalSkillsDir: join(home, ".mux/skills"),
-		agentsDir: ".mux/agents",
-		globalAgentsDir: join(home, ".mux/agents"),
-		promptsDir: ".mux/prompts",
-		globalPromptsDir: join(home, ".mux/prompts"),
+		dirs: {
+			skill: {
+				local: ".mux/skills",
+				global: join(join(home, ".mux"), "skills")
+			},
+			agent: {
+				local: ".mux/agents",
+				global: join(join(home, ".mux"), "agents")
+			},
+			prompt: {
+				local: ".mux/prompts",
+				global: join(join(home, ".mux"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".mux"));
 		}
 	},
-	opencode: {
+	"neovate": {
+		name: "neovate",
+		displayName: "Neovate",
+		dirs: {
+			skill: {
+				local: ".neovate/skills",
+				global: join(join(home, ".neovate"), "skills")
+			},
+			agent: {
+				local: ".neovate/agents",
+				global: join(join(home, ".neovate"), "agents")
+			},
+			prompt: {
+				local: ".neovate/prompts",
+				global: join(join(home, ".neovate"), "prompts")
+			}
+		},
+		detectInstalled: async () => {
+			return existsSync(join(home, ".neovate"));
+		}
+	},
+	"openclaw": {
+		name: "openclaw",
+		displayName: "OpenClaw",
+		dirs: {
+			skill: {
+				local: "skills",
+				global: existsSync(join(home, ".openclaw")) ? join(join(home, ".openclaw"), "skills") : existsSync(join(home, ".clawdbot")) ? join(join(home, ".clawdbot"), "skills") : join(join(home, ".moltbot"), "skills")
+			},
+			agent: {
+				local: "agents",
+				global: existsSync(join(home, ".openclaw")) ? join(join(home, ".openclaw"), "agents") : existsSync(join(home, ".clawdbot")) ? join(join(home, ".clawdbot"), "agents") : join(join(home, ".moltbot"), "agents")
+			},
+			prompt: {
+				local: "prompts",
+				global: existsSync(join(home, ".openclaw")) ? join(join(home, ".openclaw"), "prompts") : existsSync(join(home, ".clawdbot")) ? join(join(home, ".clawdbot"), "prompts") : join(join(home, ".moltbot"), "prompts")
+			}
+		},
+		detectInstalled: async () => {
+			return existsSync(join(home, ".openclaw")) || existsSync(join(home, ".clawdbot")) || existsSync(join(home, ".moltbot"));
+		}
+	},
+	"opencode": {
 		name: "opencode",
 		displayName: "OpenCode",
-		skillsDir: ".agents/skills",
-		globalSkillsDir: join(configHome, "opencode/skills"),
-		agentsDir: ".agents/agents",
-		globalAgentsDir: join(configHome, "opencode/agents"),
-		promptsDir: ".agents/prompts",
-		globalPromptsDir: join(configHome, "opencode/prompts"),
+		dirs: {
+			skill: {
+				local: ".agents/skills",
+				global: join(join(configHome, "opencode"), "skills")
+			},
+			agent: {
+				local: ".agents/agents",
+				global: join(join(configHome, "opencode"), "agents")
+			},
+			prompt: {
+				local: ".agents/prompts",
+				global: join(join(configHome, "opencode"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(configHome, "opencode")) || existsSync(join(claudeHome, "skills"));
 		}
 	},
-	openhands: {
+	"openhands": {
 		name: "openhands",
 		displayName: "OpenHands",
-		skillsDir: ".openhands/skills",
-		globalSkillsDir: join(home, ".openhands/skills"),
-		agentsDir: ".openhands/agents",
-		globalAgentsDir: join(home, ".openhands/agents"),
-		promptsDir: ".openhands/prompts",
-		globalPromptsDir: join(home, ".openhands/prompts"),
+		dirs: {
+			skill: {
+				local: ".openhands/skills",
+				global: join(join(home, ".openhands"), "skills")
+			},
+			agent: {
+				local: ".openhands/agents",
+				global: join(join(home, ".openhands"), "agents")
+			},
+			prompt: {
+				local: ".openhands/prompts",
+				global: join(join(home, ".openhands"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".openhands"));
 		}
 	},
-	pi: {
+	"pi": {
 		name: "pi",
 		displayName: "Pi",
-		skillsDir: ".pi/skills",
-		globalSkillsDir: join(home, ".pi/agent/skills"),
-		agentsDir: ".pi/agents",
-		globalAgentsDir: join(home, ".pi/agent/agents"),
-		promptsDir: ".pi/prompts",
-		globalPromptsDir: join(home, ".pi/agent/prompts"),
+		dirs: {
+			skill: {
+				local: ".pi/skills",
+				global: join(join(home, ".pi/agent"), "skills")
+			},
+			agent: {
+				local: ".pi/agents",
+				global: join(join(home, ".pi/agent"), "agents")
+			},
+			prompt: {
+				local: ".pi/prompts",
+				global: join(join(home, ".pi/agent"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".pi/agent"));
 		}
 	},
-	qoder: {
+	"pochi": {
+		name: "pochi",
+		displayName: "Pochi",
+		dirs: {
+			skill: {
+				local: ".pochi/skills",
+				global: join(join(home, ".pochi"), "skills")
+			},
+			agent: {
+				local: ".pochi/agents",
+				global: join(join(home, ".pochi"), "agents")
+			},
+			prompt: {
+				local: ".pochi/prompts",
+				global: join(join(home, ".pochi"), "prompts")
+			}
+		},
+		detectInstalled: async () => {
+			return existsSync(join(home, ".pochi"));
+		}
+	},
+	"qoder": {
 		name: "qoder",
 		displayName: "Qoder",
-		skillsDir: ".qoder/skills",
-		globalSkillsDir: join(home, ".qoder/skills"),
-		agentsDir: ".qoder/agents",
-		globalAgentsDir: join(home, ".qoder/agents"),
-		promptsDir: ".qoder/prompts",
-		globalPromptsDir: join(home, ".qoder/prompts"),
+		dirs: {
+			skill: {
+				local: ".qoder/skills",
+				global: join(join(home, ".qoder"), "skills")
+			},
+			agent: {
+				local: ".qoder/agents",
+				global: join(join(home, ".qoder"), "agents")
+			},
+			prompt: {
+				local: ".qoder/prompts",
+				global: join(join(home, ".qoder"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".qoder"));
 		}
@@ -645,133 +956,150 @@ const agents = {
 	"qwen-code": {
 		name: "qwen-code",
 		displayName: "Qwen Code",
-		skillsDir: ".qwen/skills",
-		globalSkillsDir: join(home, ".qwen/skills"),
-		agentsDir: ".qwen/agents",
-		globalAgentsDir: join(home, ".qwen/agents"),
-		promptsDir: ".qwen/prompts",
-		globalPromptsDir: join(home, ".qwen/prompts"),
+		dirs: {
+			skill: {
+				local: ".qwen/skills",
+				global: join(join(home, ".qwen"), "skills")
+			},
+			agent: {
+				local: ".qwen/agents",
+				global: join(join(home, ".qwen"), "agents")
+			},
+			prompt: {
+				local: ".qwen/prompts",
+				global: join(join(home, ".qwen"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".qwen"));
 		}
 	},
-	replit: {
+	"replit": {
 		name: "replit",
 		displayName: "Replit",
-		skillsDir: ".agents/skills",
-		globalSkillsDir: join(configHome, "agents/skills"),
-		agentsDir: ".agents/agents",
-		globalAgentsDir: join(configHome, "agents/agents"),
-		promptsDir: ".agents/prompts",
-		globalPromptsDir: join(configHome, "agents/prompts"),
+		dirs: {
+			skill: {
+				local: ".agents/skills",
+				global: join(join(configHome, "agents"), "skills")
+			},
+			agent: {
+				local: ".agents/agents",
+				global: join(join(configHome, "agents"), "agents")
+			},
+			prompt: {
+				local: ".agents/prompts",
+				global: join(join(configHome, "agents"), "prompts")
+			}
+		},
 		showInUniversalList: false,
 		detectInstalled: async () => {
 			return existsSync(join(process.cwd(), ".agents"));
 		}
 	},
-	roo: {
+	"roo": {
 		name: "roo",
 		displayName: "Roo Code",
-		skillsDir: ".roo/skills",
-		globalSkillsDir: join(home, ".roo/skills"),
-		agentsDir: ".roo/agents",
-		globalAgentsDir: join(home, ".roo/agents"),
-		promptsDir: ".roo/prompts",
-		globalPromptsDir: join(home, ".roo/prompts"),
+		dirs: {
+			skill: {
+				local: ".roo/skills",
+				global: join(join(home, ".roo"), "skills")
+			},
+			agent: {
+				local: ".roo/agents",
+				global: join(join(home, ".roo"), "agents")
+			},
+			prompt: {
+				local: ".roo/prompts",
+				global: join(join(home, ".roo"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".roo"));
 		}
 	},
-	trae: {
-		name: "trae",
-		displayName: "Trae",
-		skillsDir: ".trae/skills",
-		globalSkillsDir: join(home, ".trae/skills"),
-		agentsDir: ".trae/agents",
-		globalAgentsDir: join(home, ".trae/agents"),
-		promptsDir: ".trae/prompts",
-		globalPromptsDir: join(home, ".trae/prompts"),
-		detectInstalled: async () => {
-			return existsSync(join(home, ".trae"));
-		}
-	},
 	"trae-cn": {
 		name: "trae-cn",
 		displayName: "Trae CN",
-		skillsDir: ".trae/skills",
-		globalSkillsDir: join(home, ".trae-cn/skills"),
-		agentsDir: ".trae/agents",
-		globalAgentsDir: join(home, ".trae-cn/agents"),
-		promptsDir: ".trae/prompts",
-		globalPromptsDir: join(home, ".trae-cn/prompts"),
+		dirs: {
+			skill: {
+				local: ".trae/skills",
+				global: join(join(home, ".trae-cn"), "skills")
+			},
+			agent: {
+				local: ".trae/agents",
+				global: join(join(home, ".trae-cn"), "agents")
+			},
+			prompt: {
+				local: ".trae/prompts",
+				global: join(join(home, ".trae-cn"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".trae-cn"));
 		}
 	},
-	windsurf: {
+	"trae": {
+		name: "trae",
+		displayName: "Trae",
+		dirs: {
+			skill: {
+				local: ".trae/skills",
+				global: join(join(home, ".trae"), "skills")
+			},
+			agent: {
+				local: ".trae/agents",
+				global: join(join(home, ".trae"), "agents")
+			},
+			prompt: {
+				local: ".trae/prompts",
+				global: join(join(home, ".trae"), "prompts")
+			}
+		},
+		detectInstalled: async () => {
+			return existsSync(join(home, ".trae"));
+		}
+	},
+	"windsurf": {
 		name: "windsurf",
 		displayName: "Windsurf",
-		skillsDir: ".windsurf/skills",
-		globalSkillsDir: join(home, ".codeium/windsurf/skills"),
-		agentsDir: ".windsurf/agents",
-		globalAgentsDir: join(home, ".codeium/windsurf/agents"),
-		promptsDir: ".windsurf/prompts",
-		globalPromptsDir: join(home, ".codeium/windsurf/prompts"),
+		dirs: {
+			skill: {
+				local: ".windsurf/skills",
+				global: join(join(home, ".codeium/windsurf"), "skills")
+			},
+			agent: {
+				local: ".windsurf/agents",
+				global: join(join(home, ".codeium/windsurf"), "agents")
+			},
+			prompt: {
+				local: ".windsurf/prompts",
+				global: join(join(home, ".codeium/windsurf"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".codeium/windsurf"));
 		}
 	},
-	zencoder: {
+	"zencoder": {
 		name: "zencoder",
 		displayName: "Zencoder",
-		skillsDir: ".zencoder/skills",
-		globalSkillsDir: join(home, ".zencoder/skills"),
-		agentsDir: ".zencoder/agents",
-		globalAgentsDir: join(home, ".zencoder/agents"),
-		promptsDir: ".zencoder/prompts",
-		globalPromptsDir: join(home, ".zencoder/prompts"),
+		dirs: {
+			skill: {
+				local: ".zencoder/skills",
+				global: join(join(home, ".zencoder"), "skills")
+			},
+			agent: {
+				local: ".zencoder/agents",
+				global: join(join(home, ".zencoder"), "agents")
+			},
+			prompt: {
+				local: ".zencoder/prompts",
+				global: join(join(home, ".zencoder"), "prompts")
+			}
+		},
 		detectInstalled: async () => {
 			return existsSync(join(home, ".zencoder"));
 		}
-	},
-	neovate: {
-		name: "neovate",
-		displayName: "Neovate",
-		skillsDir: ".neovate/skills",
-		globalSkillsDir: join(home, ".neovate/skills"),
-		agentsDir: ".neovate/agents",
-		globalAgentsDir: join(home, ".neovate/agents"),
-		promptsDir: ".neovate/prompts",
-		globalPromptsDir: join(home, ".neovate/prompts"),
-		detectInstalled: async () => {
-			return existsSync(join(home, ".neovate"));
-		}
-	},
-	pochi: {
-		name: "pochi",
-		displayName: "Pochi",
-		skillsDir: ".pochi/skills",
-		globalSkillsDir: join(home, ".pochi/skills"),
-		agentsDir: ".pochi/agents",
-		globalAgentsDir: join(home, ".pochi/agents"),
-		promptsDir: ".pochi/prompts",
-		globalPromptsDir: join(home, ".pochi/prompts"),
-		detectInstalled: async () => {
-			return existsSync(join(home, ".pochi"));
-		}
-	},
-	adal: {
-		name: "adal",
-		displayName: "AdaL",
-		skillsDir: ".adal/skills",
-		globalSkillsDir: join(home, ".adal/skills"),
-		agentsDir: ".adal/agents",
-		globalAgentsDir: join(home, ".adal/agents"),
-		promptsDir: ".adal/prompts",
-		globalPromptsDir: join(home, ".adal/prompts"),
-		detectInstalled: async () => {
-			return existsSync(join(home, ".adal"));
-		}
 	}
 };
 async function detectInstalledAgents() {
@@ -780,55 +1108,29 @@ async function detectInstalledAgents() {
 		installed: await config.detectInstalled()
 	})))).filter((r) => r.installed).map((r) => r.type);
 }
-const AGENTS_DIR$3 = ".agents";
-const COGNITIVE_SUBDIRS = {
-	skill: "skills",
-	agent: "agents",
-	prompt: "prompts"
-};
-const COGNITIVE_FILE_NAMES = {
-	skill: "SKILL.md",
-	agent: "AGENT.md",
-	prompt: "PROMPT.md"
-};
-function getUniversalAgents() {
-	return Object.entries(agents).filter(([_, config]) => config.skillsDir === ".agents/skills" && config.showInUniversalList !== false).map(([type]) => type);
+function getUniversalAgents(cognitiveType = "skill") {
+	return Object.entries(agents).filter(([_, config]) => config.dirs[cognitiveType].local === `.agents/${COGNITIVE_SUBDIRS[cognitiveType]}` && config.showInUniversalList !== false).map(([type]) => type);
 }
-function getNonUniversalAgents() {
-	return Object.entries(agents).filter(([_, config]) => config.skillsDir !== ".agents/skills").map(([type]) => type);
+function getNonUniversalAgents(cognitiveType = "skill") {
+	return Object.entries(agents).filter(([_, config]) => config.dirs[cognitiveType].local !== `.agents/${COGNITIVE_SUBDIRS[cognitiveType]}`).map(([type]) => type);
 }
-function isUniversalAgent(type) {
-	return agents[type].skillsDir === ".agents/skills";
+function isUniversalAgent(type, cognitiveType = "skill") {
+	return agents[type].dirs[cognitiveType].local === `.agents/${COGNITIVE_SUBDIRS[cognitiveType]}`;
 }
 function getCognitiveDir(agentType, cognitiveType, scope) {
-	const agent = agents[agentType];
-	if (scope === "global") switch (cognitiveType) {
-		case "skill": return agent.globalSkillsDir;
-		case "agent": return agent.globalAgentsDir;
-		case "prompt": return agent.globalPromptsDir;
-	}
-	else switch (cognitiveType) {
-		case "skill": return agent.skillsDir;
-		case "agent": return agent.agentsDir;
-		case "prompt": return agent.promptsDir;
-	}
+	const dirEntry = agents[agentType].dirs[cognitiveType];
+	return scope === "global" ? dirEntry.global : dirEntry.local;
 }
 function isUniversalForType(agentType, cognitiveType) {
-	const agent = agents[agentType];
-	const universalDir = `.agents/${COGNITIVE_SUBDIRS[cognitiveType]}`;
-	switch (cognitiveType) {
-		case "skill": return agent.skillsDir === universalDir;
-		case "agent": return agent.agentsDir === universalDir;
-		case "prompt": return agent.promptsDir === universalDir;
-	}
+	return agents[agentType].dirs[cognitiveType].local === `.agents/${COGNITIVE_SUBDIRS[cognitiveType]}`;
 }
-function shortenPath$1(fullPath, cwd) {
+function shortenPath(fullPath, cwd) {
 	const home = homedir();
 	if (fullPath === home || fullPath.startsWith(home + sep)) return "~" + fullPath.slice(home.length);
 	if (fullPath === cwd || fullPath.startsWith(cwd + sep)) return "." + fullPath.slice(cwd.length);
 	return fullPath;
 }
-function formatList$1(items, maxShow = 5) {
+function formatList(items, maxShow = 5) {
 	if (items.length <= maxShow) return items.join(", ");
 	const shown = items.slice(0, maxShow);
 	const remaining = items.length - maxShow;
@@ -848,11 +1150,11 @@ function buildAgentSummaryLines(targetAgents, installMode) {
 	const lines = [];
 	const { universal, symlinked } = splitAgentsByType(targetAgents);
 	if (installMode === "symlink") {
-		if (universal.length > 0) lines.push(`  ${import_picocolors.default.green("universal:")} ${formatList$1(universal)}`);
-		if (symlinked.length > 0) lines.push(`  ${import_picocolors.default.dim("symlink →")} ${formatList$1(symlinked)}`);
+		if (universal.length > 0) lines.push(`  ${import_picocolors.default.green("universal:")} ${formatList(universal)}`);
+		if (symlinked.length > 0) lines.push(`  ${import_picocolors.default.dim("symlink →")} ${formatList(symlinked)}`);
 	} else {
 		const allNames = targetAgents.map((a) => agents[a].displayName);
-		lines.push(`  ${import_picocolors.default.dim("copy →")} ${formatList$1(allNames)}`);
+		lines.push(`  ${import_picocolors.default.dim("copy →")} ${formatList(allNames)}`);
 	}
 	return lines;
 }
@@ -867,31 +1169,62 @@ function buildResultLines(results, targetAgents) {
 	const { universal, symlinked: symlinkAgents } = splitAgentsByType(targetAgents);
 	const successfulSymlinks = results.filter((r) => !r.symlinkFailed && !universal.includes(r.agent)).map((r) => r.agent);
 	const failedSymlinks = results.filter((r) => r.symlinkFailed).map((r) => r.agent);
-	if (universal.length > 0) lines.push(`  ${import_picocolors.default.green("universal:")} ${formatList$1(universal)}`);
-	if (successfulSymlinks.length > 0) lines.push(`  ${import_picocolors.default.dim("symlinked:")} ${formatList$1(successfulSymlinks)}`);
-	if (failedSymlinks.length > 0) lines.push(`  ${import_picocolors.default.yellow("copied:")} ${formatList$1(failedSymlinks)}`);
+	if (universal.length > 0) lines.push(`  ${import_picocolors.default.green("universal:")} ${formatList(universal)}`);
+	if (successfulSymlinks.length > 0) lines.push(`  ${import_picocolors.default.dim("symlinked:")} ${formatList(successfulSymlinks)}`);
+	if (failedSymlinks.length > 0) lines.push(`  ${import_picocolors.default.yellow("copied:")} ${formatList(failedSymlinks)}`);
 	return lines;
 }
-const AGENTS_DIR$2 = ".agents";
-const LOCK_FILE$2 = ".skill-lock.json";
+const AGENTS_DIR = ".agents";
+const LOCK_FILE = ".synk-lock.json";
+const OLD_LOCK_FILE = ".skill-lock.json";
 const CURRENT_VERSION = 4;
-function getSkillLockPath$2() {
-	return join(homedir(), AGENTS_DIR$2, LOCK_FILE$2);
+function getLockFilePath() {
+	return join(homedir(), AGENTS_DIR, LOCK_FILE);
+}
+async function migrateLockFileIfNeeded() {
+	const newPath = join(homedir(), AGENTS_DIR, LOCK_FILE);
+	const oldPath = join(homedir(), AGENTS_DIR, OLD_LOCK_FILE);
+	try {
+		await stat(newPath);
+		return;
+	} catch {}
+	try {
+		await stat(oldPath);
+		await rename(oldPath, newPath);
+	} catch {}
 }
-async function readSkillLock$2() {
-	const lockPath = getSkillLockPath$2();
+async function readLockFile() {
+	await migrateLockFileIfNeeded();
+	const lockPath = getLockFilePath();
 	try {
 		const content = await readFile(lockPath, "utf-8");
 		const parsed = JSON.parse(content);
-		if (typeof parsed.version !== "number" || !parsed.skills) return createEmptyLockFile();
+		if (typeof parsed.version !== "number") return createEmptyLockFile();
 		if (parsed.version < CURRENT_VERSION) return createEmptyLockFile();
-		return parsed;
+		const cognitives = parsed.cognitives ?? parsed.skills ?? {};
+		const migratedCognitives = {};
+		for (const [name, entry] of Object.entries(cognitives)) migratedCognitives[name] = {
+			source: entry.source,
+			sourceType: entry.sourceType,
+			sourceUrl: entry.sourceUrl,
+			cognitivePath: entry.cognitivePath ?? entry.skillPath,
+			cognitiveFolderHash: entry.cognitiveFolderHash ?? entry.skillFolderHash,
+			installedAt: entry.installedAt,
+			updatedAt: entry.updatedAt,
+			cognitiveType: entry.cognitiveType
+		};
+		return {
+			version: parsed.version,
+			cognitives: migratedCognitives,
+			dismissed: parsed.dismissed,
+			lastSelectedAgents: parsed.lastSelectedAgents
+		};
 	} catch (error) {
 		return createEmptyLockFile();
 	}
 }
-async function writeSkillLock(lock) {
-	const lockPath = getSkillLockPath$2();
+async function writeLockFile(lock) {
+	const lockPath = getLockFilePath();
 	await mkdir(dirname(lockPath), { recursive: true });
 	await writeFile(lockPath, JSON.stringify(lock, null, 2), "utf-8");
 }
@@ -911,16 +1244,21 @@ function getGitHubToken() {
 	} catch {}
 	return null;
 }
-async function fetchSkillFolderHash(ownerRepo, skillPath, token) {
-	let folderPath = skillPath.replace(/\\/g, "/");
-	if (folderPath.endsWith("/SKILL.md")) folderPath = folderPath.slice(0, -9);
-	else if (folderPath.endsWith("SKILL.md")) folderPath = folderPath.slice(0, -8);
+async function fetchCognitiveFolderHash(ownerRepo, cognitivePath, token) {
+	let folderPath = cognitivePath.replace(/\\/g, "/");
+	for (const fileName of Object.values(COGNITIVE_FILE_NAMES)) if (folderPath.endsWith("/" + fileName)) {
+		folderPath = folderPath.slice(0, -(fileName.length + 1));
+		break;
+	} else if (folderPath.endsWith(fileName)) {
+		folderPath = folderPath.slice(0, -fileName.length);
+		break;
+	}
 	if (folderPath.endsWith("/")) folderPath = folderPath.slice(0, -1);
 	for (const branch of ["main", "master"]) try {
 		const url = `https://api.github.com/repos/${ownerRepo}/git/trees/${branch}?recursive=1`;
 		const headers = {
 			Accept: "application/vnd.github.v3+json",
-			"User-Agent": "skills-cli"
+			"User-Agent": "synk-cli"
 		};
 		if (token) headers["Authorization"] = `Bearer ${token}`;
 		const response = await fetch(url, { headers });
@@ -935,53 +1273,50 @@ async function fetchSkillFolderHash(ownerRepo, skillPath, token) {
 	return null;
 }
 async function addCognitiveToLock(name, cognitiveType, entry) {
-	const lock = await readSkillLock$2();
+	const lock = await readLockFile();
 	const now = (/* @__PURE__ */ new Date()).toISOString();
-	const existingEntry = lock.skills[name];
-	lock.skills[name] = {
+	const existingEntry = lock.cognitives[name];
+	lock.cognitives[name] = {
 		...entry,
 		cognitiveType,
 		installedAt: existingEntry?.installedAt ?? now,
 		updatedAt: now
 	};
-	await writeSkillLock(lock);
-}
-async function addSkillToLock(skillName, entry) {
-	return addCognitiveToLock(skillName, "skill", entry);
+	await writeLockFile(lock);
 }
-async function removeSkillFromLock(skillName) {
-	const lock = await readSkillLock$2();
-	if (!(skillName in lock.skills)) return false;
-	delete lock.skills[skillName];
-	await writeSkillLock(lock);
+async function removeCognitiveFromLock(name) {
+	const lock = await readLockFile();
+	if (!(name in lock.cognitives)) return false;
+	delete lock.cognitives[name];
+	await writeLockFile(lock);
 	return true;
 }
-async function getSkillFromLock(skillName) {
-	return (await readSkillLock$2()).skills[skillName] ?? null;
+async function getCognitiveFromLock(name) {
+	return (await readLockFile()).cognitives[name] ?? null;
 }
 function createEmptyLockFile() {
 	return {
 		version: CURRENT_VERSION,
-		skills: {},
+		cognitives: {},
 		dismissed: {}
 	};
 }
 async function isPromptDismissed(promptKey) {
-	return (await readSkillLock$2()).dismissed?.[promptKey] === true;
+	return (await readLockFile()).dismissed?.[promptKey] === true;
 }
 async function dismissPrompt(promptKey) {
-	const lock = await readSkillLock$2();
+	const lock = await readLockFile();
 	if (!lock.dismissed) lock.dismissed = {};
 	lock.dismissed[promptKey] = true;
-	await writeSkillLock(lock);
+	await writeLockFile(lock);
 }
 async function getLastSelectedAgents() {
-	return (await readSkillLock$2()).lastSelectedAgents;
+	return (await readLockFile()).lastSelectedAgents;
 }
 async function saveSelectedAgents(agents) {
-	const lock = await readSkillLock$2();
+	const lock = await readLockFile();
 	lock.lastSelectedAgents = agents;
-	await writeSkillLock(lock);
+	await writeLockFile(lock);
 }
 const silentOutput = new Writable({ write(_chunk, _encoding, callback) {
 	callback();
@@ -1178,11 +1513,12 @@ async function promptForAgents(message, choices) {
 	return selected;
 }
 async function selectAgentsInteractive(options) {
-	const supportsGlobalFilter = (a) => !options.global || agents[a].globalSkillsDir;
+	const cognitiveType = options.cognitiveType ?? "skill";
+	const supportsGlobalFilter = (a) => !options.global || agents[a].dirs[cognitiveType]?.global;
 	const universalAgents = getUniversalAgents().filter(supportsGlobalFilter);
 	const otherAgents = getNonUniversalAgents().filter(supportsGlobalFilter);
 	const universalSection = {
-		title: "Universal (.agents/skills)",
+		title: `Universal (.agents/${COGNITIVE_SUBDIRS[cognitiveType]})`,
 		items: universalAgents.map((a) => ({
 			value: a,
 			label: agents[a].displayName
@@ -1191,7 +1527,7 @@ async function selectAgentsInteractive(options) {
 	const otherChoices = otherAgents.map((a) => ({
 		value: a,
 		label: agents[a].displayName,
-		hint: options.global ? agents[a].globalSkillsDir : agents[a].skillsDir
+		hint: options.global ? agents[a].dirs[cognitiveType].global : agents[a].dirs[cognitiveType].local
 	}));
 	let lastSelected;
 	try {
@@ -1286,9 +1622,6 @@ async function parseCognitiveMd(mdPath, cognitiveType, options) {
 		return null;
 	}
 }
-async function parseSkillMd(skillMdPath, options) {
-	return parseCognitiveMd(skillMdPath, "skill", options);
-}
 function isContainedIn(targetPath, basePath) {
 	const normalizedBase = normalize(resolve(basePath));
 	const normalizedTarget = normalize(resolve(targetPath));
@@ -1331,11 +1664,7 @@ const SKIP_DIRS = [
 	"build",
 	"__pycache__"
 ];
-const ALL_COGNITIVE_TYPES = [
-	"skill",
-	"agent",
-	"prompt"
-];
+const ALL_COGNITIVE_TYPES = Object.keys(COGNITIVE_FILE_NAMES);
 const AGENT_DIR_PREFIXES = [
 	".agent",
 	".agents",
@@ -1447,20 +1776,14 @@ async function discoverCognitives(basePath, subpath, options) {
 	}
 	return results;
 }
-async function discoverSkills(basePath, subpath, options) {
-	return discoverCognitives(basePath, subpath, {
-		...options,
-		types: options?.types ?? ["skill"]
-	});
-}
-function getSkillDisplayName(skill) {
-	return skill.name || basename(skill.path);
+function getCognitiveDisplayName(cognitive) {
+	return cognitive.name || basename(cognitive.path);
 }
-function filterSkills(skills, inputNames) {
+function filterCognitives(cognitives, inputNames) {
 	const normalizedInputs = inputNames.map((n) => n.toLowerCase());
-	return skills.filter((skill) => {
-		const name = skill.name.toLowerCase();
-		const displayName = getSkillDisplayName(skill).toLowerCase();
+	return cognitives.filter((cognitive) => {
+		const name = cognitive.name.toLowerCase();
+		const displayName = getCognitiveDisplayName(cognitive).toLowerCase();
 		return normalizedInputs.some((input) => input === name || input === displayName);
 	});
 }
@@ -1473,7 +1796,7 @@ function isPathSafe(basePath, targetPath) {
 	return normalizedTarget.startsWith(normalizedBase + sep) || normalizedTarget === normalizedBase;
 }
 function getCanonicalDir(cognitiveType, global, cwd) {
-	return join(global ? homedir() : cwd || process.cwd(), AGENTS_DIR$3, COGNITIVE_SUBDIRS[cognitiveType]);
+	return join(global ? homedir() : cwd || process.cwd(), AGENTS_DIR$1, COGNITIVE_SUBDIRS[cognitiveType]);
 }
 function getInstallPath(skillName, agentType, options = {}) {
 	const cognitiveType = options.cognitiveType ?? "skill";
@@ -1636,7 +1959,7 @@ async function installCognitiveForAgent(cognitive, agentType, options = {}) {
 		};
 	}
 }
-async function installRemoteSkillForAgent(skill, agentType, options = {}) {
+async function installRemoteCognitiveForAgent(skill, agentType, options = {}) {
 	const cognitiveType = options.cognitiveType ?? skill.cognitiveType ?? "skill";
 	const agent = agents[agentType];
 	const isGlobal = options.global ?? false;
@@ -1650,12 +1973,12 @@ async function installRemoteSkillForAgent(skill, agentType, options = {}) {
 		mode: installMode,
 		error: `${agent.displayName} does not support global ${cognitiveType} installation`
 	};
-	const skillName = sanitizeName(skill.installName);
+	const cognitiveName = sanitizeName(skill.installName);
 	const canonicalBase = getCanonicalDir(cognitiveType, isGlobal, cwd);
-	const canonicalDir = join(canonicalBase, skillName);
+	const canonicalDir = join(canonicalBase, cognitiveName);
 	const localDir = getCognitiveDir(agentType, cognitiveType, "local");
 	const agentBase = isGlobal ? globalDir : join(cwd, localDir);
-	const agentDir = join(agentBase, skillName);
+	const agentDir = join(agentBase, cognitiveName);
 	if (!isPathSafe(canonicalBase, canonicalDir)) return {
 		success: false,
 		path: agentDir,
@@ -1712,7 +2035,7 @@ async function installRemoteSkillForAgent(skill, agentType, options = {}) {
 		};
 	}
 }
-async function installWellKnownSkillForAgent(skill, agentType, options = {}) {
+async function installWellKnownCognitiveForAgent(skill, agentType, options = {}) {
 	const cognitiveType = options.cognitiveType ?? "skill";
 	const agent = agents[agentType];
 	const isGlobal = options.global ?? false;
@@ -1725,12 +2048,12 @@ async function installWellKnownSkillForAgent(skill, agentType, options = {}) {
 		mode: installMode,
 		error: `${agent.displayName} does not support global ${cognitiveType} installation`
 	};
-	const skillName = sanitizeName(skill.installName);
+	const cognitiveName = sanitizeName(skill.installName);
 	const canonicalBase = getCanonicalDir(cognitiveType, isGlobal, cwd);
-	const canonicalDir = join(canonicalBase, skillName);
+	const canonicalDir = join(canonicalBase, cognitiveName);
 	const localDir = getCognitiveDir(agentType, cognitiveType, "local");
 	const agentBase = isGlobal ? globalDir : join(cwd, localDir);
-	const agentDir = join(agentBase, skillName);
+	const agentDir = join(agentBase, cognitiveName);
 	if (!isPathSafe(canonicalBase, canonicalDir)) return {
 		success: false,
 		path: agentDir,
@@ -1798,11 +2121,7 @@ async function installWellKnownSkillForAgent(skill, agentType, options = {}) {
 }
 async function listInstalledCognitives(options = {}) {
 	const cwd = options.cwd || process.cwd();
-	const typesToScan = options.typeFilter ?? [
-		"skill",
-		"agent",
-		"prompt"
-	];
+	const typesToScan = options.typeFilter ?? Object.keys(COGNITIVE_FILE_NAMES);
 	const cognitivesMap = /* @__PURE__ */ new Map();
 	const detectedAgents = await detectInstalledAgents();
 	const agentFilter = options.agentFilter;
@@ -1841,7 +2160,7 @@ async function listInstalledCognitives(options = {}) {
 				} catch {
 					continue;
 				}
-				const parsed = cognitiveType === "skill" ? await parseSkillMd(mdPath) : await parseCognitiveMd(mdPath, cognitiveType);
+				const parsed = await parseCognitiveMd(mdPath, cognitiveType);
 				if (!parsed) continue;
 				const scopeKey = scope.global ? "global" : "project";
 				const cognitiveKey = `${scopeKey}:${cognitiveType}:${parsed.name}`;
@@ -1891,7 +2210,7 @@ async function listInstalledCognitives(options = {}) {
 							try {
 								const candidateMdPath = join(candidateDir, fileName);
 								await stat(candidateMdPath);
-								const candidateParsed = cognitiveType === "skill" ? await parseSkillMd(candidateMdPath) : await parseCognitiveMd(candidateMdPath, cognitiveType);
+								const candidateParsed = await parseCognitiveMd(candidateMdPath, cognitiveType);
 								if (candidateParsed && candidateParsed.name === parsed.name) {
 									found = true;
 									break;
@@ -1918,12 +2237,6 @@ async function listInstalledCognitives(options = {}) {
 	}
 	return Array.from(cognitivesMap.values());
 }
-async function listInstalledSkills(options = {}) {
-	return listInstalledCognitives({
-		...options,
-		typeFilter: ["skill"]
-	});
-}
 async function isCognitiveInstalled(name, agentType, cognitiveType, options = {}) {
 	const sanitized = sanitizeName(name);
 	const globalDir = getCognitiveDir(agentType, cognitiveType, "global");
@@ -1939,9 +2252,6 @@ async function isCognitiveInstalled(name, agentType, cognitiveType, options = {}
 		return false;
 	}
 }
-async function isSkillInstalled(skillName, agentType, options = {}) {
-	return isCognitiveInstalled(skillName, agentType, options.cognitiveType ?? "skill", options);
-}
 const TELEMETRY_URL = "https://add-skill.vercel.sh/t";
 let cliVersion = null;
 function isCI() {
@@ -1984,17 +2294,28 @@ function registerProvider(provider) {
 function findProvider(url) {
 	return registry.findProvider(url);
 }
+const FILE_NAME_TO_TYPE$1 = new Map(Object.entries(COGNITIVE_FILE_NAMES).map(([type, name]) => [name.toLowerCase(), type]));
+function detectCognitiveType$1(url) {
+	const lower = url.toLowerCase();
+	for (const [fileName, type] of FILE_NAME_TO_TYPE$1) if (lower.endsWith("/" + fileName)) return type;
+	return "skill";
+}
+function matchesCognitiveFile$1(url) {
+	const lower = url.toLowerCase();
+	for (const fileName of FILE_NAME_TO_TYPE$1.keys()) if (lower.endsWith("/" + fileName)) return true;
+	return false;
+}
 var MintlifyProvider = class {
 	id = "mintlify";
 	displayName = "Mintlify";
 	match(url) {
 		if (!url.startsWith("http://") && !url.startsWith("https://")) return { matches: false };
-		if (!url.toLowerCase().endsWith("/skill.md")) return { matches: false };
+		if (!matchesCognitiveFile$1(url)) return { matches: false };
 		if (url.includes("github.com") || url.includes("gitlab.com")) return { matches: false };
 		if (url.includes("huggingface.co")) return { matches: false };
 		return { matches: true };
 	}
-	async fetchSkill(url) {
+	async fetchCognitive(url) {
 		try {
 			const response = await fetch(url, { signal: AbortSignal.timeout(3e4) });
 			if (!response.ok) return null;
@@ -2009,12 +2330,16 @@ var MintlifyProvider = class {
 				content,
 				installName: mintlifySite,
 				sourceUrl: url,
-				metadata: data.metadata
+				metadata: data.metadata,
+				cognitiveType: detectCognitiveType$1(url)
 			};
 		} catch {
 			return null;
 		}
 	}
+	async fetchSkill(url) {
+		return this.fetchCognitive(url);
+	}
 	toRawUrl(url) {
 		return url;
 	}
@@ -2023,6 +2348,17 @@ var MintlifyProvider = class {
 	}
 };
 const mintlifyProvider = new MintlifyProvider();
+const FILE_NAME_TO_TYPE = new Map(Object.entries(COGNITIVE_FILE_NAMES).map(([type, name]) => [name.toLowerCase(), type]));
+function matchesCognitiveFile(url) {
+	const lower = url.toLowerCase();
+	for (const fileName of FILE_NAME_TO_TYPE.keys()) if (lower.endsWith("/" + fileName)) return true;
+	return false;
+}
+function detectCognitiveType(url) {
+	const lower = url.toLowerCase();
+	for (const [fileName, type] of FILE_NAME_TO_TYPE) if (lower.endsWith("/" + fileName)) return type;
+	return "skill";
+}
 var HuggingFaceProvider = class {
 	id = "huggingface";
 	displayName = "HuggingFace";
@@ -2034,11 +2370,11 @@ var HuggingFaceProvider = class {
 		} catch {
 			return { matches: false };
 		}
-		if (!url.toLowerCase().endsWith("/skill.md")) return { matches: false };
+		if (!matchesCognitiveFile(url)) return { matches: false };
 		if (!url.includes("/spaces/")) return { matches: false };
 		return { matches: true };
 	}
-	async fetchSkill(url) {
+	async fetchCognitive(url) {
 		try {
 			const rawUrl = this.toRawUrl(url);
 			const response = await fetch(rawUrl, { signal: AbortSignal.timeout(3e4) });
@@ -2055,7 +2391,8 @@ var HuggingFaceProvider = class {
 				content,
 				installName,
 				sourceUrl: url,
-				metadata: data.metadata
+				metadata: data.metadata,
+				cognitiveType: detectCognitiveType(url)
 			};
 		} catch {
 			return null;
@@ -2069,6 +2406,9 @@ var HuggingFaceProvider = class {
 		if (!parsed) return "huggingface/unknown";
 		return `huggingface/${parsed.owner}/${parsed.repo}`;
 	}
+	async fetchSkill(url) {
+		return this.fetchCognitive(url);
+	}
 	parseUrl(url) {
 		const match = url.match(/\/spaces\/([^/]+)\/([^/]+)/);
 		if (!match || !match[1] || !match[2]) return null;
@@ -2081,8 +2421,9 @@ var HuggingFaceProvider = class {
 const huggingFaceProvider = new HuggingFaceProvider();
 var WellKnownProvider = class {
 	id = "well-known";
-	displayName = "Well-Known Skills";
-	WELL_KNOWN_PATH = ".well-known/skills";
+	displayName = "Well-Known Cognitives";
+	WELL_KNOWN_PATH = ".well-known/cognitives";
+	WELL_KNOWN_PATH_LEGACY = ".well-known/skills";
 	INDEX_FILE = "index.json";
 	match(url) {
 		if (!url.startsWith("http://") && !url.startsWith("https://")) return { matches: false };
@@ -2105,37 +2446,41 @@ var WellKnownProvider = class {
 		try {
 			const parsed = new URL(baseUrl);
 			const basePath = parsed.pathname.replace(/\/$/, "");
-			const urlsToTry = [{
-				indexUrl: `${parsed.protocol}//${parsed.host}${basePath}/${this.WELL_KNOWN_PATH}/${this.INDEX_FILE}`,
-				baseUrl: `${parsed.protocol}//${parsed.host}${basePath}`
-			}];
-			if (basePath && basePath !== "") urlsToTry.push({
-				indexUrl: `${parsed.protocol}//${parsed.host}/${this.WELL_KNOWN_PATH}/${this.INDEX_FILE}`,
-				baseUrl: `${parsed.protocol}//${parsed.host}`
-			});
-			for (const { indexUrl, baseUrl: resolvedBase } of urlsToTry) try {
-				const response = await fetch(indexUrl);
-				if (!response.ok) continue;
-				const index = await response.json();
-				if (!index.skills || !Array.isArray(index.skills)) continue;
-				let allValid = true;
-				for (const entry of index.skills) if (!this.isValidSkillEntry(entry)) {
-					allValid = false;
-					break;
+			const wellKnownPaths = [this.WELL_KNOWN_PATH, this.WELL_KNOWN_PATH_LEGACY];
+			for (const wkPath of wellKnownPaths) {
+				const urlsToTry = [{
+					indexUrl: `${parsed.protocol}//${parsed.host}${basePath}/${wkPath}/${this.INDEX_FILE}`,
+					baseUrl: `${parsed.protocol}//${parsed.host}${basePath}`
+				}];
+				if (basePath && basePath !== "") urlsToTry.push({
+					indexUrl: `${parsed.protocol}//${parsed.host}/${wkPath}/${this.INDEX_FILE}`,
+					baseUrl: `${parsed.protocol}//${parsed.host}`
+				});
+				for (const { indexUrl, baseUrl: resolvedBase } of urlsToTry) try {
+					const response = await fetch(indexUrl);
+					if (!response.ok) continue;
+					const raw = await response.json();
+					const entries = raw.cognitives ?? raw.skills;
+					if (!entries || !Array.isArray(entries)) continue;
+					let allValid = true;
+					for (const entry of entries) if (!this.isValidCognitiveEntry(entry)) {
+						allValid = false;
+						break;
+					}
+					if (allValid) return {
+						index: { cognitives: entries },
+						resolvedBaseUrl: resolvedBase
+					};
+				} catch {
+					continue;
 				}
-				if (allValid) return {
-					index,
-					resolvedBaseUrl: resolvedBase
-				};
-			} catch {
-				continue;
 			}
 			return null;
 		} catch {
 			return null;
 		}
 	}
-	isValidSkillEntry(entry) {
+	isValidCognitiveEntry(entry) {
 		if (!entry || typeof entry !== "object") return false;
 		const e = entry;
 		if (typeof e.name !== "string" || !e.name) return false;
@@ -2148,41 +2493,50 @@ var WellKnownProvider = class {
 			if (typeof file !== "string") return false;
 			if (file.startsWith("/") || file.startsWith("\\") || file.includes("..")) return false;
 		}
-		if (!e.files.some((f) => typeof f === "string" && f.toLowerCase() === "skill.md")) return false;
+		const cognitiveFileNames = new Set(Object.values(COGNITIVE_FILE_NAMES).map((n) => n.toLowerCase()));
+		if (!e.files.some((f) => typeof f === "string" && cognitiveFileNames.has(f.toLowerCase()))) return false;
 		return true;
 	}
-	async fetchSkill(url) {
+	async fetchCognitive(url) {
 		try {
 			const parsed = new URL(url);
 			const result = await this.fetchIndex(url);
 			if (!result) return null;
 			const { index, resolvedBaseUrl } = result;
-			let skillName = null;
-			const pathMatch = parsed.pathname.match(/\/.well-known\/skills\/([^/]+)\/?$/);
-			if (pathMatch && pathMatch[1] && pathMatch[1] !== "index.json") skillName = pathMatch[1];
-			else if (index.skills.length === 1) skillName = index.skills[0].name;
-			if (!skillName) return null;
-			const skillEntry = index.skills.find((s) => s.name === skillName);
-			if (!skillEntry) return null;
-			return this.fetchSkillByEntry(resolvedBaseUrl, skillEntry);
+			let cognitiveName = null;
+			const pathMatch = parsed.pathname.match(/\/.well-known\/cognitives\/([^/]+)\/?$/) ?? parsed.pathname.match(/\/.well-known\/skills\/([^/]+)\/?$/);
+			if (pathMatch && pathMatch[1] && pathMatch[1] !== "index.json") cognitiveName = pathMatch[1];
+			else if (index.cognitives.length === 1) cognitiveName = index.cognitives[0].name;
+			if (!cognitiveName) return null;
+			const cognitiveEntry = index.cognitives.find((s) => s.name === cognitiveName);
+			if (!cognitiveEntry) return null;
+			return this.fetchCognitiveByEntry(resolvedBaseUrl, cognitiveEntry);
 		} catch {
 			return null;
 		}
 	}
-	async fetchSkillByEntry(baseUrl, entry) {
+	async fetchCognitiveByEntry(baseUrl, entry) {
 		try {
-			const skillBaseUrl = `${baseUrl.replace(/\/$/, "")}/${this.WELL_KNOWN_PATH}/${entry.name}`;
-			const skillMdUrl = `${skillBaseUrl}/SKILL.md`;
-			const response = await fetch(skillMdUrl);
+			const cognitiveBaseUrl = `${baseUrl.replace(/\/$/, "")}/${this.WELL_KNOWN_PATH}/${entry.name}`;
+			const cognitiveFileNames = Object.values(COGNITIVE_FILE_NAMES).map((n) => n.toLowerCase());
+			const primaryFile = entry.files.find((f) => cognitiveFileNames.includes(f.toLowerCase()));
+			if (!primaryFile) return null;
+			const cognitiveType = Object.entries(COGNITIVE_FILE_NAMES).find(([_, name]) => name.toLowerCase() === primaryFile.toLowerCase())?.[0] ?? "skill";
+			const primaryUrl = `${cognitiveBaseUrl}/${primaryFile}`;
+			let response = await fetch(primaryUrl);
+			if (!response.ok) {
+				const legacyPrimaryUrl = `${`${baseUrl.replace(/\/$/, "")}/${this.WELL_KNOWN_PATH_LEGACY}/${entry.name}`}/${primaryFile}`;
+				response = await fetch(legacyPrimaryUrl);
+			}
 			if (!response.ok) return null;
 			const content = await response.text();
 			const { data } = (0, import_gray_matter.default)(content);
 			if (!data.name || !data.description) return null;
 			const files = /* @__PURE__ */ new Map();
-			files.set("SKILL.md", content);
-			const filePromises = entry.files.filter((f) => f.toLowerCase() !== "skill.md").map(async (filePath) => {
+			files.set(primaryFile, content);
+			const filePromises = entry.files.filter((f) => f.toLowerCase() !== primaryFile.toLowerCase()).map(async (filePath) => {
 				try {
-					const fileUrl = `${skillBaseUrl}/${filePath}`;
+					const fileUrl = `${cognitiveBaseUrl}/${filePath}`;
 					const fileResponse = await fetch(fileUrl);
 					if (fileResponse.ok) return {
 						path: filePath,
@@ -2198,8 +2552,9 @@ var WellKnownProvider = class {
 				description: data.description,
 				content,
 				installName: entry.name,
-				sourceUrl: skillMdUrl,
+				sourceUrl: primaryUrl,
 				metadata: data.metadata,
+				cognitiveType,
 				files,
 				indexEntry: entry
 			};
@@ -2207,13 +2562,13 @@ var WellKnownProvider = class {
 			return null;
 		}
 	}
-	async fetchAllSkills(url) {
+	async fetchAllCognitives(url) {
 		try {
 			const result = await this.fetchIndex(url);
 			if (!result) return [];
 			const { index, resolvedBaseUrl } = result;
-			const skillPromises = index.skills.map((entry) => this.fetchSkillByEntry(resolvedBaseUrl, entry));
-			return (await Promise.all(skillPromises)).filter((s) => s !== null);
+			const cognitivePromises = index.cognitives.map((entry) => this.fetchCognitiveByEntry(resolvedBaseUrl, entry));
+			return (await Promise.all(cognitivePromises)).filter((s) => s !== null);
 		} catch {
 			return [];
 		}
@@ -2221,11 +2576,16 @@ var WellKnownProvider = class {
 	toRawUrl(url) {
 		try {
 			const parsed = new URL(url);
-			if (url.toLowerCase().endsWith("/skill.md")) return url;
-			const pathMatch = parsed.pathname.match(/\/.well-known\/skills\/([^/]+)\/?$/);
+			const cognitiveFileNames = Object.values(COGNITIVE_FILE_NAMES).map((n) => n.toLowerCase());
+			const lower = url.toLowerCase();
+			if (cognitiveFileNames.some((f) => lower.endsWith("/" + f))) return url;
+			const pathMatch = parsed.pathname.match(/\/.well-known\/cognitives\/([^/]+?)(?:\/([^/]+))?\/?$/) ?? parsed.pathname.match(/\/.well-known\/skills\/([^/]+?)(?:\/([^/]+))?\/?$/);
 			if (pathMatch && pathMatch[1]) {
-				const basePath = parsed.pathname.replace(/\/.well-known\/skills\/.*$/, "");
-				return `${parsed.protocol}//${parsed.host}${basePath}/${this.WELL_KNOWN_PATH}/${pathMatch[1]}/SKILL.md`;
+				const matchedWkPath = parsed.pathname.includes(".well-known/cognitives") ? this.WELL_KNOWN_PATH : this.WELL_KNOWN_PATH_LEGACY;
+				const basePath = parsed.pathname.replace(/\/.well-known\/(?:cognitives|skills)\/.*$/, "");
+				const trailingFile = pathMatch[2]?.toLowerCase();
+				const cognitiveFile = cognitiveFileNames.find((f) => f === trailingFile) ? pathMatch[2] : COGNITIVE_FILE_NAMES.skill;
+				return `${parsed.protocol}//${parsed.host}${basePath}/${matchedWkPath}/${pathMatch[1]}/${cognitiveFile}`;
 			}
 			const basePath = parsed.pathname.replace(/\/$/, "");
 			return `${parsed.protocol}//${parsed.host}${basePath}/${this.WELL_KNOWN_PATH}/${this.INDEX_FILE}`;
@@ -2246,34 +2606,50 @@ var WellKnownProvider = class {
 			return "unknown/unknown";
 		}
 	}
-	async hasSkillsIndex(url) {
+	async hasCognitivesIndex(url) {
 		return await this.fetchIndex(url) !== null;
 	}
+	async hasSkillsIndex(url) {
+		return this.hasCognitivesIndex(url);
+	}
+	async fetchSkill(url) {
+		return this.fetchCognitive(url);
+	}
+	async fetchSkillByEntry(baseUrl, entry) {
+		return this.fetchCognitiveByEntry(baseUrl, entry);
+	}
+	async fetchAllSkills(url) {
+		return this.fetchAllCognitives(url);
+	}
 };
 const wellKnownProvider = new WellKnownProvider();
 registerProvider(mintlifyProvider);
 registerProvider(huggingFaceProvider);
-async function fetchMintlifySkill(url) {
-	try {
-		const response = await fetch(url, { signal: AbortSignal.timeout(3e4) });
-		if (!response.ok) return null;
-		const content = await response.text();
-		const { data } = (0, import_gray_matter.default)(content);
-		const mintlifySite = data.metadata?.["mintlify-proj"];
-		if (!mintlifySite) return null;
-		if (!data.name || !data.description) return null;
-		return {
-			name: data.name,
-			description: data.description,
-			content,
-			mintlifySite,
-			sourceUrl: url
-		};
-	} catch {
-		return null;
+var version$1 = "1.1.0";
+function assertNotCancelled(value, cleanup) {
+	if (pD(value)) {
+		logger.cancel("Operation cancelled");
+		if (cleanup) cleanup().then(() => process.exit(0)).catch(() => process.exit(0));
+		else process.exit(0);
+		throw new Error("cancelled");
+	}
+}
+function validateAgentNames(agentNames) {
+	const validAgents = Object.keys(agents);
+	const invalid = agentNames.filter((a) => !validAgents.includes(a));
+	if (invalid.length > 0) {
+		logger.error(`Invalid agents: ${invalid.join(", ")}`);
+		logger.info(`Valid agents: ${validAgents.join(", ")}`);
+		process.exit(1);
 	}
+	return agentNames;
+}
+function buildLockEntry(params) {
+	return {
+		...params,
+		cognitiveFolderHash: ""
+	};
 }
-var version$1 = "1.0.0";
 function initTelemetry(version) {
 	setVersion(version);
 }
@@ -2313,29 +2689,21 @@ async function selectTargetAgents(options, spinner, cleanup, useUniversalAgents
 		}
 		if (useUniversalAgents) {
 			const selected = await selectAgentsInteractive({ global: options.global });
-			if (pD(selected)) {
-				logger.cancel("Installation cancelled");
-				await cleanup?.();
-				process.exit(0);
-			}
+			assertNotCancelled(selected, cleanup);
 			return selected;
 		}
-		logger.info("Select agents to install skills to");
+		logger.info("Select agents to install to");
 		const selected = await promptForAgents("Which agents do you want to install to?", Object.entries(agents).map(([key, config]) => ({
 			value: key,
 			label: config.displayName
 		})));
-		if (pD(selected)) {
-			logger.cancel("Installation cancelled");
-			await cleanup?.();
-			process.exit(0);
-		}
+		assertNotCancelled(selected, cleanup);
 		return selected;
 	}
 	if (installedAgents.length === 1 || options.yes) {
 		if (useUniversalAgents) {
 			const target = ensureUniversalAgents(installedAgents);
-			const { universal, symlinked } = splitAgentsByType(target);
+			const { symlinked } = splitAgentsByType(target);
 			if (symlinked.length > 0) logger.info(`Installing to: ${import_picocolors.default.green("universal")} + ${symlinked.map((a) => import_picocolors.default.cyan(a)).join(", ")}`);
 			else logger.info(`Installing to: ${import_picocolors.default.green("universal agents")}`);
 			return target;
@@ -2347,16 +2715,13 @@ async function selectTargetAgents(options, spinner, cleanup, useUniversalAgents
 		return installedAgents;
 	}
 	const selected = await selectAgentsInteractive({ global: options.global });
-	if (pD(selected)) {
-		logger.cancel("Installation cancelled");
-		await cleanup?.();
-		process.exit(0);
-	}
+	assertNotCancelled(selected, cleanup);
 	return selected;
 }
 async function selectInstallScope(options, targetAgents, cleanup) {
 	let installGlobally = options.global ?? false;
-	const supportsGlobal = targetAgents.some((a) => agents[a].globalSkillsDir !== void 0);
+	const cogType = options.type ?? "skill";
+	const supportsGlobal = targetAgents.some((a) => agents[a].dirs[cogType]?.global !== void 0);
 	if (options.global === void 0 && !options.yes && supportsGlobal) {
 		const scope = await ve({
 			message: "Installation scope",
@@ -2370,11 +2735,7 @@ async function selectInstallScope(options, targetAgents, cleanup) {
 				hint: "Install in home directory (available across all projects)"
 			}]
 		});
-		if (pD(scope)) {
-			logger.cancel("Installation cancelled");
-			await cleanup?.();
-			process.exit(0);
-		}
+		assertNotCancelled(scope, cleanup);
 		installGlobally = scope;
 	}
 	return installGlobally;
@@ -2393,56 +2754,53 @@ async function selectInstallMode(options, cleanup) {
 			hint: "Independent copies for each agent"
 		}]
 	});
-	if (pD(modeChoice)) {
-		logger.cancel("Installation cancelled");
-		await cleanup?.();
-		process.exit(0);
-	}
+	assertNotCancelled(modeChoice, cleanup);
 	return modeChoice;
 }
+async function selectInstallContext(options, spinner, cleanup, config) {
+	const targetAgents = await selectTargetAgents(options, spinner, cleanup, config?.useUniversalAgents);
+	return {
+		targetAgents,
+		installGlobally: await selectInstallScope(options, targetAgents, cleanup),
+		installMode: config?.forceMode ?? await selectInstallMode(options, cleanup)
+	};
+}
 async function isSourcePrivate(source) {
 	const ownerRepo = parseOwnerRepo(source);
 	if (!ownerRepo) return false;
 	return isRepoPrivate(ownerRepo.owner, ownerRepo.repo);
 }
-async function executeInstallFlow(prepared, options, spinner, cleanup) {
-	const { items, targetAgents, installGlobally, installMode, cognitiveType } = prepared;
-	const cwd = process.cwd();
+async function checkOverwrites(items, targetAgents, installGlobally, cognitiveType) {
 	const overwriteChecks = await Promise.all(items.flatMap((item) => targetAgents.map(async (agent) => ({
-		skillName: item.installName,
+		itemName: item.installName,
 		agent,
-		installed: cognitiveType === "skill" ? await isSkillInstalled(item.installName, agent, { global: installGlobally }) : await isCognitiveInstalled(item.installName, agent, cognitiveType, { global: installGlobally })
+		installed: await isCognitiveInstalled(item.installName, agent, cognitiveType, { global: installGlobally })
 	}))));
 	const overwriteStatus = /* @__PURE__ */ new Map();
-	for (const { skillName, agent, installed } of overwriteChecks) {
-		if (!overwriteStatus.has(skillName)) overwriteStatus.set(skillName, /* @__PURE__ */ new Map());
-		overwriteStatus.get(skillName).set(agent, installed);
+	for (const { itemName, agent, installed } of overwriteChecks) {
+		if (!overwriteStatus.has(itemName)) overwriteStatus.set(itemName, /* @__PURE__ */ new Map());
+		overwriteStatus.get(itemName).set(agent, installed);
 	}
+	return overwriteStatus;
+}
+function buildInstallSummary(items, targetAgents, installGlobally, installMode, cognitiveType, overwriteStatus, cwd) {
 	const summaryLines = [];
 	for (const item of items) {
 		if (summaryLines.length > 0) summaryLines.push("");
-		const shortCanonical = shortenPath$1(getCanonicalPath(item.installName, {
+		const shortCanonical = shortenPath(getCanonicalPath(item.installName, {
 			global: installGlobally,
 			cognitiveType
 		}), cwd);
 		summaryLines.push(`${import_picocolors.default.cyan(shortCanonical)}`);
 		summaryLines.push(...buildAgentSummaryLines(targetAgents, installMode));
 		if (item.fileCount && item.fileCount > 1) summaryLines.push(`  ${import_picocolors.default.dim("files:")} ${item.fileCount}`);
-		const skillOverwrites = overwriteStatus.get(item.installName);
-		const overwriteAgents = targetAgents.filter((a) => skillOverwrites?.get(a)).map((a) => agents[a].displayName);
-		if (overwriteAgents.length > 0) summaryLines.push(`  ${import_picocolors.default.yellow("overwrites:")} ${formatList$1(overwriteAgents)}`);
+		const itemOverwrites = overwriteStatus.get(item.installName);
+		const overwriteAgents = targetAgents.filter((a) => itemOverwrites?.get(a)).map((a) => agents[a].displayName);
+		if (overwriteAgents.length > 0) summaryLines.push(`  ${import_picocolors.default.yellow("overwrites:")} ${formatList(overwriteAgents)}`);
 	}
-	logger.note(summaryLines.join("\n"), "Installation Summary");
-	if (!options.yes) {
-		const confirmed = await ye({ message: "Proceed with installation?" });
-		if (pD(confirmed) || !confirmed) {
-			logger.cancel("Installation cancelled");
-			await cleanup?.();
-			process.exit(0);
-		}
-	}
-	const label = items.length === 1 ? "Installing skill..." : "Installing skills...";
-	spinner.start(label);
+	return summaryLines;
+}
+async function performInstalls(items, targetAgents, installGlobally, installMode) {
 	const results = [];
 	for (const item of items) for (const agent of targetAgents) {
 		const result = await item.installFn(agent, {
@@ -2450,450 +2808,383 @@ async function executeInstallFlow(prepared, options, spinner, cleanup) {
 			mode: installMode
 		});
 		results.push({
-			skill: item.installName,
+			name: item.installName,
 			agent: agents[agent].displayName,
 			...result
 		});
 	}
-	spinner.succeed("Installation complete");
-	logger.line();
-	const successful = results.filter((r) => r.success);
-	const failed = results.filter((r) => !r.success);
-	const { telemetry } = prepared;
-	if (telemetry.source) {
-		let shouldTrack = true;
-		if (telemetry.checkPrivacy) {
-			if (await isSourcePrivate(telemetry.source) === true) shouldTrack = false;
+	return results;
+}
+async function writeLockEntries(prepared, successfulNames) {
+	for (const entry of prepared.lockEntries) if (successfulNames.has(entry.name)) try {
+		let cognitiveFolderHash = entry.cognitiveFolderHash;
+		if (!cognitiveFolderHash && entry.sourceType === "github" && entry.cognitivePath) {
+			const hash = await fetchCognitiveFolderHash(entry.source, entry.cognitivePath);
+			if (hash) cognitiveFolderHash = hash;
 		}
-		if (shouldTrack) track({
-			event: "install",
-			source: telemetry.source,
-			skills: items.map((i) => i.installName).join(","),
-			agents: targetAgents.join(","),
-			...installGlobally && { global: "1" },
-			skillFiles: JSON.stringify(telemetry.skillFiles),
-			...telemetry.sourceType && { sourceType: telemetry.sourceType }
+		await addCognitiveToLock(entry.name, entry.cognitiveType, {
+			source: entry.source,
+			sourceType: entry.sourceType,
+			sourceUrl: entry.sourceUrl,
+			cognitivePath: entry.cognitivePath,
+			cognitiveFolderHash
 		});
-	}
-	if (successful.length > 0 && installGlobally) {
-		const successfulSkillNames = new Set(successful.map((r) => r.skill));
-		for (const entry of prepared.lockEntries) if (successfulSkillNames.has(entry.name)) try {
-			let skillFolderHash = entry.skillFolderHash;
-			if (!skillFolderHash && entry.sourceType === "github" && entry.skillPath) {
-				const hash = await fetchSkillFolderHash(entry.source, entry.skillPath);
-				if (hash) skillFolderHash = hash;
-			}
-			if (entry.isCognitive) await addCognitiveToLock(entry.name, entry.cognitiveType, {
-				source: entry.source,
-				sourceType: entry.sourceType,
-				sourceUrl: entry.sourceUrl,
-				skillPath: entry.skillPath,
-				skillFolderHash
-			});
-			else await addSkillToLock(entry.name, {
-				source: entry.source,
-				sourceType: entry.sourceType,
-				sourceUrl: entry.sourceUrl,
-				skillFolderHash
-			});
-		} catch {}
-	}
+	} catch {}
+}
+function displayResults(results, targetAgents, cognitiveType, cwd) {
+	const successful = results.filter((r) => r.success);
+	const failed = results.filter((r) => !r.success);
 	if (successful.length > 0) {
-		const bySkill = /* @__PURE__ */ new Map();
+		const byName = /* @__PURE__ */ new Map();
 		for (const r of successful) {
-			const skillResults = bySkill.get(r.skill) || [];
-			skillResults.push(r);
-			bySkill.set(r.skill, skillResults);
+			const group = byName.get(r.name) || [];
+			group.push(r);
+			byName.set(r.name, group);
 		}
-		const skillCount = bySkill.size;
+		const itemCount = byName.size;
 		const resultLines = [];
-		for (const [skillName, skillResults] of bySkill) {
-			const firstResult = skillResults[0];
+		for (const [itemName, itemResults] of byName) {
+			const firstResult = itemResults[0];
 			if (firstResult.mode === "copy") {
-				resultLines.push(`${import_picocolors.default.green("✓")} ${skillName} ${import_picocolors.default.dim("(copied)")}`);
-				for (const r of skillResults) {
-					const shortPath = shortenPath$1(r.path, cwd);
+				resultLines.push(`${import_picocolors.default.green("✓")} ${itemName} ${import_picocolors.default.dim("(copied)")}`);
+				for (const r of itemResults) {
+					const shortPath = shortenPath(r.path, cwd);
 					resultLines.push(`  ${import_picocolors.default.dim("→")} ${shortPath}`);
 				}
 			} else {
 				if (firstResult.canonicalPath) {
-					const shortPath = shortenPath$1(firstResult.canonicalPath, cwd);
+					const shortPath = shortenPath(firstResult.canonicalPath, cwd);
 					resultLines.push(`${import_picocolors.default.green("✓")} ${shortPath}`);
-				} else resultLines.push(`${import_picocolors.default.green("✓")} ${skillName}`);
-				resultLines.push(...buildResultLines(skillResults, targetAgents));
+				} else resultLines.push(`${import_picocolors.default.green("✓")} ${itemName}`);
+				resultLines.push(...buildResultLines(itemResults, targetAgents));
 			}
 		}
-		const title = import_picocolors.default.green(`Installed ${skillCount} skill${skillCount !== 1 ? "s" : ""}`);
+		const title = import_picocolors.default.green(`Installed ${itemCount} ${cognitiveType}${itemCount !== 1 ? "s" : ""}`);
 		logger.note(resultLines.join("\n"), title);
 		const symlinkFailures = successful.filter((r) => r.mode === "symlink" && r.symlinkFailed);
 		if (symlinkFailures.length > 0) {
 			const copiedAgentNames = symlinkFailures.map((r) => r.agent);
-			logger.warning(import_picocolors.default.yellow(`Symlinks failed for: ${formatList$1(copiedAgentNames)}`));
+			logger.warning(import_picocolors.default.yellow(`Symlinks failed for: ${formatList(copiedAgentNames)}`));
 			logger.message(import_picocolors.default.dim("Files were copied instead. On Windows, enable Developer Mode for symlink support."));
 		}
 	}
 	if (failed.length > 0) {
 		logger.line();
 		logger.error(import_picocolors.default.red(`Failed to install ${failed.length}`));
-		for (const r of failed) logger.message(`${import_picocolors.default.red("✗")} ${r.skill} → ${r.agent}: ${import_picocolors.default.dim(r.error)}`);
+		for (const r of failed) logger.message(`${import_picocolors.default.red("✗")} ${r.name} → ${r.agent}: ${import_picocolors.default.dim(r.error)}`);
+	}
+}
+async function executeInstallFlow(prepared, options, spinner, cleanup) {
+	const { items, targetAgents, installGlobally, installMode, cognitiveType } = prepared;
+	const cwd = process.cwd();
+	const summaryLines = buildInstallSummary(items, targetAgents, installGlobally, installMode, cognitiveType, await checkOverwrites(items, targetAgents, installGlobally, cognitiveType), cwd);
+	logger.note(summaryLines.join("\n"), "Installation Summary");
+	if (!options.yes) {
+		const confirmed = await ye({ message: "Proceed with installation?" });
+		if (pD(confirmed) || !confirmed) {
+			logger.cancel("Installation cancelled");
+			await cleanup?.();
+			process.exit(0);
+		}
 	}
-	logger.outro(import_picocolors.default.green("Done!") + import_picocolors.default.dim("  Review skills before use; they run with full agent permissions."));
+	const label = items.length === 1 ? `Installing ${cognitiveType}...` : `Installing ${cognitiveType}s...`;
+	spinner.start(label);
+	const results = await performInstalls(items, targetAgents, installGlobally, installMode);
+	spinner.succeed("Installation complete");
+	logger.line();
+	const successful = results.filter((r) => r.success);
+	const { telemetry } = prepared;
+	if (telemetry.source) {
+		let shouldTrack = true;
+		if (telemetry.checkPrivacy) {
+			if (await isSourcePrivate(telemetry.source) === true) shouldTrack = false;
+		}
+		if (shouldTrack) track({
+			event: "install",
+			source: telemetry.source,
+			skills: items.map((i) => i.installName).join(","),
+			agents: targetAgents.join(","),
+			...installGlobally && { global: "1" },
+			skillFiles: JSON.stringify(telemetry.skillFiles),
+			...telemetry.sourceType && { sourceType: telemetry.sourceType }
+		});
+	}
+	if (successful.length > 0 && installGlobally) await writeLockEntries(prepared, new Set(successful.map((r) => r.name)));
+	displayResults(results, targetAgents, cognitiveType, cwd);
+	logger.outro(import_picocolors.default.green("Done!") + import_picocolors.default.dim("  Review cognitives before use; they run with full agent permissions."));
 	await promptForFindSkills(options, targetAgents);
 }
-async function selectSkillItems(items, options, cleanup) {
+async function selectCognitiveItems(items, options, cleanup) {
+	const cognitiveType = options.type ?? "skill";
+	const label = cognitiveType === "skill" ? "skills" : `${cognitiveType}s`;
 	if (options.skill?.includes("*")) {
-		logger.info(`Installing all ${items.length} skills`);
+		logger.info(`Installing all ${items.length} ${label}`);
 		return items;
 	}
 	if (options.skill && options.skill.length > 0) {
 		const selected = items.filter((s) => options.skill.some((name) => "installName" in s && s.installName?.toLowerCase() === name.toLowerCase() || s.name.toLowerCase() === name.toLowerCase()));
 		if (selected.length === 0) {
-			logger.error(`No matching skills found for: ${options.skill.join(", ")}`);
-			logger.info("Available skills:");
+			logger.error(`No matching ${label} found for: ${options.skill.join(", ")}`);
+			logger.info(`Available ${label}:`);
 			for (const s of items) logger.message(`- ${"installName" in s ? s.installName : s.name}`);
 			await cleanup?.();
 			process.exit(1);
 		}
-		logger.info(`Selected ${selected.length} skill${selected.length !== 1 ? "s" : ""}: ${selected.map((s) => import_picocolors.default.cyan("installName" in s ? s.installName : s.name)).join(", ")}`);
+		logger.info(`Selected ${selected.length} ${cognitiveType}${selected.length !== 1 ? "s" : ""}: ${selected.map((s) => import_picocolors.default.cyan("installName" in s ? s.installName : s.name)).join(", ")}`);
 		return selected;
 	}
 	if (items.length === 1) {
 		const first = items[0];
-		logger.info(`Skill: ${import_picocolors.default.cyan("installName" in first ? first.installName : first.name)}`);
+		logger.info(`${cognitiveType}: ${import_picocolors.default.cyan("installName" in first ? first.installName : first.name)}`);
 		return items;
 	}
 	if (options.yes) {
-		logger.info(`Installing all ${items.length} skills`);
+		logger.info(`Installing all ${items.length} ${label}`);
 		return items;
 	}
+	const cognitiveChoices = items.map((s) => ({
+		value: s,
+		label: "installName" in s ? s.installName : s.name,
+		hint: s.description.length > 60 ? s.description.slice(0, 57) + "..." : s.description
+	}));
 	const selected = await multiselect({
-		message: "Select skills to install",
-		options: items.map((s) => ({
-			value: s,
-			label: "installName" in s ? s.installName : s.name,
-			hint: s.description.length > 60 ? s.description.slice(0, 57) + "..." : s.description
-		})),
+		message: `Select ${label} to install`,
+		options: cognitiveChoices,
 		required: true
 	});
-	if (pD(selected)) {
-		logger.cancel("Installation cancelled");
-		await cleanup?.();
-		process.exit(0);
-	}
+	assertNotCancelled(selected, cleanup);
 	return selected;
 }
-async function resolveRemoteSkill(source, url, options, spinner) {
+async function resolveRemoteCognitive(url, options, spinner) {
 	const provider = findProvider(url);
-	if (!provider) return resolveDirectUrlLegacy(source, url, options, spinner);
-	spinner.start(`Fetching skill.md from ${provider.displayName}...`);
-	const providerSkill = await provider.fetchSkill(url);
-	if (!providerSkill) {
-		spinner.fail("Invalid skill");
-		logger.outro(import_picocolors.default.red("Could not fetch skill.md or missing required frontmatter (name, description)."));
+	if (!provider) {
+		spinner.fail("Unsupported source host");
+		logger.outro(import_picocolors.default.red("Could not find a provider for this URL. Supported hosts include Mintlify, HuggingFace, and well-known endpoints."));
 		process.exit(1);
 	}
-	const remoteSkill = {
-		name: providerSkill.name,
-		description: providerSkill.description,
-		content: providerSkill.content,
-		installName: providerSkill.installName,
-		sourceUrl: providerSkill.sourceUrl,
+	const cognitiveType = options.type ?? "skill";
+	const cognitiveFile = COGNITIVE_FILE_NAMES[cognitiveType];
+	spinner.start(`Fetching ${cognitiveFile} from ${provider.displayName}...`);
+	const providerCognitive = await provider.fetchCognitive(url);
+	if (!providerCognitive) {
+		spinner.fail(`Invalid ${cognitiveType}`);
+		logger.outro(import_picocolors.default.red(`Could not fetch ${cognitiveFile} or missing required frontmatter (name, description).`));
+		process.exit(1);
+	}
+	const resolvedType = providerCognitive.cognitiveType ?? cognitiveType;
+	const remoteCognitive = {
+		name: providerCognitive.name,
+		description: providerCognitive.description,
+		content: providerCognitive.content,
+		installName: providerCognitive.installName,
+		sourceUrl: providerCognitive.sourceUrl,
 		providerId: provider.id,
 		sourceIdentifier: provider.getSourceIdentifier(url),
-		metadata: providerSkill.metadata
+		metadata: providerCognitive.metadata,
+		cognitiveType: resolvedType
 	};
-	spinner.succeed(`Found skill: ${import_picocolors.default.cyan(remoteSkill.installName)}`);
-	logger.info(`Skill: ${import_picocolors.default.cyan(remoteSkill.name)}`);
-	logger.message(import_picocolors.default.dim(remoteSkill.description));
-	logger.message(import_picocolors.default.dim(`Source: ${remoteSkill.sourceIdentifier}`));
+	spinner.succeed(`Found ${resolvedType}: ${import_picocolors.default.cyan(remoteCognitive.installName)}`);
+	logger.info(`${resolvedType}: ${import_picocolors.default.cyan(remoteCognitive.name)}`);
+	logger.message(import_picocolors.default.dim(remoteCognitive.description));
+	logger.message(import_picocolors.default.dim(`Source: ${remoteCognitive.sourceIdentifier}`));
 	if (options.list) {
 		logger.line();
-		logger.step(import_picocolors.default.bold("Skill Details"));
-		logger.message(`${import_picocolors.default.cyan("Name:")} ${remoteSkill.name}`);
-		logger.message(`${import_picocolors.default.cyan("Install as:")} ${remoteSkill.installName}`);
+		logger.step(import_picocolors.default.bold("Details"));
+		logger.message(`${import_picocolors.default.cyan("Name:")} ${remoteCognitive.name}`);
+		logger.message(`${import_picocolors.default.cyan("Install as:")} ${remoteCognitive.installName}`);
 		logger.message(`${import_picocolors.default.cyan("Provider:")} ${provider.displayName}`);
-		logger.message(`${import_picocolors.default.cyan("Description:")} ${remoteSkill.description}`);
+		logger.message(`${import_picocolors.default.cyan("Description:")} ${remoteCognitive.description}`);
 		logger.outro("Run without --list to install");
 		process.exit(0);
 	}
-	const targetAgents = await selectTargetAgents(options, spinner, void 0, true);
-	const installGlobally = await selectInstallScope(options, targetAgents);
-	const installMode = await selectInstallMode(options);
+	const { targetAgents, installGlobally, installMode } = await selectInstallContext(options, spinner, void 0, {
+		useUniversalAgents: true,
+		forceMode: provider.id === "mintlify" ? "symlink" : void 0
+	});
 	return {
 		items: [{
-			installName: remoteSkill.installName,
-			displayName: remoteSkill.name,
-			description: remoteSkill.description,
-			sourceIdentifier: remoteSkill.sourceIdentifier,
-			providerId: remoteSkill.providerId,
+			installName: remoteCognitive.installName,
+			displayName: remoteCognitive.name,
+			description: remoteCognitive.description,
+			sourceIdentifier: remoteCognitive.sourceIdentifier,
+			providerId: remoteCognitive.providerId,
 			sourceUrl: url,
-			installFn: (agent, opts) => installRemoteSkillForAgent(remoteSkill, agent, opts)
+			installFn: (agent, opts) => installRemoteCognitiveForAgent(remoteCognitive, agent, {
+				...opts,
+				cognitiveType: resolvedType
+			})
 		}],
 		targetAgents,
 		installGlobally,
 		installMode,
-		cognitiveType: "skill",
-		lockEntries: [{
-			name: remoteSkill.installName,
-			source: remoteSkill.sourceIdentifier,
-			sourceType: remoteSkill.providerId,
+		cognitiveType: resolvedType,
+		lockEntries: [buildLockEntry({
+			name: remoteCognitive.installName,
+			source: remoteCognitive.sourceIdentifier,
+			sourceType: remoteCognitive.providerId,
 			sourceUrl: url,
-			skillFolderHash: "",
-			cognitiveType: "skill",
-			isCognitive: false
-		}],
+			cognitiveType: resolvedType
+		})],
 		telemetry: {
-			source: remoteSkill.sourceIdentifier,
-			sourceType: remoteSkill.providerId,
-			skillFiles: { [remoteSkill.installName]: url },
+			source: remoteCognitive.sourceIdentifier,
+			sourceType: remoteCognitive.providerId,
+			skillFiles: { [remoteCognitive.installName]: url },
 			checkPrivacy: true
 		}
 	};
 }
-async function resolveDirectUrlLegacy(source, url, options, spinner) {
-	spinner.start("Fetching skill.md...");
-	const mintlifySkill = await fetchMintlifySkill(url);
-	if (!mintlifySkill) {
-		spinner.fail("Invalid skill");
-		logger.outro(import_picocolors.default.red("Could not fetch skill.md or missing required frontmatter (name, description, mintlify-proj)."));
-		process.exit(1);
-	}
-	const remoteSkill = {
-		name: mintlifySkill.name,
-		description: mintlifySkill.description,
-		content: mintlifySkill.content,
-		installName: mintlifySkill.mintlifySite,
-		sourceUrl: mintlifySkill.sourceUrl,
-		providerId: "mintlify",
-		sourceIdentifier: "mintlify/com"
-	};
-	spinner.succeed(`Found skill: ${import_picocolors.default.cyan(remoteSkill.installName)}`);
-	logger.info(`Skill: ${import_picocolors.default.cyan(remoteSkill.name)}`);
-	logger.message(import_picocolors.default.dim(remoteSkill.description));
-	if (options.list) {
-		logger.line();
-		logger.step(import_picocolors.default.bold("Skill Details"));
-		logger.message(`${import_picocolors.default.cyan("Name:")} ${remoteSkill.name}`);
-		logger.message(`${import_picocolors.default.cyan("Site:")} ${remoteSkill.installName}`);
-		logger.message(`${import_picocolors.default.cyan("Description:")} ${remoteSkill.description}`);
-		logger.outro("Run without --list to install");
-		process.exit(0);
-	}
-	const targetAgents = await selectTargetAgents(options, spinner);
-	const installGlobally = await selectInstallScope(options, targetAgents);
-	return {
-		items: [{
-			installName: remoteSkill.installName,
-			displayName: remoteSkill.name,
-			description: remoteSkill.description,
-			sourceIdentifier: "mintlify/com",
-			providerId: "mintlify",
-			sourceUrl: url,
-			installFn: (agent, opts) => installRemoteSkillForAgent(remoteSkill, agent, opts)
-		}],
-		targetAgents,
-		installGlobally,
-		installMode: "symlink",
-		cognitiveType: "skill",
-		lockEntries: [{
-			name: remoteSkill.installName,
-			source: `mintlify/${remoteSkill.installName}`,
-			sourceType: "mintlify",
-			sourceUrl: url,
-			skillFolderHash: "",
-			cognitiveType: "skill",
-			isCognitive: false
-		}],
-		telemetry: {
-			source: "mintlify/com",
-			sourceType: "mintlify",
-			skillFiles: { [remoteSkill.installName]: url },
-			checkPrivacy: false
-		}
-	};
-}
-async function resolveWellKnownSkills(source, url, options, spinner) {
-	spinner.start("Discovering skills from well-known endpoint...");
-	const skills = await wellKnownProvider.fetchAllSkills(url);
-	if (skills.length === 0) {
-		spinner.fail("No skills found");
-		logger.outro(import_picocolors.default.red("No skills found at this URL. Make sure the server has a /.well-known/skills/index.json file."));
+async function resolveWellKnownCognitives(url, options, spinner) {
+	const cognitiveType = options.type ?? "skill";
+	const label = cognitiveType === "skill" ? "skills" : `${cognitiveType}s`;
+	spinner.start(`Discovering ${label} from well-known endpoint...`);
+	const cognitives = await wellKnownProvider.fetchAllCognitives(url);
+	if (cognitives.length === 0) {
+		spinner.fail(`No ${label} found`);
+		logger.outro(import_picocolors.default.red(`No ${label} found at this URL. Make sure the server has a /.well-known/skills/index.json file.`));
 		process.exit(1);
 	}
-	spinner.succeed(`Found ${import_picocolors.default.green(skills.length)} skill${skills.length > 1 ? "s" : ""}`);
-	for (const skill of skills) {
-		logger.info(`Skill: ${import_picocolors.default.cyan(skill.installName)}`);
-		logger.message(import_picocolors.default.dim(skill.description));
-		if (skill.files.size > 1) logger.message(import_picocolors.default.dim(`  Files: ${Array.from(skill.files.keys()).join(", ")}`));
+	spinner.succeed(`Found ${import_picocolors.default.green(cognitives.length)} ${cognitiveType}${cognitives.length > 1 ? "s" : ""}`);
+	for (const item of cognitives) {
+		logger.info(`${cognitiveType}: ${import_picocolors.default.cyan(item.installName)}`);
+		logger.message(import_picocolors.default.dim(item.description));
+		if (item.files.size > 1) logger.message(import_picocolors.default.dim(`  Files: ${Array.from(item.files.keys()).join(", ")}`));
 	}
 	if (options.list) {
 		logger.line();
-		logger.step(import_picocolors.default.bold("Available Skills"));
-		for (const skill of skills) {
-			logger.message(`${import_picocolors.default.cyan(skill.installName)}`);
-			logger.message(`  ${import_picocolors.default.dim(skill.description)}`);
-			if (skill.files.size > 1) logger.message(`  ${import_picocolors.default.dim(`Files: ${skill.files.size}`)}`);
+		logger.step(import_picocolors.default.bold(`Available ${label}`));
+		for (const item of cognitives) {
+			logger.message(`${import_picocolors.default.cyan(item.installName)}`);
+			logger.message(`  ${import_picocolors.default.dim(item.description)}`);
+			if (item.files.size > 1) logger.message(`  ${import_picocolors.default.dim(`Files: ${item.files.size}`)}`);
 		}
 		logger.outro("Run without --list to install");
 		process.exit(0);
 	}
-	const selectedSkills = await selectSkillItems(skills, options);
-	const targetAgents = await selectTargetAgents(options, spinner);
-	const installGlobally = await selectInstallScope(options, targetAgents);
-	const installMode = await selectInstallMode(options);
+	const selectedCognitives = await selectCognitiveItems(cognitives, options);
+	const { targetAgents, installGlobally, installMode } = await selectInstallContext(options, spinner);
 	const sourceIdentifier = wellKnownProvider.getSourceIdentifier(url);
-	const items = selectedSkills.map((skill) => ({
-		installName: skill.installName,
-		displayName: skill.name,
-		description: skill.description,
+	const items = selectedCognitives.map((cog) => ({
+		installName: cog.installName,
+		displayName: cog.name,
+		description: cog.description,
 		sourceIdentifier,
 		providerId: "well-known",
-		sourceUrl: skill.sourceUrl,
-		fileCount: skill.files.size,
-		installFn: (agent, opts) => installWellKnownSkillForAgent(skill, agent, opts)
+		sourceUrl: cog.sourceUrl,
+		fileCount: cog.files.size,
+		installFn: (agent, opts) => installWellKnownCognitiveForAgent(cog, agent, opts)
 	}));
-	const skillFiles = {};
+	const telemetryFiles = {};
 	const lockEntries = [];
-	for (const skill of selectedSkills) {
-		skillFiles[skill.installName] = skill.sourceUrl;
-		lockEntries.push({
-			name: skill.installName,
+	for (const cog of selectedCognitives) {
+		telemetryFiles[cog.installName] = cog.sourceUrl;
+		lockEntries.push(buildLockEntry({
+			name: cog.installName,
 			source: sourceIdentifier,
 			sourceType: "well-known",
-			sourceUrl: skill.sourceUrl,
-			skillFolderHash: "",
-			cognitiveType: "skill",
-			isCognitive: false
-		});
+			sourceUrl: cog.sourceUrl,
+			cognitiveType: cog.cognitiveType ?? cognitiveType
+		}));
 	}
 	return {
 		items,
 		targetAgents,
 		installGlobally,
 		installMode,
-		cognitiveType: "skill",
+		cognitiveType: selectedCognitives[0]?.cognitiveType ?? cognitiveType,
 		lockEntries,
 		telemetry: {
 			source: sourceIdentifier,
 			sourceType: "well-known",
-			skillFiles,
+			skillFiles: telemetryFiles,
 			checkPrivacy: true
 		}
 	};
 }
-async function resolveGitRepoSkills(source, parsed, options, spinner, skillsDir, tempDir) {
+async function resolveGitRepoCognitives(source, parsed, options, spinner, sourceDir, tempDir) {
 	const cleanupFn = async () => {
 		await cleanupDir(tempDir);
 	};
 	const cognitiveType = options.type ?? "skill";
-	const cognitiveLabel = cognitiveType === "skill" ? "skills" : `${cognitiveType}s`;
-	const cognitiveFile = cognitiveType === "skill" ? "SKILL.md" : cognitiveType === "agent" ? "AGENT.md" : "PROMPT.md";
+	const label = cognitiveType === "skill" ? "skills" : `${cognitiveType}s`;
+	const cognitiveFile = COGNITIVE_FILE_NAMES[cognitiveType];
 	const includeInternal = !!(options.skill && options.skill.length > 0);
-	spinner.start(`Discovering ${cognitiveLabel}...`);
-	const skills = options.type ? await discoverCognitives(skillsDir, parsed.subpath, {
+	spinner.start(`Discovering ${label}...`);
+	const cognitives = await discoverCognitives(sourceDir, parsed.subpath, {
 		includeInternal,
 		fullDepth: options.fullDepth,
-		types: [options.type]
-	}) : await discoverSkills(skillsDir, parsed.subpath, {
-		includeInternal,
-		fullDepth: options.fullDepth
+		types: options.type ? [options.type] : ["skill"]
 	});
-	if (skills.length === 0) {
-		spinner.fail(`No ${cognitiveLabel} found`);
-		logger.outro(import_picocolors.default.red(`No valid ${cognitiveLabel} found. They require a ${cognitiveFile} with name and description.`));
+	if (cognitives.length === 0) {
+		spinner.fail(`No ${label} found`);
+		logger.outro(import_picocolors.default.red(`No valid ${label} found. They require a ${cognitiveFile} with name and description.`));
 		await cleanupFn();
 		process.exit(1);
 	}
-	spinner.succeed(`Found ${import_picocolors.default.green(skills.length)} skill${skills.length > 1 ? "s" : ""}`);
+	spinner.succeed(`Found ${import_picocolors.default.green(cognitives.length)} ${cognitiveType}${cognitives.length > 1 ? "s" : ""}`);
 	if (options.list) {
 		logger.line();
-		logger.step(import_picocolors.default.bold("Available Skills"));
-		for (const skill of skills) {
-			logger.message(`${import_picocolors.default.cyan(getSkillDisplayName(skill))}`);
-			logger.message(`  ${import_picocolors.default.dim(skill.description)}`);
+		logger.step(import_picocolors.default.bold(`Available ${label}`));
+		for (const cog of cognitives) {
+			logger.message(`${import_picocolors.default.cyan(getCognitiveDisplayName(cog))}`);
+			logger.message(`  ${import_picocolors.default.dim(cog.description)}`);
 		}
-		logger.outro("Use --skill <name> to install specific skills");
+		logger.outro(`Use --skill <name> to install specific ${label}`);
 		await cleanupFn();
 		process.exit(0);
 	}
-	let selectedSkills;
-	if (options.skill?.includes("*")) {
-		selectedSkills = skills;
-		logger.info(`Installing all ${skills.length} skills`);
-	} else if (options.skill && options.skill.length > 0) {
-		selectedSkills = filterSkills(skills, options.skill);
-		if (selectedSkills.length === 0) {
-			logger.error(`No matching skills found for: ${options.skill.join(", ")}`);
-			logger.info("Available skills:");
-			for (const s of skills) logger.message(`- ${getSkillDisplayName(s)}`);
+	let selectedCognitives;
+	if (options.skill && options.skill.length > 0 && !options.skill.includes("*")) {
+		selectedCognitives = filterCognitives(cognitives, options.skill);
+		if (selectedCognitives.length === 0) {
+			logger.error(`No matching ${label} found for: ${options.skill.join(", ")}`);
+			logger.info(`Available ${label}:`);
+			for (const s of cognitives) logger.message(`- ${getCognitiveDisplayName(s)}`);
 			await cleanupFn();
 			process.exit(1);
 		}
-		logger.info(`Selected ${selectedSkills.length} skill${selectedSkills.length !== 1 ? "s" : ""}: ${selectedSkills.map((s) => import_picocolors.default.cyan(getSkillDisplayName(s))).join(", ")}`);
-	} else if (skills.length === 1) {
-		selectedSkills = skills;
-		const firstSkill = skills[0];
-		logger.info(`Skill: ${import_picocolors.default.cyan(getSkillDisplayName(firstSkill))}`);
-		logger.message(import_picocolors.default.dim(firstSkill.description));
-	} else if (options.yes) {
-		selectedSkills = skills;
-		logger.info(`Installing all ${skills.length} skills`);
-	} else {
-		const selected = await multiselect({
-			message: "Select skills to install",
-			options: skills.map((s) => ({
-				value: s,
-				label: getSkillDisplayName(s),
-				hint: s.description.length > 60 ? s.description.slice(0, 57) + "..." : s.description
-			})),
-			required: true
-		});
-		if (pD(selected)) {
-			logger.cancel("Installation cancelled");
-			await cleanupFn();
-			process.exit(0);
-		}
-		selectedSkills = selected;
-	}
-	const targetAgents = await selectTargetAgents(options, spinner, cleanupFn);
-	const installGlobally = await selectInstallScope(options, targetAgents, cleanupFn);
-	const installMode = await selectInstallMode(options, cleanupFn);
+		logger.info(`Selected ${selectedCognitives.length} ${cognitiveType}${selectedCognitives.length !== 1 ? "s" : ""}: ${selectedCognitives.map((s) => import_picocolors.default.cyan(getCognitiveDisplayName(s))).join(", ")}`);
+	} else selectedCognitives = (await selectCognitiveItems(cognitives.map((s) => ({
+		installName: s.name,
+		name: getCognitiveDisplayName(s),
+		description: s.description
+	})), options, cleanupFn)).map((s) => cognitives.find((c) => c.name === s.installName));
+	const { targetAgents, installGlobally, installMode } = await selectInstallContext(options, spinner, cleanupFn);
 	const normalizedSource = getOwnerRepo(parsed);
-	const skillFiles = {};
-	for (const skill of selectedSkills) {
+	const telemetryFiles = {};
+	for (const cog of selectedCognitives) {
 		let relativePath;
-		if (tempDir && skill.path === tempDir) relativePath = cognitiveFile;
-		else if (tempDir && skill.path.startsWith(tempDir + sep)) relativePath = skill.path.slice(tempDir.length + 1).split(sep).join("/") + `/${cognitiveFile}`;
+		if (tempDir && cog.path === tempDir) relativePath = cognitiveFile;
+		else if (tempDir && cog.path.startsWith(tempDir + sep)) relativePath = cog.path.slice(tempDir.length + 1).split(sep).join("/") + `/${cognitiveFile}`;
 		else continue;
-		skillFiles[skill.name] = relativePath;
+		telemetryFiles[cog.name] = relativePath;
 	}
-	const items = selectedSkills.map((skill) => ({
-		installName: skill.name,
-		displayName: getSkillDisplayName(skill),
-		description: skill.description,
+	const items = selectedCognitives.map((cog) => ({
+		installName: cog.name,
+		displayName: getCognitiveDisplayName(cog),
+		description: cog.description,
 		sourceIdentifier: normalizedSource ?? source,
 		providerId: parsed.type,
 		sourceUrl: parsed.url,
-		installFn: (agent, opts) => installCognitiveForAgent(skill, agent, {
+		installFn: (agent, opts) => installCognitiveForAgent(cog, agent, {
 			...opts,
 			cognitiveType
 		})
 	}));
 	const lockEntries = [];
-	if (normalizedSource) for (const skill of selectedSkills) lockEntries.push({
-		name: getSkillDisplayName(skill),
+	if (normalizedSource) for (const cog of selectedCognitives) lockEntries.push(buildLockEntry({
+		name: getCognitiveDisplayName(cog),
 		source: normalizedSource,
 		sourceType: parsed.type,
 		sourceUrl: parsed.url,
-		skillPath: skillFiles[skill.name],
-		skillFolderHash: "",
-		cognitiveType,
-		isCognitive: true
-	});
+		cognitivePath: telemetryFiles[cog.name],
+		cognitiveType
+	}));
 	let telemetrySource = normalizedSource ?? "";
 	if (normalizedSource) {
 		const ownerRepo = parseOwnerRepo(normalizedSource);
-		if (ownerRepo) if (await isRepoPrivate(ownerRepo.owner, ownerRepo.repo) === false) {} else telemetrySource = "";
+		if (ownerRepo) {
+			if (await isRepoPrivate(ownerRepo.owner, ownerRepo.repo) !== false) telemetrySource = "";
+		}
 	}
 	return {
 		items,
@@ -2904,7 +3195,7 @@ async function resolveGitRepoSkills(source, parsed, options, spinner, skillsDir,
 		lockEntries,
 		telemetry: {
 			source: telemetrySource,
-			skillFiles,
+			skillFiles: telemetryFiles,
 			checkPrivacy: false
 		}
 	};
@@ -2941,16 +3232,16 @@ async function runAdd(args, options = {}) {
 		const spinner = logger.spinner();
 		spinner.start("Parsing source...");
 		const parsed = parseSource(source);
-		spinner.succeed(`Source: ${parsed.type === "local" ? parsed.localPath : parsed.url}${parsed.ref ? ` @ ${import_picocolors.default.yellow(parsed.ref)}` : ""}${parsed.subpath ? ` (${parsed.subpath})` : ""}${parsed.skillFilter ? ` ${import_picocolors.default.dim("@")}${import_picocolors.default.cyan(parsed.skillFilter)}` : ""}`);
+		spinner.succeed(`Source: ${parsed.type === "local" ? parsed.localPath : parsed.url}${parsed.ref ? ` @ ${import_picocolors.default.yellow(parsed.ref)}` : ""}${parsed.subpath ? ` (${parsed.subpath})` : ""}${parsed.nameFilter ? ` ${import_picocolors.default.dim("@")}${import_picocolors.default.cyan(parsed.nameFilter)}` : ""}`);
 		if (parsed.type === "direct-url") {
-			await executeInstallFlow(await resolveRemoteSkill(source, parsed.url, options, spinner), options, spinner);
+			await executeInstallFlow(await resolveRemoteCognitive(parsed.url, options, spinner), options, spinner);
 			return;
 		}
 		if (parsed.type === "well-known") {
-			await executeInstallFlow(await resolveWellKnownSkills(source, parsed.url, options, spinner), options, spinner);
+			await executeInstallFlow(await resolveWellKnownCognitives(parsed.url, options, spinner), options, spinner);
 			return;
 		}
-		let skillsDir;
+		let sourceDir;
 		if (parsed.type === "local") {
 			spinner.start("Validating local path...");
 			if (!existsSync(parsed.localPath)) {
@@ -2958,19 +3249,19 @@ async function runAdd(args, options = {}) {
 				logger.outro(import_picocolors.default.red(`Local path does not exist: ${parsed.localPath}`));
 				process.exit(1);
 			}
-			skillsDir = parsed.localPath;
+			sourceDir = parsed.localPath;
 			spinner.succeed("Local path validated");
 		} else {
 			spinner.start("Cloning repository...");
 			tempDir = await cloneRepo(parsed.url, parsed.ref);
-			skillsDir = tempDir;
+			sourceDir = tempDir;
 			spinner.succeed("Repository cloned");
 		}
-		if (parsed.skillFilter) {
+		if (parsed.nameFilter) {
 			options.skill = options.skill || [];
-			if (!options.skill.includes(parsed.skillFilter)) options.skill.push(parsed.skillFilter);
+			if (!options.skill.includes(parsed.nameFilter)) options.skill.push(parsed.nameFilter);
 		}
-		const prepared = await resolveGitRepoSkills(source, parsed, options, spinner, skillsDir, tempDir);
+		const prepared = await resolveGitRepoCognitives(source, parsed, options, spinner, sourceDir, tempDir);
 		const cleanupFn = async () => {
 			await cleanupDir(tempDir);
 		};
@@ -2997,7 +3288,7 @@ async function promptForFindSkills(options, targetAgents) {
 	if (options?.yes) return;
 	try {
 		if (await isPromptDismissed("findSkillsPrompt")) return;
-		if (await isSkillInstalled("find-skills", "claude-code", { global: true })) {
+		if (await isCognitiveInstalled("find-skills", "claude-code", "skill", { global: true })) {
 			await dismissPrompt("findSkillsPrompt");
 			return;
 		}
@@ -3063,7 +3354,7 @@ function parseAddOptions(args) {
 		} else if (arg === "-t" || arg === "--type") {
 			i++;
 			const typeVal = args[i];
-			if (typeVal === "skill" || typeVal === "agent" || typeVal === "prompt") options.type = typeVal;
+			if (typeVal && Object.keys(COGNITIVE_FILE_NAMES).includes(typeVal)) options.type = typeVal;
 		} else if (arg === "--full-depth") options.fullDepth = true;
 		else if (arg && !arg.startsWith("-")) source.push(arg);
 	}
@@ -3280,18 +3571,6 @@ ${import_picocolors.default.dim("  2) npx synk add <owner/repo@skill>")}`;
 	else logger.log(`${import_picocolors.default.dim("Discover more skills at")} https://skills.sh`);
 	logger.line();
 }
-function shortenPath(fullPath, cwd) {
-	const home = homedir();
-	if (fullPath.startsWith(home)) return fullPath.replace(home, "~");
-	if (fullPath.startsWith(cwd)) return "." + fullPath.slice(cwd.length);
-	return fullPath;
-}
-function formatList(items, maxShow = 5) {
-	if (items.length <= maxShow) return items.join(", ");
-	const shown = items.slice(0, maxShow);
-	const remaining = items.length - maxShow;
-	return `${shown.join(", ")} +${remaining} more`;
-}
 function parseListOptions(args) {
 	const options = {};
 	for (let i = 0; i < args.length; i++) {
@@ -3303,7 +3582,7 @@ function parseListOptions(args) {
 		} else if (arg === "-t" || arg === "--type") {
 			i++;
 			const typeVal = args[i];
-			if (typeVal === "skill" || typeVal === "agent" || typeVal === "prompt") options.type = typeVal;
+			if (typeVal && Object.keys(COGNITIVE_FILE_NAMES).includes(typeVal)) options.type = typeVal;
 		}
 	}
 	return options;
@@ -3312,25 +3591,16 @@ async function runList(args) {
 	const options = parseListOptions(args);
 	const scope = options.global === true ? true : false;
 	let agentFilter;
-	if (options.agent && options.agent.length > 0) {
-		const validAgents = Object.keys(agents);
-		const invalidAgents = options.agent.filter((a) => !validAgents.includes(a));
-		if (invalidAgents.length > 0) {
-			logger.warning(`Invalid agents: ${invalidAgents.join(", ")}`);
-			logger.dim(`Valid agents: ${validAgents.join(", ")}`);
-			process.exit(1);
-		}
-		agentFilter = options.agent;
-	}
-	const installedSkills = await listInstalledSkills({
+	if (options.agent && options.agent.length > 0) agentFilter = validateAgentNames(options.agent);
+	const installedCognitives = await listInstalledCognitives({
 		global: scope,
 		agentFilter
 	});
-	const filteredSkills = options.type ? installedSkills.filter((s) => (s.cognitiveType || "skill") === options.type) : installedSkills;
+	const filteredCognitives = options.type ? installedCognitives.filter((s) => (s.cognitiveType || "skill") === options.type) : installedCognitives;
 	const cwd = process.cwd();
 	const scopeLabel = scope ? "Global" : "Project";
 	const typeLabel = options.type ? ` ${options.type}s` : "";
-	if (filteredSkills.length === 0) {
+	if (filteredCognitives.length === 0) {
 		logger.dim(`No ${scopeLabel.toLowerCase()}${typeLabel} found.`);
 		if (scope) logger.dim("Try listing project cognitives without -g");
 		else logger.dim("Try listing global cognitives with -g");
@@ -3351,13 +3621,13 @@ async function runList(args) {
 	}
 	logger.bold(`${scopeLabel}${typeLabel ? typeLabel.charAt(0).toUpperCase() + typeLabel.slice(1) : " Cognitives"}`);
 	logger.line();
-	for (const skill of filteredSkills) printSkill(skill);
+	for (const skill of filteredCognitives) printSkill(skill);
 	logger.line();
 }
 async function removeCommand(skillNames, options) {
 	const isGlobal = options.global ?? false;
 	const cwd = process.cwd();
-	const spinner = logger.spinner("Scanning for installed skills...");
+	const spinner = logger.spinner("Scanning for installed cognitives...");
 	const skillNamesSet = /* @__PURE__ */ new Set();
 	const scanDir = async (dir) => {
 		try {
@@ -3367,36 +3637,27 @@ async function removeCommand(skillNames, options) {
 			if (err instanceof Error && err.code !== "ENOENT") logger.warning(`Could not scan directory ${dir}: ${err.message}`);
 		}
 	};
-	const typesToScan = options.type ? [options.type] : [
-		"skill",
-		"agent",
-		"prompt"
-	];
+	const typesToScan = options.type ? [options.type] : Object.keys(COGNITIVE_FILE_NAMES);
 	for (const cogType of typesToScan) if (isGlobal) {
 		await scanDir(getCanonicalDir(cogType, true, cwd));
 		for (const agent of Object.values(agents)) {
-			const dir = cogType === "skill" ? agent.globalSkillsDir : cogType === "agent" ? agent.globalAgentsDir : agent.globalPromptsDir;
+			const dir = agent.dirs[cogType].global;
 			if (dir !== void 0) await scanDir(dir);
 		}
 	} else {
 		await scanDir(getCanonicalDir(cogType, false, cwd));
-		for (const agent of Object.values(agents)) await scanDir(join(cwd, cogType === "skill" ? agent.skillsDir : cogType === "agent" ? agent.agentsDir : agent.promptsDir));
+		for (const agent of Object.values(agents)) {
+			const dir = agent.dirs[cogType].local;
+			await scanDir(join(cwd, dir));
+		}
 	}
 	const installedSkills = Array.from(skillNamesSet).sort();
-	spinner.succeed(`Found ${installedSkills.length} unique installed skill(s)`);
+	spinner.succeed(`Found ${installedSkills.length} unique installed cognitive(s)`);
 	if (installedSkills.length === 0) {
-		logger.outro(import_picocolors.default.yellow("No skills found to remove."));
+		logger.outro(import_picocolors.default.yellow("No cognitives found to remove."));
 		return;
 	}
-	if (options.agent && options.agent.length > 0) {
-		const validAgents = Object.keys(agents);
-		const invalidAgents = options.agent.filter((a) => !validAgents.includes(a));
-		if (invalidAgents.length > 0) {
-			logger.error(`Invalid agents: ${invalidAgents.join(", ")}`);
-			logger.info(`Valid agents: ${validAgents.join(", ")}`);
-			process.exit(1);
-		}
-	}
+	if (options.agent && options.agent.length > 0) validateAgentNames(options.agent);
 	let selectedSkills = [];
 	if (options.all) selectedSkills = installedSkills;
 	else if (skillNames.length > 0) {
@@ -3411,14 +3672,11 @@ async function removeCommand(skillNames, options) {
 			label: s
 		}));
 		const selected = await fe({
-			message: `Select skills to remove ${import_picocolors.default.dim("(space to toggle)")}`,
+			message: `Select cognitives to remove ${import_picocolors.default.dim("(space to toggle)")}`,
 			options: choices,
 			required: true
 		});
-		if (pD(selected)) {
-			logger.cancel("Removal cancelled");
-			process.exit(0);
-		}
+		assertNotCancelled(selected);
 		selectedSkills = selected;
 	}
 	let targetAgents;
@@ -3431,16 +3689,17 @@ async function removeCommand(skillNames, options) {
 	}
 	if (!options.yes) {
 		logger.line();
-		logger.info("Skills to remove:");
+		logger.info("Cognitives to remove:");
 		for (const skill of selectedSkills) logger.message(`${import_picocolors.default.red("•")} ${skill}`);
 		logger.line();
-		const confirmed = await ye({ message: `Are you sure you want to uninstall ${selectedSkills.length} skill(s)?` });
-		if (pD(confirmed) || !confirmed) {
+		const confirmed = await ye({ message: `Are you sure you want to uninstall ${selectedSkills.length} cognitive(s)?` });
+		assertNotCancelled(confirmed);
+		if (!confirmed) {
 			logger.cancel("Removal cancelled");
 			process.exit(0);
 		}
 	}
-	spinner.start("Removing skills...");
+	spinner.start("Removing cognitives...");
 	const results = [];
 	for (const skillName of selectedSkills) try {
 		for (const agentKey of targetAgents) {
@@ -3466,10 +3725,10 @@ async function removeCommand(skillNames, options) {
 			recursive: true,
 			force: true
 		});
-		const lockEntry = isGlobal ? await getSkillFromLock(skillName) : null;
+		const lockEntry = isGlobal ? await getCognitiveFromLock(skillName) : null;
 		const effectiveSource = lockEntry?.source || "local";
 		const effectiveSourceType = lockEntry?.sourceType || "local";
-		if (isGlobal) await removeSkillFromLock(skillName);
+		if (isGlobal) await removeCognitiveFromLock(skillName);
 		results.push({
 			skill: skillName,
 			success: true,
@@ -3504,9 +3763,9 @@ async function removeCommand(skillNames, options) {
 			sourceType: data.sourceType
 		});
 	}
-	if (successful.length > 0) logger.success(import_picocolors.default.green(`Successfully removed ${successful.length} skill(s)`));
+	if (successful.length > 0) logger.success(import_picocolors.default.green(`Successfully removed ${successful.length} cognitive(s)`));
 	if (failed.length > 0) {
-		logger.error(import_picocolors.default.red(`Failed to remove ${failed.length} skill(s)`));
+		logger.error(import_picocolors.default.red(`Failed to remove ${failed.length} cognitive(s)`));
 		for (const r of failed) logger.message(`${import_picocolors.default.red("✗")} ${r.skill}: ${r.error}`);
 	}
 	logger.line();
@@ -3533,7 +3792,7 @@ function parseRemoveOptions(args) {
 		} else if (arg === "-t" || arg === "--type") {
 			i++;
 			const typeVal = args[i];
-			if (typeVal === "skill" || typeVal === "agent" || typeVal === "prompt") options.type = typeVal;
+			if (typeVal && Object.keys(COGNITIVE_FILE_NAMES).includes(typeVal)) options.type = typeVal;
 		} else if (arg && !arg.startsWith("-")) skills.push(arg);
 	}
 	return {
@@ -3549,17 +3808,13 @@ function runInit(args) {
 		const arg = args[i];
 		if ((arg === "-t" || arg === "--type") && i + 1 < args.length) {
 			const typeVal = args[i + 1];
-			if (typeVal === "skill" || typeVal === "agent" || typeVal === "prompt") cognitiveType = typeVal;
+			if (typeVal && Object.keys(COGNITIVE_FILE_NAMES).includes(typeVal)) cognitiveType = typeVal;
 			i++;
 		} else if (arg && !arg.startsWith("-")) filteredArgs.push(arg);
 	}
 	const itemName = filteredArgs[0] || basename(cwd);
 	const hasName = filteredArgs[0] !== void 0;
-	const fileName = {
-		skill: "SKILL.md",
-		agent: "AGENT.md",
-		prompt: "PROMPT.md"
-	}[cognitiveType];
+	const fileName = COGNITIVE_FILE_NAMES[cognitiveType];
 	const itemDir = hasName ? join(cwd, itemName) : cwd;
 	const itemFile = join(itemDir, fileName);
 	const displayPath = hasName ? `${itemName}/${fileName}` : fileName;
@@ -3639,70 +3894,43 @@ Describe when this skill should be used.
 	logger.log(`  ${import_picocolors.default.dim("URL:")}     Host the file, then ${import_picocolors.default.cyan(`npx synk add https://example.com/${displayPath}`)}`);
 	logger.line();
 }
-const AGENTS_DIR$1 = ".agents";
-const LOCK_FILE$1 = ".skill-lock.json";
-const CURRENT_LOCK_VERSION$1 = 4;
-function getSkillLockPath$1() {
-	return join(homedir(), AGENTS_DIR$1, LOCK_FILE$1);
-}
-function readSkillLock$1() {
-	const lockPath = getSkillLockPath$1();
-	try {
-		const content = readFileSync(lockPath, "utf-8");
-		const parsed = JSON.parse(content);
-		if (typeof parsed.version !== "number" || !parsed.skills) return {
-			version: CURRENT_LOCK_VERSION$1,
-			skills: {}
-		};
-		if (parsed.version < CURRENT_LOCK_VERSION$1) return {
-			version: CURRENT_LOCK_VERSION$1,
-			skills: {}
-		};
-		return parsed;
-	} catch {
-		return {
-			version: CURRENT_LOCK_VERSION$1,
-			skills: {}
-		};
-	}
-}
 async function runCheck(args = []) {
-	logger.log(`Checking for skill updates...`);
+	logger.log("Checking for updates...");
 	logger.line();
-	const lock = readSkillLock$1();
-	const skillNames = Object.keys(lock.skills);
-	if (skillNames.length === 0) {
-		logger.dim("No skills tracked in lock file.");
-		logger.log(`${import_picocolors.default.dim("Install skills with")} npx synk add <package>`);
+	const lock = await readLockFile();
+	const cognitiveNames = Object.keys(lock.cognitives);
+	if (cognitiveNames.length === 0) {
+		logger.dim("No cognitives tracked in lock file.");
+		logger.log(`${import_picocolors.default.dim("Install cognitives with")} npx synk add <package>`);
 		return;
 	}
 	const token = getGitHubToken();
-	const skillsBySource = /* @__PURE__ */ new Map();
+	const cognitivesBySource = /* @__PURE__ */ new Map();
 	let skippedCount = 0;
-	for (const skillName of skillNames) {
-		const entry = lock.skills[skillName];
+	for (const name of cognitiveNames) {
+		const entry = lock.cognitives[name];
 		if (!entry) continue;
-		if (entry.sourceType !== "github" || !entry.skillFolderHash || !entry.skillPath) {
+		if (entry.sourceType !== "github" || !entry.cognitiveFolderHash || !entry.cognitivePath) {
 			skippedCount++;
 			continue;
 		}
-		const existing = skillsBySource.get(entry.source) || [];
+		const existing = cognitivesBySource.get(entry.source) || [];
 		existing.push({
-			name: skillName,
+			name,
 			entry
 		});
-		skillsBySource.set(entry.source, existing);
+		cognitivesBySource.set(entry.source, existing);
 	}
-	const totalSkills = skillNames.length - skippedCount;
-	if (totalSkills === 0) {
-		logger.dim("No GitHub skills to check.");
+	const totalCognitives = cognitiveNames.length - skippedCount;
+	if (totalCognitives === 0) {
+		logger.dim("No GitHub cognitives to check.");
 		return;
 	}
-	logger.dim(`Checking ${totalSkills} skill(s) for updates...`);
+	logger.dim(`Checking ${totalCognitives} cognitive(s) for updates...`);
 	const updates = [];
 	const errors = [];
-	for (const [source, skills] of skillsBySource) for (const { name, entry } of skills) try {
-		const latestHash = await fetchSkillFolderHash(source, entry.skillPath, token);
+	for (const [source, cognitives] of cognitivesBySource) for (const { name, entry } of cognitives) try {
+		const latestHash = await fetchCognitiveFolderHash(source, entry.cognitivePath, token);
 		if (!latestHash) {
 			errors.push({
 				name,
@@ -3711,7 +3939,7 @@ async function runCheck(args = []) {
 			});
 			continue;
 		}
-		if (latestHash !== entry.skillFolderHash) updates.push({
+		if (latestHash !== entry.cognitiveFolderHash) updates.push({
 			name,
 			source
 		});
@@ -3723,7 +3951,7 @@ async function runCheck(args = []) {
 		});
 	}
 	logger.line();
-	if (updates.length === 0) logger.success("All skills are up to date");
+	if (updates.length === 0) logger.success("All cognitives are up to date");
 	else {
 		logger.log(`${updates.length} update(s) available:`);
 		logger.line();
@@ -3732,75 +3960,48 @@ async function runCheck(args = []) {
 			logger.dim(`    source: ${update.source}`);
 		}
 		logger.line();
-		logger.log(`${import_picocolors.default.dim("Run")} npx synk update ${import_picocolors.default.dim("to update all skills")}`);
+		logger.log(`${import_picocolors.default.dim("Run")} npx synk update ${import_picocolors.default.dim("to update all cognitives")}`);
 	}
 	if (errors.length > 0) {
 		logger.line();
-		logger.dim(`Could not check ${errors.length} skill(s) (may need reinstall)`);
+		logger.dim(`Could not check ${errors.length} cognitive(s) (may need reinstall)`);
 	}
 	track({
 		event: "check",
-		skillCount: String(totalSkills),
+		skillCount: String(totalCognitives),
 		updatesAvailable: String(updates.length)
 	});
 	logger.line();
 }
-const AGENTS_DIR = ".agents";
-const LOCK_FILE = ".skill-lock.json";
-const CURRENT_LOCK_VERSION = 4;
-function getSkillLockPath() {
-	return join(homedir(), AGENTS_DIR, LOCK_FILE);
-}
-function readSkillLock() {
-	const lockPath = getSkillLockPath();
-	try {
-		const content = readFileSync(lockPath, "utf-8");
-		const parsed = JSON.parse(content);
-		if (typeof parsed.version !== "number" || !parsed.skills) return {
-			version: CURRENT_LOCK_VERSION,
-			skills: {}
-		};
-		if (parsed.version < CURRENT_LOCK_VERSION) return {
-			version: CURRENT_LOCK_VERSION,
-			skills: {}
-		};
-		return parsed;
-	} catch {
-		return {
-			version: CURRENT_LOCK_VERSION,
-			skills: {}
-		};
-	}
-}
 async function runUpdate() {
-	logger.log("Checking for skill updates...");
+	logger.log("Checking for updates...");
 	logger.line();
-	const lock = readSkillLock();
-	const skillNames = Object.keys(lock.skills);
-	if (skillNames.length === 0) {
-		logger.dim("No skills tracked in lock file.");
-		logger.log(`${import_picocolors.default.dim("Install skills with")} npx synk add <package>`);
+	const lock = await readLockFile();
+	const cognitiveNames = Object.keys(lock.cognitives);
+	if (cognitiveNames.length === 0) {
+		logger.dim("No cognitives tracked in lock file.");
+		logger.log(`${import_picocolors.default.dim("Install cognitives with")} npx synk add <package>`);
 		return;
 	}
 	const token = getGitHubToken();
 	const updates = [];
 	let checkedCount = 0;
-	for (const skillName of skillNames) {
-		const entry = lock.skills[skillName];
+	for (const name of cognitiveNames) {
+		const entry = lock.cognitives[name];
 		if (!entry) continue;
-		if (entry.sourceType !== "github" || !entry.skillFolderHash || !entry.skillPath) continue;
+		if (entry.sourceType !== "github" || !entry.cognitiveFolderHash || !entry.cognitivePath) continue;
 		checkedCount++;
 		try {
-			const latestHash = await fetchSkillFolderHash(entry.source, entry.skillPath, token);
-			if (latestHash && latestHash !== entry.skillFolderHash) updates.push({
-				name: skillName,
+			const latestHash = await fetchCognitiveFolderHash(entry.source, entry.cognitivePath, token);
+			if (latestHash && latestHash !== entry.cognitiveFolderHash) updates.push({
+				name,
 				source: entry.source,
 				entry
 			});
 		} catch {}
 	}
 	if (checkedCount === 0) {
-		logger.dim("No skills to check.");
+		logger.dim("No cognitives to check.");
 		return;
 	}
 	if (updates.length === 0) {
@@ -3815,17 +4016,22 @@ async function runUpdate() {
 	for (const update of updates) {
 		logger.log(`Updating ${update.name}...`);
 		let installUrl = update.entry.sourceUrl;
-		if (update.entry.skillPath) {
-			let skillFolder = update.entry.skillPath;
-			if (skillFolder.endsWith("/SKILL.md")) skillFolder = skillFolder.slice(0, -9);
-			else if (skillFolder.endsWith("SKILL.md")) skillFolder = skillFolder.slice(0, -8);
+		if (update.entry.cognitivePath) {
+			let skillFolder = update.entry.cognitivePath;
+			for (const fileName of Object.values(COGNITIVE_FILE_NAMES)) if (skillFolder.endsWith("/" + fileName)) {
+				skillFolder = skillFolder.slice(0, -(fileName.length + 1));
+				break;
+			} else if (skillFolder.endsWith(fileName)) {
+				skillFolder = skillFolder.slice(0, -fileName.length);
+				break;
+			}
 			if (skillFolder.endsWith("/")) skillFolder = skillFolder.slice(0, -1);
 			installUrl = update.entry.sourceUrl.replace(/\.git$/, "").replace(/\/$/, "");
 			installUrl = `${installUrl}/tree/main/${skillFolder}`;
 		}
 		if (spawnSync("npx", [
 			"-y",
-			"skills",
+			"synk",
 			"add",
 			installUrl,
 			"-g",
@@ -3843,8 +4049,8 @@ async function runUpdate() {
 		}
 	}
 	logger.line();
-	if (successCount > 0) logger.success(`Updated ${successCount} skill(s)`);
-	if (failCount > 0) logger.dim(`Failed to update ${failCount} skill(s)`);
+	if (successCount > 0) logger.success(`Updated ${successCount} cognitive(s)`);
+	if (failCount > 0) logger.dim(`Failed to update ${failCount} cognitive(s)`);
 	track({
 		event: "update",
 		skillCount: String(updates.length),