diff --git a/src/config.ts b/src/config.ts index d2ccdc89e5..34205d98d5 100644 --- a/src/config.ts +++ b/src/config.ts @@ -312,6 +312,19 @@ export function detectLlmProviderKind( return "noop"; } +export function describeLlmRoute(provider: ProviderConfig): string | null { + if (provider.provider === "noop") return null; + const parts = [provider.provider, provider.model]; + if (provider.baseURL) { + try { + parts.push(new URL(provider.baseURL).host); + } catch { + parts.push("custom base URL"); + } + } + return parts.join(" · "); +} + export function loadEmbeddingConfig(): EmbeddingConfig { const env = getMergedEnv(); let bm25Weight = parseFloat(env["BM25_WEIGHT"] || "0.4"); diff --git a/src/functions/status.ts b/src/functions/status.ts index db843be91d..a785faa0d6 100644 --- a/src/functions/status.ts +++ b/src/functions/status.ts @@ -54,6 +54,7 @@ export interface StatusInputs { cpuPercent?: number; } | null; circuitBreaker: { state?: string; failures?: number } | null; + llmRoute?: string | null; functionMetrics: FunctionMetricInput[]; provider: string; embeddingProvider: string; @@ -107,6 +108,7 @@ export interface StatusReport { health: StatusInputs["health"]; provider: { llm: string; + route: string | null; embeddings: string; circuitBreaker: StatusInputs["circuitBreaker"]; offWithoutLlm: string[]; @@ -491,6 +493,7 @@ export function evaluateStatus(input: StatusInputs): StatusReport { health: input.health, provider: { llm: input.provider, + route: input.provider === "noop" ? null : (input.llmRoute ?? null), embeddings: input.embeddingProvider, circuitBreaker: input.circuitBreaker, offWithoutLlm: noLlm ? OFF_WITHOUT_LLM : [], @@ -835,7 +838,7 @@ ${row("Streams port", escapeHtml(ports.streams ?? "unknown"))} ${row("Viewer port", escapeHtml(ports.viewer ?? "not running"))}

LLM and embeddings

-${row("LLM", escapeHtml(report.provider.llm === "noop" ? "none configured" : report.provider.llm))} +${row("LLM", escapeHtml(report.provider.llm === "noop" ? "none configured" : (report.provider.route ?? report.provider.llm)))} ${report.provider.offWithoutLlm.length ? row("Off without an LLM", escapeHtml(report.provider.offWithoutLlm.join(", ")) + `

${escapeHtml(LLM_KEY_FIX)}

`) : ""} ${row("Embeddings", escapeHtml(report.provider.embeddings === "none" ? "none (keyword search only)" : report.provider.embeddings))} ${row("Circuit breaker", escapeHtml(report.provider.circuitBreaker ? `${report.provider.circuitBreaker.state ?? "unknown"} (${report.provider.circuitBreaker.failures ?? 0} failures)` : "not in use"))} diff --git a/src/triggers/api.ts b/src/triggers/api.ts index c327871481..6460ec0aeb 100644 --- a/src/triggers/api.ts +++ b/src/triggers/api.ts @@ -63,6 +63,7 @@ import { isAutoCompressEnabled, isContextInjectionEnabled, detectEmbeddingProvider, + describeLlmRoute, detectLlmProviderKind, getAgentId, isAgentScopeIsolated, @@ -428,6 +429,7 @@ export function createStatusReporter(sdk: IIIClient, kv: StateKV, deps: StatusRe } : null, circuitBreaker: circuit, + llmRoute: describeLlmRoute(config.provider), functionMetrics: functionMetrics ?? [], provider: detectLlmProviderKind(), embeddingProvider: describeEmbeddingProvider(), diff --git a/test/llm-route.test.ts b/test/llm-route.test.ts new file mode 100644 index 0000000000..d15e5d74ee --- /dev/null +++ b/test/llm-route.test.ts @@ -0,0 +1,31 @@ +import { describe, it, expect } from "vitest"; +import { describeLlmRoute } from "../src/config.js"; + +describe("describeLlmRoute", () => { + it("names provider, model and the base URL host", () => { + expect( + describeLlmRoute({ + provider: "openai", + model: "deepseek/deepseek-v4.1-flash:floor", + maxTokens: 4096, + baseURL: "https://openrouter.ai/api/v1", + }), + ).toBe("openai · deepseek/deepseek-v4.1-flash:floor · openrouter.ai"); + }); + + it("omits the host when no base URL is configured", () => { + expect(describeLlmRoute({ provider: "anthropic", model: "claude-sonnet-5", maxTokens: 4096 })).toBe( + "anthropic · claude-sonnet-5", + ); + }); + + it("never echoes an unparsable base URL", () => { + expect(describeLlmRoute({ provider: "openai", model: "m", maxTokens: 1, baseURL: "not a url sk-secret" })).toBe( + "openai · m · custom base URL", + ); + }); + + it("returns null without an LLM", () => { + expect(describeLlmRoute({ provider: "noop", model: "noop", maxTokens: 1 })).toBeNull(); + }); +}); diff --git a/test/status.test.ts b/test/status.test.ts index 0059e4a2bd..eb01092508 100644 --- a/test/status.test.ts +++ b/test/status.test.ts @@ -331,6 +331,19 @@ describe("singleFlight", () => { }); describe("renderStatusHtml", () => { + it("names the LLM route instead of the bare word llm", () => { + const report = evaluateStatus(inputs({ llmRoute: "openai · deepseek/deepseek-v4.1-flash:floor · openrouter.ai" })); + expect(report.provider.llm).toBe("llm"); + expect(report.provider.route).toBe("openai · deepseek/deepseek-v4.1-flash:floor · openrouter.ai"); + expect(renderStatusHtml(report, "n")).toContain("openai · deepseek/deepseek-v4.1-flash:floor · openrouter.ai"); + }); + + it("reports no route without an LLM", () => { + const report = evaluateStatus(inputs({ provider: "noop", llmRoute: "stale" })); + expect(report.provider.route).toBeNull(); + expect(renderStatusHtml(report, "n")).toContain("none configured"); + }); + it("escapes every server-provided string and carries no script", () => { const report = evaluateStatus( inputs({