forge-cw 0.1.3 → 0.1.4

package/dist/index.js

@@ -2441,14 +2441,17 @@ function manifestRepo(manifest) {
     return repo["url"];
   return void 0;
 }
-function marketplaceRepo(marketplaces, marketplace) {
-  const entry = marketplaces[marketplace];
+function marketplaceSource(entry) {
   const source = isRecord(entry) ? entry["source"] : void 0;
   if (!isRecord(source))
     return void 0;
-  const value = source["repo"] ?? source["url"];
+  const value = source["repo"] ?? source["url"] ?? source["path"];
   return typeof value === "string" ? value : void 0;
 }
+function splitPluginId(id) {
+  const at = id.lastIndexOf("@");
+  return { name: id.slice(0, at), marketplace: id.slice(at + 1) };
+}
 function projectSkillNames(projectPath) {
   const dir = join8(projectPath, ".claude", "skills");
   if (!existsSync6(dir))
@@ -2456,17 +2459,13 @@ function projectSkillNames(projectPath) {
   return readdirSync4(dir, { withFileTypes: true }).filter((e) => e.isDirectory() && existsSync6(join8(dir, e.name, "SKILL.md"))).map((e) => e.name).sort();
 }
 async function listPlugins(reader, remoteOf) {
-  const scopes = [
-    { scope: "global", scopeRef: "global" },
-    ...reader.getAccounts().map((a) => ({ scope: "account", scopeRef: a }))
-  ];
   const found = /* @__PURE__ */ new Map();
-  for (const { scope, scopeRef } of scopes) {
+  for (const { scope, scopeRef } of pluginScopes(reader)) {
     const configDir = reader.getSkillConfigDir(scope, scopeRef);
     const installed = readJson(join8(configDir, "plugins", "installed_plugins.json"))["plugins"];
     if (!isRecord(installed))
       continue;
-    const marketplaces = readJson(join8(configDir, "plugins", "known_marketplaces.json"));
+    const marketplaces = knownMarketplaces(configDir);
     const enabledPlugins = readJson(join8(configDir, "settings.json"))["enabledPlugins"];
     for (const [id, entries] of Object.entries(installed)) {
       if (!Array.isArray(entries))
@@ -2474,7 +2473,6 @@ async function listPlugins(reader, remoteOf) {
       const user = entries.find((e) => isRecord(e) && e["scope"] === "user" && typeof e["installPath"] === "string");
       if (!user)
         continue;
-      const marketplace = id.slice(id.lastIndexOf("@") + 1);
       const install = {
         scope,
         scopeRef,
@@ -2484,7 +2482,7 @@ async function listPlugins(reader, remoteOf) {
         lastUpdated: typeof user["lastUpdated"] === "string" ? user["lastUpdated"] : void 0
       };
       const list = found.get(id) ?? [];
-      list.push({ install, repo: marketplaceRepo(marketplaces, marketplace) });
+      list.push({ install, repo: marketplaceSource(marketplaces[splitPluginId(id).marketplace]) });
       found.set(id, list);
     }
   }
@@ -2498,8 +2496,7 @@ async function listPlugins(reader, remoteOf) {
     const match = repo ? remotes.find((r) => r.repo === repo) : void 0;
     plugins.push({
       id,
-      name: id.slice(0, id.lastIndexOf("@")),
-      marketplace: id.slice(id.lastIndexOf("@") + 1),
+      ...splitPluginId(id),
       description: String(manifest["description"] ?? ""),
       repo,
       installs: list.map((f) => f.install),
@@ -2521,7 +2518,41 @@ function readPluginSkill(plugin, name) {
     return null;
   }
 }
-var isRecord, inside;
+function readCatalog(location, marketplace) {
+  const listed = readJson(join8(location, ".claude-plugin", "marketplace.json"))["plugins"];
+  return (Array.isArray(listed) ? listed : []).filter((p) => isRecord(p) && typeof p["name"] === "string").map((p) => ({
+    id: `${String(p["name"])}@${marketplace}`,
+    name: String(p["name"]),
+    description: String(p["description"] ?? ""),
+    category: typeof p["category"] === "string" ? p["category"] : void 0
+  })).sort((a, b) => a.name.localeCompare(b.name));
+}
+function listMarketplaces(reader) {
+  const byName = /* @__PURE__ */ new Map();
+  for (const target of pluginScopes(reader)) {
+    for (const [name, entry] of Object.entries(knownMarketplaces(reader.getSkillConfigDir(target.scope, target.scopeRef)))) {
+      const source = marketplaceSource(entry);
+      if (!source)
+        continue;
+      const known = byName.get(name) ?? { name, source, scopes: [], plugins: [] };
+      known.scopes.push(target);
+      const location = isRecord(entry) ? entry["installLocation"] : void 0;
+      if (known.plugins.length === 0 && typeof location === "string")
+        known.plugins = readCatalog(location, name);
+      byName.set(name, known);
+    }
+  }
+  return [...byName.values()].sort((a, b) => a.name.localeCompare(b.name));
+}
+function marketplaceSourceOf(reader, marketplace) {
+  for (const { scope, scopeRef } of pluginScopes(reader)) {
+    const source = marketplaceSource(knownMarketplaces(reader.getSkillConfigDir(scope, scopeRef))[marketplace]);
+    if (source)
+      return source;
+  }
+  return void 0;
+}
+var isRecord, inside, pluginScopes, knownMarketplaces, knowsMarketplace;
 var init_plugins = __esm({
   "../core/dist/plugins.js"() {
     "use strict";
@@ -2531,6 +2562,12 @@ var init_plugins = __esm({
       const p = resolve2(path);
       return p === r || p.startsWith(r + sep);
     };
+    pluginScopes = (reader) => [
+      { scope: "global", scopeRef: "global" },
+      ...reader.getAccounts().map((a) => ({ scope: "account", scopeRef: a }))
+    ];
+    knownMarketplaces = (configDir) => readJson(join8(configDir, "plugins", "known_marketplaces.json"));
+    knowsMarketplace = (configDir, marketplace) => isRecord(knownMarketplaces(configDir)[marketplace]);
   }
 });
 
@@ -2559,7 +2596,26 @@ function skillRoutes(reader, options = {}) {
   const runnerFor = options.runnerFor ?? ((env) => createRunner(env, INSTALL_TIMEOUT_MS));
   const remoteOf = options.remoteOf ?? createRemoteLookup(runCommand);
   const app = new Hono2();
-  const updating = /* @__PURE__ */ new Set();
+  const busy = /* @__PURE__ */ new Set();
+  const runClaude = async (scope, ref, commands, failure) => {
+    const configDir = reader.getSkillConfigDir(scope, ref);
+    if (busy.has(configDir))
+      return { error: `A plugin command is already running for ${ref}`, status: 409 };
+    busy.add(configDir);
+    try {
+      const { CLAUDE_CONFIG_DIR: _ignored, ...base } = envWithoutHarness();
+      const run = runnerFor(scope === "global" ? base : { ...base, CLAUDE_CONFIG_DIR: configDir });
+      for (const args of commands) {
+        const result2 = await run("claude", args, configDir);
+        if (result2.code !== 0)
+          return { error: `${failure}: ${commandFailure(result2)}`, status: 500 };
+      }
+      return null;
+    } finally {
+      busy.delete(configDir);
+    }
+  };
+  const knownAccount = (account) => account && reader.getAccounts().includes(account) ? account : null;
   const refOf = (scope, scopeRef) => scope === "global" ? "global" : scopeRef ?? "";
   const knownScope = (scope, ref) => scope === "global" || (scope === "account" ? reader.getAccounts().includes(ref) : scope === "project" && ref in reader.getProjects());
   app.get("/", (c) => c.json(reader.getSkills()));
@@ -2763,27 +2819,50 @@ function skillRoutes(reader, options = {}) {
     const install = plugin?.installs.find((i) => i.scope === scope && i.scopeRef === ref);
     if (!plugin || !install)
       return c.json({ error: `${id} is not installed in ${ref || "that scope"}` }, 404);
-    const configDir = reader.getSkillConfigDir(install.scope, install.scopeRef);
-    if (updating.has(configDir))
-      return c.json({ error: `An update is already running for ${ref}` }, 409);
-    updating.add(configDir);
-    try {
-      const { CLAUDE_CONFIG_DIR: _ignored, ...base } = envWithoutHarness();
-      const run = runnerFor(install.scope === "global" ? base : { ...base, CLAUDE_CONFIG_DIR: configDir });
-      for (const args of [["plugin", "marketplace", "update", plugin.marketplace], ["plugin", "update", plugin.id]]) {
-        const result2 = await run("claude", args, configDir);
-        if (result2.code !== 0)
-          return c.json({ error: `Failed to update ${plugin.name}: ${commandFailure(result2)}` }, 500);
-      }
-    } finally {
-      updating.delete(configDir);
-    }
+    const failed = await runClaude(install.scope, ref, [["plugin", "marketplace", "update", plugin.marketplace], ["plugin", "update", plugin.id]], `Failed to update ${plugin.name}`);
+    if (failed)
+      return c.json({ error: failed.error }, failed.status);
     const version = (await find())?.installs.find((i) => i.scope === install.scope && i.scopeRef === ref)?.version ?? install.version;
     return c.json({ ok: true, version });
   });
+  app.get("/marketplaces", (c) => c.json(listMarketplaces(reader)));
+  app.post("/marketplaces", async (c) => {
+    const body = await c.req.json().catch(() => ({}));
+    const source = body.source?.trim() ?? "";
+    if (!source || source.startsWith("-"))
+      return c.json({ error: "A GitHub repo, URL or path is required" }, 400);
+    const account = knownAccount(body.account);
+    if (!account)
+      return c.json({ error: "Unknown account" }, 404);
+    const failed = await runClaude("account", account, [["plugin", "marketplace", "add", source]], `Failed to add ${source}`);
+    if (failed)
+      return c.json({ error: failed.error }, failed.status);
+    return c.json({ ok: true });
+  });
+  app.post("/plugins/install", async (c) => {
+    const body = await c.req.json().catch(() => ({}));
+    const id = body.id ?? "";
+    if (!PLUGIN_ID_RE.test(id))
+      return c.json({ error: "Invalid plugin id" }, 400);
+    const account = knownAccount(body.account);
+    if (!account)
+      return c.json({ error: "Unknown account" }, 404);
+    const { name, marketplace } = splitPluginId(id);
+    const commands = [["plugin", "install", id]];
+    if (!knowsMarketplace(reader.getSkillConfigDir("account", account), marketplace)) {
+      const source = marketplaceSourceOf(reader, marketplace);
+      if (!source)
+        return c.json({ error: `Unknown marketplace ${marketplace}` }, 404);
+      commands.unshift(["plugin", "marketplace", "add", source]);
+    }
+    const failed = await runClaude("account", account, commands, `Failed to install ${name}`);
+    if (failed)
+      return c.json({ error: failed.error }, failed.status);
+    return c.json({ ok: true });
+  });
   return app;
 }
-var INSTALL_TIMEOUT_MS, SKILL_NAME_RE;
+var INSTALL_TIMEOUT_MS, SKILL_NAME_RE, PLUGIN_ID_RE;
 var init_skill_routes = __esm({
   "../core/dist/skill-routes.js"() {
     "use strict";
@@ -2792,6 +2871,7 @@ var init_skill_routes = __esm({
     init_plugins();
     INSTALL_TIMEOUT_MS = 12e4;
     SKILL_NAME_RE = /^\w[\w.-]*$/;
+    PLUGIN_ID_RE = /^\w[\w.-]*@\w[\w.-]*$/;
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-cw",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "A visual dashboard for your coding agents on Claude Code, Codex, Pi or OpenCode. Installs CW for you.",
   "license": "MIT",
   "type": "module",
@@ -39,8 +39,8 @@
     "@types/node": "^22.0.0",
     "esbuild": "^0.25.0",
     "typescript": "^5.8.0",
-    "@forge-dev/core": "0.1.0",
-    "@forge-dev/console": "0.1.0"
+    "@forge-dev/console": "0.1.0",
+    "@forge-dev/core": "0.1.0"
   },
   "scripts": {
     "build": "tsc",