fix: resolve apiProxy via ctx.get for /model (v0.3.2)

Cordis throws on ctx.apiProxy without inject; use ctx.get and declare apiProxy inject so catalog and model APIs work under dsh web.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
owo
2026-08-14 20:20:55 +08:00
co-authored by Cursor
parent f433cce24d
commit 5dbe833205
18 changed files with 209 additions and 35 deletions
+27 -8
View File
@@ -1,21 +1,36 @@
import { randomUUID } from 'node:crypto';
import { resolveApiProxy } from './apiproxy.js';
function unwrap(res) {
const r = res;
if (r?.result?.ok === true)
return r.result.value;
return undefined;
}
function unwrapError(res) {
const r = res;
if (r?.result && r.result.ok === false) {
const err = r.result.error;
if (!err)
return 'rpc failed';
return err.code ? `${err.code}: ${err.message ?? ''}`.trim() : (err.message ?? 'rpc failed');
}
return undefined;
}
async function call(fn, payload) {
if (typeof fn !== 'function')
throw new Error('apiProxy sessions API unavailable');
return fn({ rpcId: randomUUID(), payload });
}
export async function loadSessionModels(ctx, sessionId) {
const api = ctx.apiProxy;
const raw = await call(api?.sessions?.models, { sessionId });
const api = resolveApiProxy(ctx);
if (!api?.sessions?.models) {
throw new Error('apiProxy unavailable (use ctx.get / inject apiProxy)');
}
const raw = await call(api.sessions.models, { sessionId });
const value = unwrap(raw);
if (!value)
throw new Error('failed to load session models');
if (!value) {
throw new Error(unwrapError(raw) ?? 'failed to load session models');
}
const options = [];
for (const group of value.groups ?? []) {
for (const m of group.models ?? []) {
@@ -34,16 +49,20 @@ export async function loadSessionModels(ctx, sessionId) {
};
}
export async function selectSessionModel(ctx, sessionId, selection) {
const api = ctx.apiProxy;
const raw = await call(api?.sessions?.selectModel, {
const api = resolveApiProxy(ctx);
if (!api?.sessions?.selectModel) {
throw new Error('apiProxy unavailable (use ctx.get / inject apiProxy)');
}
const raw = await call(api.sessions.selectModel, {
sessionId,
provider: selection.provider,
model: selection.model,
reasoningEffort: selection.reasoningEffort,
});
const value = unwrap(raw);
if (!value?.selected)
throw new Error('failed to select model');
if (!value?.selected) {
throw new Error(unwrapError(raw) ?? 'failed to select model');
}
return value.selected;
}
export function formatModel(sel) {