@aryacode/dsh-local-llm 0.8.1 → 0.8.3

package/lib/index.js

@@ -1,4 +1,4 @@
-import { n as __commonJSMin, t as AssistantMessageEventStream } from "./event-stream-CiG-8VvD.js";
+import { n as __commonJSMin, t as AssistantMessageEventStream } from "./event-stream-BkIJ4cYy.js";
 import { execFile, spawn, spawnSync } from "node:child_process";
 import { closeSync, copyFileSync, createWriteStream, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readSync, readdirSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { open, rename } from "node:fs/promises";
@@ -194,7 +194,7 @@ function readStore(path) {
 }
 /** Entry id and package name of the row this plugin is mounted from. */
 const ROW_ID = "llamacpp";
-const ROW_NAME = "dsh-local-llm";
+const ROW_NAME = "@aryacode/dsh-local-llm";
 /**
 * Write the target into the profile patch, if this Host can.
 *
@@ -2415,7 +2415,7 @@ function apply$1(ctx, rawConfig, hooks = {}) {
 	};
 }
 //#endregion
-//#region node_modules/@earendil-works/pi-ai/dist/api/lazy.js
+//#region node_modules/.pnpm/@earendil-works+pi-ai@0.87.1_ws@8.22.0_zod@4.6.7/node_modules/@earendil-works/pi-ai/dist/api/lazy.js
 function createSetupErrorMessage(model, error) {
 	return {
 		role: "assistant",
@@ -2485,8 +2485,8 @@ function lazyApi(load, capabilities) {
 	return api;
 }
 //#endregion
-//#region node_modules/@earendil-works/pi-ai/dist/api/openai-completions.lazy.js
-const openAICompletionsApi = () => lazyApi(() => import("./openai-completions-B6T4-oyq.js"));
+//#region node_modules/.pnpm/@earendil-works+pi-ai@0.87.1_ws@8.22.0_zod@4.6.7/node_modules/@earendil-works/pi-ai/dist/api/openai-completions.lazy.js
+const openAICompletionsApi = () => lazyApi(() => import("./openai-completions-C58ZnIdi.js"));
 //#endregion
 //#region src/remote-wire.ts
 /** Build one immutable paired-host call using the harness's maintained OpenAI codec. */
@@ -2602,6 +2602,17 @@ function pairedWireAdapter(info, connection, attachments, direct) {
 //#region src/library.ts
 /** Live model inventory: adding or removing a local model never requires editing provider YAML. */
 const LIBRARY_PROVIDER = "local-library";
+/**
+* The per-request output default this adapter publishes for one model.
+*
+* An engine's *maximum* response allowance is a ceiling it enforces when a
+* request asks for it, not something every request should ask for: this value
+* is materialized into requests that omit an output budget, so it stays small
+* (8K, and never more than a quarter of the model's own context window).
+*/
+function outputDefault(context, ceiling = 8192) {
+	return Math.max(1024, Math.min(ceiling, 8192, Math.floor(context / 4)));
+}
 /** Thinking levels a chat-template engine can be asked for through its template kwargs. */
 const strataReasoning = {
 	efforts: [
@@ -2626,13 +2637,21 @@ const strataReasoning = {
 };
 /** NInfer accepts off, low, medium and high; the codec maps high to its xhigh preset. */
 const ninferReasoning = strataReasoning;
+/**
+* Build the model-library adapter.
+*
+* The return type is restated as `any`: the harness adapter type names a private
+* `@deepseek-ai/dsh-llm` type that the emitted declaration could not reference
+* without an import this plugin does not depend on (TS2742). The value is only
+* handed to `registerAdapter`, which still checks it at the call site.
+*/
 function libraryAdapter(controller, ensure, gate, checkIdle, attachments, strata, ninfer) {
 	const info = (id, name, context, vision, provider, model) => ({
 		provider: LIBRARY_PROVIDER,
 		id,
 		name,
 		context: { contextWindow: context },
-		defaultMaxTokens: Math.min(8192, context),
+		defaultMaxTokens: outputDefault(context),
 		inputModalities: vision ? ["text", "image"] : ["text"],
 		originalProvider: provider,
 		originalModel: model
@@ -2694,8 +2713,8 @@ function libraryAdapter(controller, ensure, gate, checkIdle, attachments, strata
 			const state = await ninfer.status();
 			if (typeof state.modelName === "string" && state.modelName !== "") {
 				const model = {
-					...info("ninfer:" + state.modelName, state.modelName, Number(state.context) || 8192, state.vision === true, "ninfer", state.modelName),
-					defaultMaxTokens: Math.min(ninfer.outputTokens(), Number(state.context) || 8192),
+					...info("ninfer:" + state.modelName, "ninfer:" + state.modelName, Number(state.context) || 8192, state.vision === true, "ninfer", state.modelName),
+					defaultMaxTokens: outputDefault(Number(state.context) || 8192, ninfer.outputTokens()),
 					reasoning: ninferReasoning
 				};
 				models.push(model);
@@ -2721,7 +2740,7 @@ function libraryAdapter(controller, ensure, gate, checkIdle, attachments, strata
 			const details = await response.json();
 			const configured = /^num_ctx\s+(\d+)$/m.exec(details.parameters ?? "")?.[1];
 			model.context = { contextWindow: configured ? Number(configured) : 4096 };
-			model.defaultMaxTokens = Math.min(8192, model.context.contextWindow);
+			model.defaultMaxTokens = outputDefault(model.context.contextWindow);
 			model.inputModalities = (details.capabilities ?? []).includes("vision") ? ["text", "image"] : ["text"];
 		}
 		return model;
@@ -2963,6 +2982,18 @@ function validateNInfer(value) {
 function ownsNInfer(owner, container, name, label) {
 	return !!owner && !!container && owner.id === container.Id && owner.name === name && owner.label === label && container.Name === "/" + name && container.Config.Labels[ownershipLabel] === label;
 }
+const samePath = (a, b) => resolve(a.replaceAll("\\", "/")).toLowerCase() === resolve(b.replaceAll("\\", "/")).toLowerCase();
+/**
+* Whether a running container is provably this installation's engine: the same
+* pinned image, this artifact, our port, and the label a NInfer launcher writes.
+* Another launcher may start the engine the page will otherwise refuse to touch.
+*/
+function reclaimsNInfer(container, image, artifact, port) {
+	if (!container?.Config?.Labels?.[ownershipLabel]) return false;
+	if (container.Config.Image !== image) return false;
+	if (!(container.Mounts ?? []).some((mount) => samePath(mount.Source, artifact))) return false;
+	return (container.HostConfig?.PortBindings?.["8080/tcp"] ?? []).some((binding) => binding.HostPort === String(port));
+}
 /** Control only the saved runtime identity; leave other engines untouched. */
 var NInferController = class {
 	directory;
@@ -2977,7 +3008,7 @@ var NInferController = class {
 		};
 		this.directory = resolve(config.directory);
 		this.port = config.port;
-		this.modelName = config.modelName;
+		this.modelName = config.modelName || config.name;
 		if (config.wsl && (!/^[A-Za-z0-9._-]+$/.test(config.wsl.distribution) || !/^\/[A-Za-z0-9/._-]+$/.test(config.wsl.binary) || !/^\/[A-Za-z0-9/.:_-]+$/.test(config.wsl.libraryPath))) throw Error("Invalid NInfer WSL configuration.");
 		if (!/^[a-z0-9][a-z0-9._-]+$/.test(config.name) || !/^[a-z0-9._-]+$/.test(config.label) || !/^[a-zA-Z0-9/._-]+@sha256:[a-f0-9]{64}$/.test(config.image) || !Number.isInteger(config.port) || config.port < 1024 || config.port > 65535 || !/^[A-Za-z]:[\\/]/.test(config.artifact) || config.artifact.includes(",")) throw Error("Invalid pinned NInfer configuration.");
 	}
@@ -3057,6 +3088,26 @@ var NInferController = class {
 			}));
 		});
 	}
+	/** A container this Host may reclaim; a missing Docker or an unrelated one is no takeover. */
+	async external() {
+		try {
+			const ids = (await this.docker([
+				"ps",
+				"--no-trunc",
+				"--filter",
+				"label=dev.arya.ninfer",
+				"--filter",
+				"publish=" + this.port,
+				"--format",
+				"{{.ID}}"
+			])).split(/\r?\n/).filter(Boolean);
+			if (ids.length !== 1) return null;
+			const container = JSON.parse(await this.docker(["inspect", ids[0]]))[0];
+			return container && container.State.Running && reclaimsNInfer(container, this.config.image, this.config.artifact, this.port) ? container : null;
+		} catch (error) {
+			return null;
+		}
+	}
 	async wslStatus() {
 		const process = await this.callWsl("status");
 		let responding = false, healthy = false;
@@ -3067,13 +3118,18 @@ var NInferController = class {
 			healthy = response.ok && !!body.data?.some((model) => model.id === this.modelName);
 		} catch (error) {}
 		const phase = process.owned ? healthy ? "running" : "starting" : responding ? "unmanaged" : "stopped";
+		const external = phase === "unmanaged" ? await this.external() : null;
+		const detail = phase !== "unmanaged" ? void 0 : external ? `NInfer is serving from container ${external.Id.slice(0, 12)}, which another launcher started. Taking over stops it and starts the engine this page manages.` : `Something answers on 127.0.0.1:${this.port} and this Host did not start it. Stop it where it was started.`;
 		return {
 			...process,
 			phase,
 			healthy,
 			complete: this.complete() && process.available === true,
 			runtime: "wsl",
-			containerId: null,
+			containerId: external?.Id ?? null,
+			external: phase === "unmanaged",
+			takeover: !!external,
+			detail,
 			modelName: this.modelName,
 			baseUrl: `http://127.0.0.1:${this.port}/v1`,
 			...this.settings()
@@ -3128,20 +3184,42 @@ var NInferController = class {
 			const body = await response.json();
 			healthy = response.ok && !!body.data?.some((model) => model.id === this.modelName);
 		} catch (error) {}
+		const phase = container && !owned || responding && !owned ? "unmanaged" : owned && container?.State.Running ? healthy ? "running" : "starting" : "stopped";
+		const takeover = phase === "unmanaged" && !!container && container.State.Running && reclaimsNInfer(container, this.config.image, this.config.artifact, this.port);
+		const detail = phase !== "unmanaged" ? void 0 : takeover ? `NInfer is serving from container ${container.Id.slice(0, 12)}, which another launcher started. Taking over stops it and starts the engine this page manages.` : "Another container or server is using NInfer. Stop it where it was started.";
 		return {
-			phase: container && !owned || responding && !owned ? "unmanaged" : owned && container?.State.Running ? healthy ? "running" : "starting" : "stopped",
+			phase,
 			owned,
 			healthy,
 			complete: this.complete(),
 			containerId: owned ? container?.Id : null,
+			external: phase === "unmanaged",
+			takeover,
+			detail,
 			modelName: this.modelName,
 			baseUrl: `http://127.0.0.1:${this.port}/v1`,
 			...this.settings()
 		};
 	}
-	/** Return a bounded log tail from the configured owned runtime. */
+	/** Return a bounded log tail from the configured owned runtime, or from the engine another launcher started. */
 	async logs() {
-		if (this.config.wsl) return this.callWsl("logs");
+		if (this.config.wsl) {
+			const external = await this.external();
+			if (external) {
+				const output = await execute$1("docker", [
+					"logs",
+					"--tail",
+					"80",
+					external.Id
+				], {
+					windowsHide: true,
+					timeout: 45e3,
+					maxBuffer: 1048576
+				});
+				return { text: output.stdout + output.stderr };
+			}
+			return this.callWsl("logs");
+		}
 		const container = await this.container();
 		if (!ownsNInfer(this.owner(), container, this.config.name, this.config.label)) return { text: "No owned NInfer container logs." };
 		const output = await execute$1("docker", [
@@ -3193,17 +3271,40 @@ var NInferController = class {
 		if (!ownsNInfer(this.owner(), current, this.config.name, this.config.label)) throw Error("NInfer ownership changed; this container was not removed.");
 		await this.docker(["rm", current.Id]);
 	}
-	/** Start, stop or restart the owned localhost runtime without taking over foreign containers. */
+	/** Stop the external container that is provably this installation's engine. */
+	async takeOver() {
+		const container = await this.external();
+		if (!container) throw Error("The external NInfer container is no longer identifiable; nothing was stopped.");
+		await this.docker([
+			"stop",
+			"--time",
+			"20",
+			container.Id
+		]);
+		try {
+			await this.docker([
+				"rm",
+				"--force",
+				container.Id
+			]);
+		} catch (error) {}
+	}
+	/** Start, stop or restart the owned runtime, reclaiming only a container that is provably this engine. */
 	async action(action) {
 		if (this.changing) throw Error("NInfer is changing state.");
 		this.changing = true;
 		try {
 			const status = await this.status();
-			if (status.phase === "unmanaged") throw Error("An external server or container is using NInfer. Stop it first.");
+			let takenOver = "";
+			if (status.phase === "unmanaged") {
+				if (!status.takeover) throw Error("An external server or container is using NInfer. Stop it first.");
+				await this.takeOver();
+				takenOver = "Stopped the external NInfer container. ";
+			}
 			if (action === "stop" || action === "restart") await this.stop();
 			if (action === "stop") return {
 				ok: true,
-				detail: "NInfer stopped."
+				detail: takenOver + "NInfer stopped."
 			};
 			if (action === "start" && ["running", "starting"].includes(status.phase)) return {
 				ok: true,
@@ -3211,7 +3312,13 @@ var NInferController = class {
 			};
 			if (!this.complete()) throw Error("Wait for the model checksum verification.");
 			await this.stop();
-			if (this.config.wsl) return await this.callWsl("start");
+			if (this.config.wsl) {
+				const started = await this.callWsl("start");
+				return {
+					...started,
+					detail: takenOver + started.detail
+				};
+			}
 			const settings = this.settings();
 			const args = [
 				"run",
@@ -3269,7 +3376,7 @@ var NInferController = class {
 			}) + "\n");
 			return {
 				ok: true,
-				detail: "NInfer started. Check readiness and logs while the model loads."
+				detail: takenOver + "NInfer started. Check readiness and logs while the model loads."
 			};
 		} finally {
 			this.changing = false;
@@ -4293,7 +4400,7 @@ async function createOllamaVariant(body, endpoint = "http://127.0.0.1:11434") {
 	};
 }
 //#endregion
-//#region node_modules/xmlchars/xml/1.0/ed5.js
+//#region node_modules/.pnpm/xmlchars@2.2.0/node_modules/xmlchars/xml/1.0/ed5.js
 var require_ed5 = /* @__PURE__ */ __commonJSMin(((exports) => {
 	/**
 	* Character classes and associated utilities for the 5th edition of XML 1.0.
@@ -4370,7 +4477,7 @@ var require_ed5 = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.isNameChar = isNameChar;
 }));
 //#endregion
-//#region node_modules/xmlchars/xml/1.1/ed2.js
+//#region node_modules/.pnpm/xmlchars@2.2.0/node_modules/xmlchars/xml/1.1/ed2.js
 var require_ed2 = /* @__PURE__ */ __commonJSMin(((exports) => {
 	/**
 	* Character classes and associated utilities for the 2nd edition of XML 1.1.
@@ -4475,7 +4582,7 @@ var require_ed2 = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.isNameChar = isNameChar;
 }));
 //#endregion
-//#region node_modules/xmlchars/xmlns/1.0/ed3.js
+//#region node_modules/.pnpm/xmlchars@2.2.0/node_modules/xmlchars/xmlns/1.0/ed3.js
 var require_ed3 = /* @__PURE__ */ __commonJSMin(((exports) => {
 	/**
 	* Character class utilities for XML NS 1.0 edition 3.
@@ -8641,7 +8748,7 @@ function comparisonColumns(runs) {
 }
 //#endregion
 //#region src/index.ts
-const name = "dsh-local-llm";
+const name = "@aryacode/dsh-local-llm";
 const inject = ["webServer"];
 const run = promisify(execFile);
 /** Phases where the llama.cpp controller holds no model server: nothing to stop first. */
@@ -10153,4 +10260,4 @@ function apply(ctx, config) {
 	}, "dsh-local-llm.routes");
 }
 //#endregion
-export { ActivityGate, ApiBenchmarks, Benchmarks, FreeTokenController, LIBRARY_PROVIDER, NInferController, RemoteAdapter, RemoteClient, RemoteStore, ServerController, StrataService, allowedControl, apply, apply$1 as applyStrataRoutes, comparisonColumns, complete, controlCaller, createOllamaVariant, engineIdle, engineeringTests, extractHtml, hardwareCollector, inject, inspectEngineering, inspectWebsite, isolatedHtml, libraryAdapter, linkedTarget, mountRemote, mountRoutes as mountStrataRoutes, name, ownsNInfer, parseNInferLog, parseStreamEvent, readStrataTuning, remoteAddress, saveStrataTuning, startPairRelay, stopOtherEngines, strataProfiles, switchStrataProfile, tuningArgs, validateFreeToken, validateNInfer, validateRun, validateTuning, websiteTests };
+export { ActivityGate, ApiBenchmarks, Benchmarks, FreeTokenController, LIBRARY_PROVIDER, NInferController, RemoteAdapter, RemoteClient, RemoteStore, ServerController, StrataService, allowedControl, apply, apply$1 as applyStrataRoutes, comparisonColumns, complete, controlCaller, createOllamaVariant, engineIdle, engineeringTests, extractHtml, hardwareCollector, inject, inspectEngineering, inspectWebsite, isolatedHtml, libraryAdapter, linkedTarget, mountRemote, mountRoutes as mountStrataRoutes, name, outputDefault, ownsNInfer, parseNInferLog, parseStreamEvent, readStrataTuning, reclaimsNInfer, remoteAddress, saveStrataTuning, startPairRelay, stopOtherEngines, strataProfiles, switchStrataProfile, tuningArgs, validateFreeToken, validateNInfer, validateRun, validateTuning, websiteTests };