@nklisch/pi-enhanced 0.3.1 → 0.4.1

package/node_modules/@nklisch/pi-plugins/dist/pi/plugin-manager.d.ts

@@ -46,6 +46,8 @@ export declare class PluginManager implements Component, Focusable {
     private checking;
     private updatesChecked;
     private checkedMarketplaces;
+    private checkTotal;
+    private checkErrors;
     private checkingMarketplaces;
     private checkController;
     private checkPromise;
@@ -62,6 +64,10 @@ export declare class PluginManager implements Component, Focusable {
     private batchItemActive;
     private destroyed;
     private completed;
+    private bodyScroll;
+    private bodyFocusLine;
+    private bodyHeight;
+    private followFocus;
     constructor(options: PluginManagerOptions);
     get focused(): boolean;
     set focused(value: boolean);

package/node_modules/@nklisch/pi-plugins/dist/pi/plugin-manager.js

@@ -1,5 +1,7 @@
 import { Input, Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { DEFAULT_REFRESH_TIMEOUT_MS } from "../host.js";
+import { installedPluginVersion } from "../plugin-metadata.js";
+import { framePluginManager, padManagerLine } from "./plugin-manager-layout.js";
 import { filterPluginRows, pluginIdentity, pluginManagerKeyAction, pluginManagerMarketplaceRows, projectInstalledPluginDetail, prunePluginSelection, restorePluginCursor, } from "./plugin-manager-model.js";
 const TAB_ORDER = ["installed", "discover", "marketplaces", "issues"];
 const BATCH_ACTIONS = ["install", "update", "enable", "disable", "remove"];
@@ -27,10 +29,6 @@ function wrapText(text, width) {
 function catalogEntry(catalog, name) {
     return catalog?.plugins.find((item) => item.name === name);
 }
-function receiptVersion(plugin) {
-    const value = plugin?.receipt?.version;
-    return typeof value === "string" && value.length > 0 ? value : undefined;
-}
 function identityOf(plugin) {
     return pluginIdentity(plugin.name, plugin.marketplace);
 }
@@ -76,6 +74,8 @@ export class PluginManager {
     checking = false;
     updatesChecked = false;
     checkedMarketplaces = 0;
+    checkTotal = 0;
+    checkErrors = new Map();
     checkingMarketplaces = new Set();
     checkController;
     checkPromise;
@@ -92,6 +92,10 @@ export class PluginManager {
     batchItemActive = false;
     destroyed = false;
     completed = false;
+    bodyScroll = 0;
+    bodyFocusLine = 0;
+    bodyHeight = 20;
+    followFocus = true;
     constructor(options) {
         this.host = options.host;
         this.tui = options.tui;
@@ -115,35 +119,61 @@ export class PluginManager {
         this.dialogInput.focused = value && this.dialog?.kind === "input";
     }
     render(width) {
-        const renderWidth = Math.max(1, width);
-        const lines = [];
-        lines.push(this.renderTabs(renderWidth));
-        lines.push(this.theme.fg("border", "─".repeat(renderWidth)));
+        const renderWidth = Math.max(1, width < 4 ? width : width - 4);
+        // Reserve shell, tabs, help/status and Pi's own footer. Keep the selected
+        // row reachable rather than letting long catalogs push it off screen.
+        const terminalRows = this.tui.terminal?.rows ?? 40;
+        this.bodyHeight = Math.max(1, terminalRows - 9);
+        this.bodyFocusLine = 0;
+        let body;
         if (this.dialog !== undefined)
-            lines.push(...this.renderDialog(renderWidth));
+            body = this.renderDialog(renderWidth);
         else if (this.view === "detail")
-            lines.push(...this.renderDetail(renderWidth));
+            body = this.renderDetail(renderWidth);
         else if (this.view === "confirm")
-            lines.push(...this.renderConfirmation(renderWidth));
+            body = this.renderConfirmation(renderWidth);
         else if (this.view === "batch")
-            lines.push(...this.renderBatch(renderWidth));
+            body = this.renderBatch(renderWidth);
         else if (this.tab === "installed")
-            lines.push(...this.renderInstalled(renderWidth));
+            body = this.renderInstalled(renderWidth);
         else if (this.tab === "discover")
-            lines.push(...this.renderDiscover(renderWidth));
+            body = this.renderDiscover(renderWidth);
         else if (this.tab === "marketplaces")
-            lines.push(...this.renderMarketplaces(renderWidth));
+            body = this.renderMarketplaces(renderWidth);
         else
-            lines.push(...this.renderIssues(renderWidth));
-        lines.push("");
-        lines.push(this.renderFooter(renderWidth));
+            body = this.renderIssues(renderWidth);
+        if (this.searchFocused)
+            this.bodyFocusLine = 1;
+        if (this.followFocus) {
+            if (this.bodyFocusLine < this.bodyScroll)
+                this.bodyScroll = this.bodyFocusLine;
+            if (this.bodyFocusLine >= this.bodyScroll + this.bodyHeight)
+                this.bodyScroll = this.bodyFocusLine - this.bodyHeight + 1;
+        }
+        this.bodyScroll = Math.max(0, Math.min(this.bodyScroll, body.length - this.bodyHeight));
+        const hiddenBelow = Math.max(0, body.length - this.bodyScroll - this.bodyHeight);
+        const scrollHint = body.length > this.bodyHeight ? `↑ ${this.bodyScroll} above · ↓ ${hiddenBelow} below · PgUp/PgDn scroll` : "";
+        const lines = [
+            this.renderTabs(renderWidth),
+            this.theme.fg("borderMuted", "─".repeat(renderWidth)),
+            ...body.slice(this.bodyScroll, this.bodyScroll + this.bodyHeight),
+            this.theme.fg("muted", scrollHint),
+            this.renderFooter(renderWidth),
+        ];
         if (this.toast !== undefined)
-            lines.push(this.theme.fg("accent", truncateToWidth(` ${this.toast}`, renderWidth, "")));
-        return lines.map((line) => truncateToWidth(line, renderWidth, ""));
+            lines.push(this.theme.fg("accent", this.toast));
+        return framePluginManager(lines, width, this.theme);
     }
     handleInput(data) {
         if (this.destroyed)
             return;
+        if (!this.searchFocused && this.dialog?.kind !== "input" && (matchesKey(data, Key.pageUp) || matchesKey(data, Key.pageDown))) {
+            this.bodyScroll += (matchesKey(data, Key.pageUp) ? -1 : 1) * this.bodyHeight;
+            this.followFocus = false;
+            this.requestRender();
+            return;
+        }
+        this.followFocus = true;
         if (this.dialog !== undefined) {
             this.handleDialogInput(data);
             return;
@@ -203,6 +233,7 @@ export class PluginManager {
     }
     invalidate() {
         this.searchInput.invalidate();
+        this.dialogInput.invalidate();
     }
     dispose() {
         this.destroyed = true;
@@ -233,8 +264,10 @@ export class PluginManager {
             return tab === this.tab ? this.theme.bg("selectedBg", this.theme.fg("text", text)) : this.theme.fg("muted", text);
         }).join(" ");
         const status = this.statusText(width);
+        if (visibleWidth(rendered) > width)
+            return this.theme.fg("accent", truncateToWidth(`‹ ${labels[this.tab]} ›  ${TAB_ORDER.indexOf(this.tab) + 1}/4`, width, "…"));
         if (width < 80)
-            return truncateToWidth(rendered, width, "");
+            return rendered;
         const gap = Math.max(1, width - visibleWidth(rendered) - visibleWidth(status));
         return truncateToWidth(rendered + " ".repeat(gap) + status, width, "");
     }
@@ -242,11 +275,13 @@ export class PluginManager {
         if (width < 80)
             return "";
         if (this.checking)
-            return this.theme.fg("accent", `◌ Checking ${this.checkedMarketplaces}/${this.checkingMarketplaces.size} marketplaces · manager remains available`);
+            return this.theme.fg("accent", `◌ Checking ${this.checkedMarketplaces}/${this.checkTotal} marketplaces · manager remains available`);
         if (this.reloadNeeded)
             return this.theme.fg("warning", "● Reload needed");
+        if (this.checkErrors.size > 0)
+            return this.theme.fg("warning", `Local data · ${this.checkErrors.size} check${this.checkErrors.size === 1 ? "" : "s"} failed`);
         if (this.updatesChecked)
-            return this.theme.fg("muted", "Local data · updates checked just now");
+            return this.theme.fg("muted", "Local data · checked this session");
         return this.theme.fg("muted", "Local data · updates not checked");
     }
     renderInstalled(width) {
@@ -273,6 +308,8 @@ export class PluginManager {
         const lines = [this.heading("Manage marketplaces")];
         const rows = pluginManagerMarketplaceRows(this.marketplaces, this.checkOnOpen);
         for (const [index, row] of rows.entries()) {
+            if (this.marketplaceCursor === index)
+                this.bodyFocusLine = lines.length;
             if (row.kind === "marketplace") {
                 const marketplace = row.marketplace;
                 const status = this.marketplaceStatus(marketplace.name);
@@ -303,6 +340,8 @@ export class PluginManager {
             const issue = this.issues[index];
             const selected = index === this.cursor;
             const color = issue.severity === "error" ? "error" : "warning";
+            if (selected)
+                this.bodyFocusLine = lines.length;
             lines.push(this.renderCursorLine(selected, this.theme.fg(color, `${issue.severity === "error" ? "×" : "△"} ${issue.title}`)));
             lines.push(this.indent(this.theme.fg("muted", issue.message), width));
         }
@@ -321,8 +360,8 @@ export class PluginManager {
             this.theme.fg("accent", `${this.tab === "discover" ? "Discover" : "Installed"} / Plugin details`),
             this.heading(`${row.name} @ ${row.marketplace}`),
             this.fact("Version", row.availableVersion === undefined
-                ? receiptVersion(installed) ?? row.version ?? "not declared"
-                : `${receiptVersion(installed) ?? "unversioned"} → ${row.availableVersion}`),
+                ? installedPluginVersion(installed) ?? row.version ?? "unavailable"
+                : `${installedPluginVersion(installed) ?? "version unavailable"} → ${row.availableVersion}`),
             this.fact("Status", installed === undefined ? "not installed" : this.statusLabel(installed, entry)),
             this.fact("Source", entry?.source.kind === "local"
                 ? entry.source.path
@@ -348,7 +387,7 @@ export class PluginManager {
             lines.push("");
             const marker = installed.autoUpdate ? this.theme.fg("success", "[on]") : this.theme.fg("muted", "[off]");
             lines.push(`${marker} ${this.theme.bold("Update automatically on Pi startup")}`);
-            lines.push(this.indent(this.theme.fg("muted", "Enabling grants standing authorization to replace executable plugin content when its declared catalog version changes."), width));
+            lines.push(this.indent(this.theme.fg("muted", "Enabling grants standing authorization to replace executable plugin content when its declared release version changes."), width));
             lines.push("");
         }
         lines.push(this.theme.fg("accent", "Actions"));
@@ -356,6 +395,8 @@ export class PluginManager {
         for (let index = 0; index < actions.length; index++) {
             const action = actions[index];
             const text = action.label;
+            if (index === this.detailActionCursor)
+                this.bodyFocusLine = lines.length;
             lines.push(this.renderCursorLine(index === this.detailActionCursor, action.destructive ? this.theme.fg("error", text) : index === 0 ? this.theme.fg("accent", text) : this.theme.fg("text", text)));
         }
         return lines;
@@ -368,6 +409,7 @@ export class PluginManager {
             for (const line of wrapText(dialog.message, Math.max(8, width - 4)))
                 lines.push(this.indent(line, width));
             lines.push("");
+            this.bodyFocusLine = lines.length + this.dialogCursor;
             lines.push(this.renderCursorLine(this.dialogCursor === 0, dialog.destructive
                 ? this.theme.fg("error", dialog.actionLabel)
                 : this.theme.fg("accent", dialog.actionLabel)));
@@ -376,13 +418,13 @@ export class PluginManager {
         else {
             lines.push("");
             this.dialogInput.focused = this._focused;
-            const text = this.dialogInput.getValue().length === 0
-                ? this.theme.fg("muted", `› ${dialog.placeholder}`)
-                : `› ${this.dialogInput.render(Math.max(1, width - 4))[0] ?? ""}`;
-            lines.push(this.indent(this.theme.fg("border", "[") + text + this.theme.fg("border", "]"), width));
+            if (this.dialogInput.getValue().length === 0)
+                lines.push(this.indent(this.theme.fg("muted", dialog.placeholder), width));
+            this.bodyFocusLine = lines.length;
+            // Render the actual input even when empty so Pi can locate its IME cursor.
+            const input = this.dialogInput.render(Math.max(1, width - 4))[0] ?? "";
+            lines.push(this.indent(this.theme.fg("border", "[") + input + this.theme.fg("border", "]"), width));
         }
-        lines.push("");
-        lines.push(this.theme.fg("dim", dialog.kind === "input" ? "enter submit · esc cancel" : "↑↓ or y/n · enter run · esc cancel"));
         return lines.map((line) => truncateToWidth(line, width, ""));
     }
     handleDialogInput(data) {
@@ -474,8 +516,6 @@ export class PluginManager {
             this.heading(`${actionVerb(batch.action)} ${rows.length} plugin${rows.length === 1 ? "" : "s"}?`),
             this.theme.fg("text", `This batch affects ${rows.length} selected plugin${rows.length === 1 ? "" : "s"}.`),
         ];
-        for (const row of rows)
-            lines.push(this.indent(`• ${row.name} @ ${row.marketplace} · ${row.version ?? "unversioned"}`, width));
         lines.push("");
         if (executable) {
             lines.push(this.theme.bg("toolPendingBg", this.theme.fg("warning", " Executable content")));
@@ -490,8 +530,13 @@ export class PluginManager {
             lines.push(this.indent(this.theme.fg("muted", "Each item runs sequentially and Pi reloads once when the manager closes."), width));
         }
         lines.push("");
+        this.bodyFocusLine = lines.length + this.detailActionCursor;
         lines.push(this.renderCursorLine(this.detailActionCursor === 0, this.theme.fg("accent", `${actionVerb(batch.action)} ${rows.length} plugin${rows.length === 1 ? "" : "s"}`)));
         lines.push(this.renderCursorLine(this.detailActionCursor === 1, this.theme.fg("text", "Back to selection")));
+        // Keep the effect and confirmation controls ahead of potentially long lists.
+        lines.push("", this.heading("Selected plugins"));
+        for (const row of rows)
+            lines.push(this.indent(`• ${row.name} @ ${row.marketplace} · ${row.version ?? "version unavailable"}`, width));
         return lines;
     }
     renderBatch(width) {
@@ -511,6 +556,8 @@ export class PluginManager {
             const result = this.batchResults[index];
             const prefix = result === undefined ? this.theme.fg("dim", "○") : result.ok ? this.theme.fg("success", "✓") : this.theme.fg("error", "×");
             const note = result === undefined ? (this.batchRunning && index === this.batchResults.length ? "working…" : "waiting") : result.ok ? "complete" : result.error ?? "failed";
+            if (this.batchRunning && index === this.batchResults.length)
+                this.bodyFocusLine = lines.length;
             lines.push(this.indent(`${prefix} ${identity.plugin} @ ${identity.marketplace}  ${this.theme.fg("muted", note)}`, width));
         }
         if (!this.batchRunning) {
@@ -519,6 +566,7 @@ export class PluginManager {
             if (succeeded > 0)
                 lines.push(this.theme.fg("warning", "Reload will run once when this manager closes."));
             lines.push("");
+            this.bodyFocusLine = lines.length + this.detailActionCursor;
             lines.push(this.renderCursorLine(this.detailActionCursor === 0, this.theme.fg("accent", "View installed plugins")));
             lines.push(this.renderCursorLine(this.detailActionCursor === 1, this.theme.fg("text", "Close manager")));
         }
@@ -533,12 +581,14 @@ export class PluginManager {
         for (const [index, row] of rows.entries()) {
             const status = this.rowStatus(row);
             const selected = this.selected.has(row.id);
-            const main = `${selected ? "◉" : "○"} ${row.name} · ${row.marketplace} · ${row.version ?? "unversioned"}`;
+            const main = `${selected ? "◉" : "○"} ${row.name} · ${row.marketplace} · ${row.version ?? "version unavailable"}`;
             const suffix = row.installed && this.tab === "discover" ? ` · ${this.theme.fg("success", "installed")}` : status;
             const title = this.theme.fg("accent", main);
             const cursor = index === this.cursor ? this.theme.fg("accent", "›") : " ";
             const content = `${cursor} ${title}${suffix.length > 0 ? `  ${suffix}` : ""}`;
-            lines.push(this.theme.bg(index === this.cursor ? "selectedBg" : "toolPendingBg", truncateToWidth(content, width, "")));
+            if (index === this.cursor)
+                this.bodyFocusLine = lines.length + 2;
+            lines.push(this.theme.bg(index === this.cursor ? "selectedBg" : "toolPendingBg", padManagerLine(content, width)));
             lines.push(this.indent(this.theme.fg("muted", row.description ?? "No description declared."), width));
         }
         return lines;
@@ -554,7 +604,11 @@ export class PluginManager {
     }
     renderFooter(width) {
         let footer;
-        if (this.view === "detail" || this.view === "confirm")
+        if (this.dialog !== undefined)
+            footer = this.dialog.kind === "input" ? "enter submit · esc cancel" : "↑↓ or y/n · enter run · esc cancel";
+        else if (this.searchFocused)
+            footer = "Type to search · Enter or Esc return to list";
+        else if (this.view === "detail" || this.view === "confirm")
             footer = "↑↓ navigate · Enter run · Esc back";
         else if (this.view === "batch")
             footer = this.batchRunning ? "Esc stop after current · manager stays open" : "Enter view installed · Esc close";
@@ -562,7 +616,7 @@ export class PluginManager {
             footer = "Esc cancel checks · navigation remains available";
         else
             footer = "Ctrl+←/→ tabs · Ctrl+F search · ↑↓ navigate · Space select · a all · Enter details · r check · Esc close";
-        if (width < 80) {
+        if (width < 80 && this.dialog === undefined && !this.searchFocused) {
             const compact = this.checking ? "◌ checking · Esc cancel" : this.reloadNeeded ? "● reload needed" : "";
             footer = compact.length > 0 ? compact : footer;
         }
@@ -575,7 +629,7 @@ export class PluginManager {
         return `${this.theme.fg("muted", label.padEnd(10))} ${value}`;
     }
     indent(text, width) {
-        return truncateToWidth(`  ${text}`, width, "");
+        return truncateToWidth(`  ${text}`, width, "…");
     }
     renderCursorLine(cursor, text) {
         return `${cursor ? this.theme.fg("accent", "›") : " "} ${text}`;
@@ -784,7 +838,7 @@ export class PluginManager {
         }
         if (action === "toggle-auto" && installed !== undefined) {
             if (!installed.autoUpdate) {
-                const approved = await this.promptConfirm("Enable automatic plugin updates", "This grants standing authorization to replace executable hooks and MCP servers when Pi startup sees a declared catalog version change. Enable it?", { actionLabel: "Enable" });
+                const approved = await this.promptConfirm("Enable automatic plugin updates", "This grants standing authorization to replace executable hooks and MCP servers when Pi startup sees a declared release version change. Enable it?", { actionLabel: "Enable" });
                 if (!approved)
                     return;
             }
@@ -843,6 +897,8 @@ export class PluginManager {
         if (explicit === undefined)
             this.selected = new Set(identities.map(identityToString));
         this.batch = Object.freeze({ action, identities: Object.freeze(identities.map((identity) => Object.freeze({ ...identity }))) });
+        this.bodyScroll = 0;
+        this.followFocus = false;
         this.detailActionCursor = 0;
         this.view = "confirm";
         this.requestRender();
@@ -923,6 +979,8 @@ export class PluginManager {
         });
     }
     openDetail(id) {
+        this.bodyScroll = 0;
+        this.followFocus = false;
         this.detailId = id;
         this.detailActionCursor = 0;
         this.runtime = undefined;
@@ -937,6 +995,7 @@ export class PluginManager {
         this.done({ reloadNeeded: this.reloadNeeded });
     }
     setTab(tab) {
+        this.bodyScroll = 0;
         this.tab = tab;
         this.view = "list";
         this.detailId = undefined;
@@ -1050,13 +1109,13 @@ export class PluginManager {
     installedRows() {
         return this.installed.map((plugin) => {
             const entry = catalogEntry(this.catalogs.get(plugin.marketplace), plugin.name);
-            const installedVersion = receiptVersion(plugin);
+            const installedVersion = installedPluginVersion(plugin);
             const availableVersion = entry?.version !== undefined && entry.version !== installedVersion ? entry.version : undefined;
             return {
                 id: identityOf(plugin),
                 name: plugin.name,
                 marketplace: plugin.marketplace,
-                description: typeof entry?.description === "string" ? entry.description : undefined,
+                description: plugin.description ?? (typeof plugin.receipt?.description === "string" ? plugin.receipt.description : entry?.description),
                 version: installedVersion,
                 availableVersion,
                 installed: true,
@@ -1080,7 +1139,7 @@ export class PluginManager {
                     marketplace: marketplace.name,
                     description: entry.description,
                     version: entry.version,
-                    availableVersion: installed !== undefined && entry.version !== receiptVersion(installed) ? entry.version : undefined,
+                    availableVersion: installed !== undefined && entry.version !== installedPluginVersion(installed) ? entry.version : undefined,
                     installed: installed !== undefined,
                     enabled: installed?.enabled,
                     autoUpdate: installed?.autoUpdate,
@@ -1102,7 +1161,7 @@ export class PluginManager {
     statusLabel(installed, entry) {
         if (!installed.enabled)
             return "disabled";
-        if (entry?.version !== undefined && entry.version !== receiptVersion(installed))
+        if (entry?.version !== undefined && entry.version !== installedPluginVersion(installed))
             return "update available";
         return "enabled";
     }
@@ -1123,6 +1182,8 @@ export class PluginManager {
     marketplaceStatus(name) {
         if (this.checkingMarketplaces.has(name))
             return this.theme.fg("accent", "checking…");
+        if (this.checkErrors.has(name))
+            return this.theme.fg("warning", "check failed · cached catalog");
         const catalog = this.catalogs.get(name);
         return catalog === undefined ? this.theme.fg("warning", "catalog unavailable") : this.theme.fg("muted", "local checkout ready");
     }
@@ -1166,6 +1227,8 @@ export class PluginManager {
         this.checkController = controller;
         this.checking = true;
         this.checkedMarketplaces = 0;
+        this.checkTotal = new Set(names).size;
+        this.updatesChecked = false;
         this.checkingMarketplaces = new Set(names);
         this.localEpoch++;
         this.requestRender();
@@ -1173,6 +1236,11 @@ export class PluginManager {
             if (this.destroyed || run !== this.checkRun)
                 return;
             this.checkedMarketplaces++;
+            this.checkingMarketplaces.delete(result.marketplace);
+            if (result.ok)
+                this.checkErrors.delete(result.marketplace);
+            else
+                this.checkErrors.set(result.marketplace, result.error ?? "marketplace check failed");
             if (result.ok && result.catalog !== undefined) {
                 const cursorId = this.currentCursorId();
                 this.catalogs.set(result.marketplace, result.catalog);
@@ -1197,8 +1265,11 @@ export class PluginManager {
                 return results;
             }
             catch (error) {
-                if (!this.destroyed && run === this.checkRun)
+                if (!this.destroyed && run === this.checkRun) {
+                    for (const name of this.checkingMarketplaces)
+                        this.checkErrors.set(name, errorMessage(error));
                     this.showToast(`Marketplace check failed: ${errorMessage(error)}`, "warning");
+                }
                 return [];
             }
             finally {
@@ -1242,6 +1313,10 @@ export class PluginManager {
             if (!marketplaceNames.has(name))
                 this.catalogs.delete(name);
         }
+        for (const name of this.checkErrors.keys()) {
+            if (!marketplaceNames.has(name))
+                this.checkErrors.delete(name);
+        }
         this.restoreCursor(cursorId);
         this.requestRender();
         this.maybeStartOpenCheck();
@@ -1306,7 +1381,12 @@ export class PluginManager {
                 });
             }
         }
+        // Runtime diagnostics also aggregate each plugin's diagnostics. Display
+        // each once with its plugin identity, rather than duplicating the warning.
+        const pluginDiagnostics = new Set(runtime.plugins.flatMap((plugin) => plugin.diagnostics));
         for (const diagnostic of runtime.diagnostics) {
+            if (pluginDiagnostics.has(diagnostic))
+                continue;
             issues.push({ id: `runtime:${diagnostic.scope}`, title: diagnostic.scope, message: diagnostic.message, severity: "error" });
         }
         for (const plugin of this.installed) {
@@ -1314,10 +1394,13 @@ export class PluginManager {
             if (entry === undefined && this.catalogs.has(plugin.marketplace)) {
                 issues.push({ id: `${identityOf(plugin)}:catalog`, title: identityOf(plugin), message: "Installed bundle is not declared in the current marketplace catalog; the installed copy remains available.", severity: "error", pluginId: identityOf(plugin) });
             }
-            else if (plugin.autoUpdate && entry?.version === undefined) {
-                issues.push({ id: `${identityOf(plugin)}:version`, title: identityOf(plugin), message: "Automatic updates are marked, but this catalog does not declare a version. Use /plugins update-marked for an explicit force update.", severity: "warning", pluginId: identityOf(plugin) });
+            else if (plugin.autoUpdate && entry !== undefined && entry.version === undefined && installedPluginVersion(plugin) === undefined) {
+                issues.push({ id: `${identityOf(plugin)}:version`, title: identityOf(plugin), message: "No release version is available locally. Marked checks also inspect source manifests; /plugins update-marked forces replacement when no version is declared.", severity: "warning", pluginId: identityOf(plugin) });
             }
         }
+        for (const [marketplace, message] of this.checkErrors) {
+            issues.push({ id: `${marketplace}:check`, title: marketplace, message, severity: "warning" });
+        }
         for (const [marketplace, catalog] of this.catalogs) {
             for (const diagnostic of catalog.diagnostics ?? [])
                 issues.push({ id: `${marketplace}:${diagnostic.scope}`, title: marketplace, message: diagnostic.message, severity: "warning" });