feat(backend): /settings GET+PUT, /models PiModel shape, app wiring

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
2026-06-28 16:09:04 +02:00
co-authored by Claude Opus 4.8
parent c4b599ec00
commit bfbb017413
5 changed files with 154 additions and 32 deletions
+11 -2
View File
@@ -8,11 +8,16 @@ import { authPreHandler } from "./auth/auth.js";
import { sessionRoutes } from "./routes/sessions.js";
import { sqlRoutes } from "./routes/sql.js";
import { metaRoutes, type ListModelsFn } from "./routes/meta.js";
import { settingsRoutes } from "./routes/settings.js";
import { createPiModelLister } from "./pi/list-models.js";
import { loadSettings, type Settings } from "./settings/settings-store.js";
import { effectiveSettings } from "./routes/settings.js";
export interface BuildAppDeps {
thtRunner?: ThtRunner;
spawnFn?: () => any;
listModels?: ListModelsFn;
getSettings?: () => Settings;
}
export function buildApp(config: AppConfig, deps?: BuildAppDeps): FastifyInstance {
@@ -29,11 +34,15 @@ export function buildApp(config: AppConfig, deps?: BuildAppDeps): FastifyInstanc
const mgr = new PiProcessManager(config, deps?.spawnFn ? { spawnFn: deps.spawnFn } : undefined);
const hub = new SseHub();
const listModels = deps?.listModels ?? createPiModelLister(config);
const getSettings = deps?.getSettings ?? (() => effectiveSettings(config, loadSettings(config)));
app.addHook("preHandler", authPreHandler(config.authMode));
app.get("/health", async () => ({ status: "ok" }));
sessionRoutes(app, { mgr, tht: tht as ThtRunner, hub });
sessionRoutes(app, { mgr, tht: tht as ThtRunner, hub, getSettings });
sqlRoutes(app, { tht: tht as ThtRunner });
metaRoutes(app, { harnessDir: config.harnessDir, listModels: deps?.listModels });
metaRoutes(app, { harnessDir: config.harnessDir, listModels });
settingsRoutes(app, { cfg: config, listModels });
return app;
}
+8 -25
View File
@@ -1,14 +1,15 @@
import { readdirSync } from "node:fs";
import { join } from "node:path";
import type { FastifyInstance } from "fastify";
import type { PiModel } from "../pi/list-models.js";
export type ListModelsFn = () => Promise<string[]>;
export type ListModelsFn = () => Promise<PiModel[]>;
/**
* List YAML workspace configs found in <harnessDir>/workspaces/*.yaml.
* Returns [{name, file}] — no database credentials or secrets.
*/
function listWorkspaces(harnessDir: string): { name: string; file: string }[] {
export function listWorkspaces(harnessDir: string): { name: string; file: string }[] {
const dir = join(harnessDir, "workspaces");
let entries: string[];
try {
@@ -18,10 +19,7 @@ function listWorkspaces(harnessDir: string): { name: string; file: string }[] {
}
return entries
.filter((f) => f.endsWith(".yaml") || f.endsWith(".yml"))
.map((f) => ({
name: f.replace(/\.ya?ml$/, ""),
file: f,
}));
.map((f) => ({ name: f.replace(/\.ya?ml$/, ""), file: f }));
}
export function metaRoutes(
@@ -32,28 +30,13 @@ export function metaRoutes(
return listWorkspaces(deps.harnessDir);
});
app.get("/models", async (_req, reply) => {
const fn = deps.listModels ?? defaultListModels;
app.get("/models", async () => {
const fn = deps.listModels ?? (async () => []);
try {
const models = await fn();
return { models };
return { models: await fn() };
} catch {
// Graceful fallback: Pi may not be running; don't crash the server.
return { models: [] };
return { models: [] as PiModel[] };
}
});
}
/**
* Default implementation: spawns a short-lived `tht` invocation that asks a Pi
* process for available models via get_available_models. This is intentionally
* behind the injectable seam so tests can stub it without spawning real processes.
*
* In the MVP we return an empty list — the real spawn path can be wired in later
* once a Pi-side "list models" RPC stabilises.
*/
async function defaultListModels(): Promise<string[]> {
// Real ephemeral Pi spawn left for a follow-up task.
// Returning [] here triggers the graceful fallback seen by clients.
return [];
}
+48
View File
@@ -0,0 +1,48 @@
import type { FastifyInstance } from "fastify";
import type { AppConfig } from "../config.js";
import { loadSettings, saveSettings, type Settings } from "../settings/settings-store.js";
import { listWorkspaces, type ListModelsFn } from "./meta.js";
/** Merge stored settings over env/first-workspace defaults. */
export function effectiveSettings(cfg: AppConfig, stored: Settings): Settings {
const workspaces = listWorkspaces(cfg.harnessDir);
return {
workspace: stored.workspace ?? (workspaces[0]?.name),
provider: stored.provider ?? cfg.defaults.provider,
model: stored.model ?? cfg.defaults.model,
thinking: stored.thinking ?? cfg.defaults.thinking,
};
}
export function settingsRoutes(
app: FastifyInstance,
deps: { cfg: AppConfig; listModels: ListModelsFn },
): void {
app.get("/settings", async () => {
return effectiveSettings(deps.cfg, loadSettings(deps.cfg));
});
app.put("/settings", async (req, reply) => {
const b = (req.body ?? {}) as Settings;
if (b.model) {
let available: { id: string }[] = [];
try {
available = await deps.listModels();
} catch {
available = [];
}
// Only validate when Pi gave us a non-empty list; otherwise allow (degraded).
if (available.length > 0 && !available.some((m) => m.id === b.model)) {
return reply.code(400).send({ error: `Unknown model: ${b.model}` });
}
}
const next: Settings = {
workspace: b.workspace,
provider: b.provider,
model: b.model,
thinking: b.thinking,
};
saveSettings(deps.cfg, next);
return effectiveSettings(deps.cfg, next);
});
}