magus-cli 7.13.0 → 7.14.1

package/src/cli/market.ts

@@ -7,17 +7,18 @@
  * only that plan. Under `--json` one MarketResult is printed, on the last
  * line of stdout, and nothing is asked.
  *
- * Bare `magus market` is the interactive screen; this module answers "tui"
- * for it and the router decides.
+ * Bare `magus market` prints the help; the interactive screen is `magus
+ * edit`.
  */
 
 import {
+	planPluginAdd,
 	planPluginCreate,
 	planPluginDelete,
 } from "../services/market-ops-plugin.js";
 import {
-	type PublishArgs,
 	marketStatus,
+	planPluginPublish,
 	planPublish,
 	provisionalPublish,
 } from "../services/market-ops-publish.js";
@@ -61,6 +62,7 @@ import { askYesNo, promptValue } from "./prompt.js";
 /** Flags that take a value, and flags that stand alone. */
 const VALUE_FLAGS = new Set([
 	"--name",
+	"--company",
 	"--description",
 	"--plugin",
 	"--from",
@@ -70,6 +72,7 @@ const BOOL_FLAGS = new Set([
 	"--private",
 	"--public",
 	"--keep-local",
+	"--create-plugin",
 	"--force",
 	"--dry-run",
 	"--json",
@@ -276,15 +279,15 @@ function warnBlock(text: string): string {
 
 /**
  * `publish --dry-run`: the plan, or the answer a publish would give, and
- * nothing written. On state older than GitHub's, a provisional plan with no
- * compare, still exit 0.
+ * nothing written. On state older than GitHub's, a provisional answer with
+ * no compare (`provisional`), still exit 0; without one, that error.
  */
 async function dryRunPublish(
-	args: PublishArgs,
+	plan: () => Promise<PlanAnswer>,
 	io: Io,
-	cwd: string,
+	provisional?: (error: MarketError) => MarketResult,
 ): Promise<number> {
-	const answer = await planPublish(args, cwd);
+	const answer = await plan();
 	if (answer.kind === "plan") {
 		const p = answer.plan;
 		const result: MarketResult = {
@@ -307,8 +310,11 @@ async function dryRunPublish(
 		emit(answer.result, io);
 		return exitCodeFor(answer.result);
 	}
-	if (answer.error.code === "stale" || answer.error.code === "no-network") {
-		emit(provisionalPublish(args, cwd, answer.error), io);
+	if (
+		provisional &&
+		(answer.error.code === "stale" || answer.error.code === "no-network")
+	) {
+		emit(provisional(answer.error), io);
 		return 0;
 	}
 	const result = errorResult(answer.command, answer.error);
@@ -316,15 +322,12 @@ async function dryRunPublish(
 	return answer.error.exit ?? exitCodeFor(result);
 }
 
-/**
- * Run `magus market <argv>`. Returns the exit code, or "tui" for a bare
- * `magus market`.
- */
+/** Run `magus market <argv>`. Returns the exit code. */
 export async function runMarketCommand(
 	argv: string[],
 	version: string,
 	cwd: string = process.cwd(),
-): Promise<number | "tui"> {
+): Promise<number> {
 	if (argv.includes("--help") || argv.includes("-h")) {
 		console.log(marketHelp());
 		return 0;
@@ -333,7 +336,11 @@ export async function runMarketCommand(
 		console.log(`magus v${version}`);
 		return 0;
 	}
-	if (argv.length === 0) return "tui";
+	if (argv.length === 0) {
+		console.log(marketHelp());
+		console.log("Open the screen with `magus edit`.");
+		return 0;
+	}
 
 	const json = argv.includes("--json");
 	const io: Io = {
@@ -348,7 +355,7 @@ export async function runMarketCommand(
 		switch (verb) {
 			case "list": {
 				expect(p, [], { min: 0, max: 0, usage: "magus market list [--json]" });
-				const result = await marketList();
+				const result = await marketList(cwd);
 				emit(result, io);
 				return exitCodeFor(result);
 			}
@@ -367,12 +374,16 @@ export async function runMarketCommand(
 			}
 			case "create": {
 				const usage =
-					"magus market create <owner>/<repo> --private|--public [--name <m>] [--description <t>]";
-				expect(p, ["--private", "--public", "--name", "--description"], {
-					min: 1,
-					max: 1,
-					usage,
-				});
+					"magus market create <owner>/<repo> --private|--public [--name <m>] [--company <name>] [--description <t>]";
+				expect(
+					p,
+					["--private", "--public", "--name", "--company", "--description"],
+					{
+						min: 1,
+						max: 1,
+						usage,
+					},
+				);
 				const priv = p.flags.has("--private");
 				const pub = p.flags.has("--public");
 				if (priv === pub) {
@@ -386,6 +397,7 @@ export async function runMarketCommand(
 							repo: p.positional[0] as string,
 							visibility: priv ? "private" : "public",
 							name: str(p, "--name"),
+							company: str(p, "--company"),
 							description: str(p, "--description"),
 						}),
 					io,
@@ -394,15 +406,20 @@ export async function runMarketCommand(
 				);
 			}
 			case "connect": {
-				expect(p, ["--name"], {
+				expect(p, ["--name", "--company"], {
 					min: 1,
 					max: 1,
-					usage: "magus market connect <owner/repo|git-url|path> [--name <m>]",
+					usage:
+						"magus market connect <owner/repo|git-url|path> [--name <m>] [--company <name>]",
 				});
 				return await runWrite(
 					() =>
 						planConnect(
-							{ source: p.positional[0] as string, name: str(p, "--name") },
+							{
+								source: p.positional[0] as string,
+								name: str(p, "--name"),
+								company: str(p, "--company"),
+							},
 							cwd,
 						),
 					io,
@@ -435,6 +452,27 @@ export async function runMarketCommand(
 						cwd,
 					);
 				}
+				if (sub === "add") {
+					expect(sp, ["--to", "--name"], {
+						min: 1,
+						max: 1,
+						usage: "magus market plugin add <path> [--to <m>] [--name <p>]",
+					});
+					return await runWrite(
+						() =>
+							planPluginAdd(
+								{
+									path: ref as string,
+									to: str(p, "--to"),
+									name: str(p, "--name"),
+								},
+								cwd,
+							),
+						io,
+						yes,
+						cwd,
+					);
+				}
 				if (sub === "delete") {
 					expect(sp, [], {
 						min: 1,
@@ -448,22 +486,40 @@ export async function runMarketCommand(
 						cwd,
 					);
 				}
-				throw new UsageError("usage: magus market plugin create|delete <p@m>");
+				throw new UsageError(
+					"usage: magus market plugin create|delete <p@m>, or magus market plugin add <path>",
+				);
 			}
 			case "skill": {
 				const [sub, skill, ...extra] = p.positional;
 				const sp = { ...p, positional: skill ? [skill, ...extra] : [] };
 				if (sub === "add") {
 					const usage =
-						"magus market skill add <skill> --plugin <p@m> [--from project|global] [--keep-local]";
-					expect(sp, ["--plugin", "--from", "--keep-local"], {
-						min: 1,
-						max: 1,
-						usage,
-					});
+						"magus market skill add <skill> --plugin <p@m> [--create-plugin [--description <t>]] [--from project|global] [--keep-local]";
+					expect(
+						sp,
+						[
+							"--plugin",
+							"--from",
+							"--keep-local",
+							"--create-plugin",
+							"--description",
+						],
+						{
+							min: 1,
+							max: 1,
+							usage,
+						},
+					);
 					const plugin = str(p, "--plugin");
 					if (!plugin)
 						throw new UsageError(`--plugin is required — usage: ${usage}`);
+					const createPlugin = p.flags.has("--create-plugin");
+					if (p.flags.has("--description") && !createPlugin) {
+						throw new UsageError(
+							`--description describes a plugin --create-plugin creates — usage: ${usage}`,
+						);
+					}
 					const from = choice(
 						p,
 						"--from",
@@ -478,6 +534,12 @@ export async function runMarketCommand(
 									plugin,
 									from,
 									keepLocal: p.flags.has("--keep-local"),
+									...(createPlugin
+										? {
+												createPlugin: true,
+												description: str(p, "--description"),
+											}
+										: {}),
 								},
 								cwd,
 							),
@@ -538,25 +600,47 @@ export async function runMarketCommand(
 				return exitCodeFor(result);
 			}
 			case "publish": {
+				const usage =
+					"magus market publish <skill> [--plugin <p@m>] [--from project|global] [--keep-local] [--force] [--dry-run], or magus market publish --plugin <p@m> [--keep-local] [--dry-run]";
 				expect(
 					p,
 					["--plugin", "--from", "--keep-local", "--force", "--dry-run"],
-					{
-						min: 1,
-						max: 1,
-						usage:
-							"magus market publish <skill> [--plugin <p@m>] [--from project|global] [--keep-local] [--force] [--dry-run]",
-					},
+					{ min: 0, max: 1, usage },
 				);
-				const args: PublishArgs = {
-					skill: p.positional[0] as string,
+				const skill = p.positional[0];
+				const keepLocal = p.flags.has("--keep-local");
+				if (skill === undefined) {
+					const plugin = str(p, "--plugin");
+					if (!plugin) {
+						throw new UsageError(
+							`name a skill, or a plugin with --plugin — usage: ${usage}`,
+						);
+					}
+					for (const flag of ["--from", "--force"]) {
+						if (p.flags.has(flag)) {
+							throw new UsageError(
+								`${flag} applies to one named skill: \`magus market publish <skill> ${flag} …\``,
+							);
+						}
+					}
+					const plan = () => planPluginPublish({ plugin, keepLocal }, cwd);
+					if (p.flags.has("--dry-run")) return await dryRunPublish(plan, io);
+					return await runWrite(plan, io, yes, cwd);
+				}
+				const args = {
+					skill,
 					plugin: str(p, "--plugin"),
 					from: choice(p, "--from", ["project", "global"] as const, "project"),
-					keepLocal: p.flags.has("--keep-local"),
+					keepLocal,
 					force: p.flags.has("--force"),
 				};
-				if (p.flags.has("--dry-run")) return await dryRunPublish(args, io, cwd);
-				return await runWrite(() => planPublish(args, cwd), io, yes, cwd);
+				const plan = () => planPublish(args, cwd);
+				if (p.flags.has("--dry-run")) {
+					return await dryRunPublish(plan, io, (error) =>
+						provisionalPublish(args, cwd, error),
+					);
+				}
+				return await runWrite(plan, io, yes, cwd);
 			}
 			default:
 				throw new UsageError(

package/src/cli/router.ts

@@ -30,8 +30,8 @@ export interface RouteOutcome {
 	theme?: ThemeMode;
 	/**
 	 * Which interactive app to launch when `launchTui` is true: the dependency
-	 * TUI (bare `magus`, the default) or the company marketplace screens (bare
-	 * `magus market`).
+	 * TUI (bare `magus`, the default) or the company marketplace screens
+	 * (`magus edit`).
 	 */
 	app?: "main" | "market";
 }
@@ -93,6 +93,21 @@ const HANDLED = (exitCode: number): RouteOutcome => ({
 });
 const LAUNCH_TUI: RouteOutcome = { handled: false, launchTui: true };
 
+/** `magus edit --help`. */
+function editHelp(): string {
+	return `magus edit — open the company marketplace screens
+
+Usage: magus edit
+
+Lists the company marketplaces on this machine, their plugins and skills, and
+creates, connects and changes them: publishes edited skills (one skill, or a
+whole plugin as one new version), and adds this project's and your USER skills
+and plugin folders to a marketplace. Needs a terminal.
+
+\`magus market --help\` lists the commands that do the same without one.
+`;
+}
+
 /**
  * Every name the switch below handles.
  *
@@ -108,6 +123,7 @@ const SUBCOMMANDS = new Set([
 	"models",
 	"doctor",
 	"market",
+	"edit",
 ]);
 
 /**
@@ -130,10 +146,10 @@ export async function route(
 	themeEnv?: ThemeEnv,
 ): Promise<RouteOutcome> {
 	// Top-level flags take precedence over any command token — for every
-	// command but `market`, whose own verbs answer --help and --version (and
-	// write nothing doing so). `magus upgrade --help` must still print help
-	// rather than upgrade, so this exception is exactly argv[0] === "market".
-	const marketFirst = argv[0] === "market";
+	// command but `market` and `edit`, which answer --help and --version
+	// themselves (and write nothing doing so). `magus upgrade --help` must still
+	// print help rather than upgrade, so this exception is exactly argv[0].
+	const marketFirst = argv[0] === "market" || argv[0] === "edit";
 	if (!marketFirst && (argv.includes("--version") || argv.includes("-v"))) {
 		console.log(`magus v${version}`);
 		const result = await checkForUpdates();
@@ -229,8 +245,23 @@ export async function route(
 				return HANDLED(await runDoctorCommand(rest));
 			case "market": {
 				const { runMarketCommand } = await import("./market.js");
-				const outcome = await runMarketCommand(rest, version);
-				if (outcome !== "tui") return HANDLED(outcome);
+				return HANDLED(await runMarketCommand(rest, version));
+			}
+			case "edit": {
+				if (rest.includes("--help") || rest.includes("-h")) {
+					console.log(editHelp());
+					return HANDLED(0);
+				}
+				if (rest.includes("--version") || rest.includes("-v")) {
+					console.log(`magus v${version}`);
+					return HANDLED(0);
+				}
+				if (rest.length > 0) {
+					console.error(
+						"magus edit: takes no arguments — the commands are `magus market <verb>` (`magus market --help` lists them)",
+					);
+					return HANDLED(2);
+				}
 				return {
 					handled: false,
 					launchTui: true,
@@ -327,14 +358,15 @@ applied by a PreToolUse hook magus registers at user scope.
 
 Company marketplaces — your team's own Claude Code plugin marketplace on
 GitHub, listed first in magus. Every change prints its plan and asks first.
-  market             Open the company marketplace screens
+  edit               Open the company marketplace screens
   market list        Company marketplaces on this machine, with their plugins
   market create      Create one on GitHub;  market connect  use an existing one
   market remove <m>  Remove one from this machine (the repository stays)
-  market plugin create|delete <p@m>
+  market plugin create|delete <p@m>;  market plugin add <path>
   market skill add|edit|remove <skill>
   market status      How your local copies of company skills stand
   market publish <skill>  Send a local skill's edits back to its plugin
+  market publish --plugin <p@m>  Every edited skill of a plugin, one version
   market --help      Every market command, its flags and exit codes
 
 Other commands:

package/src/data/marketplaces.ts

@@ -250,6 +250,7 @@ export function getAllMarketplaces(
 				deprecated: defaultMp?.deprecated,
 				owned: defaultMp?.owned,
 				...(local.company ? { company: true } : {}),
+				...(local.ownerName ? { ownerName: local.ownerName } : {}),
 			});
 		}
 	}

package/src/main.tsx

@@ -97,7 +97,7 @@ async function main(): Promise<void> {
 	if (outcome.app === "market") {
 		if (!isInteractive) {
 			console.error(
-				"magus market opens an interactive screen, which needs a terminal. `magus market --help` lists the commands that run without one.",
+				"magus edit opens an interactive screen, which needs a terminal. `magus market --help` lists the commands that run without one.",
 			);
 			process.exit(2);
 		}

package/src/market-tui.tsx

@@ -1,5 +1,5 @@
 /**
- * The interactive screens behind bare `magus market`: the company
+ * The interactive screens behind `magus edit`: the company
  * marketplaces on this machine, and the plugins and skills of one of them.
  *
  * Imported dynamically from `main.tsx`, like `tui.tsx`, so no other command

package/src/services/claude-cli.ts

@@ -288,6 +288,19 @@ export function isNotInstalledAnswer(error: unknown): boolean {
 	);
 }
 
+/**
+ * The scope a wrong-scope answer says the plugin IS installed at — `user` from
+ * `is installed in user scope, not project` — or null when the answer names
+ * none, as the `not installed in <scope> scope` wording does.
+ */
+export function installedScopeFromAnswer(error: unknown): PluginScope | null {
+	const message = error instanceof Error ? error.message : String(error);
+	const match = /is installed in (user|project|local) scope, not /i.exec(
+		message,
+	);
+	return match ? (match[1].toLowerCase() as PluginScope) : null;
+}
+
 /**
  * Repair a plugin whose files drifted from the marketplace under an unchanged
  * version — uninstall, then install again at the same scope.

package/src/services/local-marketplace.ts

@@ -55,6 +55,8 @@ export interface LocalMarketplace {
 	 * and the name and source are on this machine's trust list.
 	 */
 	company?: boolean;
+	/** `owner.name` from the manifest, trimmed; absent when empty or missing. */
+	ownerName?: string;
 }
 
 /** Claude Code's marketplace clones, resolved per call. */
@@ -322,6 +324,11 @@ async function scanSingleMarketplace(
 				? manifest.metadata.pluginRoot
 				: undefined;
 
+		const ownerName: string | undefined =
+			typeof manifest.owner?.name === "string" && manifest.owner.name.trim()
+				? manifest.owner.name.trim()
+				: undefined;
+
 		const plugins: LocalMarketplacePlugin[] = [];
 
 		if (manifest.plugins && Array.isArray(manifest.plugins)) {
@@ -398,6 +405,7 @@ async function scanSingleMarketplace(
 			company:
 				readMarker(manifest) &&
 				isTrustedIn(trusted, marketplaceName, remoteSource),
+			...(ownerName ? { ownerName } : {}),
 		};
 	} catch {
 		return null;

package/src/services/market-change.ts

@@ -140,8 +140,8 @@ export interface ChangeSpec {
 	/** Names a pull-request branch. */
 	slug: string;
 	prBody: string;
-	/** A skill directory whose committed files must equal these. */
-	verify?: { dir: string; files: readonly SkillFile[] };
+	/** Directories whose committed files must equal these, each. */
+	verify?: ReadonlyArray<{ dir: string; files: readonly SkillFile[] }>;
 	/** Set when the commit is made, for later steps. */
 	state: { commit?: string; pushed?: boolean };
 }
@@ -186,15 +186,15 @@ export function changeSteps(spec: ChangeSpec): MarketStep[] {
 				}
 				const made = await gitCommit(dir, spec.message);
 				if (!made.ok) throw gitError(made, spec.label);
-				if (spec.verify) {
-					const tree = await lsTree(dir, made.value, spec.verify.dir);
+				for (const check of spec.verify ?? []) {
+					const tree = await lsTree(dir, made.value, check.dir);
 					if (!tree.ok) throw gitError(tree, spec.label);
-					const prefix = `${spec.verify.dir}/`;
+					const prefix = `${check.dir}/`;
 					const committed = tree.value.map((e) => ({
 						path: e.path.slice(prefix.length),
 						oid: e.oid,
 					}));
-					if (!sameFiles(committed, spec.verify.files)) {
+					if (!sameFiles(committed, check.files)) {
 						throw new MarketError(
 							"other",
 							"the commit did not hold exactly the planned files — nothing was pushed",

package/src/services/market-local.ts

@@ -0,0 +1,93 @@
+/**
+ * market-local.ts — the skills and plugins on this machine that no company
+ * marketplace holds yet: what the market screens offer to add to one.
+ *
+ * Read-only: folders are listed and two small files read, nothing written.
+ */
+
+import fs from "node:fs";
+import path from "node:path";
+import { ORIGIN_FILE } from "./market-bases.js";
+import { profileManaged } from "./market-publish.js";
+import type { LocalItem } from "./market-types.js";
+import { getUserSkillsDir } from "./skills-manager.js";
+
+const PLUGIN_JSON = path.join(".claude-plugin", "plugin.json");
+
+function isFile(file: string): boolean {
+	try {
+		return fs.lstatSync(file).isFile();
+	} catch {
+		return false;
+	}
+}
+
+/** The `name` a plugin folder's plugin.json gives, or null. */
+function pluginJsonName(folder: string): string | null {
+	try {
+		const json = JSON.parse(
+			fs.readFileSync(path.join(folder, PLUGIN_JSON), "utf8"),
+		) as { name?: unknown };
+		return typeof json.name === "string" && json.name.trim()
+			? json.name.trim()
+			: null;
+	} catch {
+		return null;
+	}
+}
+
+/**
+ * This project's skills (`.claude/skills/<name>/`) and your USER skills
+ * (`<claude config dir>/skills/<name>/`), real folders only, as two kinds:
+ * - a plugin: the folder holds `.claude-plugin/plugin.json`, and no company
+ *   marketplace has a plugin of its name (`companyPlugins`) — once added,
+ *   the folder is the marketplace's plugin, not a local one;
+ * - a skill: the folder holds `SKILL.md`, and is none of a copy magus made of
+ *   a company skill (it holds `.magus-origin`), a skill a company plugin
+ *   holds under the same name (`companySkills`), or a skill folder this
+ *   project's profile installs.
+ * Sorted by name, project before USER for the same name.
+ */
+export async function localItems(
+	cwd: string,
+	companySkills: ReadonlySet<string>,
+	companyPlugins: ReadonlySet<string> = new Set(),
+): Promise<LocalItem[]> {
+	const roots = [
+		{ scope: "project" as const, dir: path.join(cwd, ".claude", "skills") },
+		{ scope: "user" as const, dir: getUserSkillsDir() },
+	];
+	const out: LocalItem[] = [];
+	const seen = new Set<string>();
+	for (const { scope, dir } of roots) {
+		let entries: fs.Dirent[];
+		try {
+			entries = fs.readdirSync(dir, { withFileTypes: true });
+		} catch {
+			continue;
+		}
+		for (const d of entries) {
+			if (!d.isDirectory()) continue;
+			const folder = path.join(dir, d.name);
+			if (seen.has(folder)) continue;
+			seen.add(folder);
+			if (isFile(path.join(folder, PLUGIN_JSON))) {
+				const name = pluginJsonName(folder) ?? d.name;
+				if (!companyPlugins.has(name)) {
+					out.push({ kind: "plugin", name, scope, path: folder });
+				}
+				continue;
+			}
+			if (!isFile(path.join(folder, "SKILL.md"))) continue;
+			if (fs.existsSync(path.join(folder, ORIGIN_FILE))) continue;
+			if (companySkills.has(d.name)) continue;
+			if (scope === "project" && (await profileManaged(cwd, d.name))) continue;
+			out.push({ kind: "skill", name: d.name, scope, path: folder });
+		}
+	}
+	return out.sort((a, b) =>
+		a.name === b.name
+			? a.scope.localeCompare(b.scope)
+			: a.name.localeCompare(b.name),
+	);
+}