@serviceme/devtools-core 2.0.5 → 2.0.6

package/dist/index.mjs

@@ -781,6 +781,31 @@ function isDirectLinkRoot(workspaceDir) {
 * suffix convention for agent files. File entries keep the SOURCE basename
 * (flat agents must carry the `.agent.md` suffix to be recognized).
 *
+* Plugins that declare NO `extensions` (agent-plugins.org convention
+* shape, e.g. cloud-arch-diagram-plugin) keep ALL their content inside
+* the plugin dir under the same top-level conventions (`skills/`,
+* `agents/*.agent.md`). The schema-less served manifest makes VS Code
+* convention-scan exactly those paths, so they are projected wholesale
+* (see copyConventionContent) even though nothing references them —
+* without this such a plugin loads as an empty shell (manifest +
+* mcp.json only).
+*
+* FORMAT DISCOVERY (verified in the VS Code workbench bundle): the
+* format is picked from the LAYOUT, in this order — (1) root plugin.json
+* with an agent-plugins.org `$schema` → format 3 (spec component paths,
+* agents under `com.github.copilot/agents/`); (2) `.plugin/plugin.json`
+* present → format 2 (Claude-style); (3) `.claude-plugin/plugin.json`
+* → format 1; (4) manifest-less fallback → format 0. Our projection is
+* always format 2: schema-less root + `.plugin/plugin.json`. Format 2
+* convention paths are the TOP-LEVEL dirs — `commands/`, `skills/`,
+* `agents/`, `rules/`, `automations/`, `hooks/hooks.json` — and MCP
+* servers come from the `.mcp.json` FILE (dot-prefixed) or a
+* `mcpServers` manifest field; bare `mcp.json` is a format-3-only path
+* and would silently register NOTHING under format 2. `scripts/` is no
+* discovery dir but is runtime support for MCP/hook commands: stdio
+* servers run with the plugin root as defaultCwd and `${PLUGIN_ROOT}`
+* resolves to the projection root, so their scripts must be present.
+*
 * The served `plugin.json` is deliberately SCHEMA-LESS and identity-only
 * (see SERVED_SPEC_FIELDS): a schema-bearing manifest switches VS Code to
 * the Agent Plugins spec component paths, which read agents from
@@ -897,6 +922,41 @@ function servedPluginManifest(raw) {
 	return served;
 }
 /**
+* Copy the convention-based content directories VS Code recognizes for a
+* schema-less (format 2, `.plugin/`-manifest) local plugin: the top-level
+* `skills/`, `agents/`, `commands/`, `rules/` and `automations/` trees
+* plus `hooks/` (whose `hooks/hooks.json` format 2 reads directly).
+* `scripts/` is copied too — not a discovery dir, but the runtime support
+* location MCP/hook commands execute from (defaultCwd = plugin root,
+* `${PLUGIN_ROOT}` → projection root). Plugins following the
+* agent-plugins.org convention carry ALL their content in these dirs with
+* no `extensions` composition in plugin.json — and the schema-less served
+* manifest routes VS Code to a convention scan of exactly these paths, so
+* a projection without them has zero capabilities.
+*
+* Runs BEFORE the `extensions` loop: declared entries re-copy over with
+* plugin-dir-first source resolution, so an explicitly declared entry at
+* a convention path converges to the same bytes instead of being clobbered
+* by a repo-root composition source.
+*/
+const CONVENTION_DIRS = [
+	"skills",
+	"agents",
+	"commands",
+	"rules",
+	"automations",
+	"hooks",
+	"scripts"
+];
+async function copyConventionContent(pluginDir, targetDir, result) {
+	for (const dir of CONVENTION_DIRS) {
+		const source = path.join(pluginDir, dir);
+		if (!(await fs$1.stat(source).catch(() => void 0))?.isDirectory()) continue;
+		await copyProjectionEntry(source, path.join(targetDir, dir));
+		if (!result.entries.includes(dir)) result.entries.push(dir);
+	}
+}
+/**
 * Build (or refresh) the loadable projection at `targetDir`. Idempotent:
 * the previous projection is replaced wholesale so re-registering after a
 * checkout pull re-points every entry. Returns `materialized: false` when
@@ -922,6 +982,7 @@ async function materializePluginProjection(input) {
 		recursive: true
 	});
 	await fs$1.mkdir(targetDir, { recursive: true });
+	await copyConventionContent(pluginDir, targetDir, result);
 	for (const ref of collectRefs(raw.extensions)) {
 		const source = await resolveSource(ref.entry, pluginDir, repoRoot);
 		if (!source) {
@@ -950,7 +1011,10 @@ async function materializePluginProjection(input) {
 	const pluginMarkerDir = inside(PLUGIN_MARKER_DIR);
 	await fs$1.mkdir(pluginMarkerDir, { recursive: true });
 	await fs$1.writeFile(path.join(pluginMarkerDir, "plugin.json"), `${JSON.stringify(servedPluginManifest(raw), null, 2)}\n`);
-	if ((await fs$1.stat(path.join(pluginDir, "mcp.json")).catch(() => void 0))?.isFile()) await copyProjectionEntry(path.join(pluginDir, "mcp.json"), inside("mcp.json"));
+	if ((await fs$1.stat(path.join(pluginDir, "mcp.json")).catch(() => void 0))?.isFile()) {
+		await copyProjectionEntry(path.join(pluginDir, "mcp.json"), inside("mcp.json"));
+		await copyProjectionEntry(path.join(pluginDir, "mcp.json"), inside(".mcp.json"));
+	}
 	const marker = {
 		servicemeMaterialized: true,
 		pluginDir,
@@ -2909,7 +2973,7 @@ async function resolveWorkspaceContentPlan(input) {
 */
 async function resolvePluginEntriesLenient(input) {
 	const namespace = input.manifest.extensions[AWESOME_COPILOT_NAMESPACE];
-	if (!namespace || typeof namespace !== "object") return resolveConventionEntries(input.repoRoot, path.join(input.repoRoot, "plugins", input.pluginId), input.repositoryId, input.pluginId, void 0, input.manifest);
+	if (!namespace || typeof namespace !== "object") return resolveConventionEntries(path.join(input.repoRoot, "plugins", input.pluginId), input.repositoryId, input.pluginId, void 0, input.manifest);
 	const entries = [];
 	for (const [kind, manifestKey] of Object.entries(PATH_KINDS)) {
 		if (kind === "mcp" || kind === "hook") continue;
@@ -2946,16 +3010,18 @@ function selectedKind(artifacts, kind) {
 *   skills/<name>/SKILL.md · agents/<name>.agent.md ·
 *   rules/<name>.instructions.md · commands/<name>.prompt.md ·
 *   hooks/hooks.json
-* Checked plugin-dir-relative first, then repo-root. Used when a
-* manifest carries no `com.github.awesome-copilot` namespace at all.
+* Scoped to the plugin dir ONLY. Repo-root content is never attributed
+* to the package: awesome-copilot style root layouts are covered by the
+* declared-path branch (namespace manifests), and the legacy no-manifest
+* flow has its own plugin-id-named root lookups. Used when a manifest
+* carries no `com.github.awesome-copilot` namespace at all.
 */
-async function resolveConventionEntries(repoRoot, pluginDir, repositoryId, pluginId, artifacts, manifest) {
+async function resolveConventionEntries(pluginDir, repositoryId, pluginId, artifacts, manifest) {
 	const entries = [];
-	const seen = /* @__PURE__ */ new Set();
 	const wants = artifacts === void 0 || Object.keys(artifacts).length === 0 ? () => true : (kind) => artifacts[kind] === true;
-	const push = async (kind, base, subdir, options = {}) => {
+	const push = async (kind, subdir, options = {}) => {
 		if (!wants(kind)) return;
-		const dir = path.join(base, subdir);
+		const dir = path.join(pluginDir, subdir);
 		const dirents = await fs$1.readdir(dir, { withFileTypes: true }).catch(() => []);
 		for (const dirent of dirents) {
 			let sourcePath;
@@ -2964,27 +3030,18 @@ async function resolveConventionEntries(repoRoot, pluginDir, repositoryId, plugi
 				sourcePath = path.join(dir, dirent.name);
 			} else if (options.files !== false && dirent.isFile()) sourcePath = path.join(dir, dirent.name);
 			else continue;
-			if (seen.has(sourcePath)) continue;
-			seen.add(sourcePath);
 			entries.push(await buildEntry(repositoryId, pluginId, kind, sourcePath, !options.dirs, manifest));
 		}
 	};
-	for (const base of [pluginDir, repoRoot]) {
-		await push("skill", base, "skills", {
-			dirs: true,
-			files: false
-		});
-		await push("agent", base, "agents");
-		await push("instruction", base, "rules");
-		await push("prompt", base, "commands");
-		await push("hook", base, "hooks");
-	}
-	const byTarget = /* @__PURE__ */ new Map();
-	for (const entry of entries) {
-		const key = `${entry.kind}:${entry.name}`;
-		if (!byTarget.has(key)) byTarget.set(key, entry);
-	}
-	return [...byTarget.values()];
+	await push("skill", "skills", {
+		dirs: true,
+		files: false
+	});
+	await push("agent", "agents");
+	await push("instruction", "rules");
+	await push("prompt", "commands");
+	await push("hook", "hooks");
+	return entries;
 }
 /**
 * Repo-root-relative source for a declared plugin path, applying the
@@ -3005,7 +3062,7 @@ async function resolveDeclaredRelative(repoRoot, relative) {
 }
 async function resolvePluginManifestEntries(repoRoot, repositoryId, pluginId, artifacts, pluginManifest) {
 	const namespace = pluginManifest.extensions[AWESOME_COPILOT_NAMESPACE];
-	if (!namespace || typeof namespace !== "object") return resolveConventionEntries(repoRoot, path.join(repoRoot, "plugins", pluginId), repositoryId, pluginId, artifacts, pluginManifest);
+	if (!namespace || typeof namespace !== "object") return resolveConventionEntries(path.join(repoRoot, "plugins", pluginId), repositoryId, pluginId, artifacts, pluginManifest);
 	const entries = [];
 	for (const [kind, manifestKey] of Object.entries(PATH_KINDS)) {
 		if (!selectedKind(artifacts, kind)) continue;