@maheidem/model-discovery 0.7.0 → 0.8.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 maheidem
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,6 +1,6 @@
 # @maheidem/model-discovery
 
-Interactive TUI for discovering and managing local AI model endpoints. Works with llama.cpp, oMLX, Ollama, vLLM, SGLang, LM Studio, and other OpenAI-compatible servers.
+A responsive, hierarchical Pi wizard for discovering and managing local AI model sources. It works with llama.cpp, oMLX, Ollama, vLLM, SGLang, LM Studio, and other OpenAI-compatible servers, with useful status and diagnostics in TUI, RPC, JSON, and print modes.
 
 ## Features
 
@@ -18,6 +18,8 @@ Interactive TUI for discovering and managing local AI model endpoints. Works wit
 - **Authenticated endpoints** — enroll, replace, validate, or clear bearer API keys through masked TUI input
 - **Multi-endpoint management** — add, rename, scan, and remove local model sources
 - **LLM-callable tool** — the `discover_models` tool can register endpoints on the agent's behalf
+- **Shared Pi UX** — responsive bordered wizard steps, searchable lists, injected keybindings, scrolling previews, cancellable loaders, and masked secrets
+- **Headless command surface** — stable status, diagnostics, paths, source listing, and explicit add/remove actions for RPC and scripts
 - **Persistent storage** in `~/.pi/agent/model-discovery.json`
 
 ## Installation
@@ -27,27 +29,54 @@ Interactive TUI for discovering and managing local AI model endpoints. Works wit
 pi install npm:@maheidem/model-discovery
 
 # Via git
-pi install git:github.com/Maheidem/model-discovery@v0.7.0
+pi install git:github.com/Maheidem/model-discovery
 ```
 
 ## Usage
 
-Run `/discover` in Pi to open the management TUI:
+Run bare `/discover` in TUI mode to open the source wizard:
 
-- **Add endpoint** — enter a URL, choose anonymous or API-key authentication, probe it, review models, and register
-- **Re-scan** — refresh models reported by an existing endpoint
+```text
+Sources → source details → model details → presets and adaptive routing
+        ↘ add / scan / authentication / diagnostics
+```
+
+The home screen shows source and cached-model health before offering the primary actions. Every list supports Pi's configured navigation/confirm/cancel bindings and type-to-filter. Escape returns to the logical parent. Long diagnostics and exact-request previews use a scrolling secondary view rather than clipping the footer.
+
+From the wizard you can:
+
+- **Add source** — enter a URL, choose anonymous or API-key authentication, probe it, review models, and register
+- **Re-scan** — refresh one source or every source while retaining last known-good catalogues on failure
 - **Edit model** — override context, max output, reasoning, or vision support
-- **Manage profiles** — create, edit, rename, or delete named variants
+- **Manage presets** — create, clone, edit, rename, preview, route, or delete named variants
 - **Rename source** — change the provider name shown by `/model`
-- **Remove** — unregister and delete an endpoint
+- **Authentication** — add, replace, validate, or clear a bearer credential through masked input
+- **Diagnostics** — inspect storage, source health, authentication state, and cached catalogue state without exposing secrets
+- **Remove source** — unregister it and delete its saved configuration after confirmation
+
+The same root command has a scriptable surface. Bare `/discover` prints status outside TUI instead of silently doing nothing:
+
+```text
+/discover
+/discover status
+/discover doctor
+/discover paths
+/discover source list
+/discover source add http://192.168.1.100:8080
+/discover source add http://192.168.1.100:8080 --name my-llama
+/discover source remove my-llama --yes
+/discover help
+```
 
-You can jump directly into adding an endpoint:
+The original direct-add shorthand remains compatible:
 
 ```text
 /discover http://192.168.1.100:8080
 ```
 
-Enrollment explicitly asks whether the endpoint is anonymous or requires an API key. API-key input is masked and is sent as `Authorization: Bearer <key>` for both `/v1/models` discovery and inference. The key is stored unencrypted in `~/.pi/agent/model-discovery.json`; the extension writes that file atomically with owner-only (`0600`) permissions. Use **Authentication** on an existing endpoint to replace, validate, or clear its key without losing the cached catalogue.
+In TUI mode, add commands enter the full enrollment wizard. Outside TUI, source add probes and registers an anonymous source using server-reported/default values. Configure credentials through the masked TUI rather than command arguments. Source removal requires confirmation in TUI and requires explicit `--yes` outside TUI.
+
+Enrollment explicitly asks whether the source is anonymous or requires an API key. API-key input is masked and is sent as `Authorization: Bearer <key>` for both `/v1/models` discovery and inference. The key is stored unencrypted in `~/.pi/agent/model-discovery.json`; the extension writes that file atomically with owner-only (`0600`) permissions. Use **Authentication** on an existing source to replace, validate, or clear its key without losing the cached catalogue.
 
 The LLM-callable tool remains available:
 
@@ -207,6 +236,68 @@ If Pi has an `enabledModels` scope, press **Tab** in `/model` to switch from sco
 
 Profiles are retained if a model temporarily disappears during a re-scan.
 
+## Tool-schema repair (local endpoints)
+
+llama.cpp's JSON-schema→grammar converter — the one behind llama.cpp, llama-swap, LM
+Studio, and LiteLLM routes that forward to them — resolves `$ref` pointers **only
+against the root of a tool schema document**. MCP servers that build schemas by nesting
+Pydantic `model_json_schema()` output inside a hand-written parent routinely leave
+`$defs` on an inner node while the `$ref`s inside it stay root-relative:
+
+```jsonc
+{ "properties": { "patch": {
+    "$defs": { "GuidelineMetricInput": { /* ... */ } },        // defs live here
+    "properties": { "metrics": { "items": { "$ref": "#/$defs/GuidelineMetricInput" } } }
+}}}
+```
+
+The pointer resolves against the document root, where `$defs` is not — so the server
+rejects the **entire request**:
+
+```text
+HTTP 400 {"code":400,"message":"JSON schema conversion failed:
+          Error resolving ref #/$defs/GuidelineMetricInput: $defs not in {...}"}
+```
+
+Because the offending tool rides along in every tool list, *every* message in the
+session fails, which looks like a broken endpoint, proxy, or model discovery rather
+than a bad upstream schema.
+
+A second llama.cpp b10612 bug was verified independently: `maxLength: 2000` below
+an array's `items` schema produces `Failed to initialize samplers: failed to parse
+grammar`, while 1999, 2001, and even 65536 all compile. This affected the
+`okto_pulse_move_card` tool even before any `$ref` repair.
+
+For self-hosted endpoints (private/loopback URL, or a detected local engine) the
+extension normalises outgoing tool schemas in `before_provider_request`:
+
+- `$defs` / `definitions` found at any depth are hoisted to a root registry, with
+collisions de-duplicated and local refs rewritten to match;
+- every `$ref` is inlined iteratively, so refs-to-refs collapse;
+- unresolvable or recursive `$ref`s become permissive nodes instead of a hard 400;
+- `$ref` / `$defs` never reach the wire, and annotation siblings (`description`,
+`title`) are preserved;
+- the exact nested-array `maxLength: 2000` failure is sent as 2001. This is the
+least-permissive working neighbour; the MCP server still validates its real 2000 limit.
+
+Cloud APIs and clean payloads are left byte-identical (the payload object's identity is
+returned, no cloning). Repairing a 521-tool catalogue costs ~1.5 ms. Opt out per
+provider with `"repairToolSchemas": false` in `~/.pi/agent/model-discovery.json`, or
+globally with `PI_MODEL_DISCOVERY_NO_SCHEMA_REPAIR=1`. Each distinct repair is logged
+once as `[model-discovery] <provider>: repaired N local tool schema(s): …`.
+
+Live verification against llama-swap v251 → llama.cpp b10612: the raw 521-tool MCP
+catalogue returned HTTP 400; all 16 affected schemas were repaired in flight; the same
+request then returned HTTP 200 with no residual `$ref`/`$defs` on the wire.
+
+Verification:
+
+```bash
+npm test                                              # includes schema-repair.test.ts
+node --experimental-strip-types scripts/live-schema-repair-check.ts http://HOST
+node --experimental-strip-types scripts/bisect-grammar.ts http://HOST MODEL FILTER
+```
+
 ## Offline resilience
 
 Every successful live scan atomically persists the raw model catalogue as the source's last known-good cache. Saved sources are scanned independently and concurrently at startup. If one source is offline, times out, rejects its credentials, or returns a malformed response:
@@ -223,24 +314,32 @@ Legacy implicit routing created by early v0.6 development builds is migrated onc
 
 ## Storage
 
-Discovered providers, cached catalogues, model overrides, presets, and explicit routing maps are persisted in:
+Discovered providers, cached catalogues, model overrides, presets, credentials, and explicit routing maps are persisted atomically with owner-only (`0600`) permissions in:
 
 ```text
 ~/.pi/agent/model-discovery.json
 ```
 
+If this JSON is corrupt, startup falls back to an empty source list and preserves the unreadable file beside it as `model-discovery.json.corrupt-<timestamp>` instead of overwriting the evidence. Existing profile-routing schema migrations remain automatic.
+
 ## Requirements
 
 - Pi coding agent **0.84.0 or newer** (`samplingParams` support is required for model aliases)
-- TUI support
-- Network access to an OpenAI-compatible model server
+- TUI mode for interactive enrollment, masked credentials, and profile editing
+- Network access to an OpenAI-compatible model server for live discovery (cached status/configuration remains available offline)
 
 ## Development
 
+All suites run with isolated temporary `HOME` directories:
+
 ```bash
+npm run typecheck
 npm test
+npm pack --dry-run
 ```
 
+`prepack` runs strict typechecking and the complete offline suite automatically. Provider detection, enrichment, profile semantics, routing, schema repair, storage, application actions, responsive wizard components, command modes, and adapter registration all have regression coverage.
+
 ## License
 
 MIT

package/application.ts

@@ -0,0 +1,104 @@
+import type { ModelProfile, ModelProfileRouting } from "./profiles.ts";
+import {
+	deleteModelProfile,
+	deleteModelProfileRouting,
+	deleteProvider,
+	getModelProfileRouting,
+	getModelProfiles,
+	loadProviders,
+	renameProvider,
+	saveModelProfile,
+	saveModelProfileRouting,
+	upsertProvider,
+	type DiscoveredProvider,
+} from "./storage.ts";
+
+export interface DiscoveryRepository {
+	list(): DiscoveredProvider[];
+	save(provider: DiscoveredProvider): void;
+	remove(name: string): void;
+	rename(oldName: string, newName: string): boolean;
+}
+
+export interface RenameSourceResult {
+	ok: boolean;
+	oldName: string;
+	newName: string;
+	reason?: "missing" | "duplicate" | "invalid";
+}
+
+export interface DiscoveryApplication {
+	listSources(): DiscoveredProvider[];
+	findSource(name: string): DiscoveredProvider | undefined;
+	saveSource(provider: DiscoveredProvider): void;
+	removeSource(name: string): boolean;
+	renameSource(provider: DiscoveredProvider, newName: string): RenameSourceResult;
+	setCredential(provider: DiscoveredProvider, apiKey: string | undefined): void;
+	profiles(provider: DiscoveredProvider, modelId: string): ModelProfile[];
+	profileRouting(provider: DiscoveredProvider, modelId: string): ModelProfileRouting | undefined;
+	saveProfile(provider: DiscoveredProvider, modelId: string, profile: ModelProfile, previousSlug?: string): void;
+	removeProfile(provider: DiscoveredProvider, modelId: string, slug: string): void;
+	saveRouting(provider: DiscoveredProvider, modelId: string, routing: ModelProfileRouting): void;
+	removeRouting(provider: DiscoveredProvider, modelId: string): void;
+}
+
+export const fileDiscoveryRepository: DiscoveryRepository = {
+	list: loadProviders,
+	save: upsertProvider,
+	remove: deleteProvider,
+	rename: renameProvider,
+};
+
+export function createDiscoveryApplication(
+	repository: DiscoveryRepository = fileDiscoveryRepository,
+): DiscoveryApplication {
+	return {
+		listSources: () => repository.list(),
+		findSource: (name) => repository.list().find((provider) => provider.name === name),
+		saveSource: (provider) => repository.save(provider),
+		removeSource: (name) => {
+			if (!repository.list().some((provider) => provider.name === name)) return false;
+			repository.remove(name);
+			return true;
+		},
+		renameSource: (provider, rawName) => {
+			const oldName = provider.name;
+			const newName = rawName.trim();
+			if (!newName) return { ok: false, oldName, newName, reason: "invalid" };
+			const providers = repository.list();
+			if (!providers.some((candidate) => candidate.name === oldName)) {
+				return { ok: false, oldName, newName, reason: "missing" };
+			}
+			if (providers.some((candidate) => candidate.name === newName && candidate.name !== oldName)) {
+				return { ok: false, oldName, newName, reason: "duplicate" };
+			}
+			if (newName !== oldName && !repository.rename(oldName, newName)) {
+				return { ok: false, oldName, newName, reason: "duplicate" };
+			}
+			provider.name = newName;
+			return { ok: true, oldName, newName };
+		},
+		setCredential: (provider, apiKey) => {
+			provider.apiKey = apiKey;
+			repository.save(provider);
+		},
+		profiles: (provider, modelId) => getModelProfiles(provider, modelId),
+		profileRouting: (provider, modelId) => getModelProfileRouting(provider, modelId),
+		saveProfile: (provider, modelId, profile, previousSlug) => {
+			saveModelProfile(provider, modelId, profile, previousSlug);
+			repository.save(provider);
+		},
+		removeProfile: (provider, modelId, slug) => {
+			deleteModelProfile(provider, modelId, slug);
+			repository.save(provider);
+		},
+		saveRouting: (provider, modelId, routing) => {
+			saveModelProfileRouting(provider, modelId, routing);
+			repository.save(provider);
+		},
+		removeRouting: (provider, modelId) => {
+			deleteModelProfileRouting(provider, modelId);
+			repository.save(provider);
+		},
+	};
+}

package/commands.ts

@@ -0,0 +1,70 @@
+export type DiscoveryIntent =
+	| { kind: "open" }
+	| { kind: "status" }
+	| { kind: "doctor" }
+	| { kind: "paths" }
+	| { kind: "help" }
+	| { kind: "add"; url?: string; providerName?: string }
+	| { kind: "remove"; name: string; confirmed: boolean }
+	| { kind: "invalid"; message: string };
+
+export const DISCOVER_USAGE = [
+	"/discover                         open the source wizard (status outside TUI)",
+	"/discover <url>                   add a source (existing shorthand)",
+	"/discover status                  show source and catalogue health",
+	"/discover doctor                  show actionable diagnostics",
+	"/discover paths                   show the configuration path",
+	"/discover source list             list configured sources",
+	"/discover source add <url>         add an unauthenticated source or open its TUI wizard",
+	"/discover source remove <name>     remove with TUI confirmation",
+	"/discover source remove <name> --yes  remove non-interactively",
+	"/discover help                    show this help",
+].join("\n");
+
+const URL_SHORTHAND = /^(?:https?:\/\/|localhost(?::|\/|$)|\[[0-9a-f:]+\]:\d+|(?:\d{1,3}\.){3}\d{1,3}(?::|\/|$)|(?:[a-z0-9-]+\.)+[a-z]{2,}(?::\d+)?(?:\/|$)|[^\s/:]+:\d+)/i;
+
+export function parseDiscoverArgs(args?: string): DiscoveryIntent {
+	const raw = (args ?? "").trim();
+	if (!raw) return { kind: "open" };
+	if (raw === "status" || raw === "source list") return { kind: "status" };
+	if (raw === "doctor") return { kind: "doctor" };
+	if (raw === "paths") return { kind: "paths" };
+	if (raw === "help") return { kind: "help" };
+	if (raw === "source add") return { kind: "add" };
+	if (raw.startsWith("source add ")) {
+		const tokens = raw.slice("source add ".length).trim().split(/\s+/);
+		const url = tokens.shift();
+		if (!url) return { kind: "invalid", message: "Missing source URL." };
+		if (!tokens.length) return { kind: "add", url };
+		if (tokens[0] === "--name" && tokens[1] && tokens.length === 2) {
+			return { kind: "add", url, providerName: tokens[1] };
+		}
+		return { kind: "invalid", message: `Invalid source add arguments: ${tokens.join(" ")}` };
+	}
+	if (raw === "source remove") return { kind: "invalid", message: "Missing source name." };
+	if (raw.startsWith("source remove ")) {
+		let specification = raw.slice("source remove ".length).trim();
+		const confirmed = specification.endsWith(" --yes");
+		if (confirmed) specification = specification.slice(0, -" --yes".length).trim();
+		if (!specification) return { kind: "invalid", message: "Missing source name." };
+		return { kind: "remove", name: specification, confirmed };
+	}
+	if (URL_SHORTHAND.test(raw)) return { kind: "add", url: raw };
+	return { kind: "invalid", message: `Unknown /discover input: ${raw}` };
+}
+
+export function completeDiscoverArgs(prefix: string, sourceNames: readonly string[]): Array<{ value: string; label: string }> | null {
+	const values = [
+		"status",
+		"doctor",
+		"paths",
+		"help",
+		"source list",
+		"source add ",
+		"source remove ",
+		...sourceNames.map((name) => `source remove ${name}`),
+		...sourceNames.map((name) => `source remove ${name} --yes`),
+	];
+	const matches = values.filter((value) => value.startsWith(prefix));
+	return matches.length ? matches.map((value) => ({ value, label: value })) : null;
+}