@dsh-workbench/core 1.1.2 → 1.1.4

package/dist/host/index.js

@@ -388,6 +388,99 @@ function boardSituation(probe, workshop) {
 	if (probe.where !== "" && !insideWorkshop(workshop, probe.where)) return "off-workspace";
 	return "panel-closed";
 }
+//#endregion
+//#region ../shared/dist/lib/git-address.js
+var SCP = /^(?:([A-Za-z0-9._-]+)@)?([A-Za-z0-9.-]+):(?!\/)(\S+)$/;
+function bare(url) {
+	return url.trim().replace(/^git\+/, "");
+}
+function pathOf(pathname) {
+	return pathname.replace(/^\/+/, "").replace(/\/+$/, "");
+}
+/**
+* 把一个 git 地址拆成「哪台主机 + 哪个路径」，不管发布者当初用的是 https、ssh 还是
+* scp 那种 `git@host:path` 写法；认不出来给 undefined。
+*/
+function gitAddressOf(url) {
+	const text = bare(url);
+	if (text === "") return void 0;
+	if (text.includes("://")) {
+		let parsed;
+		try {
+			parsed = new URL(text);
+		} catch {
+			return;
+		}
+		if (parsed.protocol !== "https:" && parsed.protocol !== "http:" && parsed.protocol !== "ssh:") return;
+		const path = pathOf(parsed.pathname);
+		if (path === "") return void 0;
+		const port = parsed.port === "" ? void 0 : Number(parsed.port);
+		const shared = {
+			host: parsed.hostname,
+			path,
+			...port === void 0 ? {} : { port }
+		};
+		if (parsed.protocol !== "ssh:") return {
+			kind: "https",
+			...shared
+		};
+		return {
+			kind: "ssh",
+			...shared,
+			...parsed.username === "" ? {} : { user: parsed.username }
+		};
+	}
+	const scp = SCP.exec(text);
+	if (scp === null) return void 0;
+	const path = pathOf(scp[3] ?? "");
+	if (path === "") return void 0;
+	return {
+		kind: "ssh",
+		host: scp[2] ?? "",
+		path,
+		...scp[1] === void 0 ? {} : { user: scp[1] }
+	};
+}
+/** 一份地址的规范写法：ssh 一律成 `ssh://user@host/path`（pnpm 认这个），https 原样。 */
+function gitAddressText(address) {
+	const port = address.port === void 0 ? "" : `:${String(address.port)}`;
+	if (address.kind === "ssh") return `ssh://${address.user === void 0 || address.user === "" ? "git" : address.user}@${address.host}${port}/${address.path}`;
+	return `https://${address.host}${port}/${address.path}`;
+}
+/**
+* 同一个仓库的两种读法，发布者用的那种排前面。ssh 那条一律规范成 `ssh://` 形式，
+* 因为 `git@host:path` 拼进安装 spec 时 pnpm 不认；https 那条保留发布者的原样（含 http）。
+*/
+function gitTransportCandidates(url) {
+	const address = gitAddressOf(url);
+	if (address === void 0) {
+		const only = bare(url);
+		return only === "" ? [] : [{
+			kind: only.startsWith("ssh") ? "ssh" : "https",
+			url: only
+		}];
+	}
+	const primary = {
+		kind: address.kind,
+		url: address.kind === "ssh" ? gitAddressText(address) : bare(url)
+	};
+	const other = address.kind === "https" ? {
+		kind: "ssh",
+		url: gitAddressText({
+			kind: "ssh",
+			host: address.host,
+			path: address.path
+		})
+	} : {
+		kind: "https",
+		url: gitAddressText({
+			kind: "https",
+			host: address.host,
+			path: address.path
+		})
+	};
+	return other.url === primary.url ? [primary] : [primary, other];
+}
 /**
 * 外壳愿意认的协议版本；不在表里的模块当场被拒，不猜语义。
 */
@@ -4545,6 +4638,8 @@ function checkVersionRange(contract, version) {
 }
 var MARKET_DISCOVER_ROUTE = "panels/market-discover";
 var MARKET_DOC_ROUTE = "panels/market-doc";
+var MARKET_GIT_PROBE_ROUTE = "panels/git-probe";
+var MARKET_INSTALLED_ROUTE = "panels/market-installed";
 var MARKET_PUBLISH_PREVIEW_ROUTE = "panels/market-publish-preview";
 var MARKET_SOURCES_RESOURCE = "market-sources";
 var MARKET_SOURCES_ROUTE = "panels/market-sources";
@@ -5533,6 +5628,92 @@ function bundleInspectHandler(ctx) {
 	};
 }
 //#endregion
+//#region src/shared/api/host/git-exec.ts
+var NO_PROMPT_ENV = [
+	"GIT_TERMINAL_PROMPT=0",
+	"GIT_ASKPASS=/usr/bin/false",
+	"SSH_ASKPASS=/usr/bin/false",
+	"SSH_ASKPASS_REQUIRE=never",
+	"GCM_INTERACTIVE=never",
+	"GIT_SSH_COMMAND=ssh -o BatchMode=yes -o StrictHostKeyChecking=accept-new"
+];
+function gitNoPromptPrefix() {
+	return [quoteShellArg("env"), ...NO_PROMPT_ENV.map((one) => quoteShellArg(one))].join(" ");
+}
+function withoutAskpassNoise(text) {
+	return text.split("\n").filter((line) => !/unable to read askpass response/i.test(line)).join("\n").trim();
+}
+//#endregion
+//#region src/shared/api/host/git-probe.ts
+var PROBE_TIMEOUT_MS = 1e4;
+var AUTH_TEXT = /authentication failed|could not read (username|password)|permission denied|terminal prompts disabled|host key verification failed|repository not found|no such identity|access denied|unauthorized|forbidden/;
+function classifyGitProbe(stderr, timedOut) {
+	if (timedOut) return "unreachable";
+	return AUTH_TEXT.test(stderr.toLowerCase()) ? "auth" : "unreachable";
+}
+async function probeGitAddress(shell, url, options = {}) {
+	const line = [
+		gitNoPromptPrefix(),
+		quoteShellArg("git"),
+		quoteShellArg("ls-remote"),
+		quoteShellArg(url),
+		quoteShellArg("HEAD")
+	].join(" ");
+	let result;
+	try {
+		result = await runShell(shell, line, { timeoutMs: options.timeoutMs ?? PROBE_TIMEOUT_MS });
+	} catch (error) {
+		return {
+			status: "unreachable",
+			detail: error instanceof Error ? error.message : String(error)
+		};
+	}
+	if (result.exitCode === 0) return { status: "ok" };
+	const detail = tailLines(withoutAskpassNoise(result.stderr || result.stdout), 3);
+	return {
+		status: classifyGitProbe(`${result.stderr}\n${result.stdout}`, result.timedOut),
+		...detail === "" ? {} : { detail }
+	};
+}
+var PROBE_CACHE_MS = 6e4;
+var probeCache = /* @__PURE__ */ new Map();
+async function probeGitAddressCached(shell, url, options = {}) {
+	const hit = probeCache.get(url);
+	if (hit !== void 0 && Date.now() - hit.at < PROBE_CACHE_MS) return hit.payload;
+	const payload = await probeGitAddress(shell, url, options);
+	probeCache.set(url, {
+		at: Date.now(),
+		payload
+	});
+	return payload;
+}
+//#endregion
+//#region src/shared/api/host/git-routes.ts
+function gitProbeHandler(ctx) {
+	return async (search) => {
+		const url = param(search, "url");
+		if (url === void 0) return {
+			ok: false,
+			error: {
+				code: "workbench/no-url",
+				message: "要探哪个地址？缺 url。"
+			}
+		};
+		const shell = ctx.get("shell");
+		if (shell === void 0) return {
+			ok: false,
+			error: {
+				code: "workbench/no-shell",
+				message: "这台机器上没有执行缝，探不了 git 地址"
+			}
+		};
+		return {
+			ok: true,
+			...await probeGitAddress(shell, url)
+		};
+	};
+}
+//#endregion
 //#region src/shared/api/host/host-routes.ts
 function createHostRoutes(input) {
 	const { ctx, facts, opencli, running, profile } = input;
@@ -5542,6 +5723,7 @@ function createHostRoutes(input) {
 		[DSH_PLUGINS_ROUTE]: profile.dshPlugins(ctx),
 		[BUNDLE_REGISTRIES_ROUTE]: bundleRegistriesHandler(ctx),
 		[BUNDLE_INSPECT_ROUTE]: bundleInspectHandler(ctx),
+		[MARKET_GIT_PROBE_ROUTE]: gitProbeHandler(ctx),
 		[MODULE_VERSIONS_ROUTE]: moduleVersionsHandler(ctx, ctx.get("shell"), running, () => profile.selfUpdateView(dshHome(), basename(profile.dirOf(ctx) ?? "")))
 	};
 }
@@ -11673,10 +11855,22 @@ function pluginNameOf(entry) {
 }
 //#endregion
 //#region src/modules/panels/model/market-route.ts
+function packageNameInPath(path) {
+	const parts = path.split("/").filter((part) => part !== "");
+	const last = parts[parts.length - 1];
+	if (last === void 0 || last === "") return void 0;
+	const parent = parts[parts.length - 2];
+	return parent !== void 0 && parent.startsWith("@") ? `${parent}/${last}` : last;
+}
 function bundleNameOf(change, spec) {
 	if (change.bundle !== void 0 && change.bundle !== "") return change.bundle;
-	const at = spec.lastIndexOf("@");
-	return at > 0 ? spec.slice(0, at) : spec;
+	const at = spec.indexOf("&path:");
+	if (at !== -1) {
+		const inPath = packageNameInPath(spec.slice(at + 6));
+		if (inPath !== void 0) return inPath;
+	}
+	const version = spec.lastIndexOf("@");
+	return version > 0 ? spec.slice(0, version) : spec;
 }
 function installedPluginName(spec, pkg) {
 	const local = localDirOf(spec);
@@ -12918,6 +13112,85 @@ function marketDiscoverRoutes(discover) {
 	};
 }
 //#endregion
+//#region src/modules/panels/model/market-installed.ts
+async function transportOf(source, spec, probe, preferred) {
+	if (source.type !== "git" || probe === void 0) return source;
+	const candidates = gitTransportCandidates(source.url);
+	if (candidates.length === 0) return source;
+	const installed = spec === void 0 ? void 0 : gitAddressOf(spec);
+	const first = preferred ?? installed?.kind;
+	const ordered = first === void 0 ? candidates : [...candidates].sort((left, right) => Number(right.kind === first) - Number(left.kind === first));
+	for (const candidate of ordered) if (await probe(candidate.url).catch(() => "unreachable") === "ok") return {
+		...source,
+		url: candidate.url
+	};
+	return {
+		...source,
+		url: ordered[0]?.url ?? source.url
+	};
+}
+async function installedFromIndexes(input) {
+	const modules = new Map(input.modules.map((module) => [module.pkg, module]));
+	const rows = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const source of input.sources) {
+		const index = input.cached(source);
+		if (index === void 0) continue;
+		for (const entry of index.plugins) {
+			const module = modules.get(entry.name);
+			const newest = entry.versions[0];
+			if (module === void 0 || newest === void 0 || seen.has(entry.name)) continue;
+			if (!input.isNewer(newest.version, module.version)) continue;
+			seen.add(entry.name);
+			rows.push({
+				pkg: entry.name,
+				unit: module.unit,
+				version: newest.version,
+				sourceId: source.id,
+				sourceLabel: source.label,
+				source: newest.source
+			});
+			const wanted = input.dependencyOf(entry.name);
+			const host = gitAddressOf(source.url)?.host;
+			const resolved = await transportOf(newest.source, wanted, input.probe, host === void 0 ? void 0 : input.preferred?.(host));
+			rows[rows.length - 1] = {
+				...rows[rows.length - 1],
+				source: resolved
+			};
+		}
+	}
+	return rows;
+}
+function marketInstalledRoutes(read) {
+	return { [MARKET_INSTALLED_ROUTE]: async () => ({
+		ok: true,
+		...await read()
+	}) };
+}
+function transportOfSpec(spec) {
+	const address = gitAddressOf(spec);
+	return address === void 0 ? void 0 : {
+		host: address.host,
+		kind: address.kind
+	};
+}
+//#endregion
+//#region src/shared/api/host/profile-dependencies.ts
+function dependencyReader(profileDir) {
+	if (profileDir === null) return () => void 0;
+	let dependencies;
+	return (pkg) => {
+		if (dependencies === void 0) try {
+			const raw = JSON.parse(readFileSync(join(profileDir, "package.json"), "utf8")).dependencies;
+			dependencies = typeof raw === "object" && raw !== null ? raw : {};
+		} catch {
+			dependencies = {};
+		}
+		const value = dependencies[pkg];
+		return typeof value === "string" ? value : void 0;
+	};
+}
+//#endregion
 //#region src/modules/panels/model/market-sources-act.ts
 function marketSourcesRoutes(store) {
 	return { [MARKET_SOURCES_ROUTE]: async () => ({
@@ -13075,7 +13348,6 @@ function publishPreviewRoutes(workshop, inferredAuthorOf = async () => void 0) {
 var DEFAULT_TTL_MS = 3e5;
 var DEFAULT_TIMEOUT_MS$2 = 3e4;
 var DEFAULT_MAX_BYTES$1 = 4194304;
-var GIT_NO_PROMPT = `${quoteShellArg("env")} GIT_TERMINAL_PROMPT=0`;
 function messageOf$1(error) {
 	return error instanceof Error ? error.message : String(error);
 }
@@ -13137,7 +13409,7 @@ function gitProblemOf(source) {
 	};
 }
 function tail(text) {
-	return text.trim().split("\n").filter((line) => line !== "").slice(-3).join(" ");
+	return withoutAskpassNoise(text).split("\n").filter((line) => line !== "").slice(-3).join(" ");
 }
 function classifyGitError(stderr, timedOut) {
 	if (timedOut) return {
@@ -13241,7 +13513,7 @@ function createMarketIndexReader(options) {
 			}
 		};
 		try {
-			const result = await runShell(shell, `${GIT_NO_PROMPT} ${line}`, { timeoutMs });
+			const result = await runShell(shell, `${gitNoPromptPrefix()} ${line}`, { timeoutMs });
 			if (result.exitCode !== 0) return {
 				ok: false,
 				problem: classifyGitError(result.stderr, result.timedOut),
@@ -13506,6 +13778,15 @@ function createMarketDocReader(options) {
 function fileOf(root) {
 	return join(root, "market-index", "sources.json");
 }
+function transportsOf(raw) {
+	const record = typeof raw === "object" && raw !== null ? raw : {};
+	const found = {};
+	for (const [host, kind] of Object.entries(record)) {
+		if (host === "" || kind !== "https" && kind !== "ssh") continue;
+		found[host] = kind;
+	}
+	return found;
+}
 function readPayload(path, logger) {
 	let raw;
 	try {
@@ -13513,7 +13794,8 @@ function readPayload(path, logger) {
 	} catch {
 		return {
 			sources: [],
-			selected: null
+			selected: null,
+			transports: {}
 		};
 	}
 	const record = typeof raw === "object" && raw !== null ? raw : {};
@@ -13530,7 +13812,8 @@ function readPayload(path, logger) {
 	const selectedRaw = record["selected"];
 	return {
 		sources,
-		selected: typeof selectedRaw === "string" && sources.some((source) => source.id === selectedRaw) ? selectedRaw : sources[0]?.id ?? null
+		selected: typeof selectedRaw === "string" && sources.some((source) => source.id === selectedRaw) ? selectedRaw : sources[0]?.id ?? null,
+		transports: transportsOf(record["transports"])
 	};
 }
 async function writePayload(path, payload) {
@@ -13549,6 +13832,18 @@ function createMarketSourcesStore(options) {
 	function read() {
 		return readPayload(path, options.logger);
 	}
+	async function rememberTransport(host, kind) {
+		if (host === "") return;
+		const current = read();
+		const transports = {
+			...current.transports ?? {},
+			[host]: kind
+		};
+		await writePayload(path, {
+			...current,
+			transports
+		});
+	}
 	async function apply(action) {
 		const current = read();
 		if (action.action === "save") {
@@ -13580,7 +13875,8 @@ function createMarketSourcesStore(options) {
 	}
 	return {
 		read,
-		apply
+		apply,
+		rememberTransport
 	};
 }
 //#endregion
@@ -15115,6 +15411,15 @@ var OWNED = [{
 				...diyRecordRoutes(record),
 				...marketDiscoverRoutes(discover),
 				...marketSourcesRoutes(marketSources),
+				...marketInstalledRoutes(async () => ({ modules: await installedFromIndexes({
+					sources: marketSources.read().sources,
+					cached: (source) => marketIndex.cached(source)?.index,
+					modules: supply.profileModules(profileDir),
+					dependencyOf: dependencyReader(profileDir),
+					isNewer: supply.isNewerVersion,
+					preferred: (host) => marketSources.read().transports?.[host],
+					...shell === void 0 ? {} : { probe: (url) => probeGitAddressCached(shell, url, { timeoutMs: 4e3 }).then((one) => one.status) }
+				}) })),
 				...publishPreviewRoutes(workshopPathOf(ctx), (unit) => inferredAuthorOf(workshopPathOf(ctx), unit, shell))
 			},
 			registerTools: () => [
@@ -15152,7 +15457,15 @@ var OWNED = [{
 				handle: (payload) => applyPanelsPref(panels, payload)
 			},
 			provision: {
-				handle: (request) => dispatchMarket(market, request),
+				handle: async (request) => {
+					const result = await dispatchMarket(market, request);
+					const application = result.change?.application;
+					if (request.spec !== void 0 && (application === "applied" || application === "restart-required" || application === "overridden")) {
+						const used = transportOfSpec(request.spec);
+						if (used !== void 0) await marketSources.rememberTransport(used.host, used.kind);
+					}
+					return result;
+				},
 				affectedUnits: (request) => affectedUnitsOf(manifests(), request)
 			}
 		};

package/dist/types/app/layouts/market/discover-confirm.d.ts

@@ -1,5 +1,5 @@
 import type { Translate } from '@dsh-workbench/shared';
-import type { DiscoverEntry, DiscoverVersionRow } from '../../../kernel/contract/market-index';
+import type { DiscoverEntry, DiscoverVersionRow, GitTransportKind } from '../../../kernel/contract/market-index';
 export interface DiscoverChoice {
     readonly entry: DiscoverEntry;
     readonly version: DiscoverVersionRow;
@@ -8,7 +8,8 @@ export interface DiscoverConfirmProps {
     readonly t: Translate;
     readonly locale: string;
     readonly choice: DiscoverChoice | null;
+    readonly transports: Readonly<Record<string, GitTransportKind>>;
     readonly onCancel: () => void;
-    readonly onConfirm: () => void;
+    readonly onConfirm: (url?: string) => void;
 }
-export declare function DiscoverConfirm({ t, locale, choice, onCancel, onConfirm }: DiscoverConfirmProps): JSX.Element | null;
+export declare function DiscoverConfirm({ t, locale, choice, transports, onCancel, onConfirm }: DiscoverConfirmProps): JSX.Element | null;

package/dist/types/app/layouts/market/discover-detail.d.ts

@@ -8,5 +8,6 @@ export interface DiscoverDetailProps {
     readonly onBack: () => void;
     readonly onInstall: (entry: DiscoverEntry, version: DiscoverVersionRow) => void;
     readonly onShowInstalled: (name: string) => void;
+    readonly installDisabled?: boolean;
 }
 export declare function DiscoverDetail(props: DiscoverDetailProps): JSX.Element;

package/dist/types/app/layouts/market/discover-installing.d.ts

@@ -0,0 +1,8 @@
+import type { Translate } from '@dsh-workbench/shared';
+export interface DiscoverInstallingProps {
+    readonly t: Translate;
+    readonly name: string;
+    readonly cancelling: boolean;
+    readonly onCancel: () => void;
+}
+export declare function DiscoverInstalling({ t, name, cancelling, onCancel }: DiscoverInstallingProps): JSX.Element;

package/dist/types/app/layouts/market/discover-rows.d.ts

@@ -7,6 +7,7 @@ export interface DiscoverRowsProps {
     readonly onOpen: (name: string) => void;
     readonly onInstall: (entry: DiscoverEntry, version: DiscoverVersionRow) => void;
     readonly onShowInstalled: (name: string) => void;
+    readonly installDisabled?: boolean;
 }
 export declare function canInstall(version: DiscoverVersionRow | undefined): boolean;
 export declare function sourceTextOf(t: Translate, version: DiscoverVersionRow): string;
@@ -14,11 +15,12 @@ export declare function MarketIcon({ src, size }: {
     readonly src?: string | undefined;
     readonly size?: number;
 }): JSX.Element;
-export declare function EntryAction({ t, entry, title, onInstall, onShowInstalled, }: {
+export declare function EntryAction({ t, entry, title, onInstall, onShowInstalled, installDisabled, }: {
     readonly t: Translate;
     readonly entry: DiscoverEntry;
     readonly title: string;
     readonly onInstall: (entry: DiscoverEntry, version: DiscoverVersionRow) => void;
     readonly onShowInstalled: (name: string) => void;
+    readonly installDisabled?: boolean;
 }): JSX.Element | null;
-export declare function DiscoverRows({ t, locale, entries, onOpen, onInstall, onShowInstalled }: DiscoverRowsProps): JSX.Element;
+export declare function DiscoverRows({ t, locale, entries, onOpen, onInstall, onShowInstalled, installDisabled }: DiscoverRowsProps): JSX.Element;

package/dist/types/app/layouts/market/discover-states.d.ts

@@ -23,3 +23,9 @@ export declare function DiscoverNoSource({ t, onAdd }: {
     readonly t: Translate;
     readonly onAdd: () => void;
 }): JSX.Element;
+export declare function DiscoverReadFailure({ t, text, auth, onRetry, }: {
+    readonly t: Translate;
+    readonly text: string;
+    readonly auth: boolean;
+    readonly onRetry: () => void;
+}): JSX.Element;

package/dist/types/app/layouts/market/discover-transport.d.ts

@@ -0,0 +1,7 @@
+import type { Translate } from '@dsh-workbench/shared';
+import type { GitTransportState } from './use-git-transport';
+export interface DiscoverTransportProps {
+    readonly t: Translate;
+    readonly transport: GitTransportState;
+}
+export declare function DiscoverTransport({ t, transport }: DiscoverTransportProps): JSX.Element;

package/dist/types/app/layouts/market/discover-versions.d.ts

@@ -5,5 +5,6 @@ export interface DiscoverVersionsProps {
     readonly locale: string;
     readonly entry: DiscoverEntry;
     readonly onInstall: (entry: DiscoverEntry, version: DiscoverVersionRow) => void;
+    readonly installDisabled?: boolean;
 }
-export declare function DiscoverVersions({ t, locale, entry, onInstall }: DiscoverVersionsProps): JSX.Element;
+export declare function DiscoverVersions({ t, locale, entry, onInstall, installDisabled }: DiscoverVersionsProps): JSX.Element;

package/dist/types/app/layouts/market/market-check.d.ts

@@ -0,0 +1,10 @@
+import type { Translate } from '@dsh-workbench/shared';
+export interface MarketCheckProps {
+    readonly t: Translate;
+    readonly checkedAt: number | null;
+    readonly checking: boolean;
+    readonly failed: boolean;
+    readonly disabled: boolean;
+    readonly onCheck: () => void;
+}
+export declare function MarketCheck({ t, checkedAt, checking, failed, disabled, onCheck }: MarketCheckProps): JSX.Element;

package/dist/types/app/layouts/market/market-header.d.ts

@@ -5,9 +5,7 @@ export interface MarketHeaderProps {
     readonly idPrefix: string;
     readonly tab: MarketTab;
     readonly busy: boolean;
-    readonly checking: boolean;
     readonly onTab: (tab: MarketTab) => void;
-    readonly onReload: () => void;
     readonly onAdd: () => void;
 }
-export declare function MarketHeader({ t, idPrefix, tab, busy, checking, onTab, onReload, onAdd }: MarketHeaderProps): JSX.Element;
+export declare function MarketHeader({ t, idPrefix, tab, busy, onTab, onAdd }: MarketHeaderProps): JSX.Element;

package/dist/types/app/layouts/market/use-discover.d.ts

@@ -1,5 +1,5 @@
 import type { Translate } from '@dsh-workbench/shared';
-import type { DiscoverEntry, DiscoverPayload, DiscoverVersionRow, MarketSourceConfig } from '../../../kernel/contract/market-index';
+import type { DiscoverEntry, DiscoverPayload, DiscoverVersionRow, GitTransportKind, MarketSourceConfig } from '../../../kernel/contract/market-index';
 import { type DiscoverSort } from './discover-view';
 interface InstallTarget {
     readonly entry: DiscoverEntry;
@@ -7,6 +7,8 @@ interface InstallTarget {
 }
 export type InstallVerdict = {
     readonly kind: 'done';
+} | {
+    readonly kind: 'cancelled';
 } | {
     readonly kind: 'failed';
     readonly text: string;
@@ -23,6 +25,7 @@ export interface DiscoverController {
     readonly failure: string | null;
     readonly sources: DiscoverPayload['sources'];
     readonly selected: string | null;
+    readonly transports: Readonly<Record<string, GitTransportKind>>;
     readonly entries: readonly DiscoverEntry[];
     readonly shown: readonly DiscoverEntry[];
     readonly total: number;
@@ -38,10 +41,14 @@ export interface DiscoverController {
     readonly writeFailed: string | null;
     readonly provisionFailed: string | null;
     readonly busy: boolean;
+    readonly installing: string | null;
+    readonly cancelling: boolean;
+    readonly installDisabled: boolean;
     readonly addingSource: boolean;
     readonly manageOpen: boolean;
     readonly problem: {
         readonly id: string;
+        readonly kind: string;
         readonly detail: string;
     } | null;
     readonly uninitialized: {
@@ -70,7 +77,8 @@ export interface DiscoverController {
     readonly addSource: (url: string) => void;
     readonly removeSourceById: (id: string) => void;
     readonly selectSource: (id: string) => void;
-    readonly install: () => void;
+    readonly install: (url?: string) => void;
+    readonly cancelInstall: () => void;
 }
 export declare function useDiscover(t: Translate, active: boolean, onInstalled: () => void): DiscoverController;
 export type { InstallTarget };

package/dist/types/app/layouts/market/use-git-transport.d.ts

@@ -0,0 +1,19 @@
+import type { GitProbeStatus, GitTransportKind, MarketIndexGitSource } from '../../../kernel/contract/market-index';
+export type TransportProbe = GitProbeStatus | 'checking' | 'unknown';
+export interface GitTransportRow {
+    readonly kind: 'https' | 'ssh';
+    readonly url: string;
+}
+export interface GitTransportState {
+    readonly rows: readonly GitTransportRow[];
+    readonly chosen: string | null;
+    readonly states: Readonly<Record<string, TransportProbe>>;
+    readonly custom: string;
+    readonly customState: TransportProbe | null;
+    readonly probing: boolean;
+    readonly ready: boolean;
+    setChosen(url: string): void;
+    setCustom(value: string): void;
+    checkCustom(): void;
+}
+export declare function useGitTransport(source: MarketIndexGitSource | null, preferredKind?: GitTransportKind | undefined): GitTransportState;

package/dist/types/app/layouts/market/use-module-versions.d.ts

@@ -1,4 +1,5 @@
 import type { ModuleVersion, WorkbenchSelfUpdate, WorkbenchVersion } from '../../../kernel/contract/bundle-install';
+import type { MarketInstalledModule } from '../../../kernel/contract/market-index';
 import type { InstalledPlugin } from '../../../shared/api/installed-plugins';
 export interface ModuleVersionsState {
     readonly modules: readonly ModuleVersion[] | null;
@@ -6,6 +7,8 @@ export interface ModuleVersionsState {
     readonly workbench: WorkbenchVersion | null;
     readonly selfUpdate: WorkbenchSelfUpdate | null;
     readonly read: boolean;
+    readonly checking: boolean;
+    readonly failed: boolean;
     readonly checkedAt: number | null;
 }
 export interface ModuleVersionsView extends ModuleVersionsState {
@@ -18,5 +21,6 @@ export declare function bumpModuleVersionsEpoch(): void;
 export declare function moduleVersionsValue(): ModuleVersionsState;
 export declare function resetModuleVersions(): void;
 export declare function subscribeModuleVersions(listener: () => void): () => void;
+export declare function withMarketUpdates(modules: readonly ModuleVersion[], rows: readonly MarketInstalledModule[]): readonly ModuleVersion[];
 export declare function runModuleVersionsRead(force?: boolean, fresh?: boolean): Promise<void>;
 export declare function useModuleVersions(): ModuleVersionsView;

package/dist/types/app/layouts/market/use-settling-modules.d.ts

@@ -0,0 +1 @@
+export declare function useSettlingModules(installedKey: string, rosterKey: string, activeKey: string): ReadonlySet<string>;

package/dist/types/app/layouts/rightbar/MarketView.d.ts

@@ -20,6 +20,8 @@ export interface MarketViewProps {
     }) => void;
     readonly onPending?: ((pending: boolean) => void) | undefined;
     readonly updates?: ModuleUpdateMap | undefined;
+    readonly updatesCheckedAt?: number | null | undefined;
+    readonly updatesFailed?: boolean | undefined;
     readonly installed?: readonly InstalledWorkbenchModule[] | undefined;
     readonly installedRead?: boolean | undefined;
     readonly workbench?: WorkbenchVersion | null | undefined;
@@ -30,4 +32,4 @@ export interface MarketViewProps {
     readonly defaults?: readonly string[] | undefined;
     readonly changed?: Readonly<Record<string, number>> | undefined;
 }
-export declare function MarketView({ t, titleOf, manifests, installable, capabilities, freshness, onChanged, onPending, updates, installed, installedRead, workbench, selfUpdate, plugins, settling, mock, defaults, changed, }: MarketViewProps): JSX.Element;
+export declare function MarketView({ t, titleOf, manifests, installable, capabilities, freshness, onChanged, onPending, updates, updatesCheckedAt, updatesFailed, installed, installedRead, workbench, selfUpdate, plugins, settling, mock, defaults, changed, }: MarketViewProps): JSX.Element;

package/dist/types/app/layouts/rightbar/market-freshness.d.ts

@@ -1,6 +1,7 @@
 import type { Translate } from '@dsh-workbench/shared';
 export declare const MARKET_STALE_MS = 600000;
 export declare function checkedAgoText(at: number, now: number, t: Translate): string;
+export declare function checkedAgo(at: number, t: Translate): string;
 export interface MarketFreshness {
     readonly loaded: boolean;
     readonly checking: boolean;