shoplazza-ai-dev-cli 0.1.0 → 0.1.1

package/dist/cli.mjs

@@ -16,13 +16,13 @@ import { basename, dirname, isAbsolute, join, normalize, relative, resolve, sep
 import { homedir, platform, tmpdir } from "os";
 import { URL as URL$1, fileURLToPath } from "url";
 import { stripVTControlCharacters } from "node:util";
+import { access, chmod, cp, lstat, mkdir, mkdtemp, readFile, readdir, readlink, realpath, rm, stat, symlink, writeFile } from "fs/promises";
 import { gunzipSync } from "node:zlib";
 import { mkdirSync as mkdirSync$1, writeFileSync as writeFileSync$1 } from "node:fs";
 import { dirname as dirname$1, normalize as normalize$1, resolve as resolve$1, sep as sep$1 } from "node:path";
+import { parse } from "yaml";
 import * as readline from "readline";
 import { Writable } from "stream";
-import { access, cp, lstat, mkdir, mkdtemp, readFile, readdir, readlink, realpath, rm, stat, symlink, writeFile } from "fs/promises";
-import { parse } from "yaml";
 import { createHash } from "crypto";
 import { createServer } from "http";
 var import_picocolors = /* @__PURE__ */ __toESM(require_picocolors(), 1);
@@ -284,6 +284,95 @@ function isWellKnownUrl(input) {
 		return false;
 	}
 }
+const FORGE_STORE_DIRNAME = ".ai-dev-cli";
+const home = homedir();
+const codexHome = process.env.CODEX_HOME?.trim() || join(home, ".codex");
+const claudeHome = process.env.CLAUDE_CONFIG_DIR?.trim() || join(home, ".claude");
+const cursorHome = join(home, ".cursor");
+function getAgentHome(type) {
+	switch (type) {
+		case "claude-code": return claudeHome;
+		case "codex": return codexHome;
+		case "cursor": return cursorHome;
+	}
+}
+const agents = {
+	"claude-code": {
+		name: "claude-code",
+		displayName: "Claude Code",
+		skillsDir: ".claude/skills",
+		globalSkillsDir: join(claudeHome, "skills"),
+		detectInstalled: async () => {
+			return existsSync(claudeHome);
+		}
+	},
+	codex: {
+		name: "codex",
+		displayName: "Codex",
+		skillsDir: ".agents/skills",
+		globalSkillsDir: join(codexHome, "skills"),
+		detectInstalled: async () => {
+			return existsSync(codexHome) || existsSync("/etc/codex");
+		}
+	},
+	cursor: {
+		name: "cursor",
+		displayName: "Cursor",
+		skillsDir: ".agents/skills",
+		globalSkillsDir: join(home, ".cursor/skills"),
+		detectInstalled: async () => {
+			return existsSync(join(home, ".cursor"));
+		}
+	}
+};
+async function detectInstalledAgents() {
+	return (await Promise.all(Object.entries(agents).map(async ([type, config]) => ({
+		type,
+		installed: await config.detectInstalled()
+	})))).filter((r) => r.installed).map((r) => r.type);
+}
+function getUniversalAgents() {
+	return Object.entries(agents).filter(([_, config]) => config.skillsDir === ".agents/skills" && config.showInUniversalList !== false).map(([type]) => type);
+}
+function isUniversalAgent(type) {
+	return agents[type].skillsDir === ".agents/skills";
+}
+function getStoreRoot(_scope, _cwd) {
+	return join(home, FORGE_STORE_DIRNAME, "store");
+}
+function getAgentEntryRoot(agent, scope, cwd) {
+	if (scope === "global") return getAgentHome(agent);
+	return cwd ?? process.cwd();
+}
+function getInstallTargets(agent, component, scope, cwd) {
+	const entryRoot = getAgentEntryRoot(agent, scope, cwd);
+	switch (component.kind) {
+		case "plugin-skill": return {
+			canonical: join(component.pluginCanonical, "skills", component.skillName),
+			entry: agent === "claude-code" ? join(entryRoot, ".claude", "skills", component.skillName) : agent === "cursor" ? join(entryRoot, ".cursor", "skills", component.skillName) : join(entryRoot, ".agents", "skills", component.skillName)
+		};
+		case "plugin-agent-manifest": return {
+			canonical: join(component.pluginCanonical, "agents", component.filename),
+			entry: agent === "claude-code" ? join(entryRoot, ".claude", "agents", component.filename) : agent === "cursor" ? join(entryRoot, ".cursor", "agents", component.filename) : join(entryRoot, ".codex", "agents", component.filename)
+		};
+		case "plugin-agent-deps-dir": return {
+			canonical: join(component.pluginCanonical, "agents", component.dirname),
+			entry: agent === "claude-code" ? join(entryRoot, ".claude", "agents", component.dirname) : agent === "cursor" ? join(entryRoot, ".cursor", "agents", component.dirname) : join(entryRoot, ".codex", "agents", component.dirname)
+		};
+		case "plugin-rule-manifest": {
+			const canonical = join(component.pluginCanonical, "rules", component.filename);
+			const cursorName = component.filename.endsWith(".md") ? component.filename.slice(0, -3) + ".mdc" : component.filename;
+			return {
+				canonical,
+				entry: agent === "claude-code" ? join(entryRoot, ".claude", "rules", component.filename) : agent === "cursor" ? join(entryRoot, ".cursor", "rules", cursorName) : ""
+			};
+		}
+		case "plugin-rule-deps-dir": return {
+			canonical: join(component.pluginCanonical, "rules", component.dirname),
+			entry: agent === "claude-code" ? join(entryRoot, ".claude", "rules", component.dirname) : agent === "cursor" ? join(entryRoot, ".cursor", "rules", component.dirname) : ""
+		};
+	}
+}
 const CONFIG_DIR = join(homedir(), ".ai-dev-cli");
 const CONFIG_FILE = join(CONFIG_DIR, "config.json");
 const DEFAULT_PORTAL = "https://forge.shoplazza.site";
@@ -401,6 +490,268 @@ function configCommand(args) {
 	console.error("Available: get | set | unset | list | path");
 	process.exit(2);
 }
+const FORGE_HOOK_BASENAME$1 = "track-skill-read.mjs";
+async function upsertCursorHooks(hooksJsonPath, scriptPath) {
+	let raw = "";
+	try {
+		raw = await readFile(hooksJsonPath, "utf-8");
+	} catch {}
+	const cfg = raw.trim() ? JSON.parse(raw) : { version: 1 };
+	if (!cfg.hooks) cfg.hooks = {};
+	if (!Array.isArray(cfg.hooks.postToolUse)) cfg.hooks.postToolUse = [];
+	let readMatcher = cfg.hooks.postToolUse.find((m) => m.matcher === "Read");
+	if (!readMatcher) {
+		readMatcher = {
+			matcher: "Read",
+			hooks: []
+		};
+		cfg.hooks.postToolUse.push(readMatcher);
+	}
+	if (!Array.isArray(readMatcher.hooks)) readMatcher.hooks = [];
+	const command = `node ${shellEscape$2(scriptPath)}`;
+	const ourEntry = readMatcher.hooks.find((h) => h.command.includes(FORGE_HOOK_BASENAME$1));
+	if (ourEntry) {
+		if (ourEntry.command !== command) ourEntry.command = command;
+	} else readMatcher.hooks.push({
+		type: "command",
+		command
+	});
+	await mkdir(dirname(hooksJsonPath), { recursive: true });
+	await writeFile(hooksJsonPath, JSON.stringify(cfg, null, 2) + "\n", "utf-8");
+}
+function shellEscape$2(p) {
+	if (!/[\s"'$`\\]/.test(p)) return p;
+	return `'${p.replace(/'/g, `'\\''`)}'`;
+}
+function upsertCodexAgent(toml, entry) {
+	const header = `[agents.${entry.id}]`;
+	return upsertSection(toml, header, `${header}\nconfig_file = ${jsonString(entry.configFile)}\n`);
+}
+function removeCodexAgent(toml, id) {
+	return removeSection(toml, `[agents.${id}]`);
+}
+function ensureCodexHooksFeature(toml) {
+	const lines = toml.split("\n");
+	let inFeatures = false;
+	let hasFlag = false;
+	let featuresLineIdx = -1;
+	for (const [i, line] of lines.entries()) {
+		const trimmed = line.trim();
+		if (trimmed === "[features]") {
+			inFeatures = true;
+			featuresLineIdx = i;
+			continue;
+		}
+		if (trimmed.startsWith("[") && trimmed.endsWith("]") && trimmed !== "[features]") {
+			inFeatures = false;
+			continue;
+		}
+		if (inFeatures && /^codex_hooks\s*=/.test(trimmed)) {
+			hasFlag = true;
+			lines[i] = "codex_hooks = true";
+		}
+	}
+	if (featuresLineIdx === -1) return toml + (toml.length > 0 && !toml.endsWith("\n") ? "\n" : "") + "\n[features]\ncodex_hooks = true\n";
+	if (!hasFlag) lines.splice(featuresLineIdx + 1, 0, "codex_hooks = true");
+	return lines.join("\n");
+}
+function upsertSection(toml, header, newBlock) {
+	const idx = toml.indexOf(header);
+	if (idx < 0) return toml + (toml.length > 0 && !toml.endsWith("\n") ? "\n" : "") + "\n" + newBlock;
+	const after = toml.indexOf("\n[", idx + header.length);
+	const blockEnd = after < 0 ? toml.length : after + 1;
+	return toml.slice(0, idx) + newBlock + toml.slice(blockEnd);
+}
+function removeSection(toml, header) {
+	const idx = toml.indexOf(header);
+	if (idx < 0) return toml;
+	const after = toml.indexOf("\n[", idx + header.length);
+	const blockEnd = after < 0 ? toml.length : after + 1;
+	let start = idx;
+	while (start > 0 && toml[start - 1] === "\n" && (start - 2 < 0 || toml[start - 2] === "\n")) start--;
+	return toml.slice(0, start) + toml.slice(blockEnd);
+}
+function jsonString(s) {
+	return JSON.stringify(s);
+}
+const FORGE_HOOK_BASENAME = "track-skill-read.mjs";
+async function upsertCodexHooks(hooksJsonPath, configTomlPath, scriptPath) {
+	let raw = "";
+	try {
+		raw = await readFile(hooksJsonPath, "utf-8");
+	} catch {}
+	const cfg = raw.trim() ? JSON.parse(raw) : {};
+	if (!Array.isArray(cfg.UserPromptSubmit)) cfg.UserPromptSubmit = [];
+	let m = cfg.UserPromptSubmit.find((x) => x.matcher === ".*");
+	if (!m) {
+		m = {
+			matcher: ".*",
+			hooks: []
+		};
+		cfg.UserPromptSubmit.push(m);
+	}
+	if (!Array.isArray(m.hooks)) m.hooks = [];
+	const command = `node ${shellEscape$1(scriptPath)} --codex-mode`;
+	const our = m.hooks.find((h) => h.command.includes(FORGE_HOOK_BASENAME));
+	if (our) {
+		if (our.command !== command) our.command = command;
+	} else m.hooks.push({
+		type: "command",
+		command
+	});
+	await mkdir(dirname(hooksJsonPath), { recursive: true });
+	await writeFile(hooksJsonPath, JSON.stringify(cfg, null, 2) + "\n", "utf-8");
+	let configRaw = "";
+	try {
+		configRaw = await readFile(configTomlPath, "utf-8");
+	} catch {}
+	const updated = ensureCodexHooksFeature(configRaw);
+	if (updated !== configRaw) {
+		await mkdir(dirname(configTomlPath), { recursive: true });
+		await writeFile(configTomlPath, updated, "utf-8");
+	}
+}
+function shellEscape$1(p) {
+	if (!/[\s"'$`\\]/.test(p)) return p;
+	return `'${p.replace(/'/g, `'\\''`)}'`;
+}
+const HOOK_SCRIPT_BASENAME = "track-skill-read.mjs";
+const HOOK_DIRNAME = "forge-hooks";
+const FORGE_HOOK_TAG = "forge:track-skill-read";
+async function writeForgeSourceManifest(skillDir, manifest) {
+	const target = join(skillDir, ".forge-source.json");
+	await mkdir(skillDir, { recursive: true });
+	await writeFile(target, JSON.stringify(manifest, null, 2) + "\n", "utf-8");
+}
+function getForgeHookScript(portalUrl) {
+	const portal = portalUrl.replace(/\/$/, "");
+	return `#!/usr/bin/env node
+// ${FORGE_HOOK_TAG}
+// Auto-generated by ai-dev-cli. Do not edit; run \`ai-dev-cli add\` to refresh.
+// Reports {type:'skill_invoked', asset_ref, install_mode} when the agent reads
+// SKILL.md from a forge-installed skill (identified by .forge-source.json).
+// Anonymous: /events accepts unauthenticated posts.
+import fs from 'node:fs';
+import path from 'node:path';
+
+const PORTAL = ${JSON.stringify(portal)};
+
+setTimeout(() => process.exit(0), 5000);
+
+let buf = '';
+process.stdin.on('data', (c) => (buf += c));
+process.stdin.on('end', () => {
+  try {
+    const ev = JSON.parse(buf);
+    const filePath = ev.tool_input?.file_path || '';
+    if (!filePath.endsWith(path.sep + 'SKILL.md') && !filePath.endsWith('/SKILL.md')) return;
+
+    let dir = path.dirname(filePath);
+    let manifest = null;
+    for (let i = 0; i < 8 && dir && dir !== path.dirname(dir); i++) {
+      const p = path.join(dir, '.forge-source.json');
+      if (fs.existsSync(p)) {
+        manifest = JSON.parse(fs.readFileSync(p, 'utf8'));
+        break;
+      }
+      dir = path.dirname(dir);
+    }
+    if (!manifest?.ref) return;
+
+    fetch(PORTAL + '/events', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        event_type: 'skill_invoked',
+        asset_ref: manifest.ref,
+        install_mode: manifest.install_mode || 'claude-code',
+        metadata: {
+          parent_plugin_ref: manifest.parent_plugin_ref || null,
+        },
+      }),
+      signal: AbortSignal.timeout(2000),
+    }).catch(() => {});
+  } catch {
+    /* swallow */
+  }
+});
+`;
+}
+async function ensureForgeHooks(agent) {
+	const warnings = [];
+	try {
+		const portal = loadConfig().portal || DEFAULT_PORTAL;
+		const home = getAgentHome(agent);
+		const scriptPath = join(home, HOOK_DIRNAME, HOOK_SCRIPT_BASENAME);
+		await writeHookScript(scriptPath, portal);
+		if (agent === "claude-code") await upsertClaudeCodeSettings(join(home, "settings.json"), scriptPath);
+		else if (agent === "cursor") await upsertCursorHooks(join(home, "hooks.json"), scriptPath);
+		else if (agent === "codex") await upsertCodexHooks(join(home, "hooks.json"), join(home, "config.toml"), scriptPath);
+	} catch (err) {
+		warnings.push(`Failed to install forge hooks for ${agent}: ${err instanceof Error ? err.message : String(err)}`);
+	}
+	return { warnings };
+}
+async function writeHookScript(scriptPath, portalUrl) {
+	const next = getForgeHookScript(portalUrl);
+	let prev = null;
+	if (existsSync(scriptPath)) try {
+		prev = await readFile(scriptPath, "utf-8");
+	} catch {
+		prev = null;
+	}
+	if (prev === next) return;
+	await mkdir(dirname(scriptPath), { recursive: true });
+	await writeFile(scriptPath, next, {
+		encoding: "utf-8",
+		mode: 493
+	});
+	try {
+		await chmod(scriptPath, 493);
+	} catch {}
+}
+async function upsertClaudeCodeSettings(settingsPath, scriptPath) {
+	const command = `node ${shellEscape(scriptPath)}`;
+	let raw = "";
+	try {
+		raw = await readFile(settingsPath, "utf-8");
+	} catch {
+		raw = "";
+	}
+	let settings = {};
+	if (raw.trim().length > 0) try {
+		settings = JSON.parse(raw);
+	} catch (err) {
+		throw new Error(`Refusing to overwrite invalid JSON at ${settingsPath}: ${err instanceof Error ? err.message : String(err)}`);
+	}
+	if (!settings.hooks || typeof settings.hooks !== "object") settings.hooks = {};
+	if (!Array.isArray(settings.hooks.PostToolUse)) settings.hooks.PostToolUse = [];
+	const matcherList = settings.hooks.PostToolUse;
+	let readMatcher = matcherList.find((m) => m && m.matcher === "Read");
+	if (!readMatcher) {
+		readMatcher = {
+			matcher: "Read",
+			hooks: []
+		};
+		matcherList.push(readMatcher);
+	}
+	if (!Array.isArray(readMatcher.hooks)) readMatcher.hooks = [];
+	const ourEntry = readMatcher.hooks.find((h) => typeof h?.command === "string" && h.command.includes(HOOK_SCRIPT_BASENAME));
+	if (ourEntry) {
+		if (ourEntry.command === command && ourEntry.type === "command") return;
+		ourEntry.type = "command";
+		ourEntry.command = command;
+	} else readMatcher.hooks.push({
+		type: "command",
+		command
+	});
+	await mkdir(dirname(settingsPath), { recursive: true });
+	await writeFile(settingsPath, JSON.stringify(settings, null, 2) + "\n", "utf-8");
+}
+function shellEscape(p) {
+	if (!/[\s"'$`\\]/.test(p)) return p;
+	return `'${p.replace(/'/g, `'\\''`)}'`;
+}
 async function fetchSkillArchive(ref, portalUrl, bearerToken) {
 	const url = `${portalUrl.replace(/\/$/, "")}/api/cli/skills/archive?ref=${encodeURIComponent(ref)}`;
 	const headers = { Accept: "application/gzip" };
@@ -421,6 +772,48 @@ async function fetchSkillArchive(ref, portalUrl, bearerToken) {
 	}
 	return Buffer.from(await resp.arrayBuffer());
 }
+async function fetchTeamAssets(teamScope, portalUrl, bearerToken) {
+	const url = `${portalUrl.replace(/\/$/, "")}/api/cli/teams/${encodeURIComponent(teamScope)}/assets`;
+	const headers = {
+		Accept: "application/json",
+		Authorization: `Bearer ${bearerToken}`
+	};
+	let resp;
+	try {
+		resp = await fetch(url, { headers });
+	} catch (err) {
+		const msg = err instanceof Error ? err.message : String(err);
+		throw new Error(`Failed to reach portal at ${portalUrl}: ${msg}`);
+	}
+	if (resp.status === 401) throw new Error("Login required: run `shoplazza-ai-dev-cli login` first");
+	if (resp.status === 403) throw new Error(`Not a member of team "${teamScope}"`);
+	if (resp.status === 404) throw new Error(`Team not found: ${teamScope}`);
+	if (!resp.ok) {
+		const body = await resp.text().catch(() => "");
+		throw new Error(`Portal returned ${resp.status} ${resp.statusText}${body ? `: ${body}` : ""}`);
+	}
+	return (await resp.json()).items ?? [];
+}
+async function fetchPluginArchive(ref, portalUrl, bearerToken) {
+	const url = `${portalUrl.replace(/\/$/, "")}/api/cli/plugins/archive?ref=${encodeURIComponent(ref)}`;
+	const headers = { Accept: "application/gzip" };
+	if (bearerToken) headers.Authorization = `Bearer ${bearerToken}`;
+	let resp;
+	try {
+		resp = await fetch(url, { headers });
+	} catch (err) {
+		const msg = err instanceof Error ? err.message : String(err);
+		throw new Error(`Failed to reach portal at ${portalUrl}: ${msg}`);
+	}
+	if (resp.status === 401) throw new Error("Login required: run `ai-dev-cli login` first");
+	if (resp.status === 403) throw new Error(`Permission denied for ${ref}`);
+	if (resp.status === 404) throw new Error(`Plugin not found: ${ref}`);
+	if (!resp.ok) {
+		const body = await resp.text().catch(() => "");
+		throw new Error(`Portal returned ${resp.status} ${resp.statusText}${body ? `: ${body}` : ""}`);
+	}
+	return Buffer.from(await resp.arrayBuffer());
+}
 function extractTarGz(gz, dest) {
 	const tar = gunzipSync(gz);
 	const destAbs = resolve$1(dest);
@@ -456,6 +849,117 @@ function readCStr(buf, start, len) {
 	while (end < slice.length && slice[end] !== 0) end++;
 	return slice.subarray(0, end).toString("utf-8");
 }
+const FORGE_SIDECARS = [".forge-source.json", ".forge-plugin.json"];
+async function assertEntryReplaceable(entryPath, ctx) {
+	let st;
+	try {
+		st = await lstat(entryPath);
+	} catch (e) {
+		if (e.code === "ENOENT") return { kind: "absent" };
+		throw e;
+	}
+	if (st.isSymbolicLink()) {
+		const target = await readlink(entryPath);
+		const absTarget = isAbsolute(target) ? target : resolve(dirname(entryPath), target);
+		if (!pathInside(ctx.storeRoot, absTarget)) return {
+			kind: "foreign-symlink",
+			realPath: absTarget
+		};
+		const ref = await readForgeRef(absTarget);
+		if (ref === ctx.intendedRef || pathsEqual(absTarget, ctx.intendedCanonical)) return { kind: "forge-self" };
+		return {
+			kind: "forge-other",
+			otherRef: ref ?? "<unknown>"
+		};
+	}
+	if (st.isDirectory()) {
+		const ref = await readForgeRef(entryPath);
+		if (ref === ctx.intendedRef) return { kind: "forge-self" };
+		if (ref) return {
+			kind: "forge-other",
+			otherRef: ref
+		};
+		return {
+			kind: "foreign-dir",
+			realPath: entryPath
+		};
+	}
+	return {
+		kind: "foreign-file",
+		realPath: entryPath
+	};
+}
+function pathInside(root, p) {
+	const r = relative(resolve(root), resolve(p));
+	return r === "" || !r.startsWith("..") && !isAbsolute(r);
+}
+function pathsEqual(a, b) {
+	return resolve(a) === resolve(b);
+}
+async function readForgeRef(p) {
+	for (const name of FORGE_SIDECARS) try {
+		const buf = await readFile(join(p, name), "utf-8");
+		const json = JSON.parse(buf);
+		if (typeof json.ref === "string") return json.ref;
+	} catch {}
+	const parent = dirname(p);
+	if (parent === p) return null;
+	for (const name of FORGE_SIDECARS) try {
+		const buf = await readFile(join(parent, name), "utf-8");
+		const json = JSON.parse(buf);
+		if (typeof json.ref === "string") return json.ref;
+	} catch {}
+	return null;
+}
+async function promptForeignOverwrite(conflicts, opts = {}) {
+	if (conflicts.length === 0) return true;
+	if (opts.yes || opts.force) return true;
+	if (!process.stdin.isTTY) return false;
+	console.log();
+	console.log(import_picocolors.default.yellow(`⚠  Found ${conflicts.length} conflicts with user-owned content:`));
+	console.log();
+	for (const c of conflicts) console.log(`  ${c.entryPath} (${c.kind})`);
+	console.log();
+	console.log("These are not managed by forge. Overwriting will replace your content.");
+	const choice = await ve({
+		message: "Force overwrite all?",
+		options: [
+			{
+				value: "no",
+				label: "no — abort install (default)"
+			},
+			{
+				value: "yes",
+				label: "yes — replace everything (existing content will be lost)"
+			},
+			{
+				value: "detail",
+				label: "show details (file sizes / dir trees)"
+			}
+		],
+		initialValue: "no"
+	});
+	if (pD(choice)) return false;
+	if (choice === "detail") {
+		console.log();
+		for (const c of conflicts) console.log(`  ${c.entryPath} → ${c.kind}`);
+		return promptForeignOverwrite(conflicts, opts);
+	}
+	return choice === "yes";
+}
+const AGENTS_DIR$2 = ".agents";
+const SKILLS_SUBDIR = "skills";
+function parseFrontmatter(raw) {
+	const match = raw.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/);
+	if (!match) return {
+		data: {},
+		content: raw
+	};
+	return {
+		data: parse(match[1]) ?? {},
+		content: match[2] ?? ""
+	};
+}
 const CSI_RE = /\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]/g;
 const OSC_RE = /\x1b\][\s\S]*?(?:\x07|\x1b\\)/g;
 const DCS_PM_APC_RE = /\x1b[P^_][\s\S]*?(?:\x1b\\)/g;
@@ -468,298 +972,40 @@ function stripTerminalEscapes(str) {
 function sanitizeMetadata(str) {
 	return stripTerminalEscapes(str).replace(/[\r\n]+/g, " ").trim();
 }
-const silentOutput = new Writable({ write(_chunk, _encoding, callback) {
-	callback();
-} });
-const S_STEP_ACTIVE = import_picocolors.default.green("◆");
-const S_STEP_CANCEL = import_picocolors.default.red("■");
-const S_STEP_SUBMIT = import_picocolors.default.green("◇");
-const S_RADIO_ACTIVE = import_picocolors.default.green("●");
-const S_RADIO_INACTIVE = import_picocolors.default.dim("○");
-import_picocolors.default.green("✓");
-const S_BULLET = import_picocolors.default.green("•");
-const S_BAR = import_picocolors.default.dim("│");
-const S_BAR_H = import_picocolors.default.dim("─");
-const cancelSymbol = Symbol("cancel");
-function approxStringWidth(plain) {
-	let width = 0;
-	for (const ch of plain) {
-		const code = ch.codePointAt(0);
-		if (code === 0) continue;
-		width += code >= 4352 && code <= 4447 || code >= 8986 && code <= 8987 || code >= 9001 && code <= 9002 || code >= 9193 && code <= 9196 || code === 9200 || code === 9203 || code >= 9725 && code <= 9726 || code >= 9748 && code <= 9749 || code >= 9800 && code <= 9811 || code >= 9855 && code <= 9855 || code >= 9875 && code <= 9875 || code >= 9889 && code <= 9889 || code >= 9898 && code <= 9899 || code >= 9917 && code <= 9918 || code >= 9924 && code <= 9925 || code >= 9934 && code <= 9934 || code >= 9940 && code <= 9940 || code >= 9962 && code <= 9962 || code >= 9970 && code <= 9971 || code >= 9973 && code <= 9973 || code >= 9978 && code <= 9978 || code >= 9981 && code <= 9981 || code >= 9989 && code <= 9989 || code >= 9994 && code <= 9995 || code >= 10024 && code <= 10024 || code >= 10060 && code <= 10060 || code >= 10062 && code <= 10062 || code >= 10067 && code <= 10069 || code >= 10071 && code <= 10071 || code >= 10133 && code <= 10135 || code >= 10160 && code <= 10160 || code >= 10175 && code <= 10175 || code >= 11035 && code <= 11036 || code >= 11088 && code <= 11088 || code >= 11093 && code <= 11093 || code >= 11904 && code <= 42191 && code !== 12351 || code >= 43360 && code <= 43388 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65040 && code <= 65049 || code >= 65072 && code <= 65135 || code >= 65280 && code <= 65376 || code >= 65504 && code <= 65510 || code >= 126976 && code <= 129535 ? 2 : 1;
-	}
-	return width;
+function isContainedIn(targetPath, basePath) {
+	const normalizedBase = normalize(resolve(basePath));
+	const normalizedTarget = normalize(resolve(targetPath));
+	return normalizedTarget.startsWith(normalizedBase + sep) || normalizedTarget === normalizedBase;
 }
-function visualRowsForLine(line, columns) {
-	const plain = stripVTControlCharacters(line);
-	const cols = Math.max(1, columns);
-	const w = approxStringWidth(plain);
-	return Math.max(1, Math.ceil(w / cols));
+function isValidRelativePath(path) {
+	return path.startsWith("./");
 }
-function countVisualRowsForLines(lines, columns) {
-	const cols = columns !== void 0 && columns > 0 ? columns : process.stdout.columns && process.stdout.columns > 0 ? process.stdout.columns : 80;
-	return lines.reduce((sum, line) => sum + visualRowsForLine(line, cols), 0);
-}
-async function searchMultiselect(options) {
-	const { message, items, maxVisible = 8, initialSelected = [], required = false, lockedSection } = options;
-	return new Promise((resolve) => {
-		const rl = readline.createInterface({
-			input: process.stdin,
-			output: silentOutput,
-			terminal: false
-		});
-		if (process.stdin.isTTY) process.stdin.setRawMode(true);
-		readline.emitKeypressEvents(process.stdin, rl);
-		let query = "";
-		let cursor = 0;
-		const selected = new Set(initialSelected);
-		let lastRenderHeight = 0;
-		const lockedValues = lockedSection ? lockedSection.items.map((i) => i.value) : [];
-		const filter = (item, q) => {
-			if (!q) return true;
-			const lowerQ = q.toLowerCase();
-			return item.label.toLowerCase().includes(lowerQ) || String(item.value).toLowerCase().includes(lowerQ);
-		};
-		const getFiltered = () => {
-			return items.filter((item) => filter(item, query));
-		};
-		const clearRender = () => {
-			if (lastRenderHeight > 0) {
-				process.stdout.write(`\x1b[${lastRenderHeight}A`);
-				for (let i = 0; i < lastRenderHeight; i++) process.stdout.write("\x1B[2K\x1B[1B");
-				process.stdout.write(`\x1b[${lastRenderHeight}A`);
-			}
-		};
-		const render = (state = "active") => {
-			clearRender();
-			const lines = [];
-			const filtered = getFiltered();
-			const icon = state === "active" ? S_STEP_ACTIVE : state === "cancel" ? S_STEP_CANCEL : S_STEP_SUBMIT;
-			lines.push(`${icon}  ${import_picocolors.default.bold(message)}`);
-			if (state === "active") {
-				if (lockedSection && lockedSection.items.length > 0) {
-					lines.push(`${S_BAR}`);
-					const lockedTitle = `${import_picocolors.default.bold(lockedSection.title)} ${import_picocolors.default.dim("── always included")}`;
-					lines.push(`${S_BAR}  ${S_BAR_H}${S_BAR_H} ${lockedTitle} ${S_BAR_H.repeat(12)}`);
-					for (const item of lockedSection.items) lines.push(`${S_BAR}    ${S_BULLET} ${import_picocolors.default.bold(item.label)}`);
-					lines.push(`${S_BAR}`);
-					lines.push(`${S_BAR}  ${S_BAR_H}${S_BAR_H} ${import_picocolors.default.bold("Additional agents")} ${S_BAR_H.repeat(29)}`);
-				}
-				const searchLine = `${S_BAR}  ${import_picocolors.default.dim("Search:")} ${query}${import_picocolors.default.inverse(" ")}`;
-				lines.push(searchLine);
-				lines.push(`${S_BAR}  ${import_picocolors.default.dim("↑↓ move, space select, enter confirm")}`);
-				lines.push(`${S_BAR}`);
-				const visibleStart = Math.max(0, Math.min(cursor - Math.floor(maxVisible / 2), filtered.length - maxVisible));
-				const visibleEnd = Math.min(filtered.length, visibleStart + maxVisible);
-				const visibleItems = filtered.slice(visibleStart, visibleEnd);
-				if (filtered.length === 0) lines.push(`${S_BAR}  ${import_picocolors.default.dim("No matches found")}`);
-				else {
-					for (let i = 0; i < visibleItems.length; i++) {
-						const item = visibleItems[i];
-						const actualIndex = visibleStart + i;
-						const isSelected = selected.has(item.value);
-						const isCursor = actualIndex === cursor;
-						const radio = isSelected ? S_RADIO_ACTIVE : S_RADIO_INACTIVE;
-						const label = isCursor ? import_picocolors.default.underline(item.label) : item.label;
-						const hint = item.hint ? import_picocolors.default.dim(` (${item.hint})`) : "";
-						const prefix = isCursor ? import_picocolors.default.cyan("❯") : " ";
-						lines.push(`${S_BAR} ${prefix} ${radio} ${label}${hint}`);
-					}
-					const hiddenBefore = visibleStart;
-					const hiddenAfter = filtered.length - visibleEnd;
-					if (hiddenBefore > 0 || hiddenAfter > 0) {
-						const parts = [];
-						if (hiddenBefore > 0) parts.push(`↑ ${hiddenBefore} more`);
-						if (hiddenAfter > 0) parts.push(`↓ ${hiddenAfter} more`);
-						lines.push(`${S_BAR}  ${import_picocolors.default.dim(parts.join("  "))}`);
-					}
-				}
-				lines.push(`${S_BAR}`);
-				const allSelectedLabels = [...lockedSection ? lockedSection.items.map((i) => i.label) : [], ...items.filter((item) => selected.has(item.value)).map((item) => item.label)];
-				if (allSelectedLabels.length === 0) lines.push(`${S_BAR}  ${import_picocolors.default.dim("Selected: (none)")}`);
-				else {
-					const summary = allSelectedLabels.length <= 3 ? allSelectedLabels.join(", ") : `${allSelectedLabels.slice(0, 3).join(", ")} +${allSelectedLabels.length - 3} more`;
-					lines.push(`${S_BAR}  ${import_picocolors.default.green("Selected:")} ${summary}`);
-				}
-				lines.push(`${import_picocolors.default.dim("└")}`);
-			} else if (state === "submit") {
-				const allSelectedLabels = [...lockedSection ? lockedSection.items.map((i) => i.label) : [], ...items.filter((item) => selected.has(item.value)).map((item) => item.label)];
-				lines.push(`${S_BAR}  ${import_picocolors.default.dim(allSelectedLabels.join(", "))}`);
-			} else if (state === "cancel") lines.push(`${S_BAR}  ${import_picocolors.default.strikethrough(import_picocolors.default.dim("Cancelled"))}`);
-			process.stdout.write(lines.join("\n") + "\n");
-			lastRenderHeight = countVisualRowsForLines(lines, process.stdout.columns);
-		};
-		const cleanup = () => {
-			process.stdin.removeListener("keypress", keypressHandler);
-			if (process.stdin.isTTY) process.stdin.setRawMode(false);
-			rl.close();
-		};
-		const submit = () => {
-			if (required && selected.size === 0 && lockedValues.length === 0) return;
-			render("submit");
-			cleanup();
-			resolve([...lockedValues, ...Array.from(selected)]);
-		};
-		const cancel = () => {
-			render("cancel");
-			cleanup();
-			resolve(cancelSymbol);
-		};
-		const keypressHandler = (_str, key) => {
-			if (!key) return;
-			const filtered = getFiltered();
-			if (key.name === "return") {
-				submit();
-				return;
-			}
-			if (key.name === "escape" || key.ctrl && key.name === "c") {
-				cancel();
-				return;
-			}
-			if (key.name === "up") {
-				cursor = Math.max(0, cursor - 1);
-				render();
-				return;
-			}
-			if (key.name === "down") {
-				cursor = Math.min(filtered.length - 1, cursor + 1);
-				render();
-				return;
-			}
-			if (key.name === "space") {
-				const item = filtered[cursor];
-				if (item) if (selected.has(item.value)) selected.delete(item.value);
-				else selected.add(item.value);
-				render();
-				return;
-			}
-			if (key.name === "backspace") {
-				query = query.slice(0, -1);
-				cursor = 0;
-				render();
-				return;
-			}
-			if (key.sequence && !key.ctrl && !key.meta && key.sequence.length === 1) {
-				query += key.sequence;
-				cursor = 0;
-				render();
-				return;
-			}
-		};
-		process.stdin.on("keypress", keypressHandler);
-		render();
-	});
-}
-const DEFAULT_CLONE_TIMEOUT_MS = 3e5;
-const CLONE_TIMEOUT_MS = (() => {
-	const raw = process.env.SKILLS_CLONE_TIMEOUT_MS;
-	if (!raw) return DEFAULT_CLONE_TIMEOUT_MS;
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_CLONE_TIMEOUT_MS;
-})();
-var GitCloneError = class extends Error {
-	url;
-	isTimeout;
-	isAuthError;
-	constructor(message, url, isTimeout = false, isAuthError = false) {
-		super(message);
-		this.name = "GitCloneError";
-		this.url = url;
-		this.isTimeout = isTimeout;
-		this.isAuthError = isAuthError;
-	}
-};
-async function cloneRepo(url, ref) {
-	const tempDir = await mkdtemp(join(tmpdir(), "skills-"));
-	const git = esm_default({
-		timeout: { block: CLONE_TIMEOUT_MS },
-		config: [
-			"filter.lfs.required=false",
-			"filter.lfs.smudge=",
-			"filter.lfs.clean=",
-			"filter.lfs.process="
-		]
-	}).env({
-		...process.env,
-		GIT_TERMINAL_PROMPT: "0",
-		GIT_LFS_SKIP_SMUDGE: "1"
-	});
-	const cloneOptions = ref ? [
-		"--depth",
-		"1",
-		"--branch",
-		ref
-	] : ["--depth", "1"];
-	try {
-		await git.clone(url, tempDir, cloneOptions);
-		return tempDir;
-	} catch (error) {
-		await rm(tempDir, {
-			recursive: true,
-			force: true
-		}).catch(() => {});
-		const errorMessage = error instanceof Error ? error.message : String(error);
-		const isTimeout = errorMessage.includes("block timeout") || errorMessage.includes("timed out");
-		const isAuthError = errorMessage.includes("Authentication failed") || errorMessage.includes("could not read Username") || errorMessage.includes("Permission denied") || errorMessage.includes("Repository not found");
-		if (isTimeout) throw new GitCloneError(`Clone timed out after ${Math.round(CLONE_TIMEOUT_MS / 1e3)}s. Common causes:\n  - Large repository: raise the timeout with SKILLS_CLONE_TIMEOUT_MS=600000 (10m)\n  - Slow network: retry, or clone manually and pass the local path to 'skills add'\n  - Private repo without credentials: ensure auth is configured\n      - For SSH: ssh-add -l (to check loaded keys)\n      - For HTTPS: gh auth status (if using GitHub CLI)`, url, true, false);
-		if (isAuthError) throw new GitCloneError(`Authentication failed for ${url}.\n  - For private repos, ensure you have access\n  - For SSH: Check your keys with 'ssh -T git@github.com'\n  - For HTTPS: Run 'gh auth login' or configure git credentials`, url, false, true);
-		throw new GitCloneError(`Failed to clone ${url}: ${errorMessage}`, url, false, false);
-	}
-}
-async function cleanupTempDir(dir) {
-	const normalizedDir = normalize(resolve(dir));
-	const normalizedTmpDir = normalize(resolve(tmpdir()));
-	if (!normalizedDir.startsWith(normalizedTmpDir + sep) && normalizedDir !== normalizedTmpDir) throw new Error("Attempted to clean up directory outside of temp directory");
-	await rm(dir, {
-		recursive: true,
-		force: true
-	});
-}
-function parseFrontmatter(raw) {
-	const match = raw.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/);
-	if (!match) return {
-		data: {},
-		content: raw
-	};
-	return {
-		data: parse(match[1]) ?? {},
-		content: match[2] ?? ""
-	};
-}
-function isContainedIn(targetPath, basePath) {
-	const normalizedBase = normalize(resolve(basePath));
-	const normalizedTarget = normalize(resolve(targetPath));
-	return normalizedTarget.startsWith(normalizedBase + sep) || normalizedTarget === normalizedBase;
-}
-function isValidRelativePath(path) {
-	return path.startsWith("./");
-}
-async function getPluginSkillPaths(basePath) {
-	const searchDirs = [];
-	const addPluginSkillPaths = (pluginBase, skills) => {
-		if (!isContainedIn(pluginBase, basePath)) return;
-		if (skills && skills.length > 0) for (const skillPath of skills) {
-			if (!isValidRelativePath(skillPath)) continue;
-			const skillDir = dirname(join(pluginBase, skillPath));
-			if (isContainedIn(skillDir, basePath)) searchDirs.push(skillDir);
-		}
-		searchDirs.push(join(pluginBase, "skills"));
-	};
-	try {
-		const content = await readFile(join(basePath, ".claude-plugin/marketplace.json"), "utf-8");
-		const manifest = JSON.parse(content);
-		const pluginRoot = manifest.metadata?.pluginRoot;
-		if (pluginRoot === void 0 || isValidRelativePath(pluginRoot)) for (const plugin of manifest.plugins ?? []) {
-			if (typeof plugin.source !== "string" && plugin.source !== void 0) continue;
-			if (plugin.source !== void 0 && !isValidRelativePath(plugin.source)) continue;
-			addPluginSkillPaths(join(basePath, pluginRoot ?? "", plugin.source ?? ""), plugin.skills);
-		}
-	} catch {}
-	try {
-		const content = await readFile(join(basePath, ".claude-plugin/plugin.json"), "utf-8");
-		addPluginSkillPaths(basePath, JSON.parse(content).skills);
-	} catch {}
-	return searchDirs;
+async function getPluginSkillPaths(basePath) {
+	const searchDirs = [];
+	const addPluginSkillPaths = (pluginBase, skills) => {
+		if (!isContainedIn(pluginBase, basePath)) return;
+		if (skills && skills.length > 0) for (const skillPath of skills) {
+			if (!isValidRelativePath(skillPath)) continue;
+			const skillDir = dirname(join(pluginBase, skillPath));
+			if (isContainedIn(skillDir, basePath)) searchDirs.push(skillDir);
+		}
+		searchDirs.push(join(pluginBase, "skills"));
+	};
+	try {
+		const content = await readFile(join(basePath, ".claude-plugin/marketplace.json"), "utf-8");
+		const manifest = JSON.parse(content);
+		const pluginRoot = manifest.metadata?.pluginRoot;
+		if (pluginRoot === void 0 || isValidRelativePath(pluginRoot)) for (const plugin of manifest.plugins ?? []) {
+			if (typeof plugin.source !== "string" && plugin.source !== void 0) continue;
+			if (plugin.source !== void 0 && !isValidRelativePath(plugin.source)) continue;
+			addPluginSkillPaths(join(basePath, pluginRoot ?? "", plugin.source ?? ""), plugin.skills);
+		}
+	} catch {}
+	try {
+		const content = await readFile(join(basePath, ".claude-plugin/plugin.json"), "utf-8");
+		addPluginSkillPaths(basePath, JSON.parse(content).skills);
+	} catch {}
+	return searchDirs;
 }
 async function getPluginGroupings(basePath) {
 	const groupings = /* @__PURE__ */ new Map();
@@ -933,52 +1179,6 @@ function filterSkills(skills, inputNames) {
 		return normalizedInputs.some((input) => input === name || input === displayName);
 	});
 }
-const home = homedir();
-const codexHome = process.env.CODEX_HOME?.trim() || join(home, ".codex");
-const claudeHome = process.env.CLAUDE_CONFIG_DIR?.trim() || join(home, ".claude");
-const agents = {
-	"claude-code": {
-		name: "claude-code",
-		displayName: "Claude Code",
-		skillsDir: ".claude/skills",
-		globalSkillsDir: join(claudeHome, "skills"),
-		detectInstalled: async () => {
-			return existsSync(claudeHome);
-		}
-	},
-	codex: {
-		name: "codex",
-		displayName: "Codex",
-		skillsDir: ".agents/skills",
-		globalSkillsDir: join(codexHome, "skills"),
-		detectInstalled: async () => {
-			return existsSync(codexHome) || existsSync("/etc/codex");
-		}
-	},
-	cursor: {
-		name: "cursor",
-		displayName: "Cursor",
-		skillsDir: ".agents/skills",
-		globalSkillsDir: join(home, ".cursor/skills"),
-		detectInstalled: async () => {
-			return existsSync(join(home, ".cursor"));
-		}
-	}
-};
-async function detectInstalledAgents() {
-	return (await Promise.all(Object.entries(agents).map(async ([type, config]) => ({
-		type,
-		installed: await config.detectInstalled()
-	})))).filter((r) => r.installed).map((r) => r.type);
-}
-function getUniversalAgents() {
-	return Object.entries(agents).filter(([_, config]) => config.skillsDir === ".agents/skills" && config.showInUniversalList !== false).map(([type]) => type);
-}
-function isUniversalAgent(type) {
-	return agents[type].skillsDir === ".agents/skills";
-}
-const AGENTS_DIR$2 = ".agents";
-const SKILLS_SUBDIR = "skills";
 function sanitizeName(name) {
 	return name.toLowerCase().replace(/[^a-z0-9._]+/g, "-").replace(/^[.\-]+|[.\-]+$/g, "").substring(0, 255) || "unnamed-skill";
 }
@@ -1021,6 +1221,17 @@ async function cleanAndCreateDirectory(path) {
 	} catch {}
 	await mkdir(path, { recursive: true });
 }
+async function cleanCanonicalDir(canonicalPath, storeRoot) {
+	const rel = relative(resolve(storeRoot), resolve(canonicalPath));
+	if (rel.startsWith("..") || isAbsolute(rel)) throw new Error(`refusing to clean path outside forge store: ${canonicalPath}`);
+	try {
+		await rm(canonicalPath, {
+			recursive: true,
+			force: true
+		});
+	} catch {}
+	await mkdir(canonicalPath, { recursive: true });
+}
 async function resolveParentSymlinks(path) {
 	const resolved = resolve(path);
 	const dir = dirname(resolved);
@@ -1056,7 +1267,104 @@ async function createSymlink(target, linkPath) {
 		return false;
 	}
 }
-async function installSkillForAgent(skill, agentType, options = {}) {
+async function installSkillForAgent(skill, agentType, opts) {
+	if (!("ref" in opts && "scopeNamespace" in opts)) return _installSkillForAgentLegacy(skill, agentType, opts);
+	const newOpts = opts;
+	const scope = newOpts.scope ?? (newOpts.global ? "global" : "project");
+	const cwd = newOpts.cwd ?? process.cwd();
+	const skillName = sanitizeName(skill.name || basename(skill.path));
+	const canonicalKey = `${newOpts.scopeNamespace}__${skillName}`;
+	const storeRoot = getStoreRoot(scope, cwd);
+	const canonicalDir = join(storeRoot, "skills", canonicalKey);
+	if (!isPathSafe(join(storeRoot, "skills"), canonicalDir)) return {
+		success: false,
+		path: "",
+		mode: "symlink",
+		error: "Invalid skill name: path traversal detected",
+		forgeOtherReplacements: []
+	};
+	const entryAgentRoot = scope === "global" ? getAgentHome(agentType) : cwd;
+	const entry = agentType === "claude-code" ? join(entryAgentRoot, ".claude", "skills", skillName) : agentType === "cursor" ? join(entryAgentRoot, ".cursor", "skills", skillName) : join(entryAgentRoot, ".agents", "skills", skillName);
+	try {
+		const status = await assertEntryReplaceable(entry, {
+			intendedRef: newOpts.ref,
+			intendedCanonical: canonicalDir,
+			storeRoot
+		});
+		const forgeOtherReplacements = [];
+		const foreignConflicts = [];
+		if (status.kind === "forge-other") forgeOtherReplacements.push({
+			entryPath: entry,
+			otherRef: status.otherRef
+		});
+		else if (status.kind === "foreign-file" || status.kind === "foreign-dir" || status.kind === "foreign-symlink") foreignConflicts.push({
+			entryPath: entry,
+			kind: status.kind
+		});
+		if (foreignConflicts.length > 0) {
+			let proceed = newOpts.forceOverwrite ?? false;
+			if (!proceed && newOpts.onConflictPrompt) proceed = await newOpts.onConflictPrompt(foreignConflicts);
+			if (!proceed) return {
+				success: false,
+				path: entry,
+				mode: "symlink",
+				error: "aborted: user-owned content at entry path",
+				forgeOtherReplacements: []
+			};
+		}
+		await cleanCanonicalDir(canonicalDir, storeRoot);
+		await copyDirectory(skill.path, canonicalDir);
+		await writeFile(join(canonicalDir, ".forge-source.json"), JSON.stringify({
+			ref: newOpts.ref,
+			scope: newOpts.scopeNamespace,
+			type: "skill",
+			name: skillName,
+			install_mode: agentType,
+			parent_plugin_ref: null,
+			installed_at: (/* @__PURE__ */ new Date()).toISOString()
+		}, null, 2) + "\n");
+		if (status.kind !== "absent" && status.kind !== "forge-self") try {
+			await rm(entry, {
+				recursive: true,
+				force: true
+			});
+		} catch {}
+		if (!await createSymlink(canonicalDir, entry)) {
+			await mkdir(dirname(entry), { recursive: true });
+			try {
+				await rm(entry, {
+					recursive: true,
+					force: true
+				});
+			} catch {}
+			await copyDirectory(canonicalDir, entry);
+			return {
+				success: true,
+				path: entry,
+				mode: "symlink",
+				symlinkFailed: true,
+				canonicalPath: canonicalDir,
+				forgeOtherReplacements
+			};
+		}
+		return {
+			success: true,
+			path: entry,
+			mode: "symlink",
+			canonicalPath: canonicalDir,
+			forgeOtherReplacements
+		};
+	} catch (error) {
+		return {
+			success: false,
+			path: entry,
+			mode: "symlink",
+			error: error instanceof Error ? error.message : "Unknown error",
+			forgeOtherReplacements: []
+		};
+	}
+}
+async function _installSkillForAgentLegacy(skill, agentType, options) {
 	const agent = agents[agentType];
 	const isGlobal = options.global ?? false;
 	const cwd = options.cwd || process.cwd();
@@ -1064,7 +1372,8 @@ async function installSkillForAgent(skill, agentType, options = {}) {
 		success: false,
 		path: "",
 		mode: options.mode ?? "symlink",
-		error: `${agent.displayName} does not support global skill installation`
+		error: `${agent.displayName} does not support global skill installation`,
+		forgeOtherReplacements: []
 	};
 	const skillName = sanitizeName(skill.name || basename(skill.path));
 	const canonicalBase = getCanonicalSkillsDir(isGlobal, cwd);
@@ -1076,13 +1385,15 @@ async function installSkillForAgent(skill, agentType, options = {}) {
 		success: false,
 		path: agentDir,
 		mode: installMode,
-		error: "Invalid skill name: potential path traversal detected"
+		error: "Invalid skill name: potential path traversal detected",
+		forgeOtherReplacements: []
 	};
 	if (!isPathSafe(agentBase, agentDir)) return {
 		success: false,
 		path: agentDir,
 		mode: installMode,
-		error: "Invalid skill name: potential path traversal detected"
+		error: "Invalid skill name: potential path traversal detected",
+		forgeOtherReplacements: []
 	};
 	try {
 		if (installMode === "copy") {
@@ -1091,7 +1402,8 @@ async function installSkillForAgent(skill, agentType, options = {}) {
 			return {
 				success: true,
 				path: agentDir,
-				mode: "copy"
+				mode: "copy",
+				forgeOtherReplacements: []
 			};
 		}
 		await cleanAndCreateDirectory(canonicalDir);
@@ -1100,7 +1412,8 @@ async function installSkillForAgent(skill, agentType, options = {}) {
 			success: true,
 			path: canonicalDir,
 			canonicalPath: canonicalDir,
-			mode: "symlink"
+			mode: "symlink",
+			forgeOtherReplacements: []
 		};
 		if (!await createSymlink(canonicalDir, agentDir)) {
 			await cleanAndCreateDirectory(agentDir);
@@ -1110,21 +1423,24 @@ async function installSkillForAgent(skill, agentType, options = {}) {
 				path: agentDir,
 				canonicalPath: canonicalDir,
 				mode: "symlink",
-				symlinkFailed: true
+				symlinkFailed: true,
+				forgeOtherReplacements: []
 			};
 		}
 		return {
 			success: true,
 			path: agentDir,
 			canonicalPath: canonicalDir,
-			mode: "symlink"
+			mode: "symlink",
+			forgeOtherReplacements: []
 		};
 	} catch (error) {
 		return {
 			success: false,
 			path: agentDir,
 			mode: installMode,
-			error: error instanceof Error ? error.message : "Unknown error"
+			error: error instanceof Error ? error.message : "Unknown error",
+			forgeOtherReplacements: []
 		};
 	}
 }
@@ -1472,6 +1788,686 @@ async function listInstalledSkills(options = {}) {
 	} catch {}
 	return Array.from(skillsMap.values());
 }
+const USER_START = "<!-- forge:user-content:start -->";
+const USER_END = "<!-- forge:user-content:end -->";
+function takeoverWithUserContent(existing) {
+	if (existing.includes(USER_START)) return existing;
+	return `${USER_START}\n${existing.trim()}\n${USER_END}\n`;
+}
+function injectPluginRules(agentsMd, plugin, rules) {
+	const start = `<!-- forge-plugin:${plugin.key}:start ref=${plugin.ref} install_mode=codex -->`;
+	const end = `<!-- forge-plugin:${plugin.key}:end -->`;
+	const block = `${start}\n${rules.map((r) => {
+		const rs = `<!-- forge-rule:${r.relativePath}:start -->`;
+		const re = `<!-- forge-rule:${r.relativePath}:end -->`;
+		return `  ${rs}\n${r.content.trimEnd()}\n  ${re}`;
+	}).join("\n")}\n${end}\n`;
+	const existing = findPluginBlock(agentsMd, plugin.key);
+	if (existing) return agentsMd.slice(0, existing.start) + block + agentsMd.slice(existing.end);
+	return agentsMd + (agentsMd.endsWith("\n") ? "" : "\n") + "\n" + block;
+}
+function removePluginRules(agentsMd, pluginKey) {
+	const existing = findPluginBlock(agentsMd, pluginKey);
+	if (!existing) return agentsMd;
+	return agentsMd.slice(0, existing.start) + agentsMd.slice(existing.end);
+}
+function findPluginBlock(agentsMd, pluginKey) {
+	const startMarker = `<!-- forge-plugin:${pluginKey}:start`;
+	const endMarker = `<!-- forge-plugin:${pluginKey}:end -->`;
+	const startIdx = agentsMd.indexOf(startMarker);
+	if (startIdx < 0) return null;
+	const endIdx = agentsMd.indexOf(endMarker, startIdx);
+	if (endIdx < 0) return null;
+	let blockEnd = endIdx + endMarker.length;
+	if (agentsMd[blockEnd] === "\n") blockEnd++;
+	return {
+		start: startIdx,
+		end: blockEnd
+	};
+}
+async function installPlugin(ref, opts) {
+	const cfg = loadConfig();
+	const tarball = await fetchPluginArchive(ref, cfg.portal, cfg.token);
+	const tmp = await mkdtemp(join(tmpdir(), "plugin-"));
+	try {
+		extractTarGz(tarball, tmp);
+		return await installFromExtracted(ref, await findPluginRoot(tmp), opts);
+	} finally {
+		await rm(tmp, {
+			recursive: true,
+			force: true
+		});
+	}
+}
+async function findPluginRoot(start) {
+	const queue = [start];
+	while (queue.length > 0) {
+		const dir = queue.shift();
+		if (existsSync(join(dir, "plugin.json"))) return dir;
+		if (existsSync(join(dir, ".claude-plugin", "plugin.json"))) return dir;
+		let entries;
+		try {
+			entries = await readdir(dir, { withFileTypes: true });
+		} catch {
+			continue;
+		}
+		for (const e of entries) if (e.isDirectory()) queue.push(join(dir, e.name));
+	}
+	throw new Error(`plugin.json not found under ${start} (corrupt archive?)`);
+}
+async function installFromExtracted(ref, extractedDir, opts) {
+	const { scopeNamespace, pluginName } = parsePluginRef$1(ref);
+	const storeRoot = getStoreRoot(opts.scope, opts.cwd);
+	const pluginCanonical = join(storeRoot, "plugins", `${scopeNamespace}__${pluginName}`);
+	const components = await classifyExtracted(extractedDir);
+	const ignoredComponents = await collectIgnoredTopLevel(extractedDir);
+	const preflight = buildPreflightList(pluginCanonical, components, opts);
+	const foreignConflicts = [];
+	const forgeOtherReplacements = [];
+	const statuses = /* @__PURE__ */ new Map();
+	for (const pe of preflight) {
+		const intendedRef = ref + "/" + componentSubRef(pe.component);
+		const status = await assertEntryReplaceable(pe.entryPath, {
+			intendedRef,
+			intendedCanonical: pe.intendedCanonical,
+			storeRoot
+		});
+		statuses.set(pe.entryPath, status);
+		if (status.kind === "forge-other") forgeOtherReplacements.push({
+			entryPath: pe.entryPath,
+			otherRef: status.otherRef
+		});
+		else if (status.kind === "foreign-file" || status.kind === "foreign-dir" || status.kind === "foreign-symlink") foreignConflicts.push({
+			entryPath: pe.entryPath,
+			kind: status.kind
+		});
+	}
+	if (foreignConflicts.length > 0) {
+		if (!await promptForeignOverwrite(foreignConflicts, {
+			yes: opts.yes,
+			force: opts.force
+		})) throw new Error(`aborted: ${foreignConflicts.length} foreign conflicts at plugin entry paths`);
+	}
+	return {
+		pluginRef: ref,
+		pluginCanonical,
+		installedComponents: await commitPluginInstall({
+			ref,
+			scopeNamespace,
+			pluginName,
+			pluginCanonical,
+			extractedDir,
+			components,
+			preflight,
+			statuses,
+			opts
+		}),
+		installedEntries: preflight.map((pe) => ({
+			agent: pe.agent,
+			kind: componentLedgerKind(pe.component.kind),
+			name: componentDisplayName(pe.component),
+			entryPath: pe.entryPath
+		})),
+		forgeOtherReplacements,
+		ignoredComponents
+	};
+}
+function componentLedgerKind(kind) {
+	switch (kind) {
+		case "plugin-skill": return "skill";
+		case "plugin-agent-manifest": return "agent-manifest";
+		case "plugin-agent-deps-dir": return "agent-deps-dir";
+		case "plugin-rule-manifest": return "rule-manifest";
+		case "plugin-rule-deps-dir": return "rule-deps-dir";
+	}
+}
+function componentDisplayName(c) {
+	switch (c.kind) {
+		case "plugin-skill": return c.skillName;
+		case "plugin-agent-manifest":
+		case "plugin-rule-manifest": return c.filename;
+		case "plugin-agent-deps-dir":
+		case "plugin-rule-deps-dir": return c.dirname;
+	}
+}
+function buildPreflightList(pluginCanonical, components, opts) {
+	const preflight = [];
+	for (const agent of opts.agents) {
+		for (const skillName of components.skills) {
+			const c = {
+				kind: "plugin-skill",
+				pluginCanonical,
+				skillName
+			};
+			const t = getInstallTargets(agent, c, opts.scope, opts.cwd);
+			preflight.push({
+				agent,
+				component: c,
+				entryPath: t.entry,
+				intendedCanonical: t.canonical
+			});
+		}
+		for (const filename of components.agentManifests) {
+			const c = {
+				kind: "plugin-agent-manifest",
+				pluginCanonical,
+				filename
+			};
+			const t = getInstallTargets(agent, c, opts.scope, opts.cwd);
+			preflight.push({
+				agent,
+				component: c,
+				entryPath: t.entry,
+				intendedCanonical: t.canonical
+			});
+		}
+		for (const dirname of components.agentDepsDirs) {
+			const c = {
+				kind: "plugin-agent-deps-dir",
+				pluginCanonical,
+				dirname
+			};
+			const t = getInstallTargets(agent, c, opts.scope, opts.cwd);
+			preflight.push({
+				agent,
+				component: c,
+				entryPath: t.entry,
+				intendedCanonical: t.canonical
+			});
+		}
+		for (const filename of components.ruleManifests) {
+			const c = {
+				kind: "plugin-rule-manifest",
+				pluginCanonical,
+				filename
+			};
+			const t = getInstallTargets(agent, c, opts.scope, opts.cwd);
+			if (t.entry) preflight.push({
+				agent,
+				component: c,
+				entryPath: t.entry,
+				intendedCanonical: t.canonical
+			});
+		}
+		for (const dirname of components.ruleDepsDirs) {
+			const c = {
+				kind: "plugin-rule-deps-dir",
+				pluginCanonical,
+				dirname
+			};
+			const t = getInstallTargets(agent, c, opts.scope, opts.cwd);
+			if (t.entry) preflight.push({
+				agent,
+				component: c,
+				entryPath: t.entry,
+				intendedCanonical: t.canonical
+			});
+		}
+	}
+	return preflight;
+}
+async function classifyExtracted(dir) {
+	const out = {
+		skills: [],
+		agentManifests: [],
+		agentDepsDirs: [],
+		ruleManifests: [],
+		ruleDepsDirs: []
+	};
+	if (existsSync(join(dir, "skills"))) {
+		for (const e of await readdir(join(dir, "skills"), { withFileTypes: true })) if (e.isDirectory()) out.skills.push(e.name);
+	}
+	if (existsSync(join(dir, "agents"))) {
+		for (const e of await readdir(join(dir, "agents"), { withFileTypes: true })) if (e.isFile() && e.name.endsWith(".md")) out.agentManifests.push(e.name);
+		else if (e.isDirectory()) out.agentDepsDirs.push(e.name);
+	}
+	if (existsSync(join(dir, "rules"))) {
+		for (const e of await readdir(join(dir, "rules"), { withFileTypes: true })) if (e.isFile() && (e.name.endsWith(".md") || e.name.endsWith(".mdc"))) out.ruleManifests.push(e.name);
+		else if (e.isDirectory()) out.ruleDepsDirs.push(e.name);
+	}
+	return out;
+}
+async function collectIgnoredTopLevel(dir) {
+	const accepted = new Set([
+		"skills",
+		"agents",
+		"rules",
+		"plugin.json",
+		".claude-plugin"
+	]);
+	const out = [];
+	for (const e of await readdir(dir, { withFileTypes: true })) if (!accepted.has(e.name)) out.push(e.isDirectory() ? `${e.name}/` : e.name);
+	out.sort();
+	return out;
+}
+function parsePluginRef$1(ref) {
+	let m = /^@public\/plugins\/(.+)$/.exec(ref);
+	if (m) return {
+		scopeNamespace: "public",
+		pluginName: m[1]
+	};
+	m = /^@teams\/([^/]+)\/plugins\/(.+)$/.exec(ref);
+	if (m) return {
+		scopeNamespace: m[1],
+		pluginName: m[2]
+	};
+	throw new Error(`invalid plugin ref: ${ref}`);
+}
+function componentSubRef(c) {
+	switch (c.kind) {
+		case "plugin-skill": return `skills/${c.skillName}`;
+		case "plugin-agent-manifest": return `agents/${c.filename}`;
+		case "plugin-agent-deps-dir": return `agents/${c.dirname}`;
+		case "plugin-rule-manifest": return `rules/${c.filename}`;
+		case "plugin-rule-deps-dir": return `rules/${c.dirname}`;
+	}
+}
+async function commitPluginInstall(params) {
+	const { ref, scopeNamespace, pluginName, pluginCanonical, extractedDir, components, preflight, statuses, opts } = params;
+	await rm(pluginCanonical, {
+		recursive: true,
+		force: true
+	});
+	await mkdir(pluginCanonical, { recursive: true });
+	await copyDirRecursive(extractedDir, pluginCanonical, true);
+	for (const skillName of components.skills) {
+		const sidecarPath = join(pluginCanonical, "skills", skillName, ".forge-source.json");
+		await mkdir(dirname(sidecarPath), { recursive: true });
+		await writeFile(sidecarPath, JSON.stringify({
+			ref: `${ref}/skills/${skillName}`,
+			scope: scopeNamespace,
+			type: "skill",
+			name: skillName,
+			install_mode: opts.agents[0],
+			parent_plugin_ref: ref,
+			installed_at: (/* @__PURE__ */ new Date()).toISOString()
+		}, null, 2) + "\n");
+	}
+	const ledger = [
+		...components.skills.map((n) => ({
+			type: "skill",
+			name: n
+		})),
+		...components.agentManifests.map((n) => ({
+			type: "agent-manifest",
+			name: n
+		})),
+		...components.agentDepsDirs.map((n) => ({
+			type: "agent-deps-dir",
+			name: n
+		})),
+		...components.ruleManifests.map((n) => ({
+			type: "rule-manifest",
+			name: n
+		})),
+		...components.ruleDepsDirs.map((n) => ({
+			type: "rule-deps-dir",
+			name: n
+		}))
+	];
+	await writeFile(join(pluginCanonical, ".forge-plugin.json"), JSON.stringify({
+		ref,
+		scope: scopeNamespace,
+		name: pluginName,
+		installed_at: (/* @__PURE__ */ new Date()).toISOString(),
+		install_modes: opts.agents,
+		installed_components: ledger
+	}, null, 2) + "\n");
+	for (const pe of preflight) {
+		const status = statuses.get(pe.entryPath);
+		if (!status) continue;
+		if (status.kind !== "absent" && status.kind !== "forge-self") try {
+			await rm(pe.entryPath, {
+				recursive: true,
+				force: true
+			});
+		} catch {}
+		await mkdir(dirname(pe.entryPath), { recursive: true });
+		if (!await createSymlink(pe.intendedCanonical, pe.entryPath)) {
+			let stEntry;
+			try {
+				stEntry = await stat(pe.intendedCanonical);
+			} catch {
+				continue;
+			}
+			try {
+				await rm(pe.entryPath, {
+					recursive: true,
+					force: true
+				});
+			} catch {}
+			if (stEntry.isDirectory()) await copyDirRecursive(pe.intendedCanonical, pe.entryPath, false);
+			else await copyFileShallow(pe.intendedCanonical, pe.entryPath);
+		}
+	}
+	if (opts.agents.includes("codex") && components.ruleManifests.length > 0) await injectCodexAgentsMdForPlugin({
+		pluginCanonical,
+		pluginRef: ref,
+		pluginKey: `${scopeNamespace}:${pluginName}`,
+		ruleManifests: components.ruleManifests,
+		scope: opts.scope,
+		cwd: opts.cwd
+	});
+	if (opts.agents.includes("codex") && components.agentManifests.length > 0) await registerCodexAgents({
+		pluginCanonical,
+		agentFilenames: components.agentManifests,
+		scope: opts.scope,
+		cwd: opts.cwd
+	});
+	if (components.skills.length > 0) for (const agent of opts.agents) await ensureForgeHooks(agent);
+	return ledger;
+}
+async function copyDirRecursive(src, dest, skipDotClaudePlugin) {
+	await mkdir(dest, { recursive: true });
+	for (const e of await readdir(src, { withFileTypes: true })) {
+		if (skipDotClaudePlugin && e.name === ".claude-plugin") continue;
+		const s = join(src, e.name);
+		const d = join(dest, e.name);
+		if (e.isDirectory()) await copyDirRecursive(s, d, false);
+		else if (e.isFile()) await writeFile(d, await readFile(s));
+	}
+}
+async function copyFileShallow(src, dest) {
+	const buf = await readFile(src);
+	await mkdir(dirname(dest), { recursive: true });
+	await writeFile(dest, buf);
+}
+async function injectCodexAgentsMdForPlugin(params) {
+	const codexAgentsMd = join(params.scope === "global" ? getAgentHome("codex") : join(params.cwd ?? process.cwd(), ".codex"), "AGENTS.md");
+	const canonicalAgentsMd = join(getStoreRoot(params.scope, params.cwd), "codex-agents.md");
+	let userContent = "";
+	try {
+		if ((await stat(codexAgentsMd)).isFile()) userContent = await readFile(codexAgentsMd, "utf-8");
+	} catch {}
+	let canonicalContent = "";
+	try {
+		canonicalContent = await readFile(canonicalAgentsMd, "utf-8");
+	} catch {}
+	if (!canonicalContent) canonicalContent = takeoverWithUserContent(userContent);
+	const rules = [];
+	for (const fname of params.ruleManifests) {
+		const content = await readFile(join(params.pluginCanonical, "rules", fname), "utf-8");
+		rules.push({
+			relativePath: `rules/${fname}`,
+			content
+		});
+	}
+	const updated = injectPluginRules(canonicalContent, {
+		ref: params.pluginRef,
+		key: params.pluginKey
+	}, rules);
+	await mkdir(dirname(canonicalAgentsMd), { recursive: true });
+	await writeFile(canonicalAgentsMd, updated, "utf-8");
+	try {
+		await rm(codexAgentsMd, { force: true });
+	} catch {}
+	await mkdir(dirname(codexAgentsMd), { recursive: true });
+	await symlink(canonicalAgentsMd, codexAgentsMd);
+}
+async function registerCodexAgents(params) {
+	const configToml = join(params.scope === "global" ? getAgentHome("codex") : join(params.cwd ?? process.cwd(), ".codex"), "config.toml");
+	let raw = "";
+	try {
+		raw = await readFile(configToml, "utf-8");
+	} catch {}
+	for (const fname of params.agentFilenames) {
+		const id = fname.replace(/\.md$/, "");
+		const configFile = join(params.pluginCanonical, "agents", fname);
+		raw = upsertCodexAgent(raw, {
+			id,
+			configFile
+		});
+	}
+	await mkdir(dirname(configToml), { recursive: true });
+	await writeFile(configToml, raw, "utf-8");
+}
+const silentOutput = new Writable({ write(_chunk, _encoding, callback) {
+	callback();
+} });
+const S_STEP_ACTIVE = import_picocolors.default.green("◆");
+const S_STEP_CANCEL = import_picocolors.default.red("■");
+const S_STEP_SUBMIT = import_picocolors.default.green("◇");
+const S_RADIO_ACTIVE = import_picocolors.default.green("●");
+const S_RADIO_INACTIVE = import_picocolors.default.dim("○");
+import_picocolors.default.green("✓");
+const S_BULLET = import_picocolors.default.green("•");
+const S_BAR = import_picocolors.default.dim("│");
+const S_BAR_H = import_picocolors.default.dim("─");
+const cancelSymbol = Symbol("cancel");
+function approxStringWidth(plain) {
+	let width = 0;
+	for (const ch of plain) {
+		const code = ch.codePointAt(0);
+		if (code === 0) continue;
+		width += code >= 4352 && code <= 4447 || code >= 8986 && code <= 8987 || code >= 9001 && code <= 9002 || code >= 9193 && code <= 9196 || code === 9200 || code === 9203 || code >= 9725 && code <= 9726 || code >= 9748 && code <= 9749 || code >= 9800 && code <= 9811 || code >= 9855 && code <= 9855 || code >= 9875 && code <= 9875 || code >= 9889 && code <= 9889 || code >= 9898 && code <= 9899 || code >= 9917 && code <= 9918 || code >= 9924 && code <= 9925 || code >= 9934 && code <= 9934 || code >= 9940 && code <= 9940 || code >= 9962 && code <= 9962 || code >= 9970 && code <= 9971 || code >= 9973 && code <= 9973 || code >= 9978 && code <= 9978 || code >= 9981 && code <= 9981 || code >= 9989 && code <= 9989 || code >= 9994 && code <= 9995 || code >= 10024 && code <= 10024 || code >= 10060 && code <= 10060 || code >= 10062 && code <= 10062 || code >= 10067 && code <= 10069 || code >= 10071 && code <= 10071 || code >= 10133 && code <= 10135 || code >= 10160 && code <= 10160 || code >= 10175 && code <= 10175 || code >= 11035 && code <= 11036 || code >= 11088 && code <= 11088 || code >= 11093 && code <= 11093 || code >= 11904 && code <= 42191 && code !== 12351 || code >= 43360 && code <= 43388 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65040 && code <= 65049 || code >= 65072 && code <= 65135 || code >= 65280 && code <= 65376 || code >= 65504 && code <= 65510 || code >= 126976 && code <= 129535 ? 2 : 1;
+	}
+	return width;
+}
+function visualRowsForLine(line, columns) {
+	const plain = stripVTControlCharacters(line);
+	const cols = Math.max(1, columns);
+	const w = approxStringWidth(plain);
+	return Math.max(1, Math.ceil(w / cols));
+}
+function countVisualRowsForLines(lines, columns) {
+	const cols = columns !== void 0 && columns > 0 ? columns : process.stdout.columns && process.stdout.columns > 0 ? process.stdout.columns : 80;
+	return lines.reduce((sum, line) => sum + visualRowsForLine(line, cols), 0);
+}
+async function searchMultiselect(options) {
+	const { message, items, maxVisible = 8, initialSelected = [], required = false, lockedSection } = options;
+	return new Promise((resolve) => {
+		const rl = readline.createInterface({
+			input: process.stdin,
+			output: silentOutput,
+			terminal: false
+		});
+		if (process.stdin.isTTY) process.stdin.setRawMode(true);
+		readline.emitKeypressEvents(process.stdin, rl);
+		let query = "";
+		let cursor = 0;
+		const selected = new Set(initialSelected);
+		let lastRenderHeight = 0;
+		const lockedValues = lockedSection ? lockedSection.items.map((i) => i.value) : [];
+		const filter = (item, q) => {
+			if (!q) return true;
+			const lowerQ = q.toLowerCase();
+			return item.label.toLowerCase().includes(lowerQ) || String(item.value).toLowerCase().includes(lowerQ);
+		};
+		const getFiltered = () => {
+			return items.filter((item) => filter(item, query));
+		};
+		const clearRender = () => {
+			if (lastRenderHeight > 0) {
+				process.stdout.write(`\x1b[${lastRenderHeight}A`);
+				for (let i = 0; i < lastRenderHeight; i++) process.stdout.write("\x1B[2K\x1B[1B");
+				process.stdout.write(`\x1b[${lastRenderHeight}A`);
+			}
+		};
+		const render = (state = "active") => {
+			clearRender();
+			const lines = [];
+			const filtered = getFiltered();
+			const icon = state === "active" ? S_STEP_ACTIVE : state === "cancel" ? S_STEP_CANCEL : S_STEP_SUBMIT;
+			lines.push(`${icon}  ${import_picocolors.default.bold(message)}`);
+			if (state === "active") {
+				if (lockedSection && lockedSection.items.length > 0) {
+					lines.push(`${S_BAR}`);
+					const lockedTitle = `${import_picocolors.default.bold(lockedSection.title)} ${import_picocolors.default.dim("── always included")}`;
+					lines.push(`${S_BAR}  ${S_BAR_H}${S_BAR_H} ${lockedTitle} ${S_BAR_H.repeat(12)}`);
+					for (const item of lockedSection.items) lines.push(`${S_BAR}    ${S_BULLET} ${import_picocolors.default.bold(item.label)}`);
+					lines.push(`${S_BAR}`);
+					lines.push(`${S_BAR}  ${S_BAR_H}${S_BAR_H} ${import_picocolors.default.bold("Additional agents")} ${S_BAR_H.repeat(29)}`);
+				}
+				const searchLine = `${S_BAR}  ${import_picocolors.default.dim("Search:")} ${query}${import_picocolors.default.inverse(" ")}`;
+				lines.push(searchLine);
+				lines.push(`${S_BAR}  ${import_picocolors.default.dim("↑↓ move, space select, enter confirm")}`);
+				lines.push(`${S_BAR}`);
+				const visibleStart = Math.max(0, Math.min(cursor - Math.floor(maxVisible / 2), filtered.length - maxVisible));
+				const visibleEnd = Math.min(filtered.length, visibleStart + maxVisible);
+				const visibleItems = filtered.slice(visibleStart, visibleEnd);
+				if (filtered.length === 0) lines.push(`${S_BAR}  ${import_picocolors.default.dim("No matches found")}`);
+				else {
+					for (let i = 0; i < visibleItems.length; i++) {
+						const item = visibleItems[i];
+						const actualIndex = visibleStart + i;
+						const isSelected = selected.has(item.value);
+						const isCursor = actualIndex === cursor;
+						const radio = isSelected ? S_RADIO_ACTIVE : S_RADIO_INACTIVE;
+						const label = isCursor ? import_picocolors.default.underline(item.label) : item.label;
+						const hint = item.hint ? import_picocolors.default.dim(` (${item.hint})`) : "";
+						const prefix = isCursor ? import_picocolors.default.cyan("❯") : " ";
+						lines.push(`${S_BAR} ${prefix} ${radio} ${label}${hint}`);
+					}
+					const hiddenBefore = visibleStart;
+					const hiddenAfter = filtered.length - visibleEnd;
+					if (hiddenBefore > 0 || hiddenAfter > 0) {
+						const parts = [];
+						if (hiddenBefore > 0) parts.push(`↑ ${hiddenBefore} more`);
+						if (hiddenAfter > 0) parts.push(`↓ ${hiddenAfter} more`);
+						lines.push(`${S_BAR}  ${import_picocolors.default.dim(parts.join("  "))}`);
+					}
+				}
+				lines.push(`${S_BAR}`);
+				const allSelectedLabels = [...lockedSection ? lockedSection.items.map((i) => i.label) : [], ...items.filter((item) => selected.has(item.value)).map((item) => item.label)];
+				if (allSelectedLabels.length === 0) lines.push(`${S_BAR}  ${import_picocolors.default.dim("Selected: (none)")}`);
+				else {
+					const summary = allSelectedLabels.length <= 3 ? allSelectedLabels.join(", ") : `${allSelectedLabels.slice(0, 3).join(", ")} +${allSelectedLabels.length - 3} more`;
+					lines.push(`${S_BAR}  ${import_picocolors.default.green("Selected:")} ${summary}`);
+				}
+				lines.push(`${import_picocolors.default.dim("└")}`);
+			} else if (state === "submit") {
+				const allSelectedLabels = [...lockedSection ? lockedSection.items.map((i) => i.label) : [], ...items.filter((item) => selected.has(item.value)).map((item) => item.label)];
+				lines.push(`${S_BAR}  ${import_picocolors.default.dim(allSelectedLabels.join(", "))}`);
+			} else if (state === "cancel") lines.push(`${S_BAR}  ${import_picocolors.default.strikethrough(import_picocolors.default.dim("Cancelled"))}`);
+			process.stdout.write(lines.join("\n") + "\n");
+			lastRenderHeight = countVisualRowsForLines(lines, process.stdout.columns);
+		};
+		const cleanup = () => {
+			process.stdin.removeListener("keypress", keypressHandler);
+			if (process.stdin.isTTY) process.stdin.setRawMode(false);
+			rl.close();
+		};
+		const submit = () => {
+			if (required && selected.size === 0 && lockedValues.length === 0) return;
+			render("submit");
+			cleanup();
+			resolve([...lockedValues, ...Array.from(selected)]);
+		};
+		const cancel = () => {
+			render("cancel");
+			cleanup();
+			resolve(cancelSymbol);
+		};
+		const keypressHandler = (_str, key) => {
+			if (!key) return;
+			const filtered = getFiltered();
+			if (key.name === "return") {
+				submit();
+				return;
+			}
+			if (key.name === "escape" || key.ctrl && key.name === "c") {
+				cancel();
+				return;
+			}
+			if (key.name === "up") {
+				cursor = Math.max(0, cursor - 1);
+				render();
+				return;
+			}
+			if (key.name === "down") {
+				cursor = Math.min(filtered.length - 1, cursor + 1);
+				render();
+				return;
+			}
+			if (key.name === "space") {
+				const item = filtered[cursor];
+				if (item) if (selected.has(item.value)) selected.delete(item.value);
+				else selected.add(item.value);
+				render();
+				return;
+			}
+			if (key.name === "backspace") {
+				query = query.slice(0, -1);
+				cursor = 0;
+				render();
+				return;
+			}
+			if (key.sequence && !key.ctrl && !key.meta && key.sequence.length === 1) {
+				query += key.sequence;
+				cursor = 0;
+				render();
+				return;
+			}
+		};
+		process.stdin.on("keypress", keypressHandler);
+		render();
+	});
+}
+const DEFAULT_CLONE_TIMEOUT_MS = 3e5;
+const CLONE_TIMEOUT_MS = (() => {
+	const raw = process.env.SKILLS_CLONE_TIMEOUT_MS;
+	if (!raw) return DEFAULT_CLONE_TIMEOUT_MS;
+	const parsed = Number.parseInt(raw, 10);
+	return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_CLONE_TIMEOUT_MS;
+})();
+var GitCloneError = class extends Error {
+	url;
+	isTimeout;
+	isAuthError;
+	constructor(message, url, isTimeout = false, isAuthError = false) {
+		super(message);
+		this.name = "GitCloneError";
+		this.url = url;
+		this.isTimeout = isTimeout;
+		this.isAuthError = isAuthError;
+	}
+};
+async function cloneRepo(url, ref) {
+	const tempDir = await mkdtemp(join(tmpdir(), "skills-"));
+	const git = esm_default({
+		timeout: { block: CLONE_TIMEOUT_MS },
+		config: [
+			"filter.lfs.required=false",
+			"filter.lfs.smudge=",
+			"filter.lfs.clean=",
+			"filter.lfs.process="
+		]
+	}).env({
+		...process.env,
+		GIT_TERMINAL_PROMPT: "0",
+		GIT_LFS_SKIP_SMUDGE: "1"
+	});
+	const cloneOptions = ref ? [
+		"--depth",
+		"1",
+		"--branch",
+		ref
+	] : ["--depth", "1"];
+	try {
+		await git.clone(url, tempDir, cloneOptions);
+		return tempDir;
+	} catch (error) {
+		await rm(tempDir, {
+			recursive: true,
+			force: true
+		}).catch(() => {});
+		const errorMessage = error instanceof Error ? error.message : String(error);
+		const isTimeout = errorMessage.includes("block timeout") || errorMessage.includes("timed out");
+		const isAuthError = errorMessage.includes("Authentication failed") || errorMessage.includes("could not read Username") || errorMessage.includes("Permission denied") || errorMessage.includes("Repository not found");
+		if (isTimeout) throw new GitCloneError(`Clone timed out after ${Math.round(CLONE_TIMEOUT_MS / 1e3)}s. Common causes:\n  - Large repository: raise the timeout with SKILLS_CLONE_TIMEOUT_MS=600000 (10m)\n  - Slow network: retry, or clone manually and pass the local path to 'skills add'\n  - Private repo without credentials: ensure auth is configured\n      - For SSH: ssh-add -l (to check loaded keys)\n      - For HTTPS: gh auth status (if using GitHub CLI)`, url, true, false);
+		if (isAuthError) throw new GitCloneError(`Authentication failed for ${url}.\n  - For private repos, ensure you have access\n  - For SSH: Check your keys with 'ssh -T git@github.com'\n  - For HTTPS: Run 'gh auth login' or configure git credentials`, url, false, true);
+		throw new GitCloneError(`Failed to clone ${url}: ${errorMessage}`, url, false, false);
+	}
+}
+async function cleanupTempDir(dir) {
+	const normalizedDir = normalize(resolve(dir));
+	const normalizedTmpDir = normalize(resolve(tmpdir()));
+	if (!normalizedDir.startsWith(normalizedTmpDir + sep) && normalizedDir !== normalizedTmpDir) throw new Error("Attempted to clean up directory outside of temp directory");
+	await rm(dir, {
+		recursive: true,
+		force: true
+	});
+}
 const TELEMETRY_URL_SUFFIX = "/events";
 const AUDIT_URL = "https://add-skill.vercel.sh/audit";
 let portalUrl = null;
@@ -1780,10 +2776,30 @@ async function getSkillFromLock(skillName) {
 async function getAllLockedSkills() {
 	return (await readSkillLock$1()).skills;
 }
+async function addPluginToLock(pluginName, entry) {
+	const lock = await readSkillLock$1();
+	if (!lock.plugins) lock.plugins = {};
+	const now = (/* @__PURE__ */ new Date()).toISOString();
+	const existing = lock.plugins[pluginName];
+	lock.plugins[pluginName] = {
+		...entry,
+		installedAt: existing?.installedAt ?? now,
+		updatedAt: now
+	};
+	await writeSkillLock(lock);
+}
+async function removePluginFromLock(pluginName) {
+	const lock = await readSkillLock$1();
+	if (!lock.plugins || !(pluginName in lock.plugins)) return false;
+	delete lock.plugins[pluginName];
+	await writeSkillLock(lock);
+	return true;
+}
 function createEmptyLockFile() {
 	return {
 		version: CURRENT_VERSION$1,
 		skills: {},
+		plugins: {},
 		dismissed: {}
 	};
 }
@@ -1821,6 +2837,11 @@ async function writeLocalLock(lock, cwd) {
 		version: lock.version,
 		skills: sortedSkills
 	};
+	if (lock.plugins && Object.keys(lock.plugins).length > 0) {
+		const sortedPlugins = {};
+		for (const key of Object.keys(lock.plugins).sort()) sortedPlugins[key] = lock.plugins[key];
+		sorted.plugins = sortedPlugins;
+	}
 	await writeFile(lockPath, JSON.stringify(sorted, null, 2) + "\n", "utf-8");
 }
 async function computeSkillFolderHash(skillDir) {
@@ -1856,6 +2877,19 @@ async function addSkillToLocalLock(skillName, entry, cwd) {
 	lock.skills[skillName] = entry;
 	await writeLocalLock(lock, cwd);
 }
+async function addPluginToLocalLock(pluginName, entry, cwd) {
+	const lock = await readLocalLock(cwd);
+	if (!lock.plugins) lock.plugins = {};
+	lock.plugins[pluginName] = entry;
+	await writeLocalLock(lock, cwd);
+}
+async function removePluginFromLocalLock(pluginName, cwd) {
+	const lock = await readLocalLock(cwd);
+	if (!lock.plugins || !(pluginName in lock.plugins)) return false;
+	delete lock.plugins[pluginName];
+	await writeLocalLock(lock, cwd);
+	return true;
+}
 function createEmptyLocalLock() {
 	return {
 		version: CURRENT_VERSION,
@@ -2115,6 +3149,10 @@ function buildSecurityLines(auditData, skills, source) {
 	lines.push(`${import_picocolors.default.dim("Details:")} ${import_picocolors.default.dim(`https://skills.sh/${source}`)}`);
 	return lines;
 }
+function agentTypeFromDisplay(display) {
+	for (const [type, cfg] of Object.entries(agents)) if (cfg.displayName === display) return type;
+	return null;
+}
 function shortenPath$2(fullPath, cwd) {
 	const home = homedir();
 	if (fullPath === home || fullPath.startsWith(home + sep)) return "~" + fullPath.slice(home.length);
@@ -2476,6 +3514,126 @@ async function handleWellKnownSkills(source, url, options, spinner) {
 	Se(import_picocolors.default.green("Done!") + import_picocolors.default.dim("  Review skills before use; they run with full agent permissions."));
 	await promptForFindSkills(options, targetAgents);
 }
+async function runTeamBatchAdd(teamScope, options) {
+	const cfg = loadConfig();
+	if (!cfg.token) {
+		console.log();
+		console.log(import_picocolors.default.bgRed(import_picocolors.default.white(import_picocolors.default.bold(" ERROR "))) + " " + import_picocolors.default.red("Login required for team installs"));
+		console.log();
+		console.log(`  Run ${import_picocolors.default.cyan("shoplazza-ai-dev-cli login")} first.`);
+		console.log();
+		process.exit(1);
+	}
+	console.log();
+	Ie(import_picocolors.default.bgCyan(import_picocolors.default.black(" skills ")));
+	const spinner = Y();
+	spinner.start(`Fetching team "${teamScope}" assets...`);
+	let items;
+	try {
+		items = await fetchTeamAssets(teamScope, cfg.portal, cfg.token);
+	} catch (err) {
+		spinner.stop(import_picocolors.default.red("Failed to list team assets"));
+		const msg = err instanceof Error ? err.message : String(err);
+		Se(import_picocolors.default.red(msg));
+		process.exit(1);
+	}
+	const skills = items.filter((i) => i.kind === "skill");
+	spinner.stop(`Found ${skills.length} skill${skills.length === 1 ? "" : "s"}`);
+	if (skills.length === 0) {
+		Se(import_picocolors.default.dim(`Team "${teamScope}" has no skills.`));
+		return;
+	}
+	const validAgents = Object.keys(agents);
+	let targetAgents;
+	if (options.agent?.includes("*")) {
+		targetAgents = validAgents;
+		M.info(`Installing to all ${targetAgents.length} agents`);
+	} else if (options.agent && options.agent.length > 0) {
+		const invalidAgents = options.agent.filter((a) => !validAgents.includes(a));
+		if (invalidAgents.length > 0) {
+			M.error(`Invalid agents: ${invalidAgents.join(", ")}`);
+			M.info(`Valid agents: ${validAgents.join(", ")}`);
+			process.exit(1);
+		}
+		targetAgents = options.agent;
+	} else {
+		spinner.start("Loading agents...");
+		const installedAgents = await detectInstalledAgents();
+		spinner.stop(`${validAgents.length} agents`);
+		if (installedAgents.length === 0) if (options.yes) {
+			targetAgents = validAgents;
+			M.info("Installing to all agents");
+		} else {
+			M.info("Select agents to install skills to");
+			const selected = await promptForAgents("Which agents do you want to install to?", buildAgentChoices(validAgents, { global: options.global }));
+			if (pD(selected)) {
+				xe("Installation cancelled");
+				process.exit(0);
+			}
+			targetAgents = selected;
+		}
+		else if (installedAgents.length === 1 || options.yes) {
+			targetAgents = ensureUniversalAgents(installedAgents);
+			if (installedAgents.length === 1) {
+				const firstAgent = installedAgents[0];
+				M.info(`Installing to: ${import_picocolors.default.cyan(agents[firstAgent].displayName)}`);
+			} else M.info(`Installing to: ${installedAgents.map((a) => import_picocolors.default.cyan(agents[a].displayName)).join(", ")}`);
+		} else {
+			const selected = await selectAgentsInteractive({ global: options.global });
+			if (pD(selected)) {
+				xe("Installation cancelled");
+				process.exit(0);
+			}
+			targetAgents = selected;
+		}
+	}
+	let installGlobally = options.global ?? false;
+	const supportsGlobal = targetAgents.some((a) => agents[a].globalSkillsDir !== void 0);
+	if (options.global === void 0 && !options.yes && supportsGlobal) {
+		const scope = await ve({
+			message: "Installation scope",
+			options: [{
+				value: false,
+				label: "Project",
+				hint: "Install in current directory (committed with your project)"
+			}, {
+				value: true,
+				label: "Global",
+				hint: "Install in home directory (available across all projects)"
+			}]
+		});
+		if (pD(scope)) {
+			xe("Installation cancelled");
+			process.exit(0);
+		}
+		installGlobally = scope;
+	}
+	const childOptions = {
+		...options,
+		team: void 0,
+		yes: true,
+		agent: targetAgents,
+		global: installGlobally
+	};
+	let failures = 0;
+	for (const item of skills) {
+		M.step(`Installing ${import_picocolors.default.cyan(item.name)}`);
+		try {
+			await runAdd([item.ref], childOptions);
+		} catch (err) {
+			failures++;
+			const msg = err instanceof Error ? err.message : String(err);
+			M.warn(`Failed to install ${item.name}: ${msg}`);
+		}
+	}
+	console.log();
+	if (failures === 0) Se(import_picocolors.default.green(`Installed ${skills.length} skill${skills.length === 1 ? "" : "s"} from team "${teamScope}"`));
+	else {
+		Se(import_picocolors.default.yellow(`Installed ${skills.length - failures}/${skills.length} skills (${failures} failed) from team "${teamScope}"`));
+		process.exit(1);
+	}
+	await promptForFindSkills(options, targetAgents);
+}
 async function runAdd(args, options = {}) {
 	const source = args[0];
 	let installTipShown = false;
@@ -2484,6 +3642,20 @@ async function runAdd(args, options = {}) {
 		M.message(import_picocolors.default.dim("Tip: use the --yes (-y) and --global (-g) flags to install without prompts."));
 		installTipShown = true;
 	};
+	if (options.team && source) {
+		console.log();
+		console.log(import_picocolors.default.bgRed(import_picocolors.default.white(import_picocolors.default.bold(" ERROR "))) + " " + import_picocolors.default.red("--team cannot be combined with a positional source"));
+		console.log();
+		console.log(import_picocolors.default.dim("  Use one of:"));
+		console.log(`    ${import_picocolors.default.cyan("npx shoplazza-ai-dev-cli add")} ${import_picocolors.default.yellow("<source>")}`);
+		console.log(`    ${import_picocolors.default.cyan("npx shoplazza-ai-dev-cli add")} ${import_picocolors.default.yellow("--team <scope>")}`);
+		console.log();
+		process.exit(1);
+	}
+	if (!source && options.team) {
+		await runTeamBatchAdd(options.team, options);
+		return;
+	}
 	if (!source) {
 		console.log();
 		console.log(import_picocolors.default.bgRed(import_picocolors.default.white(import_picocolors.default.bold(" ERROR "))) + " " + import_picocolors.default.red("Missing required argument: source"));
@@ -2537,6 +3709,176 @@ async function runAdd(args, options = {}) {
 			options.skill = options.skill || [];
 			if (!options.skill.includes(parsed.skillFilter)) options.skill.push(parsed.skillFilter);
 		}
+		if (parsed.type === "portal" && parsed.portalRef) {
+			const portalRef = parsed.portalRef;
+			const pluginsDirRe = /^(?:@public|@teams\/[^/]+)\/plugins$/;
+			const pluginsItemRe = /^(?:@public|@teams\/[^/]+)\/plugins\/[^/]+/;
+			let resolvedPluginRef = null;
+			if (pluginsDirRe.test(portalRef) && options.plugin && options.plugin.length === 1) resolvedPluginRef = `${portalRef}/${options.plugin[0]}`;
+			else if (pluginsItemRe.test(portalRef)) resolvedPluginRef = portalRef;
+			if (resolvedPluginRef !== null) {
+				const isTeam = resolvedPluginRef.startsWith("@teams/");
+				const teamMatch = isTeam ? resolvedPluginRef.match(/^@teams\/([^/]+)/) : null;
+				const scopeNs = isTeam && teamMatch ? teamMatch[1] : "public";
+				let targetAgents;
+				const validAgents = Object.keys(agents);
+				if (options.agent?.includes("*")) targetAgents = validAgents;
+				else if (options.agent && options.agent.length > 0) targetAgents = options.agent;
+				else {
+					spinner.start("Loading agents...");
+					const installedAgents = await detectInstalledAgents();
+					spinner.stop(`${Object.keys(agents).length} agents`);
+					if (options.yes) targetAgents = installedAgents.length > 0 ? ensureUniversalAgents(installedAgents) : validAgents;
+					else if (installedAgents.length === 0) {
+						const selected = await promptForAgents("Which IDEs do you want to install this plugin to?", buildAgentChoices(Object.keys(agents), { global: options.global }));
+						if (pD(selected)) {
+							xe("Installation cancelled");
+							await cleanup(tempDir);
+							process.exit(0);
+						}
+						targetAgents = selected;
+					} else if (installedAgents.length === 1) {
+						targetAgents = ensureUniversalAgents(installedAgents);
+						M.info(`Installing to: ${import_picocolors.default.cyan(agents[installedAgents[0]].displayName)}`);
+					} else {
+						const selected = await selectAgentsInteractive({ global: options.global });
+						if (pD(selected)) {
+							xe("Installation cancelled");
+							await cleanup(tempDir);
+							process.exit(0);
+						}
+						targetAgents = selected;
+					}
+				}
+				let installGloballyForPlugin = options.global ?? false;
+				if (options.global === void 0 && !options.yes) {
+					const scopeChoice = await ve({
+						message: "Installation scope",
+						options: [{
+							value: false,
+							label: "Project",
+							hint: "Install in current directory"
+						}, {
+							value: true,
+							label: "Global",
+							hint: "Install in home directory"
+						}]
+					});
+					if (pD(scopeChoice)) {
+						xe("Installation cancelled");
+						await cleanup(tempDir);
+						process.exit(0);
+					}
+					installGloballyForPlugin = scopeChoice;
+				}
+				{
+					const previewCanonical = join(getStoreRoot(), "plugins", `${scopeNs}__${options.plugin && options.plugin[0] || resolvedPluginRef.split("/").pop()}`);
+					const summaryLines = [];
+					summaryLines.push(import_picocolors.default.cyan(shortenPath$2(previewCanonical, process.cwd())));
+					const agentNames = targetAgents.map((a) => agents[a].displayName);
+					if (agentNames.length > 0) summaryLines.push(`  ${import_picocolors.default.dim("symlink →")} ${formatList$1(agentNames)}`);
+					if (existsSync(previewCanonical)) summaryLines.push(`  ${import_picocolors.default.yellow("overwrites:")} ${formatList$1(agentNames)}`);
+					console.log();
+					Me(summaryLines.join("\n"), "Installation Summary");
+				}
+				if (!options.yes) {
+					const confirmed = await ye({ message: `Install plugin ${import_picocolors.default.cyan(resolvedPluginRef)}?` });
+					if (pD(confirmed) || !confirmed) {
+						xe("Installation cancelled");
+						await cleanup(tempDir);
+						process.exit(0);
+					}
+				}
+				spinner.start(`Installing plugin ${import_picocolors.default.cyan(resolvedPluginRef)}...`);
+				let pluginResult;
+				try {
+					pluginResult = await installPlugin(resolvedPluginRef, {
+						scope: installGloballyForPlugin ? "global" : "project",
+						agents: targetAgents,
+						cwd: process.cwd(),
+						yes: options.yes,
+						force: options.force
+					});
+				} catch (err) {
+					spinner.stop(import_picocolors.default.red("Plugin installation failed"));
+					throw err;
+				}
+				spinner.stop(import_picocolors.default.green("Plugin installed"));
+				if (pluginResult.installedEntries.length > 0) {
+					const grouped = /* @__PURE__ */ new Map();
+					for (const e of pluginResult.installedEntries) {
+						const list = grouped.get(e.agent) ?? [];
+						list.push(e);
+						grouped.set(e.agent, list);
+					}
+					console.log();
+					for (const [agent, list] of grouped) {
+						console.log(import_picocolors.default.bold(agents[agent].displayName));
+						for (const e of list) console.log(`  ${import_picocolors.default.dim(e.kind.padEnd(16))}${e.entryPath}`);
+					}
+				}
+				if (pluginResult.forgeOtherReplacements.length > 0) {
+					console.log();
+					console.log(import_picocolors.default.yellow(`⚠  Replaced ${pluginResult.forgeOtherReplacements.length} forge-other entries:`));
+					for (const r of pluginResult.forgeOtherReplacements) {
+						console.log(`  ${r.entryPath}`);
+						console.log(`    was ${r.otherRef} (now broken — uninstall recommended)`);
+					}
+				}
+				if (pluginResult.ignoredComponents.length > 0) {
+					console.log();
+					console.log(import_picocolors.default.dim(`ℹ Ignored non-MVP components: ${pluginResult.ignoredComponents.join(", ")}`));
+				}
+				for (const agentType of targetAgents) {
+					const { warnings } = await ensureForgeHooks(agentType);
+					for (const w of warnings) M.warn(import_picocolors.default.yellow(w));
+				}
+				const { pluginName: lockPluginName } = parsePluginRef$1(resolvedPluginRef);
+				const lockSource = resolvedPluginRef.startsWith("@teams/") ? `@teams/${resolvedPluginRef.split("/")[1]}` : "@public";
+				const lockPluginPath = `plugins/${lockPluginName}/plugin.json`;
+				let lockHash = "";
+				try {
+					lockHash = await computeSkillFolderHash(pluginResult.pluginCanonical);
+				} catch {}
+				try {
+					if (installGloballyForPlugin) {
+						await addPluginToLock(lockPluginName, {
+							source: lockSource,
+							sourceType: "portal",
+							pluginPath: lockPluginPath,
+							computedHash: lockHash
+						});
+						M.info(`Recorded in lock file: ${import_picocolors.default.dim(getSkillLockPath$1())}`);
+					} else {
+						await addPluginToLocalLock(lockPluginName, {
+							source: lockSource,
+							sourceType: "portal",
+							pluginPath: lockPluginPath,
+							computedHash: lockHash
+						}, process.cwd());
+						M.info(`Recorded in lock file: ${import_picocolors.default.dim(getLocalLockPath(process.cwd()))}`);
+					}
+				} catch (err) {
+					M.warn(import_picocolors.default.yellow(`failed to record plugin in lock file (install still succeeded): ${err instanceof Error ? err.message : String(err)}`));
+				}
+				track({
+					event_type: "install",
+					asset_ref: resolvedPluginRef,
+					agent: "cli",
+					install_mode: "cli"
+				});
+				Se(import_picocolors.default.green(`Plugin ${import_picocolors.default.bold(resolvedPluginRef)} installed successfully`));
+				return;
+			}
+			if (/^(?:@public|@teams\/[^/]+)\/plugins/.test(portalRef) && !resolvedPluginRef) {
+				Se(import_picocolors.default.red(`Cannot install plugin directory without a name. Use --plugin <name> or specify a full ref: ${portalRef}/<name>`));
+				process.exit(1);
+			}
+		}
+		if (parsed.type === "portal" && parsed.portalRef && /^(?:@public|@teams\/[^/]+)\/rules/.test(parsed.portalRef)) {
+			Se(import_picocolors.default.red("Rules are not installable as standalone — install the plugin that contains the rule."));
+			process.exit(1);
+		}
 		if (parsed.type === "portal" && parsed.portalRef && isDirectoryPortalRef(parsed.portalRef) && options.skill && options.skill.length === 1 && options.skill[0] !== "*") parsed.portalRef = `${parsed.portalRef}/${options.skill[0]}`;
 		const includeInternal = !!(options.skill && options.skill.length > 0);
 		let skills;
@@ -2858,8 +4200,12 @@ async function runAdd(args, options = {}) {
 				process.exit(0);
 			}
 			installMode = modeChoice;
-		} else if (uniqueDirs.size <= 1) installMode = "copy";
+		}
 		const cwd = process.cwd();
+		const _summaryPortalRef = parsed.type === "portal" || parsed.type === "public" || parsed.type === "team" ? parsed.portalRef ?? null : null;
+		const _summaryIsTeam = _summaryPortalRef?.startsWith("@teams/") ?? false;
+		const _summaryTeamMatch = _summaryIsTeam ? _summaryPortalRef?.match(/^@teams\/([^/]+)/) : null;
+		const _summaryScopeNs = _summaryIsTeam && _summaryTeamMatch ? _summaryTeamMatch[1] : "public";
 		const summaryLines = [];
 		targetAgents.map((a) => agents[a].displayName);
 		const overwriteChecks = await Promise.all(selectedSkills.flatMap((skill) => targetAgents.map(async (agent) => ({
@@ -2879,10 +4225,11 @@ async function runAdd(args, options = {}) {
 			if (!groupedSummary[group]) groupedSummary[group] = [];
 			groupedSummary[group].push(skill);
 		} else ungroupedSummary.push(skill);
+		const _summaryStoreRoot = getStoreRoot(installGlobally ? "global" : "project", cwd);
 		const printSkillSummary = (skills) => {
 			for (const skill of skills) {
 				if (summaryLines.length > 0) summaryLines.push("");
-				const shortCanonical = shortenPath$2(getCanonicalPath(skill.name, { global: installGlobally }), cwd);
+				const shortCanonical = shortenPath$2(join(_summaryStoreRoot, "skills", `${_summaryScopeNs}__${sanitizeName(skill.name)}`), cwd);
 				summaryLines.push(`${import_picocolors.default.cyan(shortCanonical)}`);
 				summaryLines.push(...buildAgentSummaryLines(targetAgents, installMode));
 				const skillOverwrites = overwriteStatus.get(skill.name);
@@ -2926,6 +4273,11 @@ async function runAdd(args, options = {}) {
 		}
 		spinner.start("Installing skills...");
 		const results = [];
+		const allForgeOtherReplacements = [];
+		const _installPortalRef = parsed.type === "portal" || parsed.type === "public" || parsed.type === "team" ? parsed.portalRef ?? null : null;
+		const _installIsTeam = _installPortalRef?.startsWith("@teams/") ?? false;
+		const _installTeamMatch = _installIsTeam ? _installPortalRef?.match(/^@teams\/([^/]+)/) : null;
+		const _installScopeNs = _installIsTeam && _installTeamMatch ? _installTeamMatch[1] : "public";
 		for (const skill of selectedSkills) for (const agent of targetAgents) {
 			let result;
 			if (blobResult && "files" in skill) {
@@ -2937,10 +4289,21 @@ async function runAdd(args, options = {}) {
 					global: installGlobally,
 					mode: installMode
 				});
-			} else result = await installSkillForAgent(skill, agent, {
-				global: installGlobally,
-				mode: installMode
-			});
+			} else {
+				const skillRef = _installPortalRef ? `${_installPortalRef}/${skill.name ?? ""}` : skill.name ?? "unknown";
+				result = await installSkillForAgent(skill, agent, {
+					scope: installGlobally ? "global" : "project",
+					ref: skillRef,
+					scopeNamespace: _installScopeNs,
+					mode: installMode,
+					forceOverwrite: options.force || options.yes,
+					onConflictPrompt: (conflicts) => promptForeignOverwrite(conflicts, {
+						yes: options.yes,
+						force: options.force
+					})
+				});
+				if (result.forgeOtherReplacements.length > 0) allForgeOtherReplacements.push(...result.forgeOtherReplacements);
+			}
 			results.push({
 				skill: getSkillDisplayName(skill),
 				agent: agents[agent].displayName,
@@ -2952,6 +4315,57 @@ async function runAdd(args, options = {}) {
 		console.log();
 		const successful = results.filter((r) => r.success);
 		const failed = results.filter((r) => !r.success);
+		if (allForgeOtherReplacements.length > 0) {
+			console.log();
+			console.log(import_picocolors.default.yellow(`⚠  Replaced ${allForgeOtherReplacements.length} forge-other entries:`));
+			for (const r of allForgeOtherReplacements) console.log(`  ${r.entryPath}\n    was ${r.otherRef} (now broken — uninstall recommended)`);
+		}
+		if (parsed.type === "portal" && parsed.portalRef && successful.length > 0) {
+			const portalRef = parsed.portalRef;
+			const isTeam = portalRef.startsWith("@teams/");
+			const teamMatch = isTeam ? portalRef.match(/^@teams\/([^/]+)/) : null;
+			const scope = isTeam && teamMatch ? `team:${teamMatch[1]}` : "public";
+			const directoryRef = isDirectoryPortalRef(portalRef);
+			const assetType = (portalRef.match(/\/(skills|rules)(?:\/|$)/)?.[1] || "skills") === "rules" ? "rule" : "skill";
+			const installedAt = (/* @__PURE__ */ new Date()).toISOString();
+			const manifestWarnings = [];
+			for (const r of successful) {
+				const targetDir = r.canonicalPath || r.path;
+				if (!targetDir) continue;
+				const skillName = r.skill;
+				const manifest = {
+					ref: directoryRef ? `${portalRef}/${skillName}` : portalRef,
+					scope,
+					type: assetType,
+					name: skillName,
+					install_mode: agentTypeFromDisplay(r.agent) ?? "claude-code",
+					installed_at: installedAt
+				};
+				try {
+					await writeForgeSourceManifest(targetDir, manifest);
+				} catch (err) {
+					manifestWarnings.push(`Failed to write .forge-source.json for ${skillName}: ${err instanceof Error ? err.message : String(err)}`);
+				}
+			}
+			if (manifestWarnings.length > 0) for (const w of manifestWarnings) M.warn(import_picocolors.default.yellow(w));
+			const successfulAgentTypes = /* @__PURE__ */ new Set();
+			for (const r of successful) {
+				const t = agentTypeFromDisplay(r.agent);
+				if (t) successfulAgentTypes.add(t);
+			}
+			for (const agentType of successfulAgentTypes) {
+				const { warnings } = await ensureForgeHooks(agentType);
+				for (const w of warnings) M.warn(import_picocolors.default.yellow(w));
+			}
+			const installedSkillNames = /* @__PURE__ */ new Set();
+			for (const r of successful) installedSkillNames.add(r.skill);
+			for (const skillName of installedSkillNames) track({
+				event_type: "install",
+				asset_ref: directoryRef ? `${portalRef}/${skillName}` : portalRef,
+				agent: "cli",
+				install_mode: "cli"
+			});
+		}
 		const skillFiles = {};
 		for (const skill of selectedSkills) if (blobResult && "repoPath" in skill) skillFiles[skill.name] = skill.repoPath;
 		else if (repoRoot && skill.path === repoRoot) skillFiles[skill.name] = "SKILL.md";
@@ -3154,6 +4568,7 @@ function parseAddOptions(args) {
 		const arg = args[i];
 		if (arg === "-g" || arg === "--global") options.global = true;
 		else if (arg === "-y" || arg === "--yes") options.yes = true;
+		else if (arg === "-f" || arg === "--force") options.force = true;
 		else if (arg === "-l" || arg === "--list") options.list = true;
 		else if (arg === "--all") options.all = true;
 		else if (arg === "-a" || arg === "--agent") {
@@ -3176,6 +4591,16 @@ function parseAddOptions(args) {
 				nextArg = args[i];
 			}
 			i--;
+		} else if (arg === "--plugin") {
+			options.plugin = options.plugin || [];
+			i++;
+			let nextArg = args[i];
+			while (i < args.length && nextArg && !nextArg.startsWith("-")) {
+				options.plugin.push(nextArg);
+				i++;
+				nextArg = args[i];
+			}
+			i--;
 		} else if (arg === "--rule") {
 			options.rule = options.rule || [];
 			i++;
@@ -3868,6 +5293,21 @@ async function runList(args) {
 async function removeCommand(skillNames, options) {
 	const isGlobal = options.global ?? false;
 	const cwd = process.cwd();
+	const pluginRefRe = /^@[^/]+\/plugins\/[^/]+/;
+	const pluginRefs = skillNames.filter((n) => pluginRefRe.test(n));
+	if (pluginRefs.length > 0) {
+		const scope = isGlobal ? "global" : "project";
+		for (const ref of pluginRefs) try {
+			M.info(`Uninstalling plugin ${import_picocolors.default.cyan(ref)}...`);
+			await uninstallPlugin(ref, scope, cwd);
+			M.success(import_picocolors.default.green(`Plugin ${ref} uninstalled`));
+		} catch (err) {
+			M.error(import_picocolors.default.red(`Failed to uninstall plugin ${ref}: ${err instanceof Error ? err.message : String(err)}`));
+		}
+		const nonPluginNames = skillNames.filter((n) => !pluginRefRe.test(n));
+		if (nonPluginNames.length === 0) return;
+		skillNames = nonPluginNames;
+	}
 	const spinner = Y();
 	spinner.start("Scanning for installed skills...");
 	const skillNamesSet = /* @__PURE__ */ new Set();
@@ -4055,6 +5495,130 @@ function parseRemoveOptions(args) {
 		options
 	};
 }
+async function uninstallPlugin(ref, scope, cwd) {
+	const { scopeNamespace, pluginName } = parsePluginRef(ref);
+	const storeRoot = getStoreRoot(scope, cwd);
+	const pluginCanonical = join(storeRoot, "plugins", `${scopeNamespace}__${pluginName}`);
+	const ledgerPath = join(pluginCanonical, ".forge-plugin.json");
+	let ledger;
+	try {
+		ledger = JSON.parse(await readFile(ledgerPath, "utf-8"));
+	} catch {
+		throw new Error(`plugin not installed (no ledger at ${ledgerPath})`);
+	}
+	for (const agent of ledger.install_modes) for (const c of ledger.installed_components) {
+		const entryPath = resolveEntryPath(agent, c, pluginCanonical, scope, cwd);
+		if (!entryPath) continue;
+		const status = await assertEntryReplaceable(entryPath, {
+			intendedRef: ref,
+			intendedCanonical: pluginCanonical,
+			storeRoot
+		});
+		if (status.kind === "forge-self") try {
+			await rm(entryPath, {
+				recursive: true,
+				force: true
+			});
+		} catch {}
+		else if (status.kind !== "absent") M.warn(`skipping ${entryPath} (${status.kind}) — not deleted (preserved by forge)`);
+	}
+	if (ledger.install_modes.includes("codex")) await cleanupCodexConfig(ledger, scope, cwd, scopeNamespace, pluginName);
+	try {
+		await rm(pluginCanonical, {
+			recursive: true,
+			force: true
+		});
+	} catch {}
+	try {
+		await removePluginFromLock(pluginName);
+	} catch {}
+	try {
+		await removePluginFromLocalLock(pluginName, cwd);
+	} catch {}
+}
+function resolveEntryPath(agent, c, pluginCanonical, scope, cwd) {
+	let component;
+	switch (c.type) {
+		case "skill":
+			component = {
+				kind: "plugin-skill",
+				pluginCanonical,
+				skillName: c.name
+			};
+			break;
+		case "agent-manifest":
+			component = {
+				kind: "plugin-agent-manifest",
+				pluginCanonical,
+				filename: c.name
+			};
+			break;
+		case "agent-deps-dir":
+			component = {
+				kind: "plugin-agent-deps-dir",
+				pluginCanonical,
+				dirname: c.name
+			};
+			break;
+		case "rule-manifest":
+			component = {
+				kind: "plugin-rule-manifest",
+				pluginCanonical,
+				filename: c.name
+			};
+			break;
+		case "rule-deps-dir":
+			component = {
+				kind: "plugin-rule-deps-dir",
+				pluginCanonical,
+				dirname: c.name
+			};
+			break;
+		default: return "";
+	}
+	return getInstallTargets(agent, component, scope, cwd).entry;
+}
+async function cleanupCodexConfig(ledger, scope, cwd, scopeNs, pluginName) {
+	const configToml = join(scope === "global" ? getAgentHome("codex") : join(cwd ?? process.cwd(), ".codex"), "config.toml");
+	let tomlRaw = "";
+	try {
+		tomlRaw = await readFile(configToml, "utf-8");
+	} catch {}
+	if (tomlRaw) {
+		let changed = false;
+		for (const c of ledger.installed_components) if (c.type === "agent-manifest") {
+			const id = c.name.replace(/\.md$/, "");
+			const updated = removeCodexAgent(tomlRaw, id);
+			if (updated !== tomlRaw) {
+				tomlRaw = updated;
+				changed = true;
+			}
+		}
+		if (changed) await writeFile(configToml, tomlRaw, "utf-8");
+	}
+	const canonicalAgentsMd = join(getStoreRoot(scope, cwd), "codex-agents.md");
+	let agentsRaw = "";
+	try {
+		agentsRaw = await readFile(canonicalAgentsMd, "utf-8");
+	} catch {
+		return;
+	}
+	const updatedAgentsMd = removePluginRules(agentsRaw, `${scopeNs}:${pluginName}`);
+	if (updatedAgentsMd !== agentsRaw) await writeFile(canonicalAgentsMd, updatedAgentsMd, "utf-8");
+}
+function parsePluginRef(ref) {
+	let m = /^@public\/plugins\/(.+)$/.exec(ref);
+	if (m) return {
+		scopeNamespace: "public",
+		pluginName: m[1]
+	};
+	m = /^@teams\/([^/]+)\/plugins\/(.+)$/.exec(ref);
+	if (m) return {
+		scopeNamespace: m[1],
+		pluginName: m[2]
+	};
+	throw new Error(`invalid plugin ref: ${ref}`);
+}
 function formatSourceInput(sourceUrl, ref) {
 	if (!ref) return sourceUrl;
 	return `${sourceUrl}#${ref}`;
@@ -4594,6 +6158,7 @@ ${BOLD}Manage Skills:${RESET}
                             @teams/<scope>/skills --skill <name>
                             @public/skills/<name>           # legacy, still supported
                             https://gitlab.shoplazza.site/.../<repo>.git
+  add --team <scope>   Install every skill owned by a team
   remove [skills]      Remove installed skills
   list, ls             List installed skills
   find [query]         Search for skills interactively
@@ -4615,6 +6180,8 @@ ${BOLD}Add Options:${RESET}
   -s, --skill <skills>   Specify skill names to install (use '*' for all skills)
   -l, --list             List available skills in the source without installing
   -y, --yes              Skip confirmation prompts
+  --team <scope>         Install every skill owned by the team
+                         (no positional source; mutually exclusive with <source>)
   --copy                 Copy files instead of symlinking to agent directories
   --all                  Shorthand for --skill '*' --agent '*' -y
   --full-depth           Search all subdirectories even when a root SKILL.md exists