Skip to content

Commit 05d585c

Browse files
feat: align LLM panel endpoints with the Windows frontend contract
- llm-providers: provider entry keyed by `provider` (not id/name), models as {id, name} — matches the panel's expected shape exactly. - test-model: empty body now resolves the consolidation route (exported resolveRoute: dreamProvider/dreamModel > agentDefaultModel) so the panel can one-click test "whatever consolidation uses"; response uses `durationMs` + `modelId` (provider:model, same format as audit rows) per the contract. Partial input (provider without model) is rejected; unresolved empty body returns no-route. Keys never transit this endpoint or land plugin-side. Co-Authored-By: Anans-Ivresse <[email protected]>
1 parent bd4c97e commit 05d585c

5 files changed

Lines changed: 72 additions & 29 deletions

File tree

‎dsh-mneme/lib/api.js‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { timingSafeEqual, randomBytes } from "node:crypto";
44
import { FEATURE_FLAG_SPEC } from "./settings.js";
55
import { TYPE_FILE, renderMirrorText, parseHumanEdits } from "./mirror.js";
66
import { computeHeat } from "./heat.js";
7-
import { describeStreamFailure } from "./dream.js";
7+
import { describeStreamFailure, resolveRoute } from "./dream.js";
88

99
// headers:少数端点(/export 附件下载)需要追加 Content-Disposition 等响应头。
1010
function sendJson(res, status, payload, headers = {}) {
@@ -287,6 +287,8 @@ export function createApi(ctx, service, settings, commands, embedder, semantic =
287287
// actually accepts the configured effort without tripping a full run.
288288
async function testLlmConnectivity(llm, provider, model, reasoningEffort) {
289289
const startedAt = Date.now();
290+
const elapsed = () => Date.now() - startedAt;
291+
const modelId = `${provider}:${model}`;
290292
try {
291293
let reply = "";
292294
let error = "";
@@ -304,11 +306,10 @@ export function createApi(ctx, service, settings, commands, embedder, semantic =
304306
break;
305307
}
306308
}
307-
const latencyMs = Date.now() - startedAt;
308-
if (error) return { ok: false, latencyMs, error };
309-
return { ok: true, latencyMs, reply: reply.trim().slice(0, 100) };
309+
if (error) return { ok: false, durationMs: elapsed(), error, modelId };
310+
return { ok: true, durationMs: elapsed(), modelId, reply: reply.trim().slice(0, 100) };
310311
} catch (error) {
311-
return { ok: false, latencyMs: Date.now() - startedAt, error: String(error?.message ?? error) };
312+
return { ok: false, durationMs: elapsed(), error: String(error?.message ?? error), modelId };
312313
}
313314
}
314315

@@ -331,8 +332,7 @@ export function createApi(ctx, service, settings, commands, embedder, semantic =
331332
let models = [];
332333
try { models = (await llm.listModels(p.id)) ?? []; } catch { models = []; }
333334
return {
334-
id: p.id,
335-
name: p.name ?? p.id,
335+
provider: p.id,
336336
models: models.map((m) => ({ id: m.id, name: m.name ?? m.id }))
337337
};
338338
})).then((rows) => sendJson(res, 200, { providers: rows }));
@@ -354,9 +354,17 @@ export function createApi(ctx, service, settings, commands, embedder, semantic =
354354
if (!requireAuth(req, res, apiToken)) return;
355355
return readBody(req).then(async (text) => {
356356
const body = parseBody(text);
357-
const provider = typeof body.provider === "string" ? body.provider.trim() : "";
358-
const model = typeof body.model === "string" ? body.model.trim() : "";
359-
if (!provider || !model) return sendJson(res, 400, { error: "missing-provider-or-model" });
357+
let provider = typeof body.provider === "string" ? body.provider.trim() : "";
358+
let model = typeof body.model === "string" ? body.model.trim() : "";
359+
if ((!provider && model) || (provider && !model)) return sendJson(res, 400, { error: "missing-provider-or-model" });
360+
if (!provider && !model) {
361+
// 空 = 按巩固路由解析(dreamProvider/dreamModel > agent 默认模型),
362+
// 让面板一键测"当前巩固模型"而无需手填。
363+
const route = resolveRoute(ctx, config ?? {}, ctx.logger);
364+
if (!route) return sendJson(res, 400, { error: "no-route" });
365+
provider = route.provider;
366+
model = route.model;
367+
}
360368
const llm = ctx.llm;
361369
if (typeof llm?.stream !== "function") return sendJson(res, 501, { error: "llm-unavailable" });
362370
const result = await testLlmConnectivity(llm, provider, model, body.reasoningEffort);

‎dsh-mneme/lib/dream.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { validateDecisions, applyDecisions } from "./dream/decisions.js";
22
import { clusterMemories, findPotentialConflicts } from "./dream/clustering.js";
33
import { createHash, randomUUID } from "node:crypto";
4-
export { validateDecisions, applyDecisions, withEffortFallback, describeStreamFailure, resolveDreamEffort };
4+
export { validateDecisions, applyDecisions, withEffortFallback, describeStreamFailure, resolveDreamEffort, resolveRoute };
55

66

77
// Extract the first JSON array from LLM output, tolerating markdown fences,

‎dsh-mneme/src/api.js‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { timingSafeEqual, randomBytes } from "node:crypto";
44
import { FEATURE_FLAG_SPEC } from "./settings.js";
55
import { TYPE_FILE, renderMirrorText, parseHumanEdits } from "./mirror.js";
66
import { computeHeat } from "./heat.js";
7-
import { describeStreamFailure } from "./dream.js";
7+
import { describeStreamFailure, resolveRoute } from "./dream.js";
88

99
// headers:少数端点(/export 附件下载)需要追加 Content-Disposition 等响应头。
1010
function sendJson(res, status, payload, headers = {}) {
@@ -287,6 +287,8 @@ export function createApi(ctx, service, settings, commands, embedder, semantic =
287287
// actually accepts the configured effort without tripping a full run.
288288
async function testLlmConnectivity(llm, provider, model, reasoningEffort) {
289289
const startedAt = Date.now();
290+
const elapsed = () => Date.now() - startedAt;
291+
const modelId = `${provider}:${model}`;
290292
try {
291293
let reply = "";
292294
let error = "";
@@ -304,11 +306,10 @@ export function createApi(ctx, service, settings, commands, embedder, semantic =
304306
break;
305307
}
306308
}
307-
const latencyMs = Date.now() - startedAt;
308-
if (error) return { ok: false, latencyMs, error };
309-
return { ok: true, latencyMs, reply: reply.trim().slice(0, 100) };
309+
if (error) return { ok: false, durationMs: elapsed(), error, modelId };
310+
return { ok: true, durationMs: elapsed(), modelId, reply: reply.trim().slice(0, 100) };
310311
} catch (error) {
311-
return { ok: false, latencyMs: Date.now() - startedAt, error: String(error?.message ?? error) };
312+
return { ok: false, durationMs: elapsed(), error: String(error?.message ?? error), modelId };
312313
}
313314
}
314315

@@ -331,8 +332,7 @@ export function createApi(ctx, service, settings, commands, embedder, semantic =
331332
let models = [];
332333
try { models = (await llm.listModels(p.id)) ?? []; } catch { models = []; }
333334
return {
334-
id: p.id,
335-
name: p.name ?? p.id,
335+
provider: p.id,
336336
models: models.map((m) => ({ id: m.id, name: m.name ?? m.id }))
337337
};
338338
})).then((rows) => sendJson(res, 200, { providers: rows }));
@@ -354,9 +354,17 @@ export function createApi(ctx, service, settings, commands, embedder, semantic =
354354
if (!requireAuth(req, res, apiToken)) return;
355355
return readBody(req).then(async (text) => {
356356
const body = parseBody(text);
357-
const provider = typeof body.provider === "string" ? body.provider.trim() : "";
358-
const model = typeof body.model === "string" ? body.model.trim() : "";
359-
if (!provider || !model) return sendJson(res, 400, { error: "missing-provider-or-model" });
357+
let provider = typeof body.provider === "string" ? body.provider.trim() : "";
358+
let model = typeof body.model === "string" ? body.model.trim() : "";
359+
if ((!provider && model) || (provider && !model)) return sendJson(res, 400, { error: "missing-provider-or-model" });
360+
if (!provider && !model) {
361+
// 空 = 按巩固路由解析(dreamProvider/dreamModel > agent 默认模型),
362+
// 让面板一键测"当前巩固模型"而无需手填。
363+
const route = resolveRoute(ctx, config ?? {}, ctx.logger);
364+
if (!route) return sendJson(res, 400, { error: "no-route" });
365+
provider = route.provider;
366+
model = route.model;
367+
}
360368
const llm = ctx.llm;
361369
if (typeof llm?.stream !== "function") return sendJson(res, 501, { error: "llm-unavailable" });
362370
const result = await testLlmConnectivity(llm, provider, model, body.reasoningEffort);

‎dsh-mneme/src/dream.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { validateDecisions, applyDecisions } from "./dream/decisions.js";
22
import { clusterMemories, findPotentialConflicts } from "./dream/clustering.js";
33
import { createHash, randomUUID } from "node:crypto";
4-
export { validateDecisions, applyDecisions, withEffortFallback, describeStreamFailure, resolveDreamEffort };
4+
export { validateDecisions, applyDecisions, withEffortFallback, describeStreamFailure, resolveDreamEffort, resolveRoute };
55

66

77
// Extract the first JSON array from LLM output, tolerating markdown fences,

‎dsh-mneme/test/api.test.js‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,17 +1091,18 @@ test("GET /api/dsh-mneme/list projects per-memory heat only when heatEnabled=tru
10911091
// panel can offer a dropdown over real models, and probe connectivity with a
10921092
// minimal LLM call (same harness path the consolidation uses).
10931093

1094-
function setupLlm(llm, apiToken = "") {
1094+
function setupLlm(llm, apiToken = "", extraCtx = {}, config = null) {
10951095
const store = createStore(":memory:");
10961096
const service = createService({ store, mirror: null, config: {} });
10971097
const settings = createSettings(store.db);
10981098
const commands = { add: () => {}, remove: () => {}, list: () => [] };
10991099
const routes = [];
11001100
const ctx = {
11011101
webServer: { register(route) { routes.push(route); return () => {}; } },
1102-
llm
1102+
llm,
1103+
...extraCtx
11031104
};
1104-
const api = createApi(ctx, service, settings, commands, undefined, undefined, apiToken);
1105+
const api = createApi(ctx, service, settings, commands, undefined, undefined, apiToken, config);
11051106
return { routes };
11061107
}
11071108

@@ -1139,9 +1140,9 @@ test("GET /api/dsh-mneme/llm-providers lists host providers with models, per-pro
11391140
assert.equal(res.statusCode, 200);
11401141
const data = JSON.parse(res.body);
11411142
assert.equal(data.providers.length, 2);
1142-
const deepseek = data.providers.find((p) => p.id === "deepseek");
1143+
const deepseek = data.providers.find((p) => p.provider === "deepseek");
11431144
assert.deepEqual(deepseek.models.map((m) => m.id), ["deepseek-chat", "deepseek-reasoner"]);
1144-
const broken = data.providers.find((p) => p.id === "broken");
1145+
const broken = data.providers.find((p) => p.provider === "broken");
11451146
assert.deepEqual(broken.models, [], "a provider whose model list throws degrades to empty, not a hard fail");
11461147
});
11471148

@@ -1163,7 +1164,8 @@ test("POST /api/dsh-mneme/test-model succeeds and reports reply + latency", asyn
11631164
const data = JSON.parse(res.body);
11641165
assert.equal(data.ok, true);
11651166
assert.equal(data.reply, "ok", "reply trimmed");
1166-
assert.ok(data.latencyMs >= 0);
1167+
assert.ok(data.durationMs >= 0);
1168+
assert.equal(data.modelId, "deepseek:deepseek-chat", "modelId reports the probed route");
11671169
assert.equal(MOCK_LLM.lastOptions.provider, "deepseek");
11681170
assert.equal(MOCK_LLM.lastOptions.purpose, "dsh-mneme-connectivity-test");
11691171
assert.equal("reasoningEffort" in MOCK_LLM.lastOptions, false, "no effort configured -> field omitted");
@@ -1200,12 +1202,37 @@ test("POST /api/dsh-mneme/test-model reports thrown failure with 502", async ()
12001202
assert.match(data.error, /UNSUPPORTED_REASONING_EFFORT/, "throw path surfaces the harness rejection");
12011203
});
12021204

1205+
test("POST /api/dsh-mneme/test-model resolves empty body against the consolidation route", async () => {
1206+
// Empty provider/model = "test whatever consolidation uses now": the route
1207+
// falls back to agentDefaultModel (config dreamProvider/dreamModel absent),
1208+
// the probe runs against that model, and modelId reports what was tested.
1209+
const { routes } = setupLlm(MOCK_LLM, "", {
1210+
agentDefaultModel: { currentSelection: () => ({ provider: "sel-provider", model: "sel-model" }) }
1211+
});
1212+
const route = routes.find((r) => r.path === "/api/dsh-mneme/test-model");
1213+
const res = new FakeRes();
1214+
await route.handler(req("/api/dsh-mneme/test-model", "POST", {}), res);
1215+
assert.equal(res.statusCode, 200);
1216+
const data = JSON.parse(res.body);
1217+
assert.equal(data.ok, true);
1218+
assert.equal(data.modelId, "sel-provider:sel-model", "probe ran against the resolved consolidation route");
1219+
assert.equal(MOCK_LLM.lastOptions.provider, "sel-provider");
1220+
assert.equal(MOCK_LLM.lastOptions.model, "sel-model");
1221+
});
1222+
12031223
test("POST /api/dsh-mneme/test-model validates input and llm availability", async () => {
12041224
const { routes } = setupLlm(MOCK_LLM);
12051225
const route = routes.find((r) => r.path === "/api/dsh-mneme/test-model");
12061226
let res = new FakeRes();
1227+
await route.handler(req("/api/dsh-mneme/test-model", "POST", { provider: "deepseek" }), res);
1228+
assert.equal(res.statusCode, 400, "partial input (provider without model) rejected");
1229+
assert.equal(JSON.parse(res.body).error, "missing-provider-or-model");
1230+
1231+
// empty body with no route (no agentDefaultModel, no config route) -> no-route
1232+
res = new FakeRes();
12071233
await route.handler(req("/api/dsh-mneme/test-model", "POST", {}), res);
1208-
assert.equal(res.statusCode, 400, "missing provider+model rejected");
1234+
assert.equal(res.statusCode, 400, "empty body with no resolvable route rejected");
1235+
assert.equal(JSON.parse(res.body).error, "no-route");
12091236

12101237
const { routes: routesNoLlm } = setup();
12111238
const routeNoLlm = routesNoLlm.find((r) => r.path === "/api/dsh-mneme/test-model");

0 commit comments

Comments
 (0)