Add endpoint
-
-
- IdShort, stable — used in URLs, never shown to the CLI.
-
-
-
- Label
-
-
-
- Base URL
-
-
-
- API keyOptional. Left blank on edit keeps the existing key.
-
-
-
- Auth headerNever send both — some servers hang indefinitely.
-
-
-
- Default modelWhat the Run-menu picker applies for this endpoint. Discover models first.
-
-
-
-
+
+
diff --git a/src/web/public/session-ui.js b/src/web/public/session-ui.js
index de783959..c14dcb3d 100644
--- a/src/web/public/session-ui.js
+++ b/src/web/public/session-ui.js
@@ -559,20 +559,22 @@ Object.assign(CodemanApp.prototype, {
};
const settings = this.loadAppSettingsFromStorage();
- const capableClis = window.__codemanCustomModelClis || [];
+ // Matches _refreshRunModeAvailability's own gate: a stock entry for an
+ // uninstalled CLI is hidden, so a generated one must be too, or a box with
+ // no codex still offers "Codex (llama.cpp)" and fails at launch.
+ const capableClis = (window.__codemanCustomModelClis || []).filter((cli) => this.isCliAvailable(cli.id));
if (!settings.customModelEndpointsEnabled || capableClis.length === 0) return hide();
const caseName = document.getElementById('quickStartCase')?.value;
const activeCase = caseName ? (this.cases || []).find((c) => c.name === caseName) : null;
if (activeCase?.location === 'remote' || activeCase?.location === 'docker') return hide();
- let hosts;
- try {
- const res = await fetch('/api/model-endpoints');
- hosts = await res.json();
- } catch {
- return hide();
- }
+ // GET /api/model-endpoints wraps its body in the { success, data } envelope
+ // like every other /api route (server.ts's preSerialization hook applies to
+ // arrays too) — _apiJson() unwraps it. A raw fetch().json() here would
+ // silently see the envelope object instead of the array and hide this
+ // section unconditionally.
+ const hosts = await this._apiJson('/api/model-endpoints');
if (!Array.isArray(hosts) || hosts.length === 0) return hide();
const rows = [];
@@ -580,9 +582,17 @@ Object.assign(CodemanApp.prototype, {
const modelId = host.defaultModelId || (host.models || [])[0];
if (!modelId) continue; // nothing discovered yet — the settings panel explains why
for (const cli of capableClis) {
+ // escapeHtml(JSON.stringify(...)) on EVERY arg, not just the untrusted
+ // one: JSON.stringify's own double quotes would otherwise terminate this
+ // double-quoted attribute at the first one, and everything after parses
+ // as raw tag content rather than a quoted string — which is what turns
+ // modelId (server-controlled, from the endpoint's own /v1/models reply,
+ // not this box's) into markup instead of inert data. Same idiom as
+ // deleteCase's onclick a few hundred lines down.
+ const args = [cli.id, host.id, modelId].map((v) => escapeHtml(JSON.stringify(v))).join(', ');
rows.push(`
`);
@@ -598,59 +608,57 @@ Object.assign(CodemanApp.prototype, {
* Runs a session on `mode` and immediately applies `endpointId`/`modelId` to it
* via POST /api/sessions/:id/custom-model (see session-routes.ts) — the same
* restart-in-place apply path the (not-yet-built) endpoint-management surface
- * would use for an already-running session. Reuses the existing per-mode run*()
- * functions wholesale (case creation, env overrides, the works) rather than a
- * parallel create path, forcing a single instance: a custom-model run is a
- * one-off "try this endpoint" action, not a batch spawn.
+ * would use for an already-running session. A custom-model run is a one-off
+ * "try this endpoint" action, not a sticky mode.
+ *
+ * Routes through run() itself, via a temporary `_runMode` swap, rather than a
+ * parallel dispatch table: that is what gives this the same in-flight lock
+ * every other Run click gets (CLAUDE.md, Run launch synchronization — the lock
+ * exists so a double click cannot create duplicate sessions with the same
+ * `w
@@ -2540,9 +2586,9 @@ Object.assign(CodemanApp.prototype, {
${escapeHtml(h.baseUrl)} — ${modelSummary}
-
-
-
+
+
+
+
+
+
+
+ `,
+ { url: 'http://localhost/', runScripts: 'dangerously' }
+ );
+ const win = dom.window as unknown as Window &
+ typeof globalThis & {
+ CodemanApp: new () => any;
+ __codemanCustomModelClis?: Array<{ id: string; label: string }>;
+ };
+ (win as unknown as { eval: (s: string) => void }).eval('window.CodemanApp = function CodemanApp() {};');
+ (win as unknown as { eval: (s: string) => void }).eval(CONSTANTS_JS);
+ (win as unknown as { eval: (s: string) => void }).eval(SESSION_UI_JS);
+
+ win.__codemanCustomModelClis = options.customModelClis ?? [{ id: 'claude', label: 'Claude Code' }];
+
+ const app = new win.CodemanApp();
+ app.cases = options.activeCase ? [{ name: 'testcase', ...options.activeCase }] : [{ name: 'testcase' }];
+ app.loadAppSettingsFromStorage = () => ({ customModelEndpointsEnabled: options.settingsEnabled ?? true });
+ app.isCliAvailable = options.cliAvailable ?? (() => true);
+ app.showToast = () => {};
+ // _apiJson unwraps the {success,data} envelope for real against a live
+ // server; here it stands in for that, driven from a fixed `hosts` fixture
+ // so these tests exercise the picker's OWN code, not the envelope helper.
+ app._apiJson = async (path: string) => {
+ if (path === '/api/model-endpoints') return options.hosts ?? [];
+ return null;
+ };
+ return { dom, win, app };
+}
+
+describe('Custom Model Endpoint Profiles: Run-menu picker generation', () => {
+ it('generates a real, clickable button per (capable CLI, endpoint) pair', async () => {
+ const { win, app } = bootApp({
+ hosts: [{ id: 'llama-box', label: 'llama.cpp', baseUrl: 'http://localhost:8080', models: ['qwen3'] }],
+ });
+ const menu = win.document.getElementById('runModeMenu')!;
+ await app._refreshCustomModelRunOptions(menu);
+
+ const container = win.document.getElementById('runModeCustomModels')!;
+ const buttons = container.querySelectorAll('button');
+ expect(buttons.length).toBe(1);
+
+ const btn = buttons[0] as unknown as HTMLButtonElement & { onclick: unknown };
+ // The real bug: JSON.stringify's own double quotes terminate the
+ // double-quoted onclick attribute at the first one, so btn.onclick comes
+ // back null and the parsed attribute is garbage. With escapeHtml wrapping
+ // each stringified argument, jsdom (which compiles inline handlers under
+ // runScripts:"dangerously" exactly like a real browser) parses it as a
+ // real, callable function.
+ expect(typeof btn.onclick).toBe('function');
+
+ win.app = app;
+ expect(() => btn.onclick!(new (win as any).Event('click'))).not.toThrow();
+ });
+
+ it('escapes a model id containing HTML-significant characters instead of letting it break out of the tag', async () => {
+ // modelId comes from the endpoint's OWN /v1/models reply, which this box
+ // does not control — a live-HTML-injection vector if it ever reaches the
+ // markup unescaped, distinct from (and on top of) the quoting bug above.
+ const dangerousModel = '">