discoclaw 1.2.4 → 1.3.0

package/dist/dashboard/server.js

@@ -10,11 +10,15 @@ import { DASHBOARD_HOST, DEFAULT_DASHBOARD_PORT, formatDashboardUrl } from './op
 import { renderDashboardPage } from './page.js';
 import { buildSnapshotResponse } from './api/snapshot.js';
 import { buildSettingsGetResponse, buildSettingsPostResponse, } from './api/settings.js';
+import { buildMetricsResponse } from './api/metrics.js';
+import { buildTracesResponse } from './api/traces.js';
 import { hasErrorCode, mapListenError } from './server-errors.js';
 import { applyFixes, inspect, KNOWN_RUNTIMES, loadDoctorContext, updateEnvKey } from '../health/config-doctor.js';
 import { DEFAULTS as MODEL_DEFAULTS, saveModelConfig } from '../model-config.js';
 import { isModelTier } from '../runtime/model-tiers.js';
 import { saveOverrides } from '../runtime-overrides.js';
+import { findRuntimeForModel } from '../runtime/model-tiers.js';
+import { getRuntimePathDefinition } from '../runtime/runtime-path-contract.js';
 import { getPlatformCommands, getServiceLogs, getServiceStatus, normalizeServiceName, summarizeServiceStatus, } from '../service-control.js';
 const DASHBOARD_MODEL_ROLES = [
     'chat',
@@ -178,6 +182,9 @@ function normalizeRuntimeName(value, knownRuntimes) {
     const normalized = trimmed === 'claude_code' ? 'claude' : trimmed;
     return knownRuntimes.has(normalized) ? normalized : undefined;
 }
+function presetToPrimaryRuntime(preset) {
+    return preset === 'codex' ? 'codex-cli' : 'claude-cli';
+}
 async function loadServiceName(inspectOpts, deps) {
     const ctx = await deps.loadDoctorContext(inspectOpts);
     return normalizeServiceName(ctx.env.DISCOCLAW_SERVICE_NAME);
@@ -352,7 +359,8 @@ async function applyPreset(preset, inspectOpts, deps) {
         throw new Error(`Unknown preset: ${preset}. Allowed values: ${[...ALLOWED_PRESETS].join(', ')}`);
     }
     const ctx = await deps.loadDoctorContext(inspectOpts);
-    await deps.updateEnvKey(ctx.configPaths.env, 'PRIMARY_RUNTIME', preset);
+    const primaryRuntime = presetToPrimaryRuntime(preset);
+    await deps.updateEnvKey(ctx.configPaths.env, 'PRIMARY_RUNTIME', primaryRuntime);
     const preservedOverrides = {};
     if (ctx.runtimeOverrides.ttsVoice) {
         preservedOverrides.ttsVoice = ctx.runtimeOverrides.ttsVoice;
@@ -361,7 +369,8 @@ async function applyPreset(preset, inspectOpts, deps) {
     await deps.saveModelConfig(ctx.configPaths.models, { ...MODEL_DEFAULTS });
     return {
         message: `Preset switched to ${preset}. Models reset to tier defaults. Restart the service to apply.`,
-        snapshot: await collectDashboardSnapshot(inspectOpts, deps),
+        snapshot: await collectDashboardSnapshot({ cwd: inspectOpts.cwd, env: { ...inspectOpts.env, PRIMARY_RUNTIME: primaryRuntime } }, deps),
+        primaryRuntime,
     };
 }
 async function buildPresetResponse(input, inspectOpts, deps) {
@@ -373,6 +382,27 @@ async function buildPresetResponse(input, inspectOpts, deps) {
         ...await applyPreset(preset, inspectOpts, deps),
     };
 }
+async function persistChatRuntimeSelection(runtimeName, inspectOpts, deps) {
+    const ctx = await deps.loadDoctorContext(inspectOpts);
+    await deps.updateEnvKey(ctx.configPaths.env, 'PRIMARY_RUNTIME', runtimeName);
+    let nextModels = ctx.models;
+    let clearedCrossRuntimeOverride = false;
+    const targetRuntimeId = getRuntimePathDefinition(runtimeName)?.runtimeId;
+    const savedChatModel = ctx.models['chat'];
+    const savedChatModelRuntimeId = savedChatModel ? findRuntimeForModel(savedChatModel) : undefined;
+    if (savedChatModel && targetRuntimeId && savedChatModelRuntimeId && savedChatModelRuntimeId !== targetRuntimeId) {
+        nextModels = updateModelConfig(nextModels, 'chat', null);
+        await deps.saveModelConfig(ctx.configPaths.models, nextModels);
+        clearedCrossRuntimeOverride = true;
+    }
+    return {
+        message: clearedCrossRuntimeOverride
+            ? `Saved startup chat runtime: ${runtimeName}. Cleared the saved chat model override because it targeted a different provider. Restart the service to apply.`
+            : `Saved startup chat runtime: ${runtimeName}. Restart the service to apply.`,
+        snapshot: await collectDashboardSnapshot({ cwd: inspectOpts.cwd, env: { ...inspectOpts.env, PRIMARY_RUNTIME: runtimeName } }, deps),
+        primaryRuntime: runtimeName,
+    };
+}
 function isDashboardBadRequest(message) {
     return (message === 'Request body too large'
         || message === 'JSON body must be an object'
@@ -415,6 +445,11 @@ export async function startDashboardServer(opts = {}) {
     const liveAuthCheckHandler = opts.liveAuthCheckHandler;
     // Mutable flag — set when a persisted config change requires a restart to take effect.
     let pendingRestart = false;
+    const previewEnvOverrides = {};
+    const configInspectOpts = () => ({
+        cwd: inspectOpts.cwd,
+        env: { ...inspectOpts.env, ...previewEnvOverrides },
+    });
     const server = http.createServer(async (req, res) => {
         const method = req.method ?? 'GET';
         const requestHostname = parseHostHeaderHostname(req.headers.host);
@@ -422,14 +457,15 @@ export async function startDashboardServer(opts = {}) {
             respondJson(res, 403, { ok: false, message: DNS_REBIND_ERROR });
             return;
         }
-        const pathname = new URL(req.url ?? '/', `http://${DASHBOARD_HOST}`).pathname;
+        const parsedUrl = new URL(req.url ?? '/', `http://${DASHBOARD_HOST}`);
+        const pathname = parsedUrl.pathname;
         try {
             if (method === 'GET' && pathname === '/') {
                 respondHtml(res, 200, html);
                 return;
             }
             if (method === 'GET' && pathname === '/api/snapshot') {
-                respondJson(res, 200, withLiveSnapshot(withStartupMcpSnapshot(await buildSnapshotResponse(inspectOpts, deps), opts.startupMcpStatus, opts.startupMcpWarnings), opts.liveSnapshotProvider, pendingRestart));
+                respondJson(res, 200, withLiveSnapshot(withStartupMcpSnapshot(await buildSnapshotResponse(configInspectOpts(), deps), opts.startupMcpStatus, opts.startupMcpWarnings), opts.liveSnapshotProvider, pendingRestart));
                 return;
             }
             if (method === 'GET' && pathname === '/api/status') {
@@ -463,7 +499,7 @@ export async function startDashboardServer(opts = {}) {
                 return;
             }
             if (method === 'GET' && pathname === '/api/doctor') {
-                respondJson(res, 200, await buildDoctorResponse(inspectOpts, deps));
+                respondJson(res, 200, await buildDoctorResponse(configInspectOpts(), deps));
                 return;
             }
             if (pathname === '/api/doctor/fix') {
@@ -475,7 +511,7 @@ export async function startDashboardServer(opts = {}) {
                     respondJson(res, 403, { ok: false, message: CROSS_ORIGIN_MUTATION_ERROR });
                     return;
                 }
-                respondJson(res, 200, withLiveSnapshot(withStartupMcpSnapshot(await buildDoctorFixResponse(inspectOpts, deps), opts.startupMcpStatus, opts.startupMcpWarnings), opts.liveSnapshotProvider, pendingRestart));
+                respondJson(res, 200, withLiveSnapshot(withStartupMcpSnapshot(await buildDoctorFixResponse(configInspectOpts(), deps), opts.startupMcpStatus, opts.startupMcpWarnings), opts.liveSnapshotProvider, pendingRestart));
                 return;
             }
             if (pathname === '/api/live-model') {
@@ -494,6 +530,7 @@ export async function startDashboardServer(opts = {}) {
                 const body = await readJsonBody(req);
                 const role = typeof body.role === 'string' ? body.role.trim() : '';
                 const model = typeof body.model === 'string' ? body.model.trim() : '';
+                const persist = body.persist === true;
                 if (!role)
                     throw new Error('Model role is required.');
                 if (!model)
@@ -503,8 +540,24 @@ export async function startDashboardServer(opts = {}) {
                     respondJson(res, 400, { ok: false, message: result.error });
                     return;
                 }
-                const snapshot = await collectDashboardSnapshot(inspectOpts, deps);
-                respondJson(res, 200, withLiveSnapshot(withStartupMcpSnapshot({ ok: true, message: result.summary, snapshot }, opts.startupMcpStatus, opts.startupMcpWarnings), opts.liveSnapshotProvider, pendingRestart));
+                let message = result.summary;
+                let snapshot = await collectDashboardSnapshot(configInspectOpts(), deps);
+                if (persist && role === 'chat') {
+                    const runtimeInput = normalizeRuntimeName(model, KNOWN_RUNTIMES);
+                    if (runtimeInput) {
+                        const persisted = await persistChatRuntimeSelection(runtimeInput, configInspectOpts(), deps);
+                        previewEnvOverrides['PRIMARY_RUNTIME'] = persisted.primaryRuntime;
+                        message = `${message} ${persisted.message}`;
+                        snapshot = persisted.snapshot;
+                    }
+                    else {
+                        const persisted = await applyModelChange({ role, model }, configInspectOpts(), deps, KNOWN_RUNTIMES);
+                        message = `${message} ${persisted.message}`;
+                        snapshot = persisted.snapshot;
+                    }
+                    pendingRestart = true;
+                }
+                respondJson(res, 200, withLiveSnapshot(withStartupMcpSnapshot({ ok: true, message, snapshot }, opts.startupMcpStatus, opts.startupMcpWarnings), opts.liveSnapshotProvider, pendingRestart));
                 return;
             }
             if (pathname === '/api/model') {
@@ -517,7 +570,7 @@ export async function startDashboardServer(opts = {}) {
                     return;
                 }
                 const body = await readJsonBody(req);
-                const modelResponse = await buildModelResponse(body, inspectOpts, deps, KNOWN_RUNTIMES);
+                const modelResponse = await buildModelResponse(body, configInspectOpts(), deps, KNOWN_RUNTIMES);
                 pendingRestart = true;
                 respondJson(res, 200, withLiveSnapshot(withStartupMcpSnapshot(modelResponse, opts.startupMcpStatus, opts.startupMcpWarnings), opts.liveSnapshotProvider, pendingRestart));
                 return;
@@ -532,7 +585,11 @@ export async function startDashboardServer(opts = {}) {
                     return;
                 }
                 const body = await readJsonBody(req);
-                const presetResponse = await buildPresetResponse(body, inspectOpts, deps);
+                const presetResponse = await buildPresetResponse(body, configInspectOpts(), deps);
+                const preset = typeof body.preset === 'string' ? body.preset.trim().toLowerCase() : '';
+                if (preset) {
+                    previewEnvOverrides['PRIMARY_RUNTIME'] = presetToPrimaryRuntime(preset);
+                }
                 pendingRestart = true;
                 respondJson(res, 200, withLiveSnapshot(withStartupMcpSnapshot(presetResponse, opts.startupMcpStatus, opts.startupMcpWarnings), opts.liveSnapshotProvider, pendingRestart));
                 return;
@@ -555,10 +612,11 @@ export async function startDashboardServer(opts = {}) {
                     throw new Error(`Unknown secret key: ${key}`);
                 if (!value)
                     throw new Error('Secret value is required.');
-                const ctx = await deps.loadDoctorContext(inspectOpts);
+                const ctx = await deps.loadDoctorContext(configInspectOpts());
                 await deps.updateEnvKey(ctx.configPaths.env, key, value);
+                previewEnvOverrides[key] = value;
                 pendingRestart = true;
-                const snapshot = await collectDashboardSnapshot(inspectOpts, deps);
+                const snapshot = await collectDashboardSnapshot(configInspectOpts(), deps);
                 respondJson(res, 200, withLiveSnapshot(withStartupMcpSnapshot({ ok: true, message: `Updated ${key}. Restart the service to apply.`, snapshot }, opts.startupMcpStatus, opts.startupMcpWarnings), opts.liveSnapshotProvider, pendingRestart));
                 return;
             }
@@ -600,7 +658,7 @@ export async function startDashboardServer(opts = {}) {
                 return;
             }
             if (method === 'GET' && pathname === '/api/settings') {
-                respondJson(res, 200, buildSettingsGetResponse(inspectOpts.env));
+                respondJson(res, 200, buildSettingsGetResponse(configInspectOpts().env));
                 return;
             }
             if (pathname === '/api/settings') {
@@ -615,11 +673,20 @@ export async function startDashboardServer(opts = {}) {
                 const body = await readJsonBody(req);
                 const key = typeof body.key === 'string' ? body.key.trim() : '';
                 const value = typeof body.value === 'string' ? body.value.trim() : '';
-                const response = await buildSettingsPostResponse(inspectOpts, deps, key, value);
+                const response = await buildSettingsPostResponse(configInspectOpts(), deps, key, value);
+                previewEnvOverrides[key] = value;
                 pendingRestart = true;
                 respondJson(res, 200, response);
                 return;
             }
+            if (method === 'GET' && pathname === '/api/traces') {
+                respondJson(res, 200, buildTracesResponse(parsedUrl.searchParams.get('limit')));
+                return;
+            }
+            if (method === 'GET' && pathname === '/api/metrics') {
+                respondJson(res, 200, buildMetricsResponse());
+                return;
+            }
             respondJson(res, 404, { ok: false, message: 'Not found' });
         }
         catch (err) {

package/dist/dashboard/server.test.js

@@ -777,8 +777,16 @@ describe('startDashboardServer', () => {
         const updateEnvKeyMock = vi.fn(async () => undefined);
         const saveModelConfigMock = vi.fn(async () => undefined);
         const saveOverridesMock = vi.fn(async () => undefined);
+        const loadDoctorContextMock = vi.fn(async (opts) => makeDoctorContext({
+            runtimeOverrides: ctx.runtimeOverrides,
+            runtimeOverridesFile: ctx.runtimeOverridesFile,
+            env: {
+                ...ctx.env,
+                ...(opts?.env ?? {}),
+            },
+        }));
         const { port } = await startServer({
-            loadDoctorContext: vi.fn(async () => ctx),
+            loadDoctorContext: loadDoctorContextMock,
             updateEnvKey: updateEnvKeyMock,
             saveModelConfig: saveModelConfigMock,
             saveOverrides: saveOverridesMock,
@@ -793,11 +801,11 @@ describe('startDashboardServer', () => {
         expect(body.ok).toBe(true);
         expect(body.message).toContain('codex');
         expect(body.message).toContain('tier defaults');
-        expect(updateEnvKeyMock).toHaveBeenCalledWith('/repo/.env', 'PRIMARY_RUNTIME', 'codex');
+        expect(updateEnvKeyMock).toHaveBeenCalledWith('/repo/.env', 'PRIMARY_RUNTIME', 'codex-cli');
         expect(saveOverridesMock).toHaveBeenCalledWith('/repo/data/runtime-overrides.json', { ttsVoice: 'alloy' });
         expect(saveModelConfigMock).toHaveBeenCalledWith('/repo/data/models.json', expect.objectContaining({}));
         expect(body.snapshot).toBeDefined();
-        expect(body.snapshot.primaryRuntime).toBe('claude');
+        expect(body.snapshot.primaryRuntime).toBe('codex');
     });
     it('applies claude preset correctly on /api/preset', async () => {
         const ctx = makeDoctorContext();
@@ -819,7 +827,7 @@ describe('startDashboardServer', () => {
         expect(response.status).toBe(200);
         expect(body.ok).toBe(true);
         expect(body.message).toContain('claude');
-        expect(updateEnvKeyMock).toHaveBeenCalledWith('/repo/.env', 'PRIMARY_RUNTIME', 'claude');
+        expect(updateEnvKeyMock).toHaveBeenCalledWith('/repo/.env', 'PRIMARY_RUNTIME', 'claude-cli');
     });
     it('preserves ttsVoice when clearing overrides via /api/preset', async () => {
         const ctx = makeDoctorContext({
@@ -1125,6 +1133,114 @@ describe('startDashboardServer', () => {
         expect(body.snapshot).toBeDefined();
         expect(liveModelHandler).toHaveBeenCalledWith('chat', 'opus');
     });
+    it('persists chat runtime changes requested from /api/live-model', async () => {
+        const ctx = makeDoctorContext({
+            models: {
+                chat: 'claude-opus-4-6',
+            },
+            modelsFile: {
+                exists: true,
+                values: {
+                    chat: 'claude-opus-4-6',
+                },
+            },
+        });
+        const liveModelHandler = vi.fn(() => ({
+            ok: true,
+            summary: 'Model updated: runtime → codex-cli, chat → gpt-5.4 (adapter default)',
+        }));
+        const updateEnvKeyMock = vi.fn(async () => undefined);
+        const saveModelConfigMock = vi.fn(async () => undefined);
+        const loadDoctorContextMock = vi.fn(async (opts) => makeDoctorContext({
+            models: ctx.models,
+            modelsFile: ctx.modelsFile,
+            env: {
+                ...ctx.env,
+                ...(opts?.env ?? {}),
+            },
+        }));
+        const { port } = await startServer({
+            loadDoctorContext: loadDoctorContextMock,
+            updateEnvKey: updateEnvKeyMock,
+            saveModelConfig: saveModelConfigMock,
+        }, {
+            liveModelHandler,
+            liveSnapshotProvider: () => ({
+                chatRuntime: 'codex-cli',
+                chatModel: 'gpt-5.4',
+                chatThinking: 'high',
+                availableRuntimes: ['claude-cli', 'codex-cli'],
+                pendingRestart: false,
+                imagegenProvider: undefined,
+                imagegenModel: undefined,
+                imagegenOptions: [],
+                imagegenHasGeminiKey: false,
+                imagegenHasOpenaiKey: false,
+            }),
+        });
+        const response = await makeRequest(port, {
+            path: '/api/live-model',
+            method: 'POST',
+            body: JSON.stringify({ role: 'chat', model: 'codex-cli', persist: true }),
+        });
+        const body = parseJson(response.text);
+        expect(response.status).toBe(200);
+        expect(body.ok).toBe(true);
+        expect(body.message).toContain('runtime → codex-cli');
+        expect(body.message).toContain('Saved startup chat runtime: codex-cli.');
+        expect(body.snapshot.primaryRuntime).toBe('codex');
+        expect(body.snapshot.live?.pendingRestart).toBe(true);
+        expect(updateEnvKeyMock).toHaveBeenCalledWith('/repo/.env', 'PRIMARY_RUNTIME', 'codex-cli');
+        expect(saveModelConfigMock).toHaveBeenCalledWith('/repo/data/models.json', {});
+    });
+    it('persists chat model changes requested from /api/live-model', async () => {
+        const ctx = makeDoctorContext({
+            env: {
+                DISCOCLAW_SERVICE_NAME: 'discoclaw-beta',
+                PRIMARY_RUNTIME: 'codex-cli',
+            },
+            models: {},
+            modelsFile: {
+                exists: true,
+                values: {},
+            },
+        });
+        const liveModelHandler = vi.fn(() => ({
+            ok: true,
+            summary: 'Model updated: chat → gpt-5.4',
+        }));
+        const saveModelConfigMock = vi.fn(async () => undefined);
+        const { port } = await startServer({
+            loadDoctorContext: vi.fn(async () => ctx),
+            saveModelConfig: saveModelConfigMock,
+        }, {
+            liveModelHandler,
+            liveSnapshotProvider: () => ({
+                chatRuntime: 'codex-cli',
+                chatModel: 'gpt-5.4',
+                chatThinking: 'high',
+                availableRuntimes: ['claude-cli', 'codex-cli'],
+                pendingRestart: false,
+                imagegenProvider: undefined,
+                imagegenModel: undefined,
+                imagegenOptions: [],
+                imagegenHasGeminiKey: false,
+                imagegenHasOpenaiKey: false,
+            }),
+        });
+        const response = await makeRequest(port, {
+            path: '/api/live-model',
+            method: 'POST',
+            body: JSON.stringify({ role: 'chat', model: 'gpt-5.4', persist: true }),
+        });
+        const body = parseJson(response.text);
+        expect(response.status).toBe(200);
+        expect(body.ok).toBe(true);
+        expect(body.message).toContain('Model updated: chat → gpt-5.4');
+        expect(body.message).toContain('Saved chat override: gpt-5.4. Changes take effect on next service restart.');
+        expect(body.snapshot.live?.pendingRestart).toBe(true);
+        expect(saveModelConfigMock).toHaveBeenCalledWith('/repo/data/models.json', { chat: 'gpt-5.4' });
+    });
     it('returns 400 when live model handler rejects the change', async () => {
         const liveModelHandler = vi.fn(() => ({
             ok: false,