copilot-ship 1.0.0-beta.1 → 1.0.0-beta.2

package/dist/constants.js

@@ -3,6 +3,14 @@ import path from "node:path";
 export const MARKETPLACE_MANIFEST = path.join(".claude-plugin", "marketplace.json");
 export const PROJECT_INSTALL_ROOT = ".github";
 export const GLOBAL_INSTALL_ROOT = path.join(os.homedir(), ".copilot");
+// VS Code plugin.json discovery order — checked at the plugin root (no directory walk-up).
+// Source: https://code.visualstudio.com/docs/copilot/customization/agent-plugins
+export const PLUGIN_JSON_CANDIDATES = [
+    path.join(".plugin", "plugin.json"),
+    "plugin.json",
+    path.join(".github", "plugin", "plugin.json"),
+    path.join(".claude-plugin", "plugin.json"),
+];
 export const DIRECTORY_TARGETS = {
     agents: "agents",
     hooks: "hooks",

package/dist/index.js

@@ -33,17 +33,17 @@ async function runAdd(parsedArgs) {
     activity.start("Resolving source and preparing install plan");
     let result;
     try {
-        result = await installFromMarketplace(parsedArgs.source, parsedArgs.flags, async (plugins) => {
-            activity.stop("Marketplace loaded");
+        result = await installFromMarketplace(parsedArgs.source, parsedArgs.flags, async (plugins, kind) => {
+            activity.stop(kind === "plugin" ? "Plugin loaded" : "Marketplace loaded");
             let selected = plugins;
             if (parsedArgs.flags.pluginName) {
                 const plugin = plugins.find((candidate) => candidate.plugin.name === parsedArgs.flags.pluginName);
                 if (!plugin) {
-                    throw new Error(`Plugin "${parsedArgs.flags.pluginName}" was not found in the selected marketplace scope.`);
+                    throw new Error(`Plugin "${parsedArgs.flags.pluginName}" was not found in the selected scope.`);
                 }
                 selected = [plugin];
             }
-            else if (!parsedArgs.flags.installAll && plugins.length > 1) {
+            else if (kind === "marketplace" && !parsedArgs.flags.installAll && plugins.length > 1) {
                 if (!process.stdin.isTTY || !process.stdout.isTTY) {
                     throw new Error("Interactive plugin selection requires a TTY. Use --plugin or --all instead.");
                 }
@@ -182,11 +182,10 @@ Usage:
   copilot-ship list [-g]
 
 Sources:
-  owner/repo
-  https://github.com/owner/repo
-  https://github.com/owner/repo/tree/main/plugins/my-plugin
-  git@github.com:owner/repo.git
-  ./local-path
+  owner/repo                                         marketplace
+  https://github.com/owner/repo                      marketplace
+  https://github.com/owner/repo/tree/main/my-plugin  single plugin
+  git@github.com:owner/repo.git                      marketplace
 `);
 }
 function resultTargetDescription(scope) {

package/dist/installer.js

@@ -3,20 +3,12 @@ import { access, copyFile, mkdir, mkdtemp, readdir, readFile, rm } from "node:fs
 import os from "node:os";
 import path from "node:path";
 import { promisify } from "node:util";
-import { COPILOT_INSTRUCTIONS_FILE, DIRECTORY_TARGETS, GLOBAL_INSTALL_ROOT, MARKETPLACE_MANIFEST, PROJECT_INSTALL_ROOT, } from "./constants.js";
+import { COPILOT_INSTRUCTIONS_FILE, DIRECTORY_TARGETS, GLOBAL_INSTALL_ROOT, MARKETPLACE_MANIFEST, PLUGIN_JSON_CANDIDATES, PROJECT_INSTALL_ROOT, } from "./constants.js";
 const execFileAsync = promisify(execFile);
 export async function resolveSource(source) {
-    const localPath = await tryResolveLocalPath(source);
-    if (localPath) {
-        return {
-            cleanup: undefined,
-            marketplaceRoot: await findMarketplaceRoot(localPath),
-            requestedPath: localPath,
-        };
-    }
     const parsedGitHubSource = parseGitHubSource(source);
     if (!parsedGitHubSource) {
-        throw new Error(`Unsupported source "${source}". Use a local path, owner/repo shorthand, a GitHub URL, or a git@github.com URL.`);
+        throw new Error(`Unsupported source "${source}". Use owner/repo shorthand or a GitHub URL.`);
     }
     const tempRoot = await createTempDirectory();
     const checkoutRoot = path.join(tempRoot, "source");
@@ -32,43 +24,49 @@ export async function resolveSource(source) {
         await rm(tempRoot, { force: true, recursive: true });
         throw wrapExecError(`Failed to clone ${parsedGitHubSource.cloneUrl}`, error);
     }
-    const requestedPath = path.resolve(checkoutRoot, parsedGitHubSource.subpath ?? ".");
-    try {
-        await access(requestedPath);
-    }
-    catch {
-        await rm(tempRoot, { force: true, recursive: true });
-        throw new Error(`Resolved source path "${parsedGitHubSource.subpath ?? "."}" does not exist in ${parsedGitHubSource.cloneUrl}.`);
+    const cleanup = async () => rm(tempRoot, { force: true, recursive: true });
+    if (parsedGitHubSource.subpath) {
+        const pluginRoot = path.resolve(checkoutRoot, parsedGitHubSource.subpath);
+        try {
+            await access(pluginRoot);
+        }
+        catch {
+            await cleanup();
+            throw new Error(`Path "${parsedGitHubSource.subpath}" does not exist in ${parsedGitHubSource.cloneUrl}.`);
+        }
+        const pluginJsonPath = await findPluginJsonAtRoot(pluginRoot);
+        if (!pluginJsonPath) {
+            await cleanup();
+            throw new Error(`No plugin.json found at "${parsedGitHubSource.subpath}" in ${parsedGitHubSource.cloneUrl}. ` +
+                `Expected one of: ${PLUGIN_JSON_CANDIDATES.join(", ")}.`);
+        }
+        return { kind: "plugin", root: pluginRoot, cleanup };
     }
-    return {
-        cleanup: async () => rm(tempRoot, { force: true, recursive: true }),
-        marketplaceRoot: await findMarketplaceRoot(requestedPath),
-        requestedPath,
-    };
+    return { kind: "marketplace", root: checkoutRoot, cleanup };
 }
 export async function installFromMarketplace(source, flags, selectPlugins) {
     const resolvedSource = await resolveSource(source);
     try {
-        const manifest = await readMarketplaceManifest(resolvedSource.marketplaceRoot);
+        const manifest = resolvedSource.kind === "marketplace"
+            ? await readMarketplaceManifest(resolvedSource.root)
+            : await readPluginJson(resolvedSource.root);
         const warnings = [];
         const skippedPlugins = [];
-        const localCandidates = [];
+        const candidates = [];
         for (const plugin of manifest.plugins) {
             if (typeof plugin.source !== "string") {
                 skippedPlugins.push(plugin.name);
                 warnings.push(`Skipped plugin "${plugin.name}": external marketplace sources are deferred to MVP2.`);
                 continue;
             }
-            const pluginRoot = path.resolve(resolvedSource.marketplaceRoot, plugin.source);
+            const pluginRoot = path.resolve(resolvedSource.root, plugin.source);
             await assertDirectory(pluginRoot, `Plugin "${plugin.name}" points to missing directory "${plugin.source}".`);
-            localCandidates.push({ plugin, pluginRoot });
+            candidates.push({ plugin, pluginRoot });
         }
-        const scopedCandidates = narrowCandidatesByRequestedPath(localCandidates, resolvedSource.requestedPath);
-        const candidatePool = scopedCandidates.length > 0 ? scopedCandidates : localCandidates;
-        if (candidatePool.length === 0) {
-            throw new Error("No installable plugins were found in the marketplace.");
+        if (candidates.length === 0) {
+            throw new Error("No installable plugins were found.");
         }
-        const selectedCandidates = await selectPlugins(candidatePool);
+        const selectedCandidates = await selectPlugins(candidates, resolvedSource.kind);
         if (selectedCandidates.length === 0) {
             throw new Error("No plugins were selected.");
         }
@@ -93,7 +91,7 @@ export async function installFromMarketplace(source, flags, selectPlugins) {
         return {
             installedPlugins: installablePlans,
             skippedPlugins,
-            sourceRoot: resolvedSource.marketplaceRoot,
+            sourceRoot: resolvedSource.root,
             targetRoot,
             warnings,
         };
@@ -134,7 +132,7 @@ async function readMarketplaceManifest(marketplaceRoot) {
         raw = await readFile(manifestPath, "utf8");
     }
     catch {
-        throw new Error(`MVP1 requires a marketplace manifest at "${manifestPath}".`);
+        throw new Error(`No marketplace manifest found. Expected "${MARKETPLACE_MANIFEST}" at the repository root.`);
     }
     let parsed;
     try {
@@ -148,31 +146,44 @@ async function readMarketplaceManifest(marketplaceRoot) {
     }
     return parsed;
 }
-async function findMarketplaceRoot(startingPath) {
-    let currentPath = path.resolve(startingPath);
-    const stats = await readdirOrNull(currentPath);
-    if (stats === null) {
-        currentPath = path.dirname(currentPath);
-    }
-    while (true) {
-        const candidate = path.join(currentPath, MARKETPLACE_MANIFEST);
-        if (await pathExists(candidate)) {
-            return currentPath;
-        }
-        const parent = path.dirname(currentPath);
-        if (parent === currentPath) {
-            break;
+async function findPluginJsonAtRoot(pluginRoot) {
+    for (const candidate of PLUGIN_JSON_CANDIDATES) {
+        const fullPath = path.join(pluginRoot, candidate);
+        if (await pathExists(fullPath)) {
+            return fullPath;
         }
-        currentPath = parent;
     }
-    throw new Error(`MVP1 requires a marketplace manifest. None was found from "${startingPath}" upward.`);
+    return null;
 }
-function narrowCandidatesByRequestedPath(candidates, requestedPath) {
-    const resolvedRequestedPath = path.resolve(requestedPath);
-    return candidates.filter((candidate) => {
-        const pluginRoot = path.resolve(candidate.pluginRoot);
-        return isSamePath(pluginRoot, resolvedRequestedPath) || isDescendantOf(resolvedRequestedPath, pluginRoot);
-    });
+async function readPluginJson(pluginRoot) {
+    const pluginJsonPath = await findPluginJsonAtRoot(pluginRoot);
+    if (!pluginJsonPath) {
+        throw new Error(`No plugin.json found at the specified path. Expected one of: ${PLUGIN_JSON_CANDIDATES.join(", ")}.`);
+    }
+    let raw;
+    try {
+        raw = await readFile(pluginJsonPath, "utf8");
+    }
+    catch {
+        throw new Error(`Failed to read plugin.json at "${pluginJsonPath}".`);
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch (error) {
+        throw wrapExecError(`Failed to parse plugin.json at "${pluginJsonPath}"`, error);
+    }
+    if (typeof parsed !== "object" || parsed === null) {
+        throw new Error(`plugin.json at "${pluginJsonPath}" must be a JSON object.`);
+    }
+    const record = parsed;
+    const name = typeof record.name === "string" ? record.name : path.basename(pluginRoot);
+    const plugin = { name, source: "." };
+    if (typeof record.description === "string") {
+        plugin.description = record.description;
+    }
+    return { plugins: [plugin] };
 }
 async function discoverArtifacts(pluginRoot, targetRoot) {
     const entries = [];
@@ -276,19 +287,6 @@ async function readdirOrNull(targetPath) {
         return null;
     }
 }
-async function tryResolveLocalPath(source) {
-    const expandedSource = source.startsWith("~/") ? path.join(os.homedir(), source.slice(2)) : source;
-    const shouldTreatAsPath = expandedSource.startsWith(".") || expandedSource.startsWith("/") || expandedSource.startsWith("~");
-    if (!shouldTreatAsPath) {
-        const candidate = path.resolve(expandedSource);
-        if (!(await pathExists(candidate))) {
-            return null;
-        }
-        return candidate;
-    }
-    const resolved = path.resolve(expandedSource);
-    return (await pathExists(resolved)) ? resolved : null;
-}
 function parseGitHubSource(source) {
     const shorthandMatch = source.match(/^([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)$/);
     if (shorthandMatch) {
@@ -350,13 +348,6 @@ function isMarketplacePlugin(value) {
     const record = value;
     return typeof record.name === "string" && "source" in record;
 }
-function isSamePath(left, right) {
-    return path.resolve(left) === path.resolve(right);
-}
-function isDescendantOf(child, parent) {
-    const relative = path.relative(parent, child);
-    return relative !== "" && !relative.startsWith("..") && !path.isAbsolute(relative);
-}
 async function createTempDirectory() {
     return mkdtemp(path.join(os.tmpdir(), "copilot-ship-"));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "copilot-ship",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "description": "Ship GitHub Copilot plugin artifacts into canonical Copilot directories.",
   "type": "module",
   "bin": {