magus-cli 7.13.0 → 7.14.1

package/src/ui/adapters/marketAdapter.ts

@@ -11,30 +11,146 @@ import type {
 } from "../../services/market-ops.js";
 import type {
 	InstallScope,
+	LocalItem,
 	MarketResult,
 	SkillStatusRow,
 } from "../../services/market-types.js";
 import type { FailureReport, FailureRow } from "../state/types.js";
+import { displayWidth, truncate } from "../text-width.js";
 import type { theme } from "../theme.js";
 
 // ─── Screen 1 ────────────────────────────────────────────────────────────────
 
 export type MarketplacesItem =
-	| { kind: "marketplace"; entry: MarketOverviewEntry }
+	| {
+			kind: "marketplace";
+			entry: MarketOverviewEntry;
+			/** Its plugins with skills edited here, ready to push. */
+			toPush: readonly string[];
+	  }
 	| { kind: "create" }
-	| { kind: "connect" };
+	| { kind: "connect" }
+	/** The heading over the local rows; never selected. */
+	| { kind: "local-heading"; count: number }
+	| { kind: "local"; item: LocalItem };
 
-/** The marketplaces, then the two rows that add one. */
+/**
+ * The marketplaces, the two rows that add one, then — when there are any —
+ * the skills and plugin folders here that no marketplace holds yet.
+ */
 export function marketplacesItems(
 	entries: readonly MarketOverviewEntry[],
+	status: readonly SkillStatusRow[] = [],
+	local: readonly LocalItem[] = [],
 ): MarketplacesItem[] {
 	return [
-		...entries.map((entry) => ({ kind: "marketplace" as const, entry })),
+		...entries.map((entry) => ({
+			kind: "marketplace" as const,
+			entry,
+			toPush: pluginsToPush(entry.name, status),
+		})),
 		{ kind: "create" },
 		{ kind: "connect" },
+		...(local.length > 0
+			? [
+					{ kind: "local-heading" as const, count: local.length },
+					...local.map((item) => ({ kind: "local" as const, item })),
+				]
+			: []),
 	];
 }
 
+/** Whether a row can hold the selection: every row but a heading. */
+export function selectable(item: MarketplacesItem | undefined): boolean {
+	return item !== undefined && item.kind !== "local-heading";
+}
+
+/**
+ * The next selectable index from `from` in direction `step` (±1), or `from`
+ * when there is none that way.
+ */
+export function nextSelectable(
+	items: readonly MarketplacesItem[],
+	from: number,
+	step: number,
+): number {
+	for (let i = from + step; i >= 0 && i < items.length; i += step) {
+		if (selectable(items[i])) return i;
+	}
+	return from;
+}
+
+/** The skill rows `edited` here, by the plugin `ref` that owns them. */
+export function editedSkills(
+	status: readonly SkillStatusRow[],
+	ref: string,
+): string[] {
+	return [
+		...new Set(
+			status
+				.filter((r) => r.state === "edited" && r.owner === ref)
+				.map((r) => r.skill),
+		),
+	].sort();
+}
+
+/** The plugins of `marketplace` with at least one skill edited here. */
+export function pluginsToPush(
+	marketplace: string,
+	status: readonly SkillStatusRow[],
+): string[] {
+	const suffix = `@${marketplace}`;
+	return [
+		...new Set(
+			status
+				.filter(
+					(r) => r.state === "edited" && r.owner?.endsWith(suffix) === true,
+				)
+				.map((r) => (r.owner as string).slice(0, -suffix.length)),
+		),
+	].sort();
+}
+
+/** What a local row is, in the user's words. */
+export function localKindWords(item: LocalItem): string {
+	return item.kind === "plugin" ? "plugin" : "skill";
+}
+
+/** The narrowest a cut secondary text is still worth showing. */
+const MIN_CUT = 4;
+
+/**
+ * Fit one list row into `width` columns without wrapping. The name and the
+ * parts of `fixed` columns (a scope badge, the gaps around it) always show:
+ * the name is cut with "…" to leave them room. The secondary texts follow in
+ * order while each fits whole after a gap of `gap`; the first that does not
+ * is cut to what is left (when that is at least a few columns), and the rest
+ * are dropped.
+ */
+export function fitRow<T extends { text: string }>(
+	width: number,
+	name: string,
+	fixed: number,
+	secondary: readonly T[],
+	gap = 2,
+): { name: string; secondary: T[] } {
+	const nameOut = truncate(name, Math.max(1, width - fixed));
+	let used = displayWidth(nameOut) + fixed;
+	const out: T[] = [];
+	for (const part of secondary) {
+		const need = gap + displayWidth(part.text);
+		if (used + need <= width) {
+			out.push(part);
+			used += need;
+			continue;
+		}
+		const room = width - used - gap;
+		if (room >= MIN_CUT) out.push({ ...part, text: truncate(part.text, room) });
+		break;
+	}
+	return { name: nameOut, secondary: out };
+}
+
 /** "1 plugin", "3 plugins". */
 export function plural(n: number, word: string): string {
 	return `${n} ${word}${n === 1 ? "" : "s"}`;
@@ -73,6 +189,8 @@ export type MarketplaceItem =
 			skills: readonly string[];
 			installs: ScopeVersions;
 			expanded: boolean;
+			/** Its skills edited here, which `p` pushes as one new version. */
+			edited: readonly string[];
 	  }
 	| {
 			kind: "skill";
@@ -119,6 +237,7 @@ export function marketplaceItems(
 			skills: p.skills,
 			installs: installs[ref] ?? NO_INSTALLS,
 			expanded: open,
+			edited: editedSkills(status, ref),
 		});
 		if (!open) continue;
 		for (const skill of p.skills) {

package/src/ui/adapters/pluginsAdapter.ts

@@ -15,6 +15,7 @@ import type {
 	FailureRow,
 	PluginContentsEntry,
 } from "../state/types.js";
+import { truncate } from "../text-width.js";
 import type { BadgeTone } from "../theme.js";
 import {
 	failureReport,
@@ -215,6 +216,12 @@ function pushPluginItems(
 	}
 }
 
+/**
+ * The widest company name a group header shows. The header keeps its badge
+ * whole and clips the title instead, so a long name is clipped here first.
+ */
+const COMPANY_BADGE_COLUMNS = 24;
+
 /**
  * Derives tone and badge for a category item based on marketplace identity.
  */
@@ -244,7 +251,13 @@ function categoryStyling(
 	// MadAppGang, and being this machine's company marketplace is the stronger
 	// fact.
 	if (mp.company) {
-		return { tone: "info", badge: "◆ Company" };
+		const company = companyName(mp);
+		return {
+			tone: "info",
+			badge: company
+				? `by ${truncate(company, COMPANY_BADGE_COLUMNS)}`
+				: "◆ Company",
+		};
 	}
 	if (isMadAppGang(mp)) {
 		return { tone: "byline", badge: "by MadAppGang" };
@@ -262,6 +275,17 @@ function isMadAppGang(mp: Marketplace): boolean {
 	return (mp.source.repo ?? "").toLowerCase().startsWith("madappgang/");
 }
 
+/**
+ * The name a company marketplace is shown by: the manifest's `owner.name`,
+ * else the GitHub owner of its repository.
+ */
+export function companyName(mp: Marketplace): string | undefined {
+	if (mp.ownerName) return mp.ownerName;
+	const repo = mp.source.repo ?? "";
+	const slash = repo.indexOf("/");
+	return slash > 0 ? repo.slice(0, slash) : undefined;
+}
+
 // ─── "It failed, and here is why" ────────────────────────────────────────────
 
 /** A version token — `v2.0.3`, `8.1.3`, `1.0.0-beta.2`. */

package/src/ui/components/primitives/ListCategoryRow.tsx

@@ -1,4 +1,5 @@
 import React from "react";
+import { displayWidth, truncate } from "../../text-width.js";
 import { type BadgeTone, theme } from "../../theme.js";
 import { SelectableRow, rowLead } from "./SelectableRow.js";
 
@@ -17,6 +18,12 @@ interface ListCategoryRowProps {
 	 * that is broken rather than as a section title.
 	 */
 	expandable?: boolean;
+	/**
+	 * Columns the row may use. When given, the title and count are cut with
+	 * "…" to fit one line (the badge goes first), so a narrow panel never
+	 * wraps the heading onto a second row.
+	 */
+	width?: number;
 }
 
 export function ListCategoryRow({
@@ -27,10 +34,21 @@ export function ListCategoryRow({
 	tone = "neutral",
 	selected,
 	expandable = true,
+	width,
 }: ListCategoryRowProps) {
 	const colors = theme.badge[tone];
 	const marker = expandable ? (expanded ? "▼ " : "▶ ") : "";
-	const label = `${marker}${title}${count !== undefined ? ` (${count})` : ""}`;
+	const full = `${marker}${title}${count !== undefined ? ` (${count})` : ""}`;
+	// The lead cell and the trailing space inside the chip take two columns.
+	const label =
+		width === undefined ? full : truncate(full, Math.max(1, width - 2));
+	const shownBadge =
+		width === undefined ||
+		(badge !== undefined &&
+			label === full &&
+			displayWidth(full) + 3 + displayWidth(badge) <= width)
+			? badge
+			: undefined;
 
 	// Both forms start with the row's lead cell — a blank inside the chip, the
 	// selection mark on the cursor — so the title never moves as it is selected.
@@ -50,7 +68,9 @@ export function ListCategoryRow({
 					{label}{" "}
 				</strong>
 			)}
-			{!selected && badge ? <span fg={colors.badgeFg}> {badge}</span> : null}
+			{!selected && shownBadge ? (
+				<span fg={colors.badgeFg}> {shownBadge}</span>
+			) : null}
 		</SelectableRow>
 	);
 }

package/src/ui/market/MarketplaceScreen.tsx

@@ -1,6 +1,7 @@
-import type React from "react";
+import React from "react";
 import {
 	type MarketplaceItem,
+	fitRow,
 	freshnessWords,
 	marketplaceItems,
 	plural,
@@ -40,12 +41,36 @@ const SKILL_INDENT = 6;
 /** Cells a plugin row starts in. */
 const PLUGIN_INDENT = 2;
 
-function renderRow(
+/** Columns the scope squares and the ▶ marker take before a plugin's name. */
+const PLUGIN_PREFIX = 6;
+
+/**
+ * One row of screen 2 in `width` columns, never wrapped: the name always
+ * shows; the version, the skill count and the marks are cut from the end.
+ */
+export function renderMarketplaceRow(
 	item: MarketplaceItem,
-	_index: number,
 	selected: boolean,
+	width: number,
 ): React.ReactNode {
 	if (item.kind === "plugin") {
+		const fit = fitRow(
+			Math.max(1, width - PLUGIN_INDENT),
+			item.name,
+			PLUGIN_PREFIX,
+			[
+				{ text: item.version, tone: "muted" as const },
+				{ text: plural(item.skills.length, "skill"), tone: "muted" as const },
+				...(item.edited.length > 0
+					? [
+							{
+								text: `● ${plural(item.edited.length, "skill")} edited here`,
+								tone: "warning" as const,
+							},
+						]
+					: []),
+			],
+		);
 		return (
 			<SelectableRow selected={selected} indent={PLUGIN_INDENT}>
 				<ScopeSquares
@@ -55,31 +80,32 @@ function renderRow(
 					selected={selected}
 				/>
 				{item.expanded ? " ▼ " : " ▶ "}
-				<strong>{item.name}</strong>
-				{"  "}
-				<MetaText text={item.version} selected={selected} />
-				{"  "}
-				<MetaText
-					text={plural(item.skills.length, "skill")}
-					selected={selected}
-				/>
+				<strong>{fit.name}</strong>
+				{fit.secondary.map((p) => (
+					<React.Fragment key={p.text}>
+						{"  "}
+						<MetaText text={p.text} tone={p.tone} selected={selected} />
+					</React.Fragment>
+				))}
 			</SelectableRow>
 		);
 	}
 	const mark = skillMark(item.local);
+	const fit = fitRow(
+		Math.max(1, width - SKILL_INDENT),
+		item.skill,
+		0,
+		mark ? [{ text: `${mark.glyph} ${mark.words}`, tone: mark.tone }] : [],
+	);
 	return (
 		<SelectableRow selected={selected} indent={SKILL_INDENT}>
-			{item.skill}
-			{mark ? (
-				<>
+			{fit.name}
+			{fit.secondary.map((p) => (
+				<React.Fragment key={p.text}>
 					{"  "}
-					<MetaText
-						text={`${mark.glyph} ${mark.words}`}
-						tone={mark.tone}
-						selected={selected}
-					/>
-				</>
-			) : null}
+					<MetaText text={p.text} tone={p.tone} selected={selected} />
+				</React.Fragment>
+			))}
 		</SelectableRow>
 	);
 }
@@ -125,6 +151,8 @@ export function MarketplaceScreen({
 		publish: () => {
 			if (item?.kind === "skill" && item.local) {
 				void market.publish(item.skill, item.ref, name, item.local);
+			} else if (item?.kind === "plugin") {
+				void market.publishPlugin(item.ref, name);
 			}
 		},
 		add: () => {
@@ -167,7 +195,7 @@ export function MarketplaceScreen({
 
 	return (
 		<ScreenLayout
-			title={`magus market › ${name}`}
+			title={`magus edit › ${name}`}
 			subtitle={
 				market.data.status === "loading"
 					? "reading…"
@@ -186,7 +214,7 @@ export function MarketplaceScreen({
 				bindings: [...MARKETPLACE_KEYS, ...MARKETPLACE_APP_KEYS],
 				pinned: [MARKET_HELP],
 			}}
-			listPanel={
+			listPanel={(width: number) =>
 				failed ? (
 					<ErrorNotice
 						title={`Could not read ${name}.`}
@@ -200,6 +228,7 @@ export function MarketplaceScreen({
 							count={entry?.plugins.length ?? 0}
 							selected={false}
 							expandable={false}
+							width={width}
 						/>
 						{items.length === 0 && market.data.status !== "loading" ? (
 							<ToneLine tone="muted">
@@ -211,7 +240,9 @@ export function MarketplaceScreen({
 							<ScrollableList
 								items={items}
 								selectedIndex={index}
-								renderItem={renderRow}
+								renderItem={(it, _i, selected) =>
+									renderMarketplaceRow(it, selected, width)
+								}
 								maxHeight={Math.max(
 									1,
 									dimensions.listPanelHeight - HEADING_ROWS,

package/src/ui/market/MarketplacesDetail.snowflake.tsx

@@ -1,7 +1,9 @@
+import { displayPath } from "../../utils/display-path.js";
 import {
 	type MarketplacesItem,
 	freshnessTone,
 	freshnessWords,
+	localKindWords,
 	plural,
 } from "../adapters/marketAdapter.js";
 import {
@@ -22,12 +24,53 @@ import {
  */
 export function MarketplacesDetail({
 	item,
+	canAdd,
+	cwd,
 	note,
 }: {
 	item: MarketplacesItem | undefined;
+	/** Whether there is a company marketplace to add a local row to. */
+	canAdd: boolean;
+	/** The project, against which a local folder is shown. */
+	cwd: string;
 	note: string | undefined;
 }) {
-	if (!item) return null;
+	if (!item || item.kind === "local-heading") return null;
+	if (item.kind === "local") {
+		const local = item.item;
+		return (
+			<DetailSection title={local.name}>
+				<KeyValueLine label="kind" value={localKindWords(local)} />
+				<KeyValueLine
+					label="scope"
+					value={
+						<ScopeBadge scope={local.scope === "user" ? "USER" : "PROJECT"} />
+					}
+				/>
+				<KeyValueLine
+					label="folder"
+					value={<MetaText text={displayPath(local.path, cwd)} />}
+				/>
+				<ToneLine>
+					{local.kind === "plugin"
+						? "A plugin folder of your own, in no company marketplace."
+						: "A skill of your own, in no company plugin."}
+				</ToneLine>
+				{canAdd ? (
+					<ToneLine tone="muted">
+						{local.kind === "plugin"
+							? "a adds it to a company marketplace as a new plugin; the folder stays."
+							: "a adds it to a plugin of a company marketplace, or to a new one."}
+					</ToneLine>
+				) : (
+					<ToneLine tone="muted">
+						To add it, first create a company marketplace (c) or connect one
+						(o).
+					</ToneLine>
+				)}
+			</DetailSection>
+		);
+	}
 	if (item.kind === "create") {
 		return (
 			<DetailSection title="Create a company marketplace">
@@ -36,8 +79,8 @@ export function MarketplacesDetail({
 					to this machine at USER scope.
 				</ToneLine>
 				<ToneLine tone="muted">
-					Enter or c asks for the owner, the name and who can see it, then shows
-					what it will do.
+					Enter or c asks for the owner, the company name magus shows it by, the
+					repository name and who can see it, then shows what it will do.
 				</ToneLine>
 			</DetailSection>
 		);
@@ -55,10 +98,13 @@ export function MarketplacesDetail({
 			</DetailSection>
 		);
 	}
-	const { entry } = item;
+	const { entry, toPush } = item;
 	return (
 		<box flexDirection="column">
 			<DetailSection title={entry.name}>
+				{entry.company ? (
+					<KeyValueLine label="company" value={entry.company} />
+				) : null}
 				<KeyValueLine
 					label="repository"
 					value={<MetaText text={entry.repo} tone="info" />}
@@ -83,6 +129,16 @@ export function MarketplacesDetail({
 					</ToneLine>
 				) : null}
 			</DetailSection>
+			{toPush.length > 0 ? (
+				<DetailSection title="To push">
+					<ToneLine tone="warning">
+						● {toPush.join(", ")} — skills edited here
+					</ToneLine>
+					<ToneLine tone="muted">
+						Enter opens the marketplace; p on a plugin pushes a new version.
+					</ToneLine>
+				</DetailSection>
+			) : null}
 			{entry.plugins.length > 0 ? (
 				<DetailSection title="Plugins">
 					{entry.plugins.map((p) => (