diff --git a/.codesight/CODESIGHT.md b/.codesight/CODESIGHT.md index e3b4f0e..c2f4c29 100644 --- a/.codesight/CODESIGHT.md +++ b/.codesight/CODESIGHT.md @@ -1,11 +1,11 @@ # boocode — AI Context Map -> **Stack:** fastify, go-net-http | none | react | typescript -> **Microservices:** @boocode/contracts, @boocode/ion, @boocode/booterm, @boocode/coder, @boocode/server, @boocode/web, codecontext, @boocode/conductor +> **Stack:** fastify | none | react | typescript +> **Microservices:** @boocode/contracts, @boocode/ion, @boocode/booterm, @boocode/coder, @boocode/control, @boocode/server, @boocode/web, @boocode/conductor -> 147 routes (9 inferred) + 9 ws | 23 models | 92 components | 288 lib files | 42 env vars | 16 middleware +> 182 routes (11 inferred) + 11 ws | 40 models | 107 components | 316 lib files | 57 env vars | 16 middleware > **Token savings:** this file is ~0 tokens. Without it, AI exploration would cost ~0 tokens. **Saves ~0 tokens per conversation.** -> **Last scanned:** 2026-06-08 04:10 — re-run after significant changes +> **Last scanned:** 2026-06-13 12:48 — re-run after significant changes --- @@ -17,14 +17,13 @@ - **`/api/plans`** GET | POST | GET/:id | PATCH/:id → Plan - **`/api/runs`** GET | POST | GET/:id → Run - **`/api/tasks`** GET | POST | GET/:id → Task +- **`/api/policies`** GET | POST | GET/:id | DELETE/:id → Policie - **`/api/chats/:id/messages`** GET | POST | GET/:id | DELETE/:id → Message - **`/api/projects`** GET | POST | GET/:id | PATCH/:id | DELETE/:id → Project - **`/api/sessions`** GET/:id | PATCH/:id | DELETE/:id → Session ## Other Routes -### fastify - - `GET` `/api/term/health` params() - `GET` `/api/term/sessions/:sid/panes/:pid/search` params(sid, pid) [auth] - `GET` `/api/term/sessions` params() [auth] @@ -76,6 +75,45 @@ - `POST` `/api/sessions/:sessionId/worktree-stash` params(sessionId) [auth, db] - `GET` `/api/ws/sessions/:sessionId` params(sessionId) [auth, db] - `GET` `/api/ws/user` params() [auth, db] +- `POST` `/v1/chat/completions` params() [auth, ai] +- `GET` `/v1/models` params() [auth, ai] +- `POST` `/api/action/submit` params() [queue] +- `GET` `/api/action/queue/:providerId` params(providerId) [queue] +- `POST` `/api/bench/suite` params() [auth, db, cache, queue] +- `GET` `/api/bench/suites` params() [auth, db, cache, queue] +- `GET` `/api/bench/suites/:id` params(id) [auth, db, cache, queue] +- `POST` `/api/bench/run` params() [auth, db, cache, queue] +- `GET` `/api/bench/runs` params() [auth, db, cache, queue] +- `GET` `/api/bench/runs/:id` params(id) [auth, db, cache, queue] +- `GET` `/api/bench/baselines` params() [auth, db, cache, queue] +- `GET` `/api/capture/:providerId/:swapEntryId` params(providerId, swapEntryId) [db] +- `POST` `/api/eval/suite` params() [db, queue] +- `GET` `/api/eval/suites` params() [db, queue] +- `GET` `/api/eval/suites/:id` params(id) [db, queue] +- `POST` `/api/eval/seed` params() [db, queue] +- `POST` `/api/eval/run` params() [db, queue] +- `GET` `/api/eval/runs` params() [db, queue] +- `GET` `/api/eval/runs/:id` params(id) [db, queue] +- `GET` `/api/eval/leaderboard` params() [db, queue] +- `GET` `/upstream/:model/props` params(model) [db, cache, ai] +- `GET` `/api/playground/models` params() [auth, cache] +- `POST` `/api/playground/chat` params() [auth, cache] +- `POST` `/api/playground/chat-ab` params() [auth, cache] +- `GET` `/api/policies/virtual-models` params() [auth, db] +- `GET` `/api/policies/dispatch-log` params() [auth, db] +- `GET` `/api/reports` params() [db] +- `GET` `/api/reports/:id` params(id) [db] +- `POST` `/api/reports/generate` params() [db] +- `GET` `/api/reports/schedule` params() [db] +- `POST` `/api/reports/schedule` params() [db] +- `GET` `/api/routing/scores` params() [db] +- `GET` `/api/hosts` params() [db] +- `PATCH` `/api/hosts/:id` params(id) [db] +- `GET` `/api/hosts/:id/config` params(id) [db] +- `POST` `/api/hosts/:id/config/validate` params(id) [db] +- `POST` `/api/hosts/:id/config/diff` params(id) [db] +- `POST` `/api/hosts/:id/config/apply` params(id) [db] +- `GET` `/api/ws/control` params() - `GET` `/api/projects/:id/agents` params(id) [db, cache] - `GET` `/api/analytics/context` params() [auth, db] - `POST` `/api/chats/:id/messages/:msg_id/artifacts/download` params(id, msg_id) [auth, db] @@ -95,8 +133,13 @@ - `POST` `/api/chats/:id/compare` params(id) [auth, db, queue] - `GET` `/api/coder/ws/sessions/:sessionId` params(sessionId) [auth] - `ALL` `/api/coder/*` params() [auth] +- `GET` `/api/control/ws` params() [auth, ai] +- `ALL` `/api/control/*` params() [auth, ai] - `GET` `/api/settings/inference` params() [cache] - `PATCH` `/api/settings/inference` params() [cache] +- `GET` `/api/memory` params() [db] +- `GET` `/api/memory/daily` params() [db] +- `GET` `/api/memory/dreams` params() [db] - `GET` `/api/sessions/:id/messages` params(id) [auth, db, queue] - `POST` `/api/chats/:id/messages/:message_id/regenerate` params(id, message_id) [auth, db, queue] - `POST` `/api/chats/:id/compact` params(id) [auth, db, queue] @@ -137,21 +180,6 @@ - `GET` `/api/chats/:id/traces` params(id) [db] - `GET` `/api/ws/sessions/:id` params(id) [auth, db] -### go-net-http - -- `GET` `/health` params() [queue] -- `POST` `/v1/get_codebase_overview` params() [queue] -- `POST` `/v1/get_file_analysis` params() [queue] -- `POST` `/v1/get_symbol_info` params() [queue] -- `POST` `/v1/search_symbols` params() [queue] -- `POST` `/v1/get_dependencies` params() [queue] -- `POST` `/v1/watch_changes` params() [queue] -- `POST` `/v1/get_semantic_neighborhoods` params() [queue] -- `POST` `/v1/get_framework_analysis` params() [queue] -- `POST` `/v1/get_symbol_details` params() [queue] -- `POST` `/v1/get_call_graph` params() [queue] -- `POST` `/v1/get_blast_radius` params() [queue] - ## WebSocket Events - `WS` `message` — `apps/booterm/src/ws/attach.ts` @@ -161,6 +189,8 @@ - `WS` `close` — `apps/coder/src/cli.ts` - `WS` `close` — `apps/coder/src/routes/ws.ts` - `WS` `error` — `apps/coder/src/routes/ws.ts` +- `WS` `close` — `apps/control/src/routes/ws.ts` +- `WS` `error` — `apps/control/src/routes/ws.ts` - `WS` `close` — `apps/server/src/routes/ws.ts` - `WS` `error` — `apps/server/src/routes/ws.ts` @@ -305,6 +335,173 @@ - items_completed: integer (required) - metadata: jsonb +### control_hosts +- provider_id: text (pk, fk) +- ssh_host: text +- ssh_user: text +- ssh_key_path: text +- config_path: text +- restart_cmd: text +- os: text +- gpu_label: text +- enabled: boolean (required) + +### control_requests +- id: bigint(auto) (pk) +- provider_id: text (required, fk) +- swap_entry_id: integer (required, fk) +- ts: timestamp(tz) (required) +- model: text +- req_path: text +- status_code: integer +- duration_ms: integer +- cache_tokens: integer +- input_tokens: integer +- output_tokens: integer +- prompt_tps: real +- gen_tps: real +- has_capture: boolean (required) +- capture: jsonb + +### control_perf_samples +- provider_id: text (required, fk) +- ts: timestamp(tz) (required) +- gpu: jsonb +- sys: jsonb + +### control_perf_rollup_5m +- provider_id: text (required, fk) +- bucket: timestamp(tz) (required) +- gpu_agg: jsonb +- sys_agg: jsonb + +### control_model_events +- provider_id: text (required, fk) +- model: text (required) +- state: text (required) +- ts: timestamp(tz) (required) +- detail: jsonb + +### bench_suites +- id: text (pk) +- name: text (required) +- provider_id: text (required, fk) +- model: text (required) +- repetitions: integer (required) +- metadata: jsonb + +### bench_runs +- id: text (pk) +- suite_id: text (required, fk) +- job_type: text (required) +- status: text (required) +- started_at: timestamp(tz) +- finished_at: timestamp(tz) +- total_samples: integer (required) +- completed_samples: integer (required) +- concurrent_foreign_requests: integer (required) +- temperature: real +- top_p: real +- aggregate: jsonb +- regression_flag: text +- error: text + +### bench_samples +- id: bigint(auto) (pk) +- run_id: text (required, fk) +- prompt_tokens: integer (required) +- gen_tokens: integer (required) +- concurrency: integer (required) +- repetition: integer (required) +- ttft_ms: real +- total_ms: real +- prompt_tps: real +- gen_tps: real +- cache_n: integer +- error: text + +### bench_baselines +- provider_id: text (required, fk) +- model: text (required) +- aggregate: jsonb (required) +- run_id: text (required, fk) + +### eval_suites +- id: text (pk) +- name: text (required) +- kind: text (required) +- version: integer (required) +- tasks: jsonb (required) +- judge_model: text +- judge_model_version: text +- metadata: jsonb + +### eval_runs +- id: text (pk) +- suite_id: text (required, fk) +- job_type: text (required) +- provider_id: text (required, fk) +- model: text (required) +- quant: text +- status: text (required) +- judge_model: text +- judge_model_version: text +- started_at: timestamp(tz) +- finished_at: timestamp(tz) +- total_tasks: integer (required) +- completed_tasks: integer (required) +- aggregate: jsonb +- error: text + +### eval_results +- id: bigint(auto) (pk) +- run_id: text (required, fk) +- task_id: text (required, fk) +- task_index: integer (required) +- score: real +- max_score: real +- rationale: text +- sandbox_exit_code: integer +- sandbox_stderr: text +- sandbox_stdout: text +- execution_ms: integer +- error: text + +### control_reports +- id: text (pk) +- kind: text (required) +- interval: text (required) +- period_start: timestamp(tz) (required) +- period_end: timestamp(tz) (required) +- markdown: text (required) +- stats: jsonb + +### control_schedule_meta +- name: text (pk) +- interval: text (required) +- enabled: boolean (required) +- last_run_at: timestamp(tz) + +### route_policies +- id: text (pk) +- name: text (required) +- virtual_model: text (required) +- candidates: jsonb (required) +- fallback: text +- enabled: boolean (required) + +### route_dispatch_log +- id: bigint(auto) (pk) +- ts: timestamp(tz) (required) +- virtual_model: text (required) +- chosen_provider_id: text (fk) +- chosen_model: text +- candidates_tried: jsonb +- status: text (required) +- source: text +- error: text +- duration_ms: integer + ### projects - id: uuid (pk) - name: text (required) @@ -384,6 +581,15 @@ - messages: jsonb (required) - tool_states: jsonb (required) +### memory_entries +- id: uuid (pk) +- project_id: uuid (required, fk) +- topic: text (required) +- title: text (required) +- content: text (required) +- date: date +- mood: text + --- # Components @@ -448,6 +654,19 @@ - **Workspace** — props: sessionId, projectId, agentId, onAgentChange, panesHook, chatsHook, session, project, onAddPane — `apps/web/src/components/Workspace.tsx` - **AddProviderModal** — props: open, onOpenChange, onAdded — `apps/web/src/components/coder/AddProviderModal.tsx` - **ProvidersSettings** — `apps/web/src/components/coder/ProvidersSettings.tsx` +- **ActivityTab** — props: requests, providerIds, onOpenCapture — `apps/web/src/components/control/ActivityTab.tsx` +- **BenchTab** — props: providerIds — `apps/web/src/components/control/BenchTab.tsx` +- **CaptureDrawer** — props: requestId, providerId, onClose — `apps/web/src/components/control/CaptureDrawer.tsx` +- **EvalsTab** — props: providerIds — `apps/web/src/components/control/EvalsTab.tsx` +- **FleetTab** — props: hosts, gpuMap — `apps/web/src/components/control/FleetTab.tsx` +- **HostCard** — props: host, gpuData — `apps/web/src/components/control/HostCard.tsx` +- **HostConfigEditor** — props: providerId, onClose — `apps/web/src/components/control/HostConfigEditor.tsx` +- **LogsTab** — props: logs, providerIds — `apps/web/src/components/control/LogsTab.tsx` +- **PerfChart** — props: series, timestamps, height — `apps/web/src/components/control/PerfChart.tsx` +- **PlaygroundTab** — props: providerIds — `apps/web/src/components/control/PlaygroundTab.tsx` +- **ReportsTab** — `apps/web/src/components/control/ReportsTab.tsx` +- **TtlRing** — props: deadline, size — `apps/web/src/components/control/TtlRing.tsx` +- **VramGauge** — props: used, total, size — `apps/web/src/components/control/VramGauge.tsx` - **MatrixRain** — props: enabled, density, speed, opacity — `apps/web/src/components/fx/MatrixRain.tsx` - **NeonField** — props: enabled, opacity, speed — `apps/web/src/components/fx/NeonField.tsx` - **ThemeFx** — `apps/web/src/components/fx/ThemeFx.tsx` @@ -470,10 +689,12 @@ - **FloatingMenu** — props: x, y, hasSelection, chatInputs, onCopy, onPaste, onSelectAll, onSearch, onSendToChat, onDismiss — `apps/web/src/components/panes/terminal/FloatingMenu.tsx` - **SearchBar** — props: searchRef, theme, onClose — `apps/web/src/components/panes/terminal/SearchBar.tsx` - **TerminalHotkeyBar** — props: ctrlArmed, onSendBytes, onArmCtrl, onFit — `apps/web/src/components/panes/terminal/TerminalHotkeyBar.tsx` +- **ControlProvider** — `apps/web/src/hooks/useControlStream.tsx` - **RightRailDrawerProvider** — `apps/web/src/hooks/useRightRailDrawer.tsx` - **SidebarDrawerProvider** — `apps/web/src/hooks/useSidebarDrawer.tsx` - **PATH_REGEX** — `apps/web/src/lib/linkify-paths.tsx` - **Analytics** — `apps/web/src/pages/Analytics.tsx` +- **Control** — `apps/web/src/pages/Control.tsx` - **Home** — `apps/web/src/pages/Home.tsx` - **Memory** — `apps/web/src/pages/Memory.tsx` - **Project** — `apps/web/src/pages/Project.tsx` @@ -600,8 +821,8 @@ - function sanitizeSlug: (s) => string - function buildBattleSlug: (battleId, battleType, createdAt) => string - _...7 more_ -- `apps/coder/src/services/arena-model-call.ts` — function arenaModelCall: (opts, 'LLAMA_SWAP_URL'>; - model) => Promise +- `apps/coder/src/services/arena-local-models.ts` — function createLocalModelSet: (log) => LocalModelSetHandle, interface LocalModelSetHandle +- `apps/coder/src/services/arena-model-call.ts` — function resolveModelEndpoint: (model) => void, function arenaModelCall: (opts) => Promise - `apps/coder/src/services/arena-runner.ts` - function createBattleRunner: (deps) => BattleRunner - interface ContestantSpec @@ -779,6 +1000,11 @@ - interface LineRef - `apps/coder/src/services/hashline/xxhash32.ts` — function hashXxh32: (input, seed) => number - `apps/coder/src/services/host-exec.ts` — function hostExec: (command, opts?) => Promise, interface HostExecResult +- `apps/coder/src/services/llama-providers.ts` + - function loadLlamaProviders: (providersPath, llamaSwapUrl) => LlamaProvidersFile + - function getLlamaProviders: () => LlamaProvidersFile + - function parseModelRef: (ref) => ParsedModelRef +- `apps/coder/src/services/local-gateway.ts` — function resolveGatewayModel: (model) => void, function registerLocalGatewayRoutes: (app) => void - `apps/coder/src/services/lsp/client.ts` — class LspClient - `apps/coder/src/services/lsp/config.ts` — function getServerConfig: (filePath) => LspServerConfig | null, interface LspServerConfig - `apps/coder/src/services/lsp/operations.ts` @@ -831,6 +1057,11 @@ - function reclaimPort: (port) => void - function waitForPortRelease: (port, timeoutMs) => Promise - function freePort: () => Promise +- `apps/coder/src/services/opencode-config-sync.ts` + - function buildBoocodeLocalProviderConfig: (gatewayUrl) => Promise + - function syncOpencodeConfig: (gatewayUrl, log, msg) => void + - interface OpencodeProviderConfig + - interface OpencodeConfig - `apps/coder/src/services/orphan-worktree-reaper.ts` - function reapOrphanWorktrees: (sql, log, graceMs, now) => void - function createOrphanWorktreeReaper: (deps) => void @@ -859,6 +1090,11 @@ - function waitForElicitationResponse: (taskId, sessionId, provider, modeId, params, timeoutMs) => Promise - function cancelPendingPermission: (taskId) => void - _...3 more_ +- `apps/coder/src/services/pi-config-sync.ts` + - function buildPiProviderEntry: (gatewayUrl, existing?) => Promise + - function syncPiConfig: (gatewayUrl, log, msg) => void + - interface PiProviderConfig + - interface PiModelsConfig - `apps/coder/src/services/plan-store.ts` - function createPlan: (sql, opts) => Promise - function getPlan: (sql, planId) => Promise @@ -891,11 +1127,11 @@ - `apps/coder/src/services/provider-snapshot.ts` - function fetchDeepSeekModels: (config) => Promise - function fetchLlamaSwapModels: (config) => Promise + - function fetchRegistryModels: (defaultModel?) => Promise - function prefixLlamaSwapModels: (models) => ProviderModel[] + - function prefixBoocodeLocalModels: (models) => ProviderModel[] - function mergeModels: (...lists) => ProviderModel[] - - function getProviderSnapshot: (sql, config, cwd?, force) => Promise - - function clearProviderSnapshotCache: () => void - - _...2 more_ + - _...4 more_ - `apps/coder/src/services/pty-dispatch.ts` - function dispatchViaPty: (opts) => Promise - interface DispatchResult @@ -939,6 +1175,125 @@ - function isSecretPath: (filePath) => boolean - function resolveWritePath: (projectRoot, filePath) => string - class WriteGuardError +- `apps/control/src/config.ts` — function loadConfig: () => Config, type Config +- `apps/control/src/db.ts` + - function getSql: (config) => Sql + - function waitForTable: (sql, tableName, timeoutMs) => Promise + - function applySchema: (sql) => Promise + - function pingDb: (sql) => Promise + - function closeDb: () => Promise + - type Sql +- `apps/control/src/index.ts` + - function createDeltaEmitter: () => DeltaEmitter + - function handleLlamaSweepEvent: (fleet, sql, config, providerId, emitter, event, logRelay) => Promise + - type DeltaCallback + - type DeltaEmitter +- `apps/control/src/services/action-queue.ts` + - class ActionQueue + - interface QueuedAction + - interface ActionQueueEntry + - interface ActionQueueState + - interface ActionQueueDeps + - type ActionType +- `apps/control/src/services/bench-engine.ts` + - function parseLlamaTimings: (chunk) => BenchTimings | null + - function runSingleBenchRequest: (baseUrl, model, promptTokens, genTokens, repetition, temperature, topP) => Promise + - function runBenchSuite: (params, sql, emitter, seq, onProgress) => void + - function computeRegressionFlag: (current, baselineJson) => 'baseline' | 'regression' | 'improvement' | null + - function computeAggregates: (samples) => BenchAggregate + - interface BenchSuite + - _...5 more_ +- `apps/control/src/services/capture-fetch.ts` + - function fetchCapture: (baseUrl, providerId, swapEntryId) => Promise + - function parseCapture: (raw, unknown>, providerId, swapEntryId) => CaptureData + - function persistCapture: (sql, capture) => Promise + - interface CaptureData + - interface CaptureFetchResult +- `apps/control/src/services/eval-suites.ts` + - function loadEvalSuitesFromData: () => EvalSuiteData[] + - function seedEvalSuites: (sql) => Promise + - function listEvalSuites: (sql) => Promise + - function getEvalSuite: (sql, id) => Promise + - function upsertEvalSuite: (sql, id, name, kind, tasks, judgeModel, metadata?, unknown>) => Promise + - function createEvalRun: (sql, suiteId, providerId, model, quant, judgeModel, judgeModelVersion, totalTasks) => Promise + - _...9 more_ +- `apps/control/src/services/fleet-connector.ts` + - function addJitter: (delayMs) => number + - function reconnectDecision: (failures, policy) => ReconnectDecision + - function parseSseLine: (line) => LlamaSweepSSEEvent | null + - function startFleetConnector: (providerId, baseUrl, deps) => AbortController + - function runFleetConnector: (providerId, baseUrl, abort, deps) => Promise + - interface ReconnectPolicy + - _...8 more_ +- `apps/control/src/services/fleet-state.ts` + - function createFleetState: () => FleetState + - function ensureHostState: (fleet, providerId) => HostState + - function stampLastSeen: (state) => void + - function incrementSeq: (state) => number + - interface HostConfig + - interface FleetState + - _...3 more_ +- `apps/control/src/services/gateway.ts` + - function isGatewayVirtualModel: (id) => boolean + - function parseVirtualModel: (modelId) => string + - function orderCandidates: (virtualModel, policy, scores) => string[] + - function resolveCandidates: (sql, fleet, modelId) => Promise + - function splitComposite: (compositeId) => void + - interface RoutePolicyRow + - _...3 more_ +- `apps/control/src/services/host-access.ts` — function acquireHostAccess: (providerId, purpose) => Promise, interface HostGrant +- `apps/control/src/services/jsonb.ts` + - function jsonbStringArray: (value) => string[] + - function jsonbArray: (value) => unknown[] + - function jsonbNumberArray: (value) => number[] + - function jsonbObject: (value) => Record | null +- `apps/control/src/services/judge-runner.ts` + - function runJudgeEval: (params, sql, emitter, seq, logger) => void + - interface JudgeEvalParams + - interface JudgeProgress + - interface JudgeResult +- `apps/control/src/services/llama-providers.ts` + - function loadLlamaProviders: (providersPath, llamaSwapUrl) => LlamaProvidersFile + - function getLlamaProviders: () => LlamaProvidersFile + - function resolveProviderBaseUrl: (providerId) => string | null +- `apps/control/src/services/log-relay.ts` — class LogRelay, interface LogLine +- `apps/control/src/services/reconcile.ts` — function detectGap: (oldestReconcileTs, newestPersistedTs) => boolean +- `apps/control/src/services/reports.ts` + - function gatherReportStats: (sql, interval, now) => Promise + - function renderReportMarkdown: (stats) => string + - function generateReport: (sql, interval, now) => void + - function isReportDue: (lastRunAt, interval, now) => boolean + - function runReportSchedulerTick: (sql, now) => void + - interface ReportStats + - _...1 more_ +- `apps/control/src/services/retention.ts` + - function buildRetentionConfig: (cfg) => RetentionConfig + - function runRollup: (sql, providerId, hours) => Promise + - function pruneRawSamples: (sql, providerId, hours) => Promise + - function pruneActivity: (sql, hours) => Promise + - function pruneModelEvents: (sql, hours) => Promise + - function trimCapture: (captureJson, sizeKB) => string | null + - _...2 more_ +- `apps/control/src/services/routing-scores.ts` + - function assignBadges: (scores) => void + - function computeRoutingScores: (sql, fleet) => Promise + - interface ModelScore + - type BadgeKind + - const BADGE_LABELS: Record +- `apps/control/src/services/sandbox-runner.ts` + - function runCodeEval: (params, sql, emitter, seq, onProgress) => void + - interface SandboxEvalParams + - interface SandboxProgress + - interface SandboxResult + - interface SandboxContainer +- `apps/control/src/services/ssh-config.ts` + - function validateLlamaConfig: (yamlText, schema) => ValidationResult + - function computeDiff: (oldText, newText) => string + - function backupFilename: (configPath, now) => string + - function readRemoteConfig: (target, configPath, exec) => Promise + - function applyRemoteConfig: (opts) => Promise + - function healthWait: (baseUrl, fetcher, attempts, delayMs) => Promise + - _...7 more_ - `apps/server/src/config.ts` — function loadConfig: () => Config, type Config - `apps/server/src/db.ts` - function getSql: (config) => Sql @@ -1086,11 +1441,6 @@ - function finalizeStreamedRow: (ctx, opts) => void - function finalizeEmpty: (ctx, args) => Promise - function finalizeCompletion: (ctx, args, result, startedAt, session) => Promise -- `apps/server/src/services/inference/llama-args-validator.ts` - - function validateExtraArgs: (args?) => string[] - - function isManagedFlag: (flag) => boolean - - function stripShadowingFlags: (args, opts?) => string[] - - interface StripOptions - `apps/server/src/services/inference/loop-detectors.ts` - function detectContentRepeat: (messages) => LoopDetectionResult - function detectToolLoop: (toolNames) => LoopDetectionResult @@ -1121,12 +1471,12 @@ - interface OpenAiMessage - `apps/server/src/services/inference/provider.ts` - function isDeepSeekModel: (modelId) => boolean - - function resolveRoute: (agent, config?, modelId?) => RoutingInfo - - function upstreamModel: (config, modelId, agent?) => LanguageModel + - function isGatewayVirtualModel: (wireModelId) => boolean + - function resolveModelProvider: (modelId, config) => ResolvedModel + - function resolveRoute: (agent, config?, modelId?) => void + - function upstreamModel: (config, modelId, agent?, source?) => LanguageModel - function resolveModelEndpoint: (config, modelId) => void - - function resetDeepSeekProvider: () => void - - interface RoutingInfo - - _...1 more_ + - _...4 more_ - `apps/server/src/services/inference/prune.ts` - function selectPruneTargets: (partsNewestFirst, tailStartCreatedAt) => void - function prune: (args) => Promise @@ -1194,6 +1544,10 @@ - function runInference: (ctx, sessionId, chatId, assistantMessageId, signal?) => Promise - function runInferenceWithModel: (ctx, sessionId, chatId, assistantMessageId, modelOverride, compareGroupId, signal?) => Promise - function createInferenceRunner: (ctx, 'publishUser'>, publishUserFn, frame) => void +- `apps/server/src/services/llama-providers.ts` + - function loadLlamaProviders: (providersPath, llamaSwapUrl) => LlamaProvidersFile + - function getLlamaProviders: () => LlamaProvidersFile + - function parseModelRef: (ref) => ParsedModelRef - `apps/server/src/services/mcp-client.ts` - function initialize: (entries, logger) => Promise - function callTool: (prefixedName, args, unknown>) => Promise @@ -1415,6 +1769,7 @@ - `apps/web/src/hooks/useProjectGit.ts` — function useProjectGit: (projectId) => GitMeta | null - `apps/web/src/hooks/useProviderSnapshot.ts` — function refreshProviderSnapshot: (cwd?) => Promise, function useProviderSnapshot: (cwd?) => ProviderSnapshotEntry[] | null - `apps/web/src/hooks/usePullToRefresh.ts` — function usePullToRefresh: (onRefresh) => void +- `apps/web/src/hooks/useReducedMotion.ts` — function useReducedMotion: () => boolean - `apps/web/src/hooks/useSessionChats.ts` - function useSessionChats: (sessionId, opts) => UseSessionChatsResult - interface UseSessionChatsOpts @@ -1532,6 +1887,14 @@ - function waitForEvent: (threadManager, threadId, eventType, timeoutMs) => Promise - function waitForEventCount: (threadManager, threadId, eventType, count, timeoutMs) => Promise - function waitForEventMatch: (threadManager, threadId, predicate) => void +- `packages/contracts/src/llama-providers.ts` + - function parseModelRef: (ref, defaultProvider) => ParsedModelRef + - function formatModelRef: (providerId, wireModelId) => string + - interface ParsedModelRef + - type LlamaProvider + - type LlamaProvidersFile + - const LlamaProviderSchema + - _...1 more_ - `packages/ion/src/cli/commands/abandon.ts` — function abandonCommand: (args, options) => Promise - `packages/ion/src/cli/commands/approve.ts` — function approveCommand: (args, options) => Promise - `packages/ion/src/cli/commands/cleanup.ts` — function cleanupCommand: (args, options) => Promise @@ -1639,6 +2002,7 @@ - `BOOCODE_TRUNCATION_DIR` **required** — apps/server/src/services/__tests__/truncate.test.ts - `BOOCODER_DEV_URL` **required** — apps/web/vite.config.ts - `BOOCODER_URL` **required** — apps/coder/src/cli.ts +- `BOOCONTROL_URL` **required** — apps/server/src/index.ts - `BOOTERM_DEV_URL` **required** — apps/web/vite.config.ts - `BOOTERM_SSH_HOST` **required** — apps/booterm/src/pty/manager.ts - `BOOTERM_SSH_USER` **required** — apps/booterm/src/pty/manager.ts @@ -1648,38 +2012,53 @@ - `BRAINSTORM_OWNER_PID` **required** — data/skills/superpowers/brainstorming/scripts/server.cjs - `BRAINSTORM_PORT` **required** — data/skills/superpowers/brainstorming/scripts/server.cjs - `BRAINSTORM_URL_HOST` **required** — data/skills/superpowers/brainstorming/scripts/server.cjs -- `CODECONTEXT_CHILD` **required** — codecontext/shim.go +- `CAPTURE_BUDGET_MB` (has default) — apps/control/.env.example +- `CAPTURE_SIZE_KB` (has default) — apps/control/.env.example - `CONDUCTOR_MODEL` **required** — conductor/src/dispatch.ts - `CONDUCTOR_OPENCODE_BIN` **required** — conductor/src/dispatch.ts - `CONDUCTOR_TIMEOUT_MS` **required** — conductor/src/dispatch.ts - `CONTAINER_GUIDANCE_FILE` **required** — apps/server/src/services/__tests__/system-prompt.test.ts - `CONTEXT7_API_KEY` (has default) — .env -- `DATABASE_URL` (has default) — .env.example +- `DATABASE_URL` (has default) — apps/control/.env.example - `DEEPSEEK_API_KEY` (has default) — .env - `DEEPSEEK_BASE_URL` (has default) — .env - `DEFAULT_MODEL` (has default) — .env.example - `DEV_REMOTE_USER` **required** — apps/web/vite.config.ts - `EMBEDDING_MODEL_PATH` **required** — apps/server/src/services/memory/embeddings.ts +- `EVAL_JUDGE_MODEL` **required** — apps/control/src/services/judge-runner.ts - `GITEA_BASE_URL` (has default) — .env - `GITEA_SSH_HOST` (has default) — .env - `GITEA_TOKEN` (has default) — .env - `GITEA_USER` (has default) — .env -- `LLAMA_SWAP_URL` (has default) — .env.example +- `HOST` (has default) — apps/control/.env.example +- `LLAMA_PROVIDERS_PATH` (has default) — apps/control/.env.example +- `LLAMA_SWAP_URL` (has default) — apps/control/.env.example +- `LOG_LEVEL` (has default) — apps/control/.env.example - `MCP_TEST_MISSING` **required** — apps/server/src/services/__tests__/mcp-config.test.ts - `MCP_TEST_SECRET` **required** — apps/server/src/services/__tests__/mcp-config.test.ts - `MEMORY_SEARCH` **required** — apps/server/src/services/memory/recall.ts -- `NODE_ENV` (has default) — .env.example -- `PORT` (has default) — .env.example +- `NODE_ENV` (has default) — apps/control/.env.example +- `PORT` (has default) — apps/control/.env.example - `POSTGRES_PASSWORD` (has default) — .env.example - `PROJECT_ROOT_WHITELIST` (has default) — .env.example +- `RETENTION_RAW_HOURS` (has default) — apps/control/.env.example +- `RETENTION_ROLLUP_DAYS` (has default) — apps/control/.env.example +- `SANDBOX_CONCURRENCY` **required** — apps/control/src/services/sandbox-runner.ts +- `SANDBOX_CPU` **required** — apps/control/src/services/sandbox-runner.ts +- `SANDBOX_IMAGE` **required** — apps/control/src/services/sandbox-runner.ts +- `SANDBOX_MEMORY` **required** — apps/control/src/services/sandbox-runner.ts +- `SANDBOX_PIDS` **required** — apps/control/src/services/sandbox-runner.ts +- `SANDBOX_TIMEOUT_MS` **required** — apps/control/src/services/sandbox-runner.ts - `SEARXNG_URL` (has default) — .env.example - `SKILLS_ROOT` **required** — apps/server/src/services/skills.ts +- `VITEST` **required** — apps/control/src/index.ts - `WEB_DIST_PATH` **required** — apps/server/src/index.ts ## Config Files - `.env.example` - `Dockerfile` +- `apps/control/.env.example` - `apps/web/vite.config.ts` - `docker-compose.yml` @@ -1720,38 +2099,38 @@ ## Most Imported Files (change these carefully) - `apps/coder/src/db.ts` — imported by **44** files +- `apps/server/src/db.ts` — imported by **34** files - `apps/server/src/types/api.ts` — imported by **34** files -- `apps/server/src/db.ts` — imported by **32** files - `packages/ion/src/cli/utils.ts` — imported by **24** files +- `apps/control/src/db.ts` — imported by **22** files - `apps/coder/src/services/tools/types.ts` — imported by **18** files - `apps/coder/src/conductor/types.ts` — imported by **16** files +- `apps/control/src/services/fleet-state.ts` — imported by **15** files - `apps/server/src/services/tools.ts` — imported by **15** files - `apps/coder/src/services/agent-backend.ts` — imported by **14** files - `apps/coder/src/services/acp-tool-snapshot.ts` — imported by **14** files +- `apps/control/src/index.ts` — imported by **14** files - `apps/server/src/config.ts` — imported by **14** files +- `apps/coder/src/services/provider-config-registry.ts` — imported by **13** files - `conductor/src/types.ts` — imported by **13** files -- `apps/coder/src/services/provider-config-registry.ts` — imported by **12** files -- `apps/coder/src/config.ts` — imported by **11** files -- `apps/coder/src/services/provider-types.ts` — imported by **11** files +- `apps/coder/src/services/provider-types.ts` — imported by **12** files +- `apps/coder/src/config.ts` — imported by **10** files +- `apps/coder/src/services/llama-providers.ts` — imported by **10** files - `apps/server/src/services/broker.ts` — imported by **10** files -- `apps/server/src/services/agents.ts` — imported by **10** files - `apps/server/src/services/path_guard.ts` — imported by **10** files -- `apps/coder/src/services/pending_changes.ts` — imported by **9** files -- `apps/server/src/services/inference/payload.ts` — imported by **9** files -- `apps/server/src/services/inference/dcp/messages.ts` — imported by **9** files ## Import Map (who imports what) - `apps/coder/src/db.ts` ← `apps/coder/src/index.ts`, `apps/coder/src/routes/__tests__/agent-sessions.routes.test.ts`, `apps/coder/src/routes/__tests__/chat-resolve.test.ts`, `apps/coder/src/routes/__tests__/providers.routes.test.ts`, `apps/coder/src/routes/agent-sessions.ts` +39 more +- `apps/server/src/db.ts` ← `apps/server/src/index.ts`, `apps/server/src/routes/__tests__/settings-favorites.test.ts`, `apps/server/src/routes/agents.ts`, `apps/server/src/routes/analytics.ts`, `apps/server/src/routes/artifacts.ts` +29 more - `apps/server/src/types/api.ts` ← `apps/server/src/routes/chats.ts`, `apps/server/src/routes/messages.ts`, `apps/server/src/routes/models.ts`, `apps/server/src/routes/projects.ts`, `apps/server/src/routes/sessions.ts` +29 more -- `apps/server/src/db.ts` ← `apps/server/src/index.ts`, `apps/server/src/routes/agents.ts`, `apps/server/src/routes/analytics.ts`, `apps/server/src/routes/artifacts.ts`, `apps/server/src/routes/chats.ts` +27 more - `packages/ion/src/cli/utils.ts` ← `packages/ion/src/cli/commands/abandon.ts`, `packages/ion/src/cli/commands/abandon.ts`, `packages/ion/src/cli/commands/approve.ts`, `packages/ion/src/cli/commands/approve.ts`, `packages/ion/src/cli/commands/cleanup.ts` +19 more +- `apps/control/src/db.ts` ← `apps/control/src/index.ts`, `apps/control/src/routes/bench.ts`, `apps/control/src/routes/captures.ts`, `apps/control/src/routes/evals.ts`, `apps/control/src/routes/gateway.ts` +17 more - `apps/coder/src/services/tools/types.ts` ← `apps/coder/src/routes/messages.ts`, `apps/coder/src/services/dispatcher.ts`, `apps/coder/src/services/tools/adapter.ts`, `apps/coder/src/services/tools/apply_pending.ts`, `apps/coder/src/services/tools/check_task_status.ts` +13 more - `apps/coder/src/conductor/types.ts` ← `apps/coder/src/conductor/flows/_util.ts`, `apps/coder/src/conductor/flows/architectural-analysis.ts`, `apps/coder/src/conductor/flows/authoring.ts`, `apps/coder/src/conductor/flows/code-review.ts`, `apps/coder/src/conductor/flows/discovery.ts` +11 more +- `apps/control/src/services/fleet-state.ts` ← `apps/control/src/index.ts`, `apps/control/src/index.ts`, `apps/control/src/routes/actions.ts`, `apps/control/src/routes/bench.ts`, `apps/control/src/routes/evals.ts` +10 more - `apps/server/src/services/tools.ts` ← `apps/server/src/index.ts`, `apps/server/src/services/__tests__/agent-allowlist.test.ts`, `apps/server/src/services/agents.ts`, `apps/server/src/services/inference/stream-phase-adapter.ts`, `apps/server/src/services/inference/stream-phase.ts` +10 more - `apps/coder/src/services/agent-backend.ts` ← `apps/coder/src/routes/lifecycle.ts`, `apps/coder/src/services/__tests__/stream-json-parser.test.ts`, `apps/coder/src/services/acp-event-map.ts`, `apps/coder/src/services/agent-pool.ts`, `apps/coder/src/services/backends/__tests__/claude-sdk-map.test.ts` +9 more -- `apps/coder/src/services/acp-tool-snapshot.ts` ← `apps/coder/src/services/__tests__/acp-event-map.test.ts`, `apps/coder/src/services/__tests__/frame-emitter.test.ts`, `apps/coder/src/services/__tests__/stream-json-parser.test.ts`, `apps/coder/src/services/acp-dispatch.ts`, `apps/coder/src/services/acp-event-map.ts` +9 more -- `apps/server/src/config.ts` ← `apps/server/src/db.ts`, `apps/server/src/index.ts`, `apps/server/src/routes/chats.ts`, `apps/server/src/routes/messages.ts`, `apps/server/src/routes/models.ts` +9 more --- diff --git a/.codesight/components.md b/.codesight/components.md index d9e5c57..7e313c9 100644 --- a/.codesight/components.md +++ b/.codesight/components.md @@ -60,6 +60,19 @@ - **Workspace** — props: sessionId, projectId, agentId, onAgentChange, panesHook, chatsHook, session, project, onAddPane — `apps/web/src/components/Workspace.tsx` - **AddProviderModal** — props: open, onOpenChange, onAdded — `apps/web/src/components/coder/AddProviderModal.tsx` - **ProvidersSettings** — `apps/web/src/components/coder/ProvidersSettings.tsx` +- **ActivityTab** — props: requests, providerIds, onOpenCapture — `apps/web/src/components/control/ActivityTab.tsx` +- **BenchTab** — props: providerIds — `apps/web/src/components/control/BenchTab.tsx` +- **CaptureDrawer** — props: requestId, providerId, onClose — `apps/web/src/components/control/CaptureDrawer.tsx` +- **EvalsTab** — props: providerIds — `apps/web/src/components/control/EvalsTab.tsx` +- **FleetTab** — props: hosts, gpuMap — `apps/web/src/components/control/FleetTab.tsx` +- **HostCard** — props: host, gpuData — `apps/web/src/components/control/HostCard.tsx` +- **HostConfigEditor** — props: providerId, onClose — `apps/web/src/components/control/HostConfigEditor.tsx` +- **LogsTab** — props: logs, providerIds — `apps/web/src/components/control/LogsTab.tsx` +- **PerfChart** — props: series, timestamps, height — `apps/web/src/components/control/PerfChart.tsx` +- **PlaygroundTab** — props: providerIds — `apps/web/src/components/control/PlaygroundTab.tsx` +- **ReportsTab** — `apps/web/src/components/control/ReportsTab.tsx` +- **TtlRing** — props: deadline, size — `apps/web/src/components/control/TtlRing.tsx` +- **VramGauge** — props: used, total, size — `apps/web/src/components/control/VramGauge.tsx` - **MatrixRain** — props: enabled, density, speed, opacity — `apps/web/src/components/fx/MatrixRain.tsx` - **NeonField** — props: enabled, opacity, speed — `apps/web/src/components/fx/NeonField.tsx` - **ThemeFx** — `apps/web/src/components/fx/ThemeFx.tsx` @@ -82,10 +95,12 @@ - **FloatingMenu** — props: x, y, hasSelection, chatInputs, onCopy, onPaste, onSelectAll, onSearch, onSendToChat, onDismiss — `apps/web/src/components/panes/terminal/FloatingMenu.tsx` - **SearchBar** — props: searchRef, theme, onClose — `apps/web/src/components/panes/terminal/SearchBar.tsx` - **TerminalHotkeyBar** — props: ctrlArmed, onSendBytes, onArmCtrl, onFit — `apps/web/src/components/panes/terminal/TerminalHotkeyBar.tsx` +- **ControlProvider** — `apps/web/src/hooks/useControlStream.tsx` - **RightRailDrawerProvider** — `apps/web/src/hooks/useRightRailDrawer.tsx` - **SidebarDrawerProvider** — `apps/web/src/hooks/useSidebarDrawer.tsx` - **PATH_REGEX** — `apps/web/src/lib/linkify-paths.tsx` - **Analytics** — `apps/web/src/pages/Analytics.tsx` +- **Control** — `apps/web/src/pages/Control.tsx` - **Home** — `apps/web/src/pages/Home.tsx` - **Memory** — `apps/web/src/pages/Memory.tsx` - **Project** — `apps/web/src/pages/Project.tsx` diff --git a/.codesight/config.md b/.codesight/config.md index 1ef4563..2a6b57b 100644 --- a/.codesight/config.md +++ b/.codesight/config.md @@ -8,6 +8,7 @@ - `BOOCODE_TRUNCATION_DIR` **required** — apps/server/src/services/__tests__/truncate.test.ts - `BOOCODER_DEV_URL` **required** — apps/web/vite.config.ts - `BOOCODER_URL` **required** — apps/coder/src/cli.ts +- `BOOCONTROL_URL` **required** — apps/server/src/index.ts - `BOOTERM_DEV_URL` **required** — apps/web/vite.config.ts - `BOOTERM_SSH_HOST` **required** — apps/booterm/src/pty/manager.ts - `BOOTERM_SSH_USER` **required** — apps/booterm/src/pty/manager.ts @@ -17,38 +18,53 @@ - `BRAINSTORM_OWNER_PID` **required** — data/skills/superpowers/brainstorming/scripts/server.cjs - `BRAINSTORM_PORT` **required** — data/skills/superpowers/brainstorming/scripts/server.cjs - `BRAINSTORM_URL_HOST` **required** — data/skills/superpowers/brainstorming/scripts/server.cjs -- `CODECONTEXT_CHILD` **required** — codecontext/shim.go +- `CAPTURE_BUDGET_MB` (has default) — apps/control/.env.example +- `CAPTURE_SIZE_KB` (has default) — apps/control/.env.example - `CONDUCTOR_MODEL` **required** — conductor/src/dispatch.ts - `CONDUCTOR_OPENCODE_BIN` **required** — conductor/src/dispatch.ts - `CONDUCTOR_TIMEOUT_MS` **required** — conductor/src/dispatch.ts - `CONTAINER_GUIDANCE_FILE` **required** — apps/server/src/services/__tests__/system-prompt.test.ts - `CONTEXT7_API_KEY` (has default) — .env -- `DATABASE_URL` (has default) — .env.example +- `DATABASE_URL` (has default) — apps/control/.env.example - `DEEPSEEK_API_KEY` (has default) — .env - `DEEPSEEK_BASE_URL` (has default) — .env - `DEFAULT_MODEL` (has default) — .env.example - `DEV_REMOTE_USER` **required** — apps/web/vite.config.ts - `EMBEDDING_MODEL_PATH` **required** — apps/server/src/services/memory/embeddings.ts +- `EVAL_JUDGE_MODEL` **required** — apps/control/src/services/judge-runner.ts - `GITEA_BASE_URL` (has default) — .env - `GITEA_SSH_HOST` (has default) — .env - `GITEA_TOKEN` (has default) — .env - `GITEA_USER` (has default) — .env -- `LLAMA_SWAP_URL` (has default) — .env.example +- `HOST` (has default) — apps/control/.env.example +- `LLAMA_PROVIDERS_PATH` (has default) — apps/control/.env.example +- `LLAMA_SWAP_URL` (has default) — apps/control/.env.example +- `LOG_LEVEL` (has default) — apps/control/.env.example - `MCP_TEST_MISSING` **required** — apps/server/src/services/__tests__/mcp-config.test.ts - `MCP_TEST_SECRET` **required** — apps/server/src/services/__tests__/mcp-config.test.ts - `MEMORY_SEARCH` **required** — apps/server/src/services/memory/recall.ts -- `NODE_ENV` (has default) — .env.example -- `PORT` (has default) — .env.example +- `NODE_ENV` (has default) — apps/control/.env.example +- `PORT` (has default) — apps/control/.env.example - `POSTGRES_PASSWORD` (has default) — .env.example - `PROJECT_ROOT_WHITELIST` (has default) — .env.example +- `RETENTION_RAW_HOURS` (has default) — apps/control/.env.example +- `RETENTION_ROLLUP_DAYS` (has default) — apps/control/.env.example +- `SANDBOX_CONCURRENCY` **required** — apps/control/src/services/sandbox-runner.ts +- `SANDBOX_CPU` **required** — apps/control/src/services/sandbox-runner.ts +- `SANDBOX_IMAGE` **required** — apps/control/src/services/sandbox-runner.ts +- `SANDBOX_MEMORY` **required** — apps/control/src/services/sandbox-runner.ts +- `SANDBOX_PIDS` **required** — apps/control/src/services/sandbox-runner.ts +- `SANDBOX_TIMEOUT_MS` **required** — apps/control/src/services/sandbox-runner.ts - `SEARXNG_URL` (has default) — .env.example - `SKILLS_ROOT` **required** — apps/server/src/services/skills.ts +- `VITEST` **required** — apps/control/src/index.ts - `WEB_DIST_PATH` **required** — apps/server/src/index.ts ## Config Files - `.env.example` - `Dockerfile` +- `apps/control/.env.example` - `apps/web/vite.config.ts` - `docker-compose.yml` diff --git a/.codesight/graph.md b/.codesight/graph.md index 58b4889..c4c2315 100644 --- a/.codesight/graph.md +++ b/.codesight/graph.md @@ -3,35 +3,35 @@ ## Most Imported Files (change these carefully) - `apps/coder/src/db.ts` — imported by **44** files +- `apps/server/src/db.ts` — imported by **34** files - `apps/server/src/types/api.ts` — imported by **34** files -- `apps/server/src/db.ts` — imported by **32** files - `packages/ion/src/cli/utils.ts` — imported by **24** files +- `apps/control/src/db.ts` — imported by **22** files - `apps/coder/src/services/tools/types.ts` — imported by **18** files - `apps/coder/src/conductor/types.ts` — imported by **16** files +- `apps/control/src/services/fleet-state.ts` — imported by **15** files - `apps/server/src/services/tools.ts` — imported by **15** files - `apps/coder/src/services/agent-backend.ts` — imported by **14** files - `apps/coder/src/services/acp-tool-snapshot.ts` — imported by **14** files +- `apps/control/src/index.ts` — imported by **14** files - `apps/server/src/config.ts` — imported by **14** files +- `apps/coder/src/services/provider-config-registry.ts` — imported by **13** files - `conductor/src/types.ts` — imported by **13** files -- `apps/coder/src/services/provider-config-registry.ts` — imported by **12** files -- `apps/coder/src/config.ts` — imported by **11** files -- `apps/coder/src/services/provider-types.ts` — imported by **11** files +- `apps/coder/src/services/provider-types.ts` — imported by **12** files +- `apps/coder/src/config.ts` — imported by **10** files +- `apps/coder/src/services/llama-providers.ts` — imported by **10** files - `apps/server/src/services/broker.ts` — imported by **10** files -- `apps/server/src/services/agents.ts` — imported by **10** files - `apps/server/src/services/path_guard.ts` — imported by **10** files -- `apps/coder/src/services/pending_changes.ts` — imported by **9** files -- `apps/server/src/services/inference/payload.ts` — imported by **9** files -- `apps/server/src/services/inference/dcp/messages.ts` — imported by **9** files ## Import Map (who imports what) - `apps/coder/src/db.ts` ← `apps/coder/src/index.ts`, `apps/coder/src/routes/__tests__/agent-sessions.routes.test.ts`, `apps/coder/src/routes/__tests__/chat-resolve.test.ts`, `apps/coder/src/routes/__tests__/providers.routes.test.ts`, `apps/coder/src/routes/agent-sessions.ts` +39 more +- `apps/server/src/db.ts` ← `apps/server/src/index.ts`, `apps/server/src/routes/__tests__/settings-favorites.test.ts`, `apps/server/src/routes/agents.ts`, `apps/server/src/routes/analytics.ts`, `apps/server/src/routes/artifacts.ts` +29 more - `apps/server/src/types/api.ts` ← `apps/server/src/routes/chats.ts`, `apps/server/src/routes/messages.ts`, `apps/server/src/routes/models.ts`, `apps/server/src/routes/projects.ts`, `apps/server/src/routes/sessions.ts` +29 more -- `apps/server/src/db.ts` ← `apps/server/src/index.ts`, `apps/server/src/routes/agents.ts`, `apps/server/src/routes/analytics.ts`, `apps/server/src/routes/artifacts.ts`, `apps/server/src/routes/chats.ts` +27 more - `packages/ion/src/cli/utils.ts` ← `packages/ion/src/cli/commands/abandon.ts`, `packages/ion/src/cli/commands/abandon.ts`, `packages/ion/src/cli/commands/approve.ts`, `packages/ion/src/cli/commands/approve.ts`, `packages/ion/src/cli/commands/cleanup.ts` +19 more +- `apps/control/src/db.ts` ← `apps/control/src/index.ts`, `apps/control/src/routes/bench.ts`, `apps/control/src/routes/captures.ts`, `apps/control/src/routes/evals.ts`, `apps/control/src/routes/gateway.ts` +17 more - `apps/coder/src/services/tools/types.ts` ← `apps/coder/src/routes/messages.ts`, `apps/coder/src/services/dispatcher.ts`, `apps/coder/src/services/tools/adapter.ts`, `apps/coder/src/services/tools/apply_pending.ts`, `apps/coder/src/services/tools/check_task_status.ts` +13 more - `apps/coder/src/conductor/types.ts` ← `apps/coder/src/conductor/flows/_util.ts`, `apps/coder/src/conductor/flows/architectural-analysis.ts`, `apps/coder/src/conductor/flows/authoring.ts`, `apps/coder/src/conductor/flows/code-review.ts`, `apps/coder/src/conductor/flows/discovery.ts` +11 more +- `apps/control/src/services/fleet-state.ts` ← `apps/control/src/index.ts`, `apps/control/src/index.ts`, `apps/control/src/routes/actions.ts`, `apps/control/src/routes/bench.ts`, `apps/control/src/routes/evals.ts` +10 more - `apps/server/src/services/tools.ts` ← `apps/server/src/index.ts`, `apps/server/src/services/__tests__/agent-allowlist.test.ts`, `apps/server/src/services/agents.ts`, `apps/server/src/services/inference/stream-phase-adapter.ts`, `apps/server/src/services/inference/stream-phase.ts` +10 more - `apps/coder/src/services/agent-backend.ts` ← `apps/coder/src/routes/lifecycle.ts`, `apps/coder/src/services/__tests__/stream-json-parser.test.ts`, `apps/coder/src/services/acp-event-map.ts`, `apps/coder/src/services/agent-pool.ts`, `apps/coder/src/services/backends/__tests__/claude-sdk-map.test.ts` +9 more -- `apps/coder/src/services/acp-tool-snapshot.ts` ← `apps/coder/src/services/__tests__/acp-event-map.test.ts`, `apps/coder/src/services/__tests__/frame-emitter.test.ts`, `apps/coder/src/services/__tests__/stream-json-parser.test.ts`, `apps/coder/src/services/acp-dispatch.ts`, `apps/coder/src/services/acp-event-map.ts` +9 more -- `apps/server/src/config.ts` ← `apps/server/src/db.ts`, `apps/server/src/index.ts`, `apps/server/src/routes/chats.ts`, `apps/server/src/routes/messages.ts`, `apps/server/src/routes/models.ts` +9 more diff --git a/.codesight/libs.md b/.codesight/libs.md index eda0ff0..284dc94 100644 --- a/.codesight/libs.md +++ b/.codesight/libs.md @@ -115,8 +115,8 @@ - function sanitizeSlug: (s) => string - function buildBattleSlug: (battleId, battleType, createdAt) => string - _...7 more_ -- `apps/coder/src/services/arena-model-call.ts` — function arenaModelCall: (opts, 'LLAMA_SWAP_URL'>; - model) => Promise +- `apps/coder/src/services/arena-local-models.ts` — function createLocalModelSet: (log) => LocalModelSetHandle, interface LocalModelSetHandle +- `apps/coder/src/services/arena-model-call.ts` — function resolveModelEndpoint: (model) => void, function arenaModelCall: (opts) => Promise - `apps/coder/src/services/arena-runner.ts` - function createBattleRunner: (deps) => BattleRunner - interface ContestantSpec @@ -294,6 +294,11 @@ - interface LineRef - `apps/coder/src/services/hashline/xxhash32.ts` — function hashXxh32: (input, seed) => number - `apps/coder/src/services/host-exec.ts` — function hostExec: (command, opts?) => Promise, interface HostExecResult +- `apps/coder/src/services/llama-providers.ts` + - function loadLlamaProviders: (providersPath, llamaSwapUrl) => LlamaProvidersFile + - function getLlamaProviders: () => LlamaProvidersFile + - function parseModelRef: (ref) => ParsedModelRef +- `apps/coder/src/services/local-gateway.ts` — function resolveGatewayModel: (model) => void, function registerLocalGatewayRoutes: (app) => void - `apps/coder/src/services/lsp/client.ts` — class LspClient - `apps/coder/src/services/lsp/config.ts` — function getServerConfig: (filePath) => LspServerConfig | null, interface LspServerConfig - `apps/coder/src/services/lsp/operations.ts` @@ -346,6 +351,11 @@ - function reclaimPort: (port) => void - function waitForPortRelease: (port, timeoutMs) => Promise - function freePort: () => Promise +- `apps/coder/src/services/opencode-config-sync.ts` + - function buildBoocodeLocalProviderConfig: (gatewayUrl) => Promise + - function syncOpencodeConfig: (gatewayUrl, log, msg) => void + - interface OpencodeProviderConfig + - interface OpencodeConfig - `apps/coder/src/services/orphan-worktree-reaper.ts` - function reapOrphanWorktrees: (sql, log, graceMs, now) => void - function createOrphanWorktreeReaper: (deps) => void @@ -374,6 +384,11 @@ - function waitForElicitationResponse: (taskId, sessionId, provider, modeId, params, timeoutMs) => Promise - function cancelPendingPermission: (taskId) => void - _...3 more_ +- `apps/coder/src/services/pi-config-sync.ts` + - function buildPiProviderEntry: (gatewayUrl, existing?) => Promise + - function syncPiConfig: (gatewayUrl, log, msg) => void + - interface PiProviderConfig + - interface PiModelsConfig - `apps/coder/src/services/plan-store.ts` - function createPlan: (sql, opts) => Promise - function getPlan: (sql, planId) => Promise @@ -406,11 +421,11 @@ - `apps/coder/src/services/provider-snapshot.ts` - function fetchDeepSeekModels: (config) => Promise - function fetchLlamaSwapModels: (config) => Promise + - function fetchRegistryModels: (defaultModel?) => Promise - function prefixLlamaSwapModels: (models) => ProviderModel[] + - function prefixBoocodeLocalModels: (models) => ProviderModel[] - function mergeModels: (...lists) => ProviderModel[] - - function getProviderSnapshot: (sql, config, cwd?, force) => Promise - - function clearProviderSnapshotCache: () => void - - _...2 more_ + - _...4 more_ - `apps/coder/src/services/pty-dispatch.ts` - function dispatchViaPty: (opts) => Promise - interface DispatchResult @@ -454,6 +469,125 @@ - function isSecretPath: (filePath) => boolean - function resolveWritePath: (projectRoot, filePath) => string - class WriteGuardError +- `apps/control/src/config.ts` — function loadConfig: () => Config, type Config +- `apps/control/src/db.ts` + - function getSql: (config) => Sql + - function waitForTable: (sql, tableName, timeoutMs) => Promise + - function applySchema: (sql) => Promise + - function pingDb: (sql) => Promise + - function closeDb: () => Promise + - type Sql +- `apps/control/src/index.ts` + - function createDeltaEmitter: () => DeltaEmitter + - function handleLlamaSweepEvent: (fleet, sql, config, providerId, emitter, event, logRelay) => Promise + - type DeltaCallback + - type DeltaEmitter +- `apps/control/src/services/action-queue.ts` + - class ActionQueue + - interface QueuedAction + - interface ActionQueueEntry + - interface ActionQueueState + - interface ActionQueueDeps + - type ActionType +- `apps/control/src/services/bench-engine.ts` + - function parseLlamaTimings: (chunk) => BenchTimings | null + - function runSingleBenchRequest: (baseUrl, model, promptTokens, genTokens, repetition, temperature, topP) => Promise + - function runBenchSuite: (params, sql, emitter, seq, onProgress) => void + - function computeRegressionFlag: (current, baselineJson) => 'baseline' | 'regression' | 'improvement' | null + - function computeAggregates: (samples) => BenchAggregate + - interface BenchSuite + - _...5 more_ +- `apps/control/src/services/capture-fetch.ts` + - function fetchCapture: (baseUrl, providerId, swapEntryId) => Promise + - function parseCapture: (raw, unknown>, providerId, swapEntryId) => CaptureData + - function persistCapture: (sql, capture) => Promise + - interface CaptureData + - interface CaptureFetchResult +- `apps/control/src/services/eval-suites.ts` + - function loadEvalSuitesFromData: () => EvalSuiteData[] + - function seedEvalSuites: (sql) => Promise + - function listEvalSuites: (sql) => Promise + - function getEvalSuite: (sql, id) => Promise + - function upsertEvalSuite: (sql, id, name, kind, tasks, judgeModel, metadata?, unknown>) => Promise + - function createEvalRun: (sql, suiteId, providerId, model, quant, judgeModel, judgeModelVersion, totalTasks) => Promise + - _...9 more_ +- `apps/control/src/services/fleet-connector.ts` + - function addJitter: (delayMs) => number + - function reconnectDecision: (failures, policy) => ReconnectDecision + - function parseSseLine: (line) => LlamaSweepSSEEvent | null + - function startFleetConnector: (providerId, baseUrl, deps) => AbortController + - function runFleetConnector: (providerId, baseUrl, abort, deps) => Promise + - interface ReconnectPolicy + - _...8 more_ +- `apps/control/src/services/fleet-state.ts` + - function createFleetState: () => FleetState + - function ensureHostState: (fleet, providerId) => HostState + - function stampLastSeen: (state) => void + - function incrementSeq: (state) => number + - interface HostConfig + - interface FleetState + - _...3 more_ +- `apps/control/src/services/gateway.ts` + - function isGatewayVirtualModel: (id) => boolean + - function parseVirtualModel: (modelId) => string + - function orderCandidates: (virtualModel, policy, scores) => string[] + - function resolveCandidates: (sql, fleet, modelId) => Promise + - function splitComposite: (compositeId) => void + - interface RoutePolicyRow + - _...3 more_ +- `apps/control/src/services/host-access.ts` — function acquireHostAccess: (providerId, purpose) => Promise, interface HostGrant +- `apps/control/src/services/jsonb.ts` + - function jsonbStringArray: (value) => string[] + - function jsonbArray: (value) => unknown[] + - function jsonbNumberArray: (value) => number[] + - function jsonbObject: (value) => Record | null +- `apps/control/src/services/judge-runner.ts` + - function runJudgeEval: (params, sql, emitter, seq, logger) => void + - interface JudgeEvalParams + - interface JudgeProgress + - interface JudgeResult +- `apps/control/src/services/llama-providers.ts` + - function loadLlamaProviders: (providersPath, llamaSwapUrl) => LlamaProvidersFile + - function getLlamaProviders: () => LlamaProvidersFile + - function resolveProviderBaseUrl: (providerId) => string | null +- `apps/control/src/services/log-relay.ts` — class LogRelay, interface LogLine +- `apps/control/src/services/reconcile.ts` — function detectGap: (oldestReconcileTs, newestPersistedTs) => boolean +- `apps/control/src/services/reports.ts` + - function gatherReportStats: (sql, interval, now) => Promise + - function renderReportMarkdown: (stats) => string + - function generateReport: (sql, interval, now) => void + - function isReportDue: (lastRunAt, interval, now) => boolean + - function runReportSchedulerTick: (sql, now) => void + - interface ReportStats + - _...1 more_ +- `apps/control/src/services/retention.ts` + - function buildRetentionConfig: (cfg) => RetentionConfig + - function runRollup: (sql, providerId, hours) => Promise + - function pruneRawSamples: (sql, providerId, hours) => Promise + - function pruneActivity: (sql, hours) => Promise + - function pruneModelEvents: (sql, hours) => Promise + - function trimCapture: (captureJson, sizeKB) => string | null + - _...2 more_ +- `apps/control/src/services/routing-scores.ts` + - function assignBadges: (scores) => void + - function computeRoutingScores: (sql, fleet) => Promise + - interface ModelScore + - type BadgeKind + - const BADGE_LABELS: Record +- `apps/control/src/services/sandbox-runner.ts` + - function runCodeEval: (params, sql, emitter, seq, onProgress) => void + - interface SandboxEvalParams + - interface SandboxProgress + - interface SandboxResult + - interface SandboxContainer +- `apps/control/src/services/ssh-config.ts` + - function validateLlamaConfig: (yamlText, schema) => ValidationResult + - function computeDiff: (oldText, newText) => string + - function backupFilename: (configPath, now) => string + - function readRemoteConfig: (target, configPath, exec) => Promise + - function applyRemoteConfig: (opts) => Promise + - function healthWait: (baseUrl, fetcher, attempts, delayMs) => Promise + - _...7 more_ - `apps/server/src/config.ts` — function loadConfig: () => Config, type Config - `apps/server/src/db.ts` - function getSql: (config) => Sql @@ -601,11 +735,6 @@ - function finalizeStreamedRow: (ctx, opts) => void - function finalizeEmpty: (ctx, args) => Promise - function finalizeCompletion: (ctx, args, result, startedAt, session) => Promise -- `apps/server/src/services/inference/llama-args-validator.ts` - - function validateExtraArgs: (args?) => string[] - - function isManagedFlag: (flag) => boolean - - function stripShadowingFlags: (args, opts?) => string[] - - interface StripOptions - `apps/server/src/services/inference/loop-detectors.ts` - function detectContentRepeat: (messages) => LoopDetectionResult - function detectToolLoop: (toolNames) => LoopDetectionResult @@ -636,12 +765,12 @@ - interface OpenAiMessage - `apps/server/src/services/inference/provider.ts` - function isDeepSeekModel: (modelId) => boolean - - function resolveRoute: (agent, config?, modelId?) => RoutingInfo - - function upstreamModel: (config, modelId, agent?) => LanguageModel + - function isGatewayVirtualModel: (wireModelId) => boolean + - function resolveModelProvider: (modelId, config) => ResolvedModel + - function resolveRoute: (agent, config?, modelId?) => void + - function upstreamModel: (config, modelId, agent?, source?) => LanguageModel - function resolveModelEndpoint: (config, modelId) => void - - function resetDeepSeekProvider: () => void - - interface RoutingInfo - - _...1 more_ + - _...4 more_ - `apps/server/src/services/inference/prune.ts` - function selectPruneTargets: (partsNewestFirst, tailStartCreatedAt) => void - function prune: (args) => Promise @@ -709,6 +838,10 @@ - function runInference: (ctx, sessionId, chatId, assistantMessageId, signal?) => Promise - function runInferenceWithModel: (ctx, sessionId, chatId, assistantMessageId, modelOverride, compareGroupId, signal?) => Promise - function createInferenceRunner: (ctx, 'publishUser'>, publishUserFn, frame) => void +- `apps/server/src/services/llama-providers.ts` + - function loadLlamaProviders: (providersPath, llamaSwapUrl) => LlamaProvidersFile + - function getLlamaProviders: () => LlamaProvidersFile + - function parseModelRef: (ref) => ParsedModelRef - `apps/server/src/services/mcp-client.ts` - function initialize: (entries, logger) => Promise - function callTool: (prefixedName, args, unknown>) => Promise @@ -930,6 +1063,7 @@ - `apps/web/src/hooks/useProjectGit.ts` — function useProjectGit: (projectId) => GitMeta | null - `apps/web/src/hooks/useProviderSnapshot.ts` — function refreshProviderSnapshot: (cwd?) => Promise, function useProviderSnapshot: (cwd?) => ProviderSnapshotEntry[] | null - `apps/web/src/hooks/usePullToRefresh.ts` — function usePullToRefresh: (onRefresh) => void +- `apps/web/src/hooks/useReducedMotion.ts` — function useReducedMotion: () => boolean - `apps/web/src/hooks/useSessionChats.ts` - function useSessionChats: (sessionId, opts) => UseSessionChatsResult - interface UseSessionChatsOpts @@ -1047,6 +1181,14 @@ - function waitForEvent: (threadManager, threadId, eventType, timeoutMs) => Promise - function waitForEventCount: (threadManager, threadId, eventType, count, timeoutMs) => Promise - function waitForEventMatch: (threadManager, threadId, predicate) => void +- `packages/contracts/src/llama-providers.ts` + - function parseModelRef: (ref, defaultProvider) => ParsedModelRef + - function formatModelRef: (providerId, wireModelId) => string + - interface ParsedModelRef + - type LlamaProvider + - type LlamaProvidersFile + - const LlamaProviderSchema + - _...1 more_ - `packages/ion/src/cli/commands/abandon.ts` — function abandonCommand: (args, options) => Promise - `packages/ion/src/cli/commands/approve.ts` — function approveCommand: (args, options) => Promise - `packages/ion/src/cli/commands/cleanup.ts` — function cleanupCommand: (args, options) => Promise diff --git a/.codesight/routes.md b/.codesight/routes.md index e1f1814..5fb03c3 100644 --- a/.codesight/routes.md +++ b/.codesight/routes.md @@ -6,14 +6,13 @@ - **`/api/plans`** GET | POST | GET/:id | PATCH/:id → Plan - **`/api/runs`** GET | POST | GET/:id → Run - **`/api/tasks`** GET | POST | GET/:id → Task +- **`/api/policies`** GET | POST | GET/:id | DELETE/:id → Policie - **`/api/chats/:id/messages`** GET | POST | GET/:id | DELETE/:id → Message - **`/api/projects`** GET | POST | GET/:id | PATCH/:id | DELETE/:id → Project - **`/api/sessions`** GET/:id | PATCH/:id | DELETE/:id → Session ## Other Routes -### fastify - - `GET` `/api/term/health` params() - `GET` `/api/term/sessions/:sid/panes/:pid/search` params(sid, pid) [auth] - `GET` `/api/term/sessions` params() [auth] @@ -65,6 +64,45 @@ - `POST` `/api/sessions/:sessionId/worktree-stash` params(sessionId) [auth, db] - `GET` `/api/ws/sessions/:sessionId` params(sessionId) [auth, db] - `GET` `/api/ws/user` params() [auth, db] +- `POST` `/v1/chat/completions` params() [auth, ai] +- `GET` `/v1/models` params() [auth, ai] +- `POST` `/api/action/submit` params() [queue] +- `GET` `/api/action/queue/:providerId` params(providerId) [queue] +- `POST` `/api/bench/suite` params() [auth, db, cache, queue] +- `GET` `/api/bench/suites` params() [auth, db, cache, queue] +- `GET` `/api/bench/suites/:id` params(id) [auth, db, cache, queue] +- `POST` `/api/bench/run` params() [auth, db, cache, queue] +- `GET` `/api/bench/runs` params() [auth, db, cache, queue] +- `GET` `/api/bench/runs/:id` params(id) [auth, db, cache, queue] +- `GET` `/api/bench/baselines` params() [auth, db, cache, queue] +- `GET` `/api/capture/:providerId/:swapEntryId` params(providerId, swapEntryId) [db] +- `POST` `/api/eval/suite` params() [db, queue] +- `GET` `/api/eval/suites` params() [db, queue] +- `GET` `/api/eval/suites/:id` params(id) [db, queue] +- `POST` `/api/eval/seed` params() [db, queue] +- `POST` `/api/eval/run` params() [db, queue] +- `GET` `/api/eval/runs` params() [db, queue] +- `GET` `/api/eval/runs/:id` params(id) [db, queue] +- `GET` `/api/eval/leaderboard` params() [db, queue] +- `GET` `/upstream/:model/props` params(model) [db, cache, ai] +- `GET` `/api/playground/models` params() [auth, cache] +- `POST` `/api/playground/chat` params() [auth, cache] +- `POST` `/api/playground/chat-ab` params() [auth, cache] +- `GET` `/api/policies/virtual-models` params() [auth, db] +- `GET` `/api/policies/dispatch-log` params() [auth, db] +- `GET` `/api/reports` params() [db] +- `GET` `/api/reports/:id` params(id) [db] +- `POST` `/api/reports/generate` params() [db] +- `GET` `/api/reports/schedule` params() [db] +- `POST` `/api/reports/schedule` params() [db] +- `GET` `/api/routing/scores` params() [db] +- `GET` `/api/hosts` params() [db] +- `PATCH` `/api/hosts/:id` params(id) [db] +- `GET` `/api/hosts/:id/config` params(id) [db] +- `POST` `/api/hosts/:id/config/validate` params(id) [db] +- `POST` `/api/hosts/:id/config/diff` params(id) [db] +- `POST` `/api/hosts/:id/config/apply` params(id) [db] +- `GET` `/api/ws/control` params() - `GET` `/api/projects/:id/agents` params(id) [db, cache] - `GET` `/api/analytics/context` params() [auth, db] - `POST` `/api/chats/:id/messages/:msg_id/artifacts/download` params(id, msg_id) [auth, db] @@ -84,8 +122,13 @@ - `POST` `/api/chats/:id/compare` params(id) [auth, db, queue] - `GET` `/api/coder/ws/sessions/:sessionId` params(sessionId) [auth] - `ALL` `/api/coder/*` params() [auth] +- `GET` `/api/control/ws` params() [auth, ai] +- `ALL` `/api/control/*` params() [auth, ai] - `GET` `/api/settings/inference` params() [cache] - `PATCH` `/api/settings/inference` params() [cache] +- `GET` `/api/memory` params() [db] +- `GET` `/api/memory/daily` params() [db] +- `GET` `/api/memory/dreams` params() [db] - `GET` `/api/sessions/:id/messages` params(id) [auth, db, queue] - `POST` `/api/chats/:id/messages/:message_id/regenerate` params(id, message_id) [auth, db, queue] - `POST` `/api/chats/:id/compact` params(id) [auth, db, queue] @@ -126,21 +169,6 @@ - `GET` `/api/chats/:id/traces` params(id) [db] - `GET` `/api/ws/sessions/:id` params(id) [auth, db] -### go-net-http - -- `GET` `/health` params() [queue] -- `POST` `/v1/get_codebase_overview` params() [queue] -- `POST` `/v1/get_file_analysis` params() [queue] -- `POST` `/v1/get_symbol_info` params() [queue] -- `POST` `/v1/search_symbols` params() [queue] -- `POST` `/v1/get_dependencies` params() [queue] -- `POST` `/v1/watch_changes` params() [queue] -- `POST` `/v1/get_semantic_neighborhoods` params() [queue] -- `POST` `/v1/get_framework_analysis` params() [queue] -- `POST` `/v1/get_symbol_details` params() [queue] -- `POST` `/v1/get_call_graph` params() [queue] -- `POST` `/v1/get_blast_radius` params() [queue] - ## WebSocket Events - `WS` `message` — `apps/booterm/src/ws/attach.ts` @@ -150,5 +178,7 @@ - `WS` `close` — `apps/coder/src/cli.ts` - `WS` `close` — `apps/coder/src/routes/ws.ts` - `WS` `error` — `apps/coder/src/routes/ws.ts` +- `WS` `close` — `apps/control/src/routes/ws.ts` +- `WS` `error` — `apps/control/src/routes/ws.ts` - `WS` `close` — `apps/server/src/routes/ws.ts` - `WS` `error` — `apps/server/src/routes/ws.ts` diff --git a/.codesight/schema.md b/.codesight/schema.md index 452c49e..48b9de8 100644 --- a/.codesight/schema.md +++ b/.codesight/schema.md @@ -137,6 +137,173 @@ - items_completed: integer (required) - metadata: jsonb +### control_hosts +- provider_id: text (pk, fk) +- ssh_host: text +- ssh_user: text +- ssh_key_path: text +- config_path: text +- restart_cmd: text +- os: text +- gpu_label: text +- enabled: boolean (required) + +### control_requests +- id: bigint(auto) (pk) +- provider_id: text (required, fk) +- swap_entry_id: integer (required, fk) +- ts: timestamp(tz) (required) +- model: text +- req_path: text +- status_code: integer +- duration_ms: integer +- cache_tokens: integer +- input_tokens: integer +- output_tokens: integer +- prompt_tps: real +- gen_tps: real +- has_capture: boolean (required) +- capture: jsonb + +### control_perf_samples +- provider_id: text (required, fk) +- ts: timestamp(tz) (required) +- gpu: jsonb +- sys: jsonb + +### control_perf_rollup_5m +- provider_id: text (required, fk) +- bucket: timestamp(tz) (required) +- gpu_agg: jsonb +- sys_agg: jsonb + +### control_model_events +- provider_id: text (required, fk) +- model: text (required) +- state: text (required) +- ts: timestamp(tz) (required) +- detail: jsonb + +### bench_suites +- id: text (pk) +- name: text (required) +- provider_id: text (required, fk) +- model: text (required) +- repetitions: integer (required) +- metadata: jsonb + +### bench_runs +- id: text (pk) +- suite_id: text (required, fk) +- job_type: text (required) +- status: text (required) +- started_at: timestamp(tz) +- finished_at: timestamp(tz) +- total_samples: integer (required) +- completed_samples: integer (required) +- concurrent_foreign_requests: integer (required) +- temperature: real +- top_p: real +- aggregate: jsonb +- regression_flag: text +- error: text + +### bench_samples +- id: bigint(auto) (pk) +- run_id: text (required, fk) +- prompt_tokens: integer (required) +- gen_tokens: integer (required) +- concurrency: integer (required) +- repetition: integer (required) +- ttft_ms: real +- total_ms: real +- prompt_tps: real +- gen_tps: real +- cache_n: integer +- error: text + +### bench_baselines +- provider_id: text (required, fk) +- model: text (required) +- aggregate: jsonb (required) +- run_id: text (required, fk) + +### eval_suites +- id: text (pk) +- name: text (required) +- kind: text (required) +- version: integer (required) +- tasks: jsonb (required) +- judge_model: text +- judge_model_version: text +- metadata: jsonb + +### eval_runs +- id: text (pk) +- suite_id: text (required, fk) +- job_type: text (required) +- provider_id: text (required, fk) +- model: text (required) +- quant: text +- status: text (required) +- judge_model: text +- judge_model_version: text +- started_at: timestamp(tz) +- finished_at: timestamp(tz) +- total_tasks: integer (required) +- completed_tasks: integer (required) +- aggregate: jsonb +- error: text + +### eval_results +- id: bigint(auto) (pk) +- run_id: text (required, fk) +- task_id: text (required, fk) +- task_index: integer (required) +- score: real +- max_score: real +- rationale: text +- sandbox_exit_code: integer +- sandbox_stderr: text +- sandbox_stdout: text +- execution_ms: integer +- error: text + +### control_reports +- id: text (pk) +- kind: text (required) +- interval: text (required) +- period_start: timestamp(tz) (required) +- period_end: timestamp(tz) (required) +- markdown: text (required) +- stats: jsonb + +### control_schedule_meta +- name: text (pk) +- interval: text (required) +- enabled: boolean (required) +- last_run_at: timestamp(tz) + +### route_policies +- id: text (pk) +- name: text (required) +- virtual_model: text (required) +- candidates: jsonb (required) +- fallback: text +- enabled: boolean (required) + +### route_dispatch_log +- id: bigint(auto) (pk) +- ts: timestamp(tz) (required) +- virtual_model: text (required) +- chosen_provider_id: text (fk) +- chosen_model: text +- candidates_tried: jsonb +- status: text (required) +- source: text +- error: text +- duration_ms: integer + ### projects - id: uuid (pk) - name: text (required) @@ -215,3 +382,12 @@ - turn_number: integer (required) - messages: jsonb (required) - tool_states: jsonb (required) + +### memory_entries +- id: uuid (pk) +- project_id: uuid (required, fk) +- topic: text (required) +- title: text (required) +- content: text (required) +- date: date +- mood: text diff --git a/.env.example b/.env.example index 6527a4f..f8f4263 100644 --- a/.env.example +++ b/.env.example @@ -2,6 +2,8 @@ NODE_ENV=production PORT=3000 DATABASE_URL=postgres://boocode:CHANGE_ME@boocode_db:5432/boochat LLAMA_SWAP_URL=http://100.101.41.16:8401 +# Multi-provider local registry (optional; falls back to LLAMA_SWAP_URL when absent) +#LLAMA_PROVIDERS_PATH=/data/llama-providers.json PROJECT_ROOT_WHITELIST=/opt BOOTSTRAP_ROOT=/opt/projects DEFAULT_MODEL=qwen3.6-35b-a3b-mxfp4 diff --git a/CLAUDE.md b/CLAUDE.md index c08bc29..eab473a 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -102,7 +102,7 @@ BooCoder at port 9502: `curl http://100.114.205.53:9502/api/health`. Runs as `bo - `CHANGELOG.md` is the per-tag release log, newest on top. New tag → add a `## — ` section, one 3–6 sentence paragraph (no nested bullets) from the commit body; cross-reference related tags by name when the batch builds on / fixes / pairs with prior work. - Git push to Gitea: `GIT_SSH_COMMAND="ssh -i /opt/boocode/secrets/boocode_gitea -o IdentitiesOnly=yes" git push origin `. The default agent identity is rejected; the in-repo deploy key (`secrets/`, gitignored) is the working one. Transient `Connection reset by peer` retries cleanly after `sleep 5`. Keep both remotes synced: push `main` + the release tag to `origin` (Gitea, deploy key above) AND `backup` (`git@github.com:indifferentketchup/boocode.git`, default key). - Don't accumulate `.bak-*` files. Clean them up in the same batch or immediately after merge. -- DB-integration tests opt-in via env var: `DATABASE_URL='postgres://boocode:devpass@localhost:5500/boochat' pnpm -C apps/server test`. Host port 5500; password is `${POSTGRES_PASSWORD}` from `.env` (`devpass`), NOT the literal in `.env`'s `DATABASE_URL` line. `psql` isn't on host PATH — use `docker exec boocode_db psql -U boocode -d boochat -c "..."`. Pattern: `describe.runIf(!!process.env.DATABASE_URL)(...)` + `beforeAll` applying schema via `sql.unsafe(readFileSync(schemaPath))`. `tool_cost_stats.test.ts` is the reference. +- DB-integration tests opt-in via env var: `DATABASE_URL="postgres://boocode:${POSTGRES_PASSWORD}@localhost:5500/boochat" pnpm -C apps/server test`. Host port 5500; password is `${POSTGRES_PASSWORD}` from `.env` (read it from there — do NOT trust any literal written here or in `.env`'s `DATABASE_URL` line; a stale literal in this doc has already caused auth-failure debugging loops). `psql` isn't on host PATH — use `docker exec boocode_db psql -U boocode -d boochat -c "..."`. Pattern: `describe.runIf(!!process.env.DATABASE_URL)(...)` + `beforeAll` applying schema via `sql.unsafe(readFileSync(schemaPath))`. `tool_cost_stats.test.ts` is the reference. - Host-side smoke endpoint: `curl http://100.114.205.53:9500/api/...`. The container's port mapping binds to the Tailscale IP, not `0.0.0.0`, so `localhost:9500` doesn't work from the host shell. Same for booterm at `:9501`. - Frontend blank-screen / runtime crash: get the stack-trace column offset from the browser console, then `cut -c - apps/web/dist/assets/index-*.js | sed -n 'p'` to read the exact minified expression that threw. Watch for `=== null`/`!== null` on optional fields fed an `as unknown as` cast — those bypass tsc. - Fastify global JSON parser tolerates empty bodies (overridden in `index.ts`); bodyless POSTs (archive, unarchive, stop) work without `Content-Type` tricks on the client. diff --git a/apps/booterm/src/pty/manager.ts b/apps/booterm/src/pty/manager.ts index bc5be9b..976039c 100644 --- a/apps/booterm/src/pty/manager.ts +++ b/apps/booterm/src/pty/manager.ts @@ -182,6 +182,7 @@ export async function sweepExpired( ? 'idle timeout' : 'absolute timeout'; log.info({ paneId: meta.paneId, reason }, 'sweeping expired PTY session'); + meta.timedOut = true; const sessionName = tmuxSessionName(meta.paneId); try { const ok = await killSession(tmuxConfPath, sessionName); @@ -191,7 +192,6 @@ export async function sweepExpired( } catch (err) { log.warn({ paneId: meta.paneId, err }, 'killSession threw during sweep'); } - registry.unregister(meta.paneId); killed.push(meta.paneId); } return killed; diff --git a/apps/booterm/src/pty/registry.ts b/apps/booterm/src/pty/registry.ts index 5a2b22a..08848c8 100644 --- a/apps/booterm/src/pty/registry.ts +++ b/apps/booterm/src/pty/registry.ts @@ -10,6 +10,7 @@ export interface SessionMeta { timeoutSeconds?: number; idleExpiresAt?: Date; absoluteExpiresAt?: Date; + timedOut?: boolean; } const sessions = new Map(); @@ -115,6 +116,18 @@ export interface SearchMatch { const ringBuffers = new Map(); +/** + * Return the last N non-empty lines from the ring buffer for a pane. + * ANSI escape sequences are preserved (xterm handles them). + * Partial lines from mid-stream exit are included as-is. + */ +export function getLastLines(paneId: string, n: number): string[] { + const buf = ringBuffers.get(paneId); + if (!buf || buf.length === 0) return []; + const nonEmpty = buf.filter(l => l.trim().length > 0); + return nonEmpty.slice(-n); +} + /** * Append raw PTY data to the ring buffer for a given pane. * Splits incoming data on newlines and pushes each line into the buffer, diff --git a/apps/booterm/src/ws/attach.ts b/apps/booterm/src/ws/attach.ts index 6963257..6412022 100644 --- a/apps/booterm/src/ws/attach.ts +++ b/apps/booterm/src/ws/attach.ts @@ -9,7 +9,7 @@ import { } from '../pty/manager.js'; import { attachPty } from '../pty/pty.js'; import { getUser } from '../auth.js'; -import { register, unregister, appendOutput, touchActivity, consumePendingMetadata } from '../pty/registry.js'; +import { register, unregister, appendOutput, touchActivity, consumePendingMetadata, get as getRegistry, getLastLines } from '../pty/registry.js'; export function registerWsAttachRoute( app: FastifyInstance, @@ -168,9 +168,22 @@ export function registerWsAttachRoute( }); handle.onExit(({ exitCode }) => { + const meta = getRegistry(pid); + const lastLines = getLastLines(pid, 5); + const frame = { + type: 'pty_exited' as const, + session_id: sid, + pane_id: pid, + exit_code: exitCode, + last_lines: lastLines, + session_title: meta?.title ?? null, + session_description: meta?.description ?? null, + parent_agent: meta?.parentAgent ?? null, + timed_out: meta?.timedOut ?? false, + }; try { if (socket.readyState === socket.OPEN) { - socket.send(JSON.stringify({ type: 'exit', code: exitCode })); + socket.send(JSON.stringify(frame)); } } catch { /* ignore */ diff --git a/apps/coder/src/config.ts b/apps/coder/src/config.ts index 63eb371..915182f 100644 --- a/apps/coder/src/config.ts +++ b/apps/coder/src/config.ts @@ -55,6 +55,9 @@ const ConfigSchema = z.object({ // v2.9.x: flow step timeout (default 5 min). When a 'running' step exceeds // this duration, it is marked 'timed_out' and may be retried. FLOW_STEP_TIMEOUT_MS: z.coerce.number().int().positive().default(300_000), + // vMultiProvider: path to the local providers config JSON file. Missing file + // = legacy synthesis from LLAMA_SWAP_URL. + LLAMA_PROVIDERS_PATH: z.string().optional(), }); export type Config = z.infer; diff --git a/apps/coder/src/index.ts b/apps/coder/src/index.ts index 9680819..f28bffa 100644 --- a/apps/coder/src/index.ts +++ b/apps/coder/src/index.ts @@ -31,6 +31,9 @@ import { registerLifecycleRoutes } from './routes/lifecycle.js'; import { registerAnalyticsRoutes } from './routes/analytics.js'; import { registerPlanRoutes } from './routes/plans.js'; import { registerWebSocket } from './routes/ws.js'; +import { registerLocalGatewayRoutes } from './services/local-gateway.js'; +import { syncOpencodeConfig } from './services/opencode-config-sync.js'; +import { syncPiConfig } from './services/pi-config-sync.js'; import { updatePlanFromRun } from './services/plan-store.js'; // Phase 4: dispatcher + agent probe import { createDispatcher } from './services/dispatcher.js'; @@ -43,7 +46,9 @@ import { createAnalyzer } from './services/arena-analyzer.js'; import { agentPool } from './services/agent-pool.js'; import { createOrphanWorktreeReaper } from './services/orphan-worktree-reaper.js'; import { probeAgents } from './services/agent-probe.js'; -import { getProviderSnapshot, persistProbedModels, fetchLlamaSwapModels } from './services/provider-snapshot.js'; +import { getProviderSnapshot, persistProbedModels } from './services/provider-snapshot.js'; +import { loadLlamaProviders } from './services/llama-providers.js'; +import { createLocalModelSet } from './services/arena-local-models.js'; import { setPermissionHooks } from './services/permission-waiter.js'; import { publishAgentStatus } from './services/agent-status-publish.js'; import { homedir } from 'node:os'; @@ -83,6 +88,17 @@ async function main() { await applySchema(sql); app.log.info('database schema applied'); + // Wire the shared local-provider registry at startup so provider-snapshot + // can build composite provider/model ids from the registry (W5). + const llamaProviders = loadLlamaProviders( + config.LLAMA_PROVIDERS_PATH, + config.LLAMA_SWAP_URL, + ); + app.log.info( + { providers: llamaProviders.providers.length, default: llamaProviders.defaultProvider }, + 'llama-providers: loaded', + ); + // Broker: in-memory pub/sub for session + user channel streaming. const broker = createBroker(app.log); @@ -242,15 +258,15 @@ async function main() { }, }); - // Arena SEAM (a): build the local-model set from the live llama-swap model list. - // Both bare IDs ('qwen3.6-35b') and prefixed IDs ('llama-swap/qwen3.6-35b') are - // included so opencode-style prefixed contestants and native-style bare contestants - // both classify correctly as local. - const localModelsList = await fetchLlamaSwapModels(config).catch(() => []); - const localModels = new Set([ - ...localModelsList.map((m) => m.id), - ...localModelsList.map((m) => `llama-swap/${m.id}`), - ]); + // Arena SEAM (a): self-refreshing local-model set from every provider in + // the shared registry. Composite "provider/model" ids from every provider; + // bare wire ids only from the default provider (bare ids resolve there). + // Refreshes every 5 min so a provider that was down at startup reclassifies + // as local once it recovers — no boocoder restart needed. + const localModelSet = createLocalModelSet(app.log); + await localModelSet.refresh(); + localModelSet.start(5 * 60_000); + const localModels = localModelSet.set; // Arena dispatch function — Phase 4 SEAM (b). // Coding: insert a tasks row with agent=identity (null for native/boocode); @@ -376,6 +392,7 @@ async function main() { // drain the pool (kills opencode server + warm ACP children). await dispatcher.stop(); orphanReaper.stop(); + localModelSet.stop(); await agentPool.dispose(); }); @@ -397,6 +414,28 @@ async function main() { registerPlanRoutes(app, sql); registerWebSocket(app, sql, broker); + // W7: Local-model gateway — OpenAI-compatible proxy for opencode. + registerLocalGatewayRoutes(app); + + // W7: Sync boocode-local provider into opencode's config file so it + // accepts composite local model ids. Derives the gateway URL from the + // coder's own HOST/PORT config. Fire-and-forget — a config write failure + // is non-fatal (the gateway still works; opencode just won't list models). + const gatewayUrl = `http://127.0.0.1:${config.PORT}`; + void syncOpencodeConfig(gatewayUrl, app.log).catch((err) => { + app.log.warn( + { err: err instanceof Error ? err.message : String(err) }, + 'opencode-config-sync: startup sync failed (non-fatal)', + ); + }); + // Same story for Pi (~/.pi/agent/models.json) — the other external agent. + void syncPiConfig(gatewayUrl, app.log).catch((err) => { + app.log.warn( + { err: err instanceof Error ? err.message : String(err) }, + 'pi-config-sync: startup sync failed (non-fatal)', + ); + }); + // Graceful shutdown const shutdown = async () => { app.log.info('shutting down'); diff --git a/apps/coder/src/routes/arena.ts b/apps/coder/src/routes/arena.ts index ecff236..a244dbb 100644 --- a/apps/coder/src/routes/arena.ts +++ b/apps/coder/src/routes/arena.ts @@ -83,7 +83,6 @@ export function registerArenaRoutes( try { const prompt = await arenaModelCall({ - config, model: config.DEFAULT_MODEL, system: [ 'You are a battle-prompt writer for an AI Arena.', diff --git a/apps/coder/src/services/__tests__/arena-decisions.test.ts b/apps/coder/src/services/__tests__/arena-decisions.test.ts index 68ce2f1..f64b805 100644 --- a/apps/coder/src/services/__tests__/arena-decisions.test.ts +++ b/apps/coder/src/services/__tests__/arena-decisions.test.ts @@ -51,6 +51,55 @@ describe('classifyLane', () => { expect(classifyLane('coding', 'boocode', 'qwen3.6-35b-a3b-mxfp4', new Set())).toBe('cloud'); expect(classifyLane('coding', 'native', 'any-local-model', new Set())).toBe('cloud'); }); + + it('classifies composite provider/model ids as local when present', () => { + const multiProvider = new Set([ + 'sam-desktop/qwen3.6-35b-a3b-mxfp4', + 'embedding/qwen2.5-coder-7b', + 'qwen3.6-35b-a3b-mxfp4', // bare fallback + ]); + expect(classifyLane('coding', 'boocode', 'sam-desktop/qwen3.6-35b-a3b-mxfp4', multiProvider)).toBe('local'); + expect(classifyLane('coding', 'opencode', 'embedding/qwen2.5-coder-7b', multiProvider)).toBe('local'); + }); + + it('classifies composite ids as cloud when provider is not in localModels', () => { + const multiProvider = new Set([ + 'sam-desktop/qwen3.6-35b-a3b-mxfp4', + ]); + expect(classifyLane('coding', 'boocode', 'other-machine/qwen3.6-35b-a3b-mxfp4', multiProvider)).toBe('cloud'); + }); + + it('classifies bare legacy ids as local when present', () => { + const mixed = new Set([ + 'sam-desktop/qwen3.6-35b-a3b-mxfp4', + 'qwen3.6-35b-a3b-mxfp4', // bare fallback for default provider + ]); + expect(classifyLane('coding', 'boocode', 'qwen3.6-35b-a3b-mxfp4', mixed)).toBe('local'); + }); + + it('classifies deepseek as cloud even when local providers exist', () => { + const multiProvider = new Set([ + 'sam-desktop/qwen3.6-35b-a3b-mxfp4', + 'embedding/qwen2.5-coder-7b', + ]); + expect(classifyLane('coding', 'opencode', 'deepseek-chat', multiProvider)).toBe('cloud'); + expect(classifyLane('coding', 'opencode', 'deepseek/deepseek-r1', multiProvider)).toBe('cloud'); + }); + + it('handles duplicate wire names across two providers routing to different baseUrls', () => { + const multiProvider = new Set([ + 'sam-desktop/qwen3.6-35b-a3b-mxfp4', + 'laptop/qwen3.6-35b-a3b-mxfp4', + 'qwen3.6-35b-a3b-mxfp4', // bare fallback + ]); + // Composite IDs classify correctly per provider + expect(classifyLane('coding', 'boocode', 'sam-desktop/qwen3.6-35b-a3b-mxfp4', multiProvider)).toBe('local'); + expect(classifyLane('coding', 'boocode', 'laptop/qwen3.6-35b-a3b-mxfp4', multiProvider)).toBe('local'); + // Bare id also classifies as local (backward compat) + expect(classifyLane('coding', 'boocode', 'qwen3.6-35b-a3b-mxfp4', multiProvider)).toBe('local'); + // Unknown provider does not + expect(classifyLane('coding', 'boocode', 'unknown-provider/qwen3.6-35b-a3b-mxfp4', multiProvider)).toBe('cloud'); + }); }); // ─── nextLocalContestant ───────────────────────────────────────────────────── diff --git a/apps/coder/src/services/__tests__/arena-local-models.test.ts b/apps/coder/src/services/__tests__/arena-local-models.test.ts new file mode 100644 index 0000000..32f6127 --- /dev/null +++ b/apps/coder/src/services/__tests__/arena-local-models.test.ts @@ -0,0 +1,98 @@ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; +import { writeFileSync } from 'node:fs'; +import { tmpdir } from 'node:os'; +import { join } from 'node:path'; +import { createLocalModelSet } from '../arena-local-models.js'; +import { loadLlamaProviders } from '../llama-providers.js'; + +const log = { warn: vi.fn() }; + +function loadFixture(providers: Array<{ id: string; label: string; baseUrl: string }>): void { + const file = { + defaultProvider: providers[0]!.id, + providers: providers.map((p) => ({ ...p, kind: 'llama-swap' })), + }; + const path = join(tmpdir(), `llama-providers-alm-${Math.random().toString(36).slice(2)}.json`); + writeFileSync(path, JSON.stringify(file), 'utf8'); + loadLlamaProviders(path, 'http://legacy.test:8080'); +} + +function modelsResponse(ids: string[]): Response { + return new Response(JSON.stringify({ data: ids.map((id) => ({ id })) }), { + status: 200, + headers: { 'content-type': 'application/json' }, + }); +} + +describe('createLocalModelSet', () => { + const fetchMock = vi.fn(); + + beforeEach(() => { + vi.stubGlobal('fetch', fetchMock); + fetchMock.mockReset(); + log.warn.mockReset(); + loadFixture([ + { id: 'sam-desktop', label: 'Sam Desktop', baseUrl: 'http://a.test:8401' }, + { id: 'embedding', label: 'Embedding', baseUrl: 'http://b.test:8411' }, + ]); + }); + + afterEach(() => { + vi.unstubAllGlobals(); + }); + + it('adds composite ids from every provider, bare ids only from the default', async () => { + fetchMock.mockImplementation((url: string) => + url.startsWith('http://a.test') + ? Promise.resolve(modelsResponse(['qwen3.6-35b'])) + : Promise.resolve(modelsResponse(['gemma-4-12b'])), + ); + const handle = createLocalModelSet(log); + await handle.refresh(); + expect(handle.set.has('sam-desktop/qwen3.6-35b')).toBe(true); + expect(handle.set.has('embedding/gemma-4-12b')).toBe(true); + expect(handle.set.has('qwen3.6-35b')).toBe(true); // bare from default + expect(handle.set.has('gemma-4-12b')).toBe(false); // bare NOT from non-default + }); + + it('keeps last-known contribution when a provider goes unreachable, drops removed models when reachable', async () => { + fetchMock.mockImplementation((url: string) => + url.startsWith('http://a.test') + ? Promise.resolve(modelsResponse(['qwen3.6-35b', 'old-model'])) + : Promise.resolve(modelsResponse(['gemma-4-12b'])), + ); + const handle = createLocalModelSet(log); + await handle.refresh(); + expect(handle.set.has('sam-desktop/old-model')).toBe(true); + + // Second refresh: provider A drops a model, provider B is down. + fetchMock.mockImplementation((url: string) => + url.startsWith('http://a.test') + ? Promise.resolve(modelsResponse(['qwen3.6-35b'])) + : Promise.reject(new Error('ECONNREFUSED')), + ); + await handle.refresh(); + expect(handle.set.has('sam-desktop/old-model')).toBe(false); // removed on reachable provider + expect(handle.set.has('embedding/gemma-4-12b')).toBe(true); // kept for unreachable provider + expect(log.warn).toHaveBeenCalled(); + }); + + it('recovers a provider that was down at first refresh', async () => { + fetchMock.mockImplementation((url: string) => + url.startsWith('http://a.test') + ? Promise.resolve(modelsResponse(['qwen3.6-35b'])) + : Promise.reject(new Error('ECONNREFUSED')), + ); + const handle = createLocalModelSet(log); + await handle.refresh(); + expect(handle.set.has('embedding/gemma-4-12b')).toBe(false); + + fetchMock.mockImplementation((url: string) => + url.startsWith('http://a.test') + ? Promise.resolve(modelsResponse(['qwen3.6-35b'])) + : Promise.resolve(modelsResponse(['gemma-4-12b'])), + ); + await handle.refresh(); + expect(handle.set.has('embedding/gemma-4-12b')).toBe(true); + }); +}); diff --git a/apps/coder/src/services/__tests__/arena-model-call-headers.test.ts b/apps/coder/src/services/__tests__/arena-model-call-headers.test.ts new file mode 100644 index 0000000..722b703 --- /dev/null +++ b/apps/coder/src/services/__tests__/arena-model-call-headers.test.ts @@ -0,0 +1,64 @@ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; + +describe('P4: arena-model-call X-Boo-Source header', () => { + const originalFetch = globalThis.fetch; + + beforeEach(() => { + vi.stubGlobal( + 'fetch', + vi.fn(() => + new Response( + JSON.stringify({ + choices: [{ message: { content: 'analysis result' } }], + }), + { status: 200, headers: { 'content-type': 'application/json' } }, + ), + ), + ); + }); + + afterEach(() => { + vi.unstubAllGlobals(); + }); + + it('sets X-Boo-Source: arena on model calls', async () => { + const fetchMock = vi.fn(() => + new Response( + JSON.stringify({ + choices: [{ message: { content: 'result' } }], + }), + { status: 200, headers: { 'content-type': 'application/json' } }, + ), + ); + vi.stubGlobal('fetch', fetchMock); + + // Load providers fixture + const { writeFileSync } = await import('node:fs'); + const { tmpdir } = await import('node:os'); + const { join } = await import('node:path'); + const providerFile = { + defaultProvider: 'sam-desktop', + providers: [ + { id: 'sam-desktop', label: 'Sam Desktop', baseUrl: 'http://test:8401', kind: 'llama-swap' }, + ], + }; + const path = join(tmpdir(), `test-providers-${Date.now()}.json`); + writeFileSync(path, JSON.stringify(providerFile), 'utf8'); + + const { loadLlamaProviders } = await import('../llama-providers.js'); + loadLlamaProviders(path, 'http://localhost:8080'); + + const { arenaModelCall } = await import('../arena-model-call.js'); + const result = await arenaModelCall({ + model: 'sam-desktop/test-model', + system: 'You are a judge.', + user: 'Evaluate this response.', + temperature: 0, + }); + + expect(result).toBe('result'); + expect(fetchMock).toHaveBeenCalledTimes(1); + const callHeaders = (fetchMock.mock.calls[0] as [string, RequestInit])[1]?.headers as Record; + expect(callHeaders['X-Boo-Source']).toBe('arena'); + }); +}); diff --git a/apps/coder/src/services/__tests__/arena-model-routing.test.ts b/apps/coder/src/services/__tests__/arena-model-routing.test.ts new file mode 100644 index 0000000..425bb12 --- /dev/null +++ b/apps/coder/src/services/__tests__/arena-model-routing.test.ts @@ -0,0 +1,73 @@ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; +import { resolveModelEndpoint } from '../arena-model-call.js'; + +// Mock the llama-providers module so resolveModelEndpoint resolves against +// our test registry instead of the startup-time cached config. +const mockProviders = { + defaultProvider: 'sam-desktop', + providers: [ + { + id: 'sam-desktop', + label: 'Sam Desktop', + baseUrl: 'http://100.101.41.16:8080', + kind: 'llama-swap', + }, + { + id: 'embedding', + label: 'Embedding Box', + baseUrl: 'http://100.101.41.17:8080', + kind: 'llama-swap', + }, + ], +}; + +vi.mock('../llama-providers.js', () => ({ + getLlamaProviders: () => mockProviders, + parseModelRef: (ref: string) => { + const slashIdx = ref.indexOf('/'); + if (slashIdx <= 0) { + return { providerId: mockProviders.defaultProvider, wireModelId: ref, isLegacyBareId: true }; + } + return { + providerId: ref.slice(0, slashIdx), + wireModelId: ref.slice(slashIdx + 1), + isLegacyBareId: false, + }; + }, +})); + +// ─── resolveModelEndpoint ─────────────────────────────────────────────────── + +describe('resolveModelEndpoint', () => { + it('resolves a composite provider/model id to the correct baseUrl', () => { + const result = resolveModelEndpoint('sam-desktop/qwen3.6-35b-a3b-mxfp4'); + expect(result.baseUrl).toBe('http://100.101.41.16:8080'); + expect(result.wireModelId).toBe('qwen3.6-35b-a3b-mxfp4'); + }); + + it('routes duplicate wire names to different baseUrls by provider', () => { + // Same wire model on two providers + const r1 = resolveModelEndpoint('sam-desktop/qwen3.6-35b-a3b-mxfp4'); + const r2 = resolveModelEndpoint('embedding/qwen3.6-35b-a3b-mxfp4'); + expect(r1.baseUrl).toBe('http://100.101.41.16:8080'); + expect(r1.wireModelId).toBe('qwen3.6-35b-a3b-mxfp4'); + expect(r2.baseUrl).toBe('http://100.101.41.17:8080'); + expect(r2.wireModelId).toBe('qwen3.6-35b-a3b-mxfp4'); + }); + + it('resolves bare legacy ids to the default provider', () => { + const result = resolveModelEndpoint('qwen3.6-35b-a3b-mxfp4'); + expect(result.baseUrl).toBe('http://100.101.41.16:8080'); + expect(result.wireModelId).toBe('qwen3.6-35b-a3b-mxfp4'); + }); + + it('throws for an unknown provider prefix', () => { + expect(() => resolveModelEndpoint('nonexistent/model')).toThrow('unknown provider: nonexistent'); + }); + + it('handles models with slashes in the wire id', () => { + const result = resolveModelEndpoint('sam-desktop/models/qwen3.6-35b'); + expect(result.baseUrl).toBe('http://100.101.41.16:8080'); + expect(result.wireModelId).toBe('models/qwen3.6-35b'); + }); +}); diff --git a/apps/coder/src/services/__tests__/flow-runner-decisions.test.ts b/apps/coder/src/services/__tests__/flow-runner-decisions.test.ts index 19ecf52..30e0bb5 100644 --- a/apps/coder/src/services/__tests__/flow-runner-decisions.test.ts +++ b/apps/coder/src/services/__tests__/flow-runner-decisions.test.ts @@ -14,7 +14,7 @@ import { shouldFailOnMissingAgent, type SchedulerState, } from '../flow-runner-decisions.js'; -import type { StepContext } from '../../conductor/types.js'; +import type { TriggerRule } from '../../conductor/types.js'; /** * The DB-driven flow-runner replaces the Phase-1 in-memory wave scheduler @@ -58,6 +58,7 @@ const emptyState = (over: Partial = {}): SchedulerState => ({ excluded: new Set(), timedOut: new Set(), switchResults: new Map(), + loopIterations: new Map(), ...over, }); @@ -371,6 +372,7 @@ describe('readySteps with switch-excluded steps', () => { excluded: new Set(), timedOut: new Set(), switchResults: switchResult, + loopIterations: new Map(), }; const ready = readySteps(flow, state).map((s) => s.id); // branch-a is ready (dep switch is done), branch-b is excluded @@ -390,6 +392,7 @@ describe('readySteps with switch-excluded steps', () => { excluded: new Set(), timedOut: new Set(), switchResults: switchResult, + loopIterations: new Map(), }; const ready = readySteps(flow, state).map((s) => s.id); // fold's deps: branch-a done, branch-b excluded (via switch) → satisfied @@ -408,6 +411,7 @@ describe('readySteps with switch-excluded steps', () => { excluded: new Set(), timedOut: new Set(), switchResults: switchResult, + loopIterations: new Map(), }; const ready = readySteps(flow, state).map((s) => s.id); // branch-a in flight, branch-b excluded — only branch-a offered @@ -427,6 +431,7 @@ describe('readySteps with switch-excluded steps', () => { excluded: new Set(), timedOut: new Set(), switchResults: switchResult, + loopIterations: new Map(), }; expect(isRunComplete(flow, state)).toBe(true); expect(isStuck(flow, state)).toBe(false); @@ -445,6 +450,7 @@ describe('readySteps with switch-excluded steps', () => { excluded: new Set(['branch-b']), timedOut: new Set(), switchResults: switchResult, + loopIterations: new Map(), }; // branch-b excluded both ways; fold sees branch-a done, branch-b excluded const ready = readySteps(flow, state).map((s) => s.id); @@ -554,6 +560,7 @@ describe('getReadyInBatch', () => { excluded: new Set(), timedOut: new Set(), switchResults: new Map(), + loopIterations: new Map(), batchState: makeBatchState(), }; const result = getReadyInBatch(steps, state, {} as Flow); @@ -574,6 +581,7 @@ describe('getReadyInBatch', () => { excluded: new Set(), timedOut: new Set(), switchResults: new Map(), + loopIterations: new Map(), batchState, }; const result = getReadyInBatch(steps, state, {} as Flow); @@ -596,6 +604,7 @@ describe('getReadyInBatch', () => { excluded: new Set(), timedOut: new Set(), switchResults: new Map(), + loopIterations: new Map(), batchState, }; // All 0 running, maxConcurrent=2 → all 3 pass through (readySteps would return them, @@ -620,6 +629,7 @@ describe('getReadyInBatch', () => { excluded: new Set(), timedOut: new Set(), switchResults: new Map(), + loopIterations: new Map(), batchState, }; // Both batches at capacity → everything filtered out @@ -642,6 +652,7 @@ describe('getReadyInBatch', () => { excluded: new Set(), timedOut: new Set(), switchResults: new Map(), + loopIterations: new Map(), batchState, }; expect(getReadyInBatch(steps, state, {} as Flow).map((s) => s.id)).toEqual(['c', 'd']); @@ -660,6 +671,7 @@ describe('getReadyInBatch', () => { excluded: new Set(), timedOut: new Set(), switchResults: new Map(), + loopIterations: new Map(), batchState, }; expect(getReadyInBatch(steps, state, {} as Flow).map((s) => s.id)).toEqual(['first']); @@ -673,6 +685,7 @@ describe('getReadyInBatch', () => { excluded: new Set(), timedOut: new Set(), switchResults: new Map(), + loopIterations: new Map(), batchState: makeBatchState(), }; expect(getReadyInBatch([], state, {} as Flow)).toEqual([]); diff --git a/apps/coder/src/services/__tests__/local-gateway-routing.test.ts b/apps/coder/src/services/__tests__/local-gateway-routing.test.ts new file mode 100644 index 0000000..76daa30 --- /dev/null +++ b/apps/coder/src/services/__tests__/local-gateway-routing.test.ts @@ -0,0 +1,124 @@ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; +import { writeFileSync } from 'node:fs'; +import { tmpdir } from 'node:os'; +import { join } from 'node:path'; +import Fastify from 'fastify'; +import { resolveGatewayModel, registerLocalGatewayRoutes } from '../local-gateway.js'; +import { loadLlamaProviders } from '../llama-providers.js'; + +// P0 duplicate-name routing smoke (multi-llama-swap-providers-model-favorites, +// P8): five wire model ids exist on BOTH llama-swap hosts in production +// (deepseek-r1-qwen3-8b et al). Opencode dispatches through the boocode-local +// gateway, so the gateway is the layer that must preserve provider identity — +// the same bare wire name prefixed with different provider ids must reach +// DIFFERENT baseUrls, and an unknown provider must be an error, never a +// silent fallback to whichever host the bare name happens to resolve on. + +const DUP = 'deepseek-r1-qwen3-8b'; +const SAM_URL = 'http://a.test:8401'; +const EMB_URL = 'http://b.test:8411'; + +function loadFixture(): void { + const file = { + defaultProvider: 'sam-desktop', + providers: [ + { id: 'sam-desktop', label: 'Sam Desktop', baseUrl: SAM_URL, kind: 'llama-swap' }, + { id: 'embedding', label: 'Embedding', baseUrl: EMB_URL, kind: 'llama-swap' }, + ], + }; + const path = join(tmpdir(), `llama-providers-lgr-${Math.random().toString(36).slice(2)}.json`); + writeFileSync(path, JSON.stringify(file), 'utf8'); + loadLlamaProviders(path, 'http://legacy.test:8080'); +} + +describe('local-gateway duplicate-name routing (P0 P8 smoke)', () => { + beforeEach(() => { + loadFixture(); + }); + + it('routes the same wire name to the intended provider per composite prefix', () => { + expect(resolveGatewayModel(`sam-desktop/${DUP}`)).toEqual({ + baseUrl: SAM_URL, + wireModelId: DUP, + }); + expect(resolveGatewayModel(`embedding/${DUP}`)).toEqual({ + baseUrl: EMB_URL, + wireModelId: DUP, + }); + }); + + it('resolves a bare id to the default provider, deterministically', () => { + expect(resolveGatewayModel(DUP)).toEqual({ baseUrl: SAM_URL, wireModelId: DUP }); + }); + + it('rejects an unknown provider instead of silently falling back', () => { + const resolved = resolveGatewayModel(`no-such-host/${DUP}`); + expect(resolved).toHaveProperty('error'); + }); + + describe('through the HTTP route', () => { + const fetchMock = vi.fn(); + + beforeEach(() => { + vi.stubGlobal('fetch', fetchMock); + fetchMock.mockReset(); + fetchMock.mockImplementation( + async () => + new Response(JSON.stringify({ id: 'resp', choices: [] }), { + status: 200, + headers: { 'content-type': 'application/json' }, + }), + ); + }); + + afterEach(() => { + vi.unstubAllGlobals(); + }); + + it('proxies each composite id to its own host with the bare wire id', async () => { + const app = Fastify(); + registerLocalGatewayRoutes(app); + await app.ready(); + try { + for (const composite of [`sam-desktop/${DUP}`, `embedding/${DUP}`]) { + const res = await app.inject({ + method: 'POST', + url: '/v1/chat/completions', + payload: { model: composite, stream: false, messages: [] }, + }); + expect(res.statusCode).toBe(200); + } + const urls = fetchMock.mock.calls.map((c) => String(c[0])); + expect(urls).toEqual([ + `${SAM_URL}/v1/chat/completions`, + `${EMB_URL}/v1/chat/completions`, + ]); + // The upstream body must carry the BARE wire id — llama-swap knows + // nothing about composite prefixes. + const upstreamModels = fetchMock.mock.calls.map( + (c) => (JSON.parse((c[1] as RequestInit).body as string) as { model: string }).model, + ); + expect(upstreamModels).toEqual([DUP, DUP]); + } finally { + await app.close(); + } + }); + + it('returns 400 for an unknown provider without touching any upstream', async () => { + const app = Fastify(); + registerLocalGatewayRoutes(app); + await app.ready(); + try { + const res = await app.inject({ + method: 'POST', + url: '/v1/chat/completions', + payload: { model: `no-such-host/${DUP}`, stream: false, messages: [] }, + }); + expect(res.statusCode).toBe(400); + expect(fetchMock).not.toHaveBeenCalled(); + } finally { + await app.close(); + } + }); + }); +}); diff --git a/apps/coder/src/services/__tests__/local-gateway.test.ts b/apps/coder/src/services/__tests__/local-gateway.test.ts new file mode 100644 index 0000000..78a42d3 --- /dev/null +++ b/apps/coder/src/services/__tests__/local-gateway.test.ts @@ -0,0 +1,399 @@ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; +import { writeFileSync } from 'node:fs'; +import { tmpdir } from 'node:os'; +import { join } from 'node:path'; +import { resolveGatewayModel } from '../local-gateway.js'; +import { prefixBoocodeLocalModels, clearProviderSnapshotCache, getProviderSnapshot } from '../provider-snapshot.js'; +import { loadLlamaProviders } from '../llama-providers.js'; +import { loadProviderConfig } from '../provider-config-registry.js'; + +vi.mock('../acp-probe.js', () => ({ + probeAcpProvider: vi.fn(), +})); +import { probeAcpProvider } from '../acp-probe.js'; +const mockProbe = vi.mocked(probeAcpProvider); + +/** Load a providers fixture into the in-memory registry. */ +function loadProvidersFixture(providers: Array<{ id: string; label: string; baseUrl: string; kind?: string }>): void { + const file = { + defaultProvider: providers[0]?.id ?? 'llama-swap', + providers, + }; + const path = join(tmpdir(), `llama-providers-w7-${Date.now()}.json`); + writeFileSync(path, JSON.stringify(file), 'utf8'); + loadLlamaProviders(path, 'http://localhost:8080'); +} + +function mockSql(agents: Array<{ + name: string; + install_path: string | null; + supports_acp: boolean; + models: Array<{ id: string; label: string }> | null; + label: string | null; + transport: string | null; + last_probed_at?: string | null; +}>) { + return vi.fn((strings: TemplateStringsArray) => { + const query = strings.join(''); + if (query.includes('FROM available_agents')) { + return Promise.resolve(agents); + } + if (query.includes('UPDATE available_agents')) { + return Promise.resolve([]); + } + return Promise.resolve([]); + }) as unknown as import('../db.js').Sql; +} + +// --- Gateway model-id parsing tests --- + +describe('resolveGatewayModel', () => { + beforeEach(() => { + loadProvidersFixture([ + { id: 'sam-desktop', label: 'Sam Desktop', baseUrl: 'http://100.101.41.16:8401' }, + { id: 'embedding', label: 'Embedding', baseUrl: 'http://100.90.172.55:8411' }, + ]); + }); + + it('resolves composite "provider/model" to the correct baseUrl', () => { + const result = resolveGatewayModel('sam-desktop/qwen3.6-35b'); + expect(result).toEqual({ + baseUrl: 'http://100.101.41.16:8401', + wireModelId: 'qwen3.6-35b', + }); + }); + + it('resolves a different provider to its own baseUrl', () => { + const result = resolveGatewayModel('embedding/gemma-4-12b'); + expect(result).toEqual({ + baseUrl: 'http://100.90.172.55:8411', + wireModelId: 'gemma-4-12b', + }); + }); + + it('returns error for unknown provider', () => { + const result = resolveGatewayModel('nonexistent/model'); + expect(result).toHaveProperty('error'); + expect((result as { error: string }).error).toContain('unknown provider'); + }); + + it('bare model resolves to default provider', () => { + const result = resolveGatewayModel('qwen3.6-35b'); + expect(result).toEqual({ + baseUrl: 'http://100.101.41.16:8401', + wireModelId: 'qwen3.6-35b', + }); + }); + + it('two providers serving the SAME wire model name hit different baseUrls', () => { + const r1 = resolveGatewayModel('sam-desktop/qwen3.6-35b'); + const r2 = resolveGatewayModel('embedding/qwen3.6-35b'); + expect(r1).toHaveProperty('baseUrl', 'http://100.101.41.16:8401'); + expect(r2).toHaveProperty('baseUrl', 'http://100.90.172.55:8411'); + expect((r1 as { wireModelId: string }).wireModelId).toBe('qwen3.6-35b'); + expect((r2 as { wireModelId: string }).wireModelId).toBe('qwen3.6-35b'); + }); +}); + +// --- prefixBoocodeLocalModels --- + +describe('prefixBoocodeLocalModels', () => { + it('wraps composite ids with boocode-local prefix', () => { + const result = prefixBoocodeLocalModels([ + { id: 'sam-desktop/qwen3.6-35b', label: 'Qwen' }, + { id: 'embedding/gemma-4-12b', label: 'Gemma' }, + ]); + expect(result.map((m) => m.id)).toEqual([ + 'boocode-local/sam-desktop/qwen3.6-35b', + 'boocode-local/embedding/gemma-4-12b', + ]); + }); + + it('leaves already-prefixed ids unchanged', () => { + const result = prefixBoocodeLocalModels([ + { id: 'boocode-local/sam-desktop/qwen3.6-35b', label: 'Qwen' }, + ]); + expect(result[0].id).toBe('boocode-local/sam-desktop/qwen3.6-35b'); + }); + + it('preserves label and other fields', () => { + const result = prefixBoocodeLocalModels([ + { id: 'sam-desktop/qwen3.6-35b', label: 'Qwen 3.6 35B', isDefault: true }, + ]); + expect(result[0]).toEqual({ + id: 'boocode-local/sam-desktop/qwen3.6-35b', + label: 'Qwen 3.6 35B', + isDefault: true, + }); + }); +}); + +// --- parseModel inner-slash preservation --- + +describe('gateway model id parsing preserves inner slashes', () => { + beforeEach(() => { + loadProvidersFixture([ + { id: 'sam-desktop', label: 'Sam Desktop', baseUrl: 'http://100.101.41.16:8401' }, + ]); + }); + + it('parses "sam-desktop/qwen3.6-35b-a3b-mxfp4" preserving the full wire id', () => { + const result = resolveGatewayModel('sam-desktop/qwen3.6-35b-a3b-mxfp4'); + expect(result).toHaveProperty('wireModelId', 'qwen3.6-35b-a3b-mxfp4'); + }); + + it('parses model ids with dots and hyphens', () => { + const result = resolveGatewayModel('sam-desktop/deepseek-r1-0528'); + expect(result).toHaveProperty('wireModelId', 'deepseek-r1-0528'); + }); +}); + +// --- Snapshot advertising shape (integration) --- + +describe('provider snapshot opencode entry uses boocode-local prefix', () => { + beforeEach(() => { + clearProviderSnapshotCache(); + loadProviderConfig('/nonexistent-coder-providers.json'); + vi.restoreAllMocks(); + vi.stubGlobal( + 'fetch', + vi.fn().mockResolvedValue({ + ok: true, + json: async () => ({ + data: [{ id: 'local-model' }, { id: 'qwen3.6-35b' }], + }), + }), + ); + mockProbe.mockResolvedValue({ + ok: true, + models: [], + modes: [], + defaultModeId: null, + commands: [], + }); + }); + + it('opencode snapshot entry has boocode-local prefixed model ids', async () => { + loadProvidersFixture([ + { id: 'sam-desktop', label: 'Sam Desktop', baseUrl: 'http://100.101.41.16:8401' }, + ]); + + const sql = mockSql([ + { + name: 'opencode', + install_path: '/usr/bin/opencode', + supports_acp: true, + models: null, + label: 'OpenCode', + transport: 'acp', + last_probed_at: null, + }, + ]); + + const config = { + LLAMA_SWAP_URL: 'http://llama-swap.test', + PROVIDER_PROBE_TTL_MS: 86_400_000, + DEFAULT_MODEL: 'qwen3.6-35b', + } as import('../config.js').Config; + + const entries = await getProviderSnapshot(sql, config, '/tmp/test', true); + const opencode = entries.find((e) => e.name === 'opencode'); + + expect(opencode).toBeDefined(); + // W7: all model ids start with "boocode-local/" and never "llama-swap/". + for (const m of opencode!.models) { + expect(m.id).toMatch(/^boocode-local\//); + expect(m.id).not.toMatch(/^llama-swap\//); + } + }); +}); + +// --- Gateway HTTP proxy tests (W7 audit M3) --- + +describe('local gateway HTTP proxy', () => { + let app: import('fastify').FastifyInstance; + const fetchMock = vi.fn(); + + beforeEach(async () => { + loadProvidersFixture([ + { id: 'sam-desktop', label: 'Sam Desktop', baseUrl: 'http://machine-a.test:8401' }, + { id: 'laptop', label: 'Laptop', baseUrl: 'http://machine-b.test:8401' }, + ]); + vi.stubGlobal('fetch', fetchMock); + fetchMock.mockReset(); + const { default: Fastify } = await import('fastify'); + const { registerLocalGatewayRoutes } = await import('../local-gateway.js'); + app = Fastify({ logger: false }); + registerLocalGatewayRoutes(app); + await app.ready(); + }); + + afterEach(async () => { + vi.unstubAllGlobals(); + await app.close(); + }); + + it('proxies non-streaming requests to the right provider with the bare wire id', async () => { + fetchMock.mockResolvedValue( + new Response(JSON.stringify({ id: 'cmpl-1', model: 'qwen3.6-35b' }), { + status: 200, + headers: { 'content-type': 'application/json' }, + }), + ); + const res = await app.inject({ + method: 'POST', + url: '/v1/chat/completions', + payload: { model: 'sam-desktop/qwen3.6-35b', messages: [] }, + }); + expect(res.statusCode).toBe(200); + expect(res.json()).toMatchObject({ id: 'cmpl-1' }); + expect(fetchMock).toHaveBeenCalledTimes(1); + const [url, init] = fetchMock.mock.calls[0] as [string, RequestInit]; + expect(url).toBe('http://machine-a.test:8401/v1/chat/completions'); + expect(JSON.parse(init.body as string).model).toBe('qwen3.6-35b'); + }); + + it('routes duplicate wire model names to different machines by provider prefix', async () => { + fetchMock.mockResolvedValue( + new Response(JSON.stringify({ ok: true }), { + status: 200, + headers: { 'content-type': 'application/json' }, + }), + ); + await app.inject({ + method: 'POST', + url: '/v1/chat/completions', + payload: { model: 'sam-desktop/qwen3.6-35b', messages: [] }, + }); + await app.inject({ + method: 'POST', + url: '/v1/chat/completions', + payload: { model: 'laptop/qwen3.6-35b', messages: [] }, + }); + const urls = fetchMock.mock.calls.map((c) => c[0] as string); + expect(urls).toEqual([ + 'http://machine-a.test:8401/v1/chat/completions', + 'http://machine-b.test:8401/v1/chat/completions', + ]); + }); + + it('returns 400 for an unknown provider without calling upstream', async () => { + const res = await app.inject({ + method: 'POST', + url: '/v1/chat/completions', + payload: { model: 'nonexistent/some-model', messages: [] }, + }); + expect(res.statusCode).toBe(400); + expect(res.json().error).toContain('unknown provider'); + expect(fetchMock).not.toHaveBeenCalled(); + }); + + it('returns 400 when the model field is missing', async () => { + const res = await app.inject({ + method: 'POST', + url: '/v1/chat/completions', + payload: { messages: [] }, + }); + expect(res.statusCode).toBe(400); + expect(fetchMock).not.toHaveBeenCalled(); + }); + + it('returns an OpenAI-shaped 502 error when upstream replies non-JSON', async () => { + fetchMock.mockResolvedValue( + new Response('gateway error', { + status: 200, + headers: { 'content-type': 'text/html' }, + }), + ); + const res = await app.inject({ + method: 'POST', + url: '/v1/chat/completions', + payload: { model: 'sam-desktop/qwen3.6-35b', messages: [] }, + }); + expect(res.statusCode).toBe(502); + expect(res.json().error.message).toContain('non-JSON'); + }); + + it('relays streaming responses chunk-for-chunk with the upstream status', async () => { + const chunks = ['data: {"a":1}\n\n', 'data: {"a":2}\n\n', 'data: [DONE]\n\n']; + const stream = new ReadableStream({ + start(controller) { + for (const c of chunks) controller.enqueue(new TextEncoder().encode(c)); + controller.close(); + }, + }); + fetchMock.mockResolvedValue( + new Response(stream, { status: 200, headers: { 'content-type': 'text/event-stream' } }), + ); + const res = await app.inject({ + method: 'POST', + url: '/v1/chat/completions', + payload: { model: 'laptop/qwen3.6-35b', messages: [], stream: true }, + }); + expect(res.statusCode).toBe(200); + expect(res.headers['content-type']).toBe('text/event-stream'); + expect(res.body).toBe(chunks.join('')); + }); + + it('forwards inbound X-Boo-Source header to upstream', async () => { + fetchMock.mockResolvedValue( + new Response(JSON.stringify({ ok: true }), { + status: 200, + headers: { 'content-type': 'application/json' }, + }), + ); + await app.inject({ + method: 'POST', + url: '/v1/chat/completions', + payload: { model: 'sam-desktop/qwen3.6-35b', messages: [] }, + headers: { 'x-boo-source': 'arena' }, + }); + expect(fetchMock).toHaveBeenCalledTimes(1); + const callHeaders = (fetchMock.mock.calls[0] as [string, RequestInit])[1]?.headers as Record; + expect(callHeaders['X-Boo-Source']).toBe('arena'); + }); + + it('defaults X-Boo-Source to boocoder when not present', async () => { + fetchMock.mockResolvedValue( + new Response(JSON.stringify({ ok: true }), { + status: 200, + headers: { 'content-type': 'application/json' }, + }), + ); + await app.inject({ + method: 'POST', + url: '/v1/chat/completions', + payload: { model: 'sam-desktop/qwen3.6-35b', messages: [] }, + }); + expect(fetchMock).toHaveBeenCalledTimes(1); + const callHeaders = (fetchMock.mock.calls[0] as [string, RequestInit])[1]?.headers as Record; + expect(callHeaders['X-Boo-Source']).toBe('boocoder'); + }); +}); + +// --- opencode config sync shape (W7 audit B1) --- + +describe('buildBoocodeLocalProviderConfig', () => { + it('emits an opencode-routable provider: npm + options.baseURL + models as object map', async () => { + loadProvidersFixture([ + { id: 'sam-desktop', label: 'Sam Desktop', baseUrl: 'http://machine-a.test:8401' }, + ]); + const fetchMock = vi.fn().mockResolvedValue( + new Response(JSON.stringify({ data: [{ id: 'qwen3.6-35b' }] }), { + status: 200, + headers: { 'content-type': 'application/json' }, + }), + ); + vi.stubGlobal('fetch', fetchMock); + try { + const { buildBoocodeLocalProviderConfig } = await import('../opencode-config-sync.js'); + const cfg = await buildBoocodeLocalProviderConfig('http://127.0.0.1:9502'); + expect(cfg.npm).toBe('@ai-sdk/openai-compatible'); + expect(cfg.options?.baseURL).toBe('http://127.0.0.1:9502/v1'); + expect(Array.isArray(cfg.models)).toBe(false); + expect(cfg.models).toHaveProperty(['sam-desktop/qwen3.6-35b']); + } finally { + vi.unstubAllGlobals(); + } + }); +}); diff --git a/apps/coder/src/services/__tests__/pi-config-sync.test.ts b/apps/coder/src/services/__tests__/pi-config-sync.test.ts new file mode 100644 index 0000000..ce39cc2 --- /dev/null +++ b/apps/coder/src/services/__tests__/pi-config-sync.test.ts @@ -0,0 +1,61 @@ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; +import { writeFileSync } from 'node:fs'; +import { tmpdir } from 'node:os'; +import { join } from 'node:path'; +import { buildPiProviderEntry } from '../pi-config-sync.js'; +import { loadLlamaProviders } from '../llama-providers.js'; + +describe('buildPiProviderEntry', () => { + const fetchMock = vi.fn(); + + beforeEach(() => { + vi.stubGlobal('fetch', fetchMock); + fetchMock.mockResolvedValue( + new Response(JSON.stringify({ data: [{ id: 'qwen3.6-35b' }] }), { + status: 200, + headers: { 'content-type': 'application/json' }, + }), + ); + const file = { + defaultProvider: 'sam-desktop', + providers: [ + { id: 'sam-desktop', label: 'Sam Desktop', baseUrl: 'http://a.test:8401', kind: 'llama-swap' }, + ], + }; + const path = join(tmpdir(), `llama-providers-pi-${Math.random().toString(36).slice(2)}.json`); + writeFileSync(path, JSON.stringify(file), 'utf8'); + loadLlamaProviders(path, 'http://legacy.test:8080'); + }); + + afterEach(() => { + vi.unstubAllGlobals(); + }); + + it('emits a Pi-routable provider with gateway baseUrl and composite model ids', async () => { + const entry = await buildPiProviderEntry('http://127.0.0.1:9502'); + expect(entry.baseUrl).toBe('http://127.0.0.1:9502/v1'); + expect(entry.api).toBe('openai-completions'); + expect(entry.models?.map((m) => m.id)).toEqual(['sam-desktop/qwen3.6-35b']); + expect(entry.models?.[0]?.contextWindow).toBeGreaterThan(0); + expect(entry.models?.[0]?.cost).toEqual({ input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }); + }); + + it('preserves hand-tuned per-model overrides on re-sync', async () => { + const existing = { + baseUrl: 'http://stale:1/v1', + models: [ + { + id: 'sam-desktop/qwen3.6-35b', + name: 'Old Name', + contextWindow: 262_144, + maxTokens: 65_536, + }, + ], + }; + const entry = await buildPiProviderEntry('http://127.0.0.1:9502', existing); + expect(entry.baseUrl).toBe('http://127.0.0.1:9502/v1'); // ours wins + const m = entry.models?.[0]; + expect(m?.contextWindow).toBe(262_144); // hand-tuned values preserved + expect(m?.maxTokens).toBe(65_536); + }); +}); diff --git a/apps/coder/src/services/__tests__/provider-snapshot.test.ts b/apps/coder/src/services/__tests__/provider-snapshot.test.ts index 450d38c..f914e54 100644 --- a/apps/coder/src/services/__tests__/provider-snapshot.test.ts +++ b/apps/coder/src/services/__tests__/provider-snapshot.test.ts @@ -90,13 +90,13 @@ describe('getProviderSnapshot', () => { vi.fn().mockResolvedValue({ ok: true, json: async () => ({ - data: [{ id: 'local-model' }, { id: 'llama-swap/existing' }], + data: [{ id: 'local-model' }, { id: 'existing' }], }), }), ); }); - it('merges opencode ACP models with prefixed llama-swap models', async () => { + it('merges opencode ACP models with boocode-local prefixed registry models', async () => { mockProbe.mockResolvedValue({ ok: true, models: [{ id: 'opencode/big-pickle', label: 'Big Pickle', isDefault: true }], @@ -119,10 +119,11 @@ describe('getProviderSnapshot', () => { const entries = await getProviderSnapshot(sql, config, '/tmp/project', true); const opencode = entries.find((e) => e.name === 'opencode'); + // W7: registry models are prefixed with boocode-local/ (D-6), not llama-swap/. expect(opencode?.models.map((m) => m.id)).toEqual([ 'opencode/big-pickle', - 'llama-swap/local-model', - 'llama-swap/existing', + 'boocode-local/llama-swap/local-model', + 'boocode-local/llama-swap/existing', ]); expect(opencode?.commands.some((c) => c.name === 'help')).toBe(true); expect(opencode?.commands.some((c) => c.name === 'custom')).toBe(true); diff --git a/apps/coder/src/services/agent-probe.ts b/apps/coder/src/services/agent-probe.ts index de35b6b..84f5b53 100644 --- a/apps/coder/src/services/agent-probe.ts +++ b/apps/coder/src/services/agent-probe.ts @@ -4,7 +4,7 @@ import { exec as execCb, execFile as execFileCb } from 'node:child_process'; import { promisify } from 'node:util'; import { PROVIDERS_BY_NAME } from './provider-registry.js'; import { resolveAcpProbeBinaries } from './acp-spawn.js'; -import { clearProviderSnapshotCache, fetchLlamaSwapModels, prefixLlamaSwapModels } from './provider-snapshot.js'; +import { clearProviderSnapshotCache, fetchRegistryModels, prefixBoocodeLocalModels } from './provider-snapshot.js'; import { readQwenSettingsModels } from './qwen-settings.js'; import { loadConfig } from '../config.js'; import { loadProviderConfig } from './provider-config-registry.js'; @@ -119,11 +119,12 @@ export async function probeAgents(sql: Sql, log: FastifyBaseLogger): Promise; - /** Model IDs served by local llama-swap — cross-exam routing uses this. */ + config: Pick; + /** Model IDs served by local providers — cross-exam routing uses this. */ localModels: ReadonlySet; } @@ -270,7 +270,7 @@ export function createAnalyzer(deps: AnalyzerDeps): Analyzer { // ─── Model call routing ─────────────────────────────────────────────────── /** - * Route a one-shot model call to llama-swap (local) or the task dispatcher + * Route a one-shot model call to a local provider or the task dispatcher * (cloud). Cloud dispatch inserts a tasks row and polls for completion. */ async function executeModelCall(opts: { @@ -281,11 +281,12 @@ export function createAnalyzer(deps: AnalyzerDeps): Analyzer { system: string; user: string; }): Promise { - const isLocal = localModels.has(opts.model) || localModels.has(`llama-swap/${opts.model}`); + const isLocal = + localModels.has(opts.model) || + localModels.has(`llama-swap/${opts.model}`); if (isLocal) { return arenaModelCall({ - config, model: opts.model, system: opts.system, user: opts.user, @@ -374,7 +375,6 @@ export function createAnalyzer(deps: AnalyzerDeps): Analyzer { let digest: string; try { digest = await arenaModelCall({ - config, model: config.DEFAULT_MODEL, system, user, @@ -404,7 +404,6 @@ export function createAnalyzer(deps: AnalyzerDeps): Analyzer { let judgeOutput = ''; try { judgeOutput = await arenaModelCall({ - config, model: config.DEFAULT_MODEL, system, user, diff --git a/apps/coder/src/services/arena-local-models.ts b/apps/coder/src/services/arena-local-models.ts new file mode 100644 index 0000000..b68d459 --- /dev/null +++ b/apps/coder/src/services/arena-local-models.ts @@ -0,0 +1,83 @@ +/** + * Self-refreshing arena local-model set. + * + * The set's contents are rebuilt from the provider registry on an interval so + * a provider that was unreachable at coder startup is reclassified as local + * once it comes back — without a boocoder restart. The Set instance is stable + * (consumers hold a ReadonlySet reference); only its contents change. + * + * Merge semantics per refresh: a reachable provider replaces its own + * contribution; an unreachable provider keeps its last-known contribution + * (stale-but-local classification is safer than flipping to the cloud lane). + * Bare wire ids are contributed only by the default provider — bare ids + * resolve through defaultProvider at call time, so advertising another + * machine's models as bare would route them to the wrong host. + */ +import { getLlamaProviders, formatModelRef } from './llama-providers.js'; + +interface LogLike { + warn: (obj: unknown, msg: string) => void; +} + +export interface LocalModelSetHandle { + /** Stable Set instance — pass this to analyzer/battle-runner deps. */ + set: ReadonlySet; + /** Fetch every provider's live model list and rebuild the set contents. */ + refresh: () => Promise; + /** Start periodic refresh. */ + start: (intervalMs: number) => void; + /** Stop periodic refresh. */ + stop: () => void; +} + +export function createLocalModelSet(log: LogLike): LocalModelSetHandle { + const set = new Set(); + const contributions = new Map>(); + let timer: NodeJS.Timeout | null = null; + + async function refresh(): Promise { + const { providers, defaultProvider } = getLlamaProviders(); + await Promise.all( + providers.map(async (p) => { + try { + const res = await fetch(`${p.baseUrl}/v1/models`, { + signal: AbortSignal.timeout(10_000), + }); + if (!res.ok) return; + const parsed = (await res.json()) as { data?: Array<{ id: string }> }; + const contrib = new Set(); + for (const m of parsed.data ?? []) { + contrib.add(formatModelRef(p.id, m.id)); + // Bare ids resolve via defaultProvider — only it contributes them. + if (p.id === defaultProvider) contrib.add(m.id); + } + contributions.set(p.id, contrib); + } catch (err) { + // Unreachable — keep the last-known contribution. + log.warn( + { provider: p.id, err: err instanceof Error ? err.message : String(err) }, + 'arena-local-models: provider unreachable; keeping last-known model set', + ); + } + }), + ); + set.clear(); + for (const contrib of contributions.values()) { + for (const id of contrib) set.add(id); + } + } + + return { + set, + refresh, + start(intervalMs: number) { + if (timer) return; + timer = setInterval(() => void refresh(), intervalMs); + timer.unref?.(); + }, + stop() { + if (timer) clearInterval(timer); + timer = null; + }, + }; +} diff --git a/apps/coder/src/services/arena-model-call.ts b/apps/coder/src/services/arena-model-call.ts index 35c95eb..e039883 100644 --- a/apps/coder/src/services/arena-model-call.ts +++ b/apps/coder/src/services/arena-model-call.ts @@ -1,35 +1,56 @@ /** * One-shot model completion for the Arena analyzer. * - * Calls the local llama-swap server directly for a single non-streaming - * completion. Used for the digest and judge stages (always DEFAULT_MODEL) - * and for local-model cross-examinations (any local model). + * Resolves a model id (composite "provider/model" or bare) against the + * provider registry, then calls the correct provider's baseUrl directly. + * Used for the digest and judge stages (always DEFAULT_MODEL) and for + * local-model cross-examinations (any local model). * * Mirrors apps/server/src/services/task-model.ts but targets the coder's * config shape and uses a longer timeout appropriate for analysis calls. */ -import type { Config } from '../config.js'; +import { + parseModelRef as parseModelRefBase, + getLlamaProviders, +} from './llama-providers.js'; const TIMEOUT_MS = 120_000; +/** + * Resolve a model id to { baseUrl, wireModelId } against the provider registry. + * Composite "provider/model" is parsed; bare ids resolve to the default provider. + */ +export function resolveModelEndpoint( + model: string, +): { baseUrl: string; wireModelId: string } { + const ref = parseModelRefBase(model); + const providers = getLlamaProviders(); + const provider = providers.providers.find((p) => p.id === ref.providerId); + if (!provider) { + throw new Error(`unknown provider: ${ref.providerId} (model: ${model})`); + } + return { baseUrl: provider.baseUrl, wireModelId: ref.wireModelId }; +} + export async function arenaModelCall(opts: { - config: Pick; model: string; system: string; user: string; maxTokens?: number; temperature?: number; }): Promise { - const { config, model, system, user } = opts; + const { model, system, user } = opts; const maxTokens = opts.maxTokens ?? 2_000; const temperature = opts.temperature ?? 0.3; - const res = await fetch(`${config.LLAMA_SWAP_URL}/v1/chat/completions`, { + const { baseUrl, wireModelId } = resolveModelEndpoint(model); + + const res = await fetch(`${baseUrl}/v1/chat/completions`, { method: 'POST', - headers: { 'Content-Type': 'application/json' }, + headers: { 'Content-Type': 'application/json', 'X-Boo-Source': 'arena' }, body: JSON.stringify({ - model, + model: wireModelId, messages: [ { role: 'system', content: system }, { role: 'user', content: user }, @@ -44,7 +65,7 @@ export async function arenaModelCall(opts: { if (!res.ok) { const text = await res.text().catch(() => ''); - throw new Error(`llama-swap responded ${res.status}: ${text.slice(0, 200)}`); + throw new Error(`model endpoint responded ${res.status}: ${text.slice(0, 200)}`); } const data = (await res.json()) as { diff --git a/apps/coder/src/services/backends/opencode-server.ts b/apps/coder/src/services/backends/opencode-server.ts index 562344a..7f41c9e 100644 --- a/apps/coder/src/services/backends/opencode-server.ts +++ b/apps/coder/src/services/backends/opencode-server.ts @@ -593,9 +593,9 @@ function parseModel(model: string | undefined): { providerID: string; modelID: s if (idx > 0 && idx < trimmed.length - 1) { return { providerID: trimmed.slice(0, idx), modelID: trimmed.slice(idx + 1) }; } - // No slash but non-empty → infer llama-swap (the only configured provider). + // No slash but non-empty → infer boocode-local (W7: the gateway namespace). if (idx < 0 && trimmed.length > 0) { - return { providerID: 'llama-swap', modelID: trimmed }; + return { providerID: 'boocode-local', modelID: trimmed }; } return undefined; } diff --git a/apps/coder/src/services/dispatcher.ts b/apps/coder/src/services/dispatcher.ts index de3cd87..64a5494 100644 --- a/apps/coder/src/services/dispatcher.ts +++ b/apps/coder/src/services/dispatcher.ts @@ -31,6 +31,7 @@ import { } from './finalize-message.js'; import { shouldFailOnMissingAgent } from './flow-runner-decisions.js'; import { emitHook } from '../plugins/host.js'; +import { parseModelRef } from './llama-providers.js'; interface InferenceRunner { enqueue: ( @@ -1003,12 +1004,26 @@ export function createDispatcher(deps: Deps): { } }; - // opencode expects provider-prefixed model ids (e.g. 'llama-swap/qwen3.6-35b…'). - // DEFAULT_MODEL is bare (no prefix) because native inference uses it directly - // against llama-swap. Coalesce empty string (frontend sends '' when no models - // listed) and prefix bare ids so parseModel always succeeds. + // W7: opencode now uses the boocode-local gateway (D-6). The model string + // is "boocode-local//" — parseModel splits only on + // the FIRST "/" so the inner composite survives. Coalesce empty string + // (frontend sends '' when no models listed) and wrap bare ids with the + // default provider composite so parseModel always succeeds. const rawModel = (task.model && task.model.trim()) || config.DEFAULT_MODEL; - const model = rawModel.includes('/') ? rawModel : `llama-swap/${rawModel}`; + let model: string; + if (rawModel.includes('/')) { + // Already composite (e.g. "sam-desktop/qwen3.6-35b" from the frontend + // or "boocode-local/sam-desktop/qwen3.6-35b" from the snapshot). + // If it already has the boocode-local prefix, use as-is. + // If it's a bare composite (provider/model), wrap in boocode-local/. + model = rawModel.startsWith('boocode-local/') + ? rawModel + : `boocode-local/${rawModel}`; + } else { + // Bare model id — wrap with default provider composite. + const ref = parseModelRef(rawModel); + model = `boocode-local/${ref.providerId}/${ref.wireModelId}`; + } const backend = getOpenCodeBackend(installPath); const handle = await backend.ensureSession(sessionId, { agent, diff --git a/apps/coder/src/services/llama-providers.ts b/apps/coder/src/services/llama-providers.ts new file mode 100644 index 0000000..5cdcd62 --- /dev/null +++ b/apps/coder/src/services/llama-providers.ts @@ -0,0 +1,102 @@ +/** + * vMultiProvider local provider registry loader (coder-side). + * + * Reads the shared `/data/llama-providers.json` (or `LLAMA_PROVIDERS_PATH`) at + * startup and caches the parsed result. When the file is absent or invalid, + * synthesizes a single legacy provider from `LLAMA_SWAP_URL` so both apps + * start with only legacy env vars (D-1). + * + * Schema and pure helpers live in @boocode/contracts/llama-providers. + * File I/O stays app-local per D-1. + */ +import { readFileSync } from 'node:fs'; +import { + LlamaProvidersFileSchema, + type LlamaProvidersFile, + type LlamaProvider, + type ParsedModelRef, + parseModelRef as parseModelRefBase, + formatModelRef, +} from '@boocode/contracts/llama-providers'; + +export type { LlamaProvidersFile, LlamaProvider, ParsedModelRef }; +export { formatModelRef }; + +/** Synthesize a single legacy provider from env vars. */ +function buildLegacyProvider(llamaSwapUrl: string): LlamaProvidersFile { + return { + defaultProvider: 'llama-swap', + providers: [ + { + id: 'llama-swap', + label: 'llama-swap', + baseUrl: llamaSwapUrl, + kind: 'llama-swap', + }, + ], + }; +} + +let cached: LlamaProvidersFile | null = null; + +/** + * Load (or re-load) the local provider config. Never throws on bad input — + * falls back to the legacy single-provider shape. + */ +export function loadLlamaProviders( + providersPath: string | undefined, + llamaSwapUrl: string, +): LlamaProvidersFile { + if (!providersPath) { + cached = buildLegacyProvider(llamaSwapUrl); + return cached; + } + + let raw: string; + try { + raw = readFileSync(providersPath, 'utf8'); + } catch { + console.warn( + `llama-providers: file not found at ${providersPath} — falling back to legacy single-provider`, + ); + cached = buildLegacyProvider(llamaSwapUrl); + return cached; + } + + let json: unknown; + try { + json = JSON.parse(raw); + } catch (err) { + console.error( + `llama-providers: invalid JSON in ${providersPath} — falling back to legacy single-provider`, + err, + ); + cached = buildLegacyProvider(llamaSwapUrl); + return cached; + } + + const parsed = LlamaProvidersFileSchema.safeParse(json); + if (!parsed.success) { + console.error( + `llama-providers: schema validation failed for ${providersPath} — falling back to legacy single-provider`, + parsed.error.flatten(), + ); + cached = buildLegacyProvider(llamaSwapUrl); + return cached; + } + + cached = parsed.data; + return cached; +} + +/** The cached provider config. Returns legacy fallback if nothing loaded yet. */ +export function getLlamaProviders(): LlamaProvidersFile { + return cached ?? buildLegacyProvider('http://localhost:8080'); +} + +/** + * Convenience: parse a model ref against the cached default provider. + */ +export function parseModelRef(ref: string): ParsedModelRef { + return parseModelRefBase(ref, getLlamaProviders().defaultProvider); +} diff --git a/apps/coder/src/services/local-gateway.ts b/apps/coder/src/services/local-gateway.ts new file mode 100644 index 0000000..af64c8f --- /dev/null +++ b/apps/coder/src/services/local-gateway.ts @@ -0,0 +1,145 @@ +/** + * W7: BooCoder-hosted OpenAI-compatible local-model gateway. + * + * Accepts composite local model ids ("sam-desktop/qwen3.6-35b"), parses them + * via the provider registry, and proxies the request to the correct provider's + * baseUrl with the bare wire model id. Unknown provider → 400. + * + * Presented to opencode as ONE stable provider namespace "boocode-local". + * The inner modelID carries the composite local identity so duplicate wire + * names across providers remain unambiguous end-to-end (D-6). + */ +import { once } from 'node:events'; +import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify'; +import { parseModelRef, getLlamaProviders } from './llama-providers.js'; +import { fetchRegistryModels } from './provider-snapshot.js'; +import type { ProviderModel } from './provider-types.js'; + +/** + * Resolve a composite model id to the upstream provider's baseUrl + wire model id. + */ +export function resolveGatewayModel( + model: string, +): { baseUrl: string; wireModelId: string } | { error: string } { + const ref = parseModelRef(model); + const providers = getLlamaProviders(); + const provider = providers.providers.find((p) => p.id === ref.providerId); + if (!provider) { + return { error: `unknown provider: ${ref.providerId} (model: ${model})` }; + } + return { baseUrl: provider.baseUrl, wireModelId: ref.wireModelId }; +} + +/** + * Handle POST /v1/chat/completions — proxy to the correct local provider. + */ +async function handleChatCompletions( + req: FastifyRequest, + reply: FastifyReply, +): Promise { + const body = req.body as Record | undefined; + if (!body || typeof body.model !== 'string') { + return reply.code(400).send({ error: 'missing or invalid "model" field' }); + } + + const modelStr = body.model; + const resolved = resolveGatewayModel(modelStr); + if ('error' in resolved) { + return reply.code(400).send({ error: resolved.error }); + } + + const { baseUrl, wireModelId } = resolved; + + // Build upstream request body with the bare wire model id. + const upstreamBody = { ...body, model: wireModelId }; + + // Abort the upstream call if the client disconnects, so a cancelled turn + // doesn't keep the GPU generating to completion. + const clientGone = new AbortController(); + reply.raw.once('close', () => clientGone.abort()); + + // Forward the client's Authorization header when present (future-proofing + // for authed upstreams; llama-swap ignores it today). + const auth = req.headers.authorization; + + // Forward inbound X-Boo-Source header for per-consumer attribution (P4). + // Default to 'boocoder' when not present (opencode dispatch path). + const booSource = (req.headers['x-boo-source'] as string | undefined) ?? 'boocoder'; + + let upstreamRes: Response; + try { + upstreamRes = await fetch(`${baseUrl}/v1/chat/completions`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + ...(auth ? { Authorization: auth } : {}), + 'X-Boo-Source': booSource, + }, + body: JSON.stringify(upstreamBody), + signal: AbortSignal.any([AbortSignal.timeout(300_000), clientGone.signal]), + }); + } catch (err) { + if (clientGone.signal.aborted) return; // client went away; nothing to answer + req.log.error({ err, baseUrl, model: modelStr }, 'local-gateway: upstream fetch failed'); + return reply.code(502).send({ + error: `upstream provider unreachable: ${err instanceof Error ? err.message : String(err)}`, + }); + } + + // Pipe the upstream response status + headers + body to the client. + const status = upstreamRes.status; + const contentType = upstreamRes.headers.get('content-type') ?? 'application/json'; + + if (body.stream) { + // Streaming: pipe the response body with backpressure — pause reading the + // upstream when the client socket's buffer is full. + reply.raw.writeHead(status, { 'content-type': contentType }); + if (upstreamRes.body) { + const reader = upstreamRes.body.getReader(); + try { + while (!clientGone.signal.aborted) { + const { done, value } = await reader.read(); + if (done) break; + if (!reply.raw.write(value)) await once(reply.raw, 'drain'); + } + } catch (err) { + if (!clientGone.signal.aborted) { + req.log.error({ err, baseUrl, model: modelStr }, 'local-gateway: stream relay failed'); + } + } finally { + reply.raw.end(); + } + } else { + reply.raw.end(); + } + } else { + // Non-streaming: relay the full JSON response. + const data = await upstreamRes.json().catch(() => null); + if (data === null) { + return reply.code(status === 200 ? 502 : status).send({ + error: { message: 'upstream returned a non-JSON response', code: status }, + }); + } + reply.code(status).header('content-type', contentType).send(data); + } +} + +/** + * Handle GET /v1/models — live composite model list fetched from every + * provider in the registry (same source as the provider snapshot). + */ +async function handleModels(_req: FastifyRequest, reply: FastifyReply): Promise { + const models: ProviderModel[] = await fetchRegistryModels(); + reply.send({ + object: 'list', + data: models.map((m) => ({ id: m.id, object: 'model', owned_by: 'boocode-local' })), + }); +} + +/** + * Register the local-model gateway routes on the coder's Fastify instance. + */ +export function registerLocalGatewayRoutes(app: FastifyInstance): void { + app.post('/v1/chat/completions', handleChatCompletions); + app.get('/v1/models', handleModels); +} diff --git a/apps/coder/src/services/opencode-config-sync.ts b/apps/coder/src/services/opencode-config-sync.ts new file mode 100644 index 0000000..52a2fa5 --- /dev/null +++ b/apps/coder/src/services/opencode-config-sync.ts @@ -0,0 +1,105 @@ +/** + * W7: Sync the boocode-local provider into opencode's config file. + * + * opencode validates model strings against its own config at + * `~/.config/opencode/opencode.json` — the model must be a key in the + * provider's `models` object map (Record), and a custom + * provider needs `npm` (the AI-SDK package) plus `options.baseURL` to be + * routable. This module writes/updates the boocode-local provider entry so + * opencode accepts composite local model ids and routes them to the gateway. + * + * The gateway URL derives from the coder's own HOST/PORT config. + */ +import { readFileSync, writeFileSync, mkdirSync } from 'node:fs'; +import { dirname, join } from 'node:path'; +import { homedir } from 'node:os'; +import { fetchRegistryModels } from './provider-snapshot.js'; + +const OPENCODE_CONFIG_DIR = join(homedir(), '.config', 'opencode'); +const OPENCODE_CONFIG_FILE = join(OPENCODE_CONFIG_DIR, 'opencode.json'); + +export interface OpencodeProviderConfig { + enabled?: boolean; + npm?: string; + name?: string; + options?: { baseURL?: string; [key: string]: unknown }; + models?: Record; +} + +export interface OpencodeConfig { + provider?: Record; + [key: string]: unknown; +} + +/** + * Build the boocode-local provider config for opencode. + * + * `gatewayUrl` is the URL where the local gateway listens (e.g. + * "http://127.0.0.1:9502"). The provider models are composite local ids + * like "sam-desktop/qwen3.6-35b". + */ +export async function buildBoocodeLocalProviderConfig( + gatewayUrl: string, +): Promise { + // Fetch live model lists from every provider in the registry. + const registryModels = await fetchRegistryModels(); + return { + enabled: true, + npm: '@ai-sdk/openai-compatible', + name: 'BooCode Local', + options: { baseURL: `${gatewayUrl}/v1` }, + models: Object.fromEntries(registryModels.map((m) => [m.id, { name: m.label }])), + }; +} + +/** + * Read the current opencode config, merge the boocode-local provider, and + * write it back. Idempotent — re-running with the same gatewayUrl is safe. + * + * Returns the updated config or null on read/write errors (logged, not thrown). + */ +export async function syncOpencodeConfig( + gatewayUrl: string, + log: { warn: (obj: unknown, msg: string) => void; info: (obj: unknown, msg: string) => void }, +): Promise { + // Read existing config (or start fresh). + let config: OpencodeConfig = {}; + try { + const raw = readFileSync(OPENCODE_CONFIG_FILE, 'utf8'); + config = JSON.parse(raw) as OpencodeConfig; + } catch { + // File missing or invalid JSON — start with empty config. + } + + // Ensure provider object exists. + if (!config.provider) config.provider = {}; + + // Build the boocode-local provider config. + const providerConfig = await buildBoocodeLocalProviderConfig(gatewayUrl); + + // Merge per-field: preserve any hand-added fields/options on the existing + // entry; ours win for the fields we own (npm, baseURL, models). + const existing = config.provider['boocode-local'] ?? {}; + config.provider['boocode-local'] = { + ...existing, + ...providerConfig, + options: { ...existing.options, ...providerConfig.options }, + }; + + // Write back. + try { + mkdirSync(dirname(OPENCODE_CONFIG_FILE), { recursive: true }); + writeFileSync(OPENCODE_CONFIG_FILE, JSON.stringify(config, null, 2) + '\n', 'utf8'); + log.info( + { path: OPENCODE_CONFIG_FILE, modelCount: Object.keys(providerConfig.models ?? {}).length }, + 'opencode-config-sync: wrote boocode-local provider', + ); + return config; + } catch (err) { + log.warn( + { err: err instanceof Error ? err.message : String(err), path: OPENCODE_CONFIG_FILE }, + 'opencode-config-sync: failed to write config', + ); + return null; + } +} diff --git a/apps/coder/src/services/pi-config-sync.ts b/apps/coder/src/services/pi-config-sync.ts new file mode 100644 index 0000000..a0173ee --- /dev/null +++ b/apps/coder/src/services/pi-config-sync.ts @@ -0,0 +1,119 @@ +/** + * Sync the boocode-local provider into Pi's config file. + * + * Pi (~/.pi/agent/models.json) defines custom OpenAI-compatible providers as + * `providers. = { baseUrl, api, apiKey, models: [{ id, name, ... }] }`. + * This writes/updates a `boocode-local` entry pointing at the BooCoder local + * gateway with the composite local model ids, so Pi can target every machine + * in the llama-providers registry (same identity story as opencode, D-6). + * + * Merge semantics: other providers are untouched; within boocode-local, + * per-model contextWindow/maxTokens/cost overrides on existing entries are + * preserved (we only own id/name and the provider-level routing fields). + */ +import { readFileSync, writeFileSync, mkdirSync } from 'node:fs'; +import { dirname, join } from 'node:path'; +import { homedir } from 'node:os'; +import { fetchRegistryModels } from './provider-snapshot.js'; + +const PI_MODELS_FILE = join(homedir(), '.pi', 'agent', 'models.json'); + +interface PiModelEntry { + id: string; + name: string; + contextWindow?: number; + maxTokens?: number; + cost?: { input: number; output: number; cacheRead: number; cacheWrite: number }; + [key: string]: unknown; +} + +export interface PiProviderConfig { + baseUrl?: string; + api?: string; + apiKey?: string; + compat?: Record; + models?: PiModelEntry[]; + [key: string]: unknown; +} + +export interface PiModelsConfig { + providers?: Record; + [key: string]: unknown; +} + +// Conservative defaults for llama-swap models; Pi treats these as caps, and a +// model whose real window differs can be hand-tuned — the merge preserves it. +const DEFAULT_CONTEXT_WINDOW = 131_072; +const DEFAULT_MAX_TOKENS = 32_768; +const ZERO_COST = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }; + +/** Build the boocode-local provider entry for Pi. */ +export async function buildPiProviderEntry( + gatewayUrl: string, + existing?: PiProviderConfig, +): Promise { + const registryModels = await fetchRegistryModels(); + const prior = new Map((existing?.models ?? []).map((m) => [m.id, m])); + return { + ...existing, + baseUrl: `${gatewayUrl}/v1`, + api: 'openai-completions', + apiKey: 'dummy', + compat: existing?.compat ?? { + supportsDeveloperRole: false, + supportsReasoningEffort: false, + }, + models: registryModels.map((m) => { + const old = prior.get(m.id); + return { + contextWindow: DEFAULT_CONTEXT_WINDOW, + maxTokens: DEFAULT_MAX_TOKENS, + cost: ZERO_COST, + ...old, + id: m.id, + name: m.label, + }; + }), + }; +} + +/** + * Read Pi's models.json, merge the boocode-local provider, write it back. + * Never throws — returns null on failure (logged). + */ +export async function syncPiConfig( + gatewayUrl: string, + log: { warn: (obj: unknown, msg: string) => void; info: (obj: unknown, msg: string) => void }, +): Promise { + let config: PiModelsConfig = {}; + try { + config = JSON.parse(readFileSync(PI_MODELS_FILE, 'utf8')) as PiModelsConfig; + } catch { + // Missing or invalid — start fresh (Pi tolerates a providers-only file). + } + + if (!config.providers) config.providers = {}; + + try { + config.providers['boocode-local'] = await buildPiProviderEntry( + gatewayUrl, + config.providers['boocode-local'], + ); + mkdirSync(dirname(PI_MODELS_FILE), { recursive: true }); + writeFileSync(PI_MODELS_FILE, JSON.stringify(config, null, 2) + '\n', 'utf8'); + log.info( + { + path: PI_MODELS_FILE, + modelCount: config.providers['boocode-local'].models?.length ?? 0, + }, + 'pi-config-sync: wrote boocode-local provider', + ); + return config; + } catch (err) { + log.warn( + { err: err instanceof Error ? err.message : String(err), path: PI_MODELS_FILE }, + 'pi-config-sync: failed to write config', + ); + return null; + } +} diff --git a/apps/coder/src/services/provider-snapshot.ts b/apps/coder/src/services/provider-snapshot.ts index c60d65e..0fcbd20 100644 --- a/apps/coder/src/services/provider-snapshot.ts +++ b/apps/coder/src/services/provider-snapshot.ts @@ -17,6 +17,7 @@ import { readQwenSettingsModels } from './qwen-settings.js'; import { getResolvedRegistry, type ResolvedProviderDef } from './provider-config-registry.js'; import { isCommandAvailable } from './command-availability.js'; import { discoverClaudeCommands } from './claude-command-discovery.js'; +import { getLlamaProviders, formatModelRef } from './llama-providers.js'; interface AgentRow { name: string; @@ -63,6 +64,50 @@ export async function fetchLlamaSwapModels(config: Config): Promise { + try { + const res = await fetch(`${baseUrl}/v1/models`); + if (!res.ok) return []; + const parsed = (await res.json()) as { data?: Array<{ id: string }> }; + return (parsed.data ?? []).map((m) => ({ id: m.id, label: m.id })); + } catch { + return []; + } +} + +/** + * Fetch models from every provider in the shared registry, returning composite + * `provider/model` ids. Used by the native boocode provider to expose the full + * multi-provider local model set (W5). + */ +export async function fetchRegistryModels(defaultModel?: string): Promise { + const providers = getLlamaProviders(); + const results = await Promise.allSettled( + providers.providers.map(async (p) => { + const models = await fetchModelsFromUrl(p.baseUrl); + return models.map((m) => ({ + id: formatModelRef(p.id, m.id), + label: m.label, + })); + }), + ); + const all: ProviderModel[] = []; + for (const r of results) { + if (r.status === 'fulfilled') all.push(...r.value); + } + // Hoist the default model to the front for the picker default selection. + if (defaultModel) { + const i = all.findIndex((m) => { + // Match by wire id suffix (e.g. "sam-desktop/qwen3.6-35b" ends with "/qwen3.6-35b") + // or exact match for bare ids that slipped through. + return m.id === defaultModel || m.id.endsWith(`/${defaultModel}`); + }); + if (i > 0) all.unshift(all.splice(i, 1)[0]!); + } + return all; +} + /** Prefix llama-swap model ids so they don't collide with provider-native models. */ export function prefixLlamaSwapModels(models: ProviderModel[]): ProviderModel[] { return models.map((m) => ({ @@ -71,6 +116,20 @@ export function prefixLlamaSwapModels(models: ProviderModel[]): ProviderModel[] })); } +/** + * W7: Wrap registry composite model ids with the boocode-local provider + * namespace for opencode. Input ids are already composite "provider/model" + * (e.g. "sam-desktop/qwen3.6-35b"); this wraps them as + * "boocode-local/sam-desktop/qwen3.6-35b" so opencode routes through the + * local gateway (D-6). + */ +export function prefixBoocodeLocalModels(models: ProviderModel[]): ProviderModel[] { + return models.map((m) => ({ + ...m, + id: m.id.startsWith('boocode-local/') ? m.id : `boocode-local/${m.id}`, + })); +} + function attachClaudeThinking(models: ProviderModel[]): ProviderModel[] { const thinking = PROVIDER_MANIFEST.claude?.thinkingOptions; if (!thinking?.length) return models; @@ -98,6 +157,7 @@ async function buildProviderEntry( resolved: ResolvedProviderDef, agentRow: AgentRow | undefined, llamaModels: ProviderModel[], + registryModels: ProviderModel[], cwd: string, ttlMs: number, force: boolean, @@ -138,13 +198,13 @@ async function buildProviderEntry( }; } - // 2. Native boocode → always ready (llama-swap models). Exposes the unified - // permission modes (plan/ask/bypass) so the composer's permission picker works - // for native BooCode too; `bypass` auto-applies staged edits (dispatcher.ts). + // 2. Native boocode → always ready (multi-provider local models from the + // shared registry). Exposes composite provider/model ids so the UI can group + // by provider and dispatch routes to the correct upstream. if (isNative) { return { name, label: resolved.label, transport, status: 'ready', - enabled: true, installed: true, models: withConfigModels(llamaModels), + enabled: true, installed: true, models: withConfigModels(registryModels), modes: fallbackModes, defaultModeId, commands: manifestCommands, }; } @@ -201,7 +261,9 @@ async function buildProviderEntry( if (!runTier2) { let skipModels = agentRow?.models ?? []; if (resolved.mergeLlamaSwap && resolved.modelSource !== 'llama-swap') { - skipModels = mergeModels(skipModels, prefixLlamaSwapModels(llamaModels)); + // W7: use composite registry models with boocode-local prefix (D-6) + // instead of llama-swap-prefixed ids. + skipModels = mergeModels(skipModels, prefixBoocodeLocalModels(registryModels)); } else if (resolved.modelSource === 'llama-swap' && skipModels.length === 0) { skipModels = llamaModels; } @@ -223,7 +285,8 @@ async function buildProviderEntry( } if (resolved.mergeLlamaSwap && resolved.modelSource !== 'llama-swap') { const nativeModels = probe.models.length > 0 ? probe.models : probeModels; - probeModels = mergeModels(nativeModels, prefixLlamaSwapModels(llamaModels)); + // W7: use composite registry models with boocode-local prefix (D-6). + probeModels = mergeModels(nativeModels, prefixBoocodeLocalModels(registryModels)); } return { @@ -272,9 +335,10 @@ export async function getProviderSnapshot( } const build = async (): Promise => { - const [llamaModels, deepseekModels] = await Promise.all([ + const [llamaModels, deepseekModels, registryModels] = await Promise.all([ fetchLlamaSwapModels(config), fetchDeepSeekModels(config), + fetchRegistryModels(config.DEFAULT_MODEL), ]); // Merge DeepSeek models into the llama-swap model pool so the boocode // provider (which sources from llama-swap) also includes DeepSeek models. @@ -287,7 +351,7 @@ export async function getProviderSnapshot( const entries = await Promise.all( [...getResolvedRegistry().values()].map((resolved) => - buildProviderEntry(resolved, agentMap.get(resolved.id), mergedModels, resolvedCwd, ttlMs, force), + buildProviderEntry(resolved, agentMap.get(resolved.id), mergedModels, registryModels, resolvedCwd, ttlMs, force), ), ); diff --git a/apps/control/.env.example b/apps/control/.env.example new file mode 100644 index 0000000..a476cf2 --- /dev/null +++ b/apps/control/.env.example @@ -0,0 +1,20 @@ +NODE_ENV=production +PORT=9503 +HOST=100.114.205.53 +DATABASE_URL=postgres://boocode:CHANGE_ME@127.0.0.1:5500/boochat +LOG_LEVEL=info +# Retention windows (hours) +RETENTION_RAW_HOURS=48 +RETENTION_ROLLUP_DAYS=90 +# Capture size cap (KB) +CAPTURE_SIZE_KB=256 +# Total capture budget (MB) +CAPTURE_BUDGET_MB=50 +# Provider registry: path to llama-providers.json. Missing = legacy fallback from LLAMA_SWAP_URL. +LLAMA_PROVIDERS_PATH=/data/llama-providers.json +# Legacy fallback: single-provider URL when LLAMA_PROVIDERS_PATH is absent or invalid. +LLAMA_SWAP_URL=http://localhost:8080 +# P9.1 SSH config editor: path to the llama-swap config-schema.json (fork). +# Unset = use the copy bundled at dist/data/config-schema.json. Override to track +# the live fork schema, e.g. /opt/forks/llama-swap/config-schema.json. +#LLAMA_CONFIG_SCHEMA_PATH=/opt/forks/llama-swap/config-schema.json diff --git a/apps/control/boocontrol.service b/apps/control/boocontrol.service new file mode 100644 index 0000000..1ea5e25 --- /dev/null +++ b/apps/control/boocontrol.service @@ -0,0 +1,17 @@ +[Unit] +Description=BooControl fleet cockpit service +After=network-online.target postgresql.service +Wants=network-online.target + +[Service] +Type=simple +User=samkintop +Group=samkintop +WorkingDirectory=/home/samkintop/opt/boocode +ExecStart=/home/samkintop/.local/share/pnpm/global/5/.pnpm/node_modules/pnpm/bin/pnpm.cjs start -C apps/control start +Restart=on-failure +RestartSec=5 +EnvironmentFile=/home/samkintop/opt/boocode/apps/control/.env.host + +[Install] +WantedBy=multi-user.target diff --git a/apps/control/data/config-schema.json b/apps/control/data/config-schema.json new file mode 100644 index 0000000..52a7229 --- /dev/null +++ b/apps/control/data/config-schema.json @@ -0,0 +1,622 @@ +{ + "$schema": "https://json-schema.org/draft-07/schema#", + "$id": "llama-swap-config-schema.json", + "title": "llama-swap configuration", + "description": "Configuration file for llama-swap", + "type": "object", + "required": [ + "models" + ], + "definitions": { + "macros": { + "type": "object", + "additionalProperties": { + "oneOf": [ + { + "type": "string", + "minLength": 0, + "maxLength": 1024 + }, + { + "type": "number" + }, + { + "type": "boolean" + } + ] + }, + "propertyNames": { + "type": "string", + "minLength": 1, + "maxLength": 64, + "pattern": "^[a-zA-Z0-9_-]+$", + "not": { + "enum": [ + "PORT", + "MODEL_ID" + ] + } + }, + "default": {}, + "description": "A dictionary of string substitutions. Macros are reusable snippets used in model cmd, cmdStop, proxy, checkEndpoint, filters.stripParams. Macro names must be <64 chars, match ^[a-zA-Z0-9_-]+$, and not be PORT or MODEL_ID. Values can be string, number, or boolean. Macros can reference other macros defined before them." + }, + "timeouts": { + "type": "object", + "properties": { + "connect": { + "type": "integer", + "minimum": 0, + "default": 30, + "description": "TCP connection timeout in seconds. Set to 0 to disable." + }, + "keepalive": { + "type": "integer", + "minimum": 0, + "default": 30, + "description": "TCP keepalive timeout in seconds. Set to 0 to disable." + }, + "responseHeader": { + "type": "integer", + "minimum": 0, + "default": 0, + "description": "Time to wait for response headers in seconds. Set to 0 to disable." + }, + "tlsHandshake": { + "type": "integer", + "minimum": 0, + "default": 10, + "description": "TLS handshake timeout in seconds. Set to 0 to disable." + }, + "expectContinue": { + "type": "integer", + "minimum": 0, + "default": 1, + "description": "Expect-Continue timeout in seconds. Set to 0 to disable." + }, + "idleConn": { + "type": "integer", + "minimum": 0, + "default": 90, + "description": "Idle connection timeout in seconds. Set to 0 to disable." + } + }, + "additionalProperties": false, + "description": "Timeout settings for proxy connections." + }, + "groupsConfig": { + "type": "object", + "additionalProperties": { + "type": "object", + "required": [ + "members" + ], + "properties": { + "swap": { + "type": "boolean", + "default": true, + "description": "Controls model swapping behaviour within the group. True: only one model runs at a time. False: all models can run together." + }, + "exclusive": { + "type": "boolean", + "default": true, + "description": "Controls how the group affects other groups. True: causes all other groups to unload when this group runs a model. False: does not affect other groups." + }, + "persistent": { + "type": "boolean", + "default": false, + "description": "Prevents other groups from unloading the models in this group. Does not affect individual model behaviour." + }, + "members": { + "type": "array", + "items": { + "type": "string" + }, + "description": "Array of model IDs that are members of this group. Model IDs must be defined in models." + } + } + }, + "description": "A dictionary of group settings. Provides advanced controls over model swapping behaviour. Model IDs must be defined in models. A model can only be a member of one group. Behaviour controlled via swap, exclusive, persistent." + }, + "matrixConfig": { + "type": "object", + "description": "Solver-based alternative to groups. Declares valid combinations of concurrent models. The solver minimizes eviction cost when swapping. A config must use either groups or matrix, not both.", + "required": [ + "vars", + "sets" + ], + "properties": { + "vars": { + "type": "object", + "description": "Short names for models. Keys must be alphanumeric, 1-8 characters. All sets and evict_costs must use these IDs.", + "minProperties": 1, + "additionalProperties": { + "type": "string" + }, + "propertyNames": { + "pattern": "^[a-zA-Z0-9]{1,8}$" + } + }, + "evict_costs": { + "type": "object", + "description": "Relative cost of evicting a running model. Models not listed default to 1. Values must be positive integers.", + "additionalProperties": { + "type": "integer", + "minimum": 1 + } + }, + "sets": { + "type": "object", + "description": "Named sets of concurrent model combinations. Values are DSL strings using & (AND), | (OR), () (grouping), and +ref (inline another set). Definition order is used for tie-breaking.", + "minProperties": 1, + "additionalProperties": { + "type": "string" + } + } + }, + "additionalProperties": false + } + }, + "properties": { + "healthCheckTimeout": { + "type": "integer", + "minimum": 15, + "default": 120, + "description": "Number of seconds to wait for a model to be ready to serve requests." + }, + "globalTTL": { + "type": "integer", + "minimum": 0, + "default": 0, + "description": "Default TTL for all models in seconds, 0 means no TTL and models will never be automatically unloaded" + }, + "logLevel": { + "type": "string", + "enum": [ + "debug", + "info", + "warn", + "error" + ], + "default": "info", + "description": "Sets the logging value. Valid values: debug, info, warn, error." + }, + "logTimeFormat": { + "type": "string", + "enum": [ + "", + "ansic", + "unixdate", + "rubydate", + "rfc822", + "rfc822z", + "rfc850", + "rfc1123", + "rfc1123z", + "rfc3339", + "rfc3339nano", + "kitchen", + "stamp", + "stampmilli", + "stampmicro", + "stampnano" + ], + "default": "", + "description": "Enables and sets the logging timestamp format. Valid values: \"\", \"ansic\", \"unixdate\", \"rubydate\", \"rfc822\", \"rfc822z\", \"rfc850\", \"rfc1123\", \"rfc1123z\", \"rfc3339\", \"rfc3339nano\", \"kitchen\", \"stamp\", \"stampmilli\", \"stampmicro\", and \"stampnano\". For more info, read: https://pkg.go.dev/time#pkg-constants" + }, + "metricsMaxInMemory": { + "type": "integer", + "default": 1000, + "description": "Maximum number of metrics to keep in memory. Controls how many metrics are stored before older ones are discarded." + }, + "captureBuffer": { + "type": "integer", + "minimum": 0, + "default": 5, + "description": "Size in megabytes of the buffer for storing request/response captures. Set to 0 to disable captures." + }, + "performance": { + "type": "object", + "properties": { + "disabled": { + "type": "boolean", + "default": false, + "description": "Disable system performance monitoring." + }, + "every": { + "type": "string", + "pattern": "^[-+]?(\\d+(\\.\\d+)?(ns|us|ms|s|m|h))+$", + "default": "15s", + "description": "Delay between polling for new performance statistics. Minimum duration is 1s. Lower values use more RAM as stats are kept in memory." + } + }, + "additionalProperties": false, + "default": {}, + "description": "Configuration for CPU, RAM and GPU monitoring statistics." + }, + "startPort": { + "type": "integer", + "default": 5800, + "description": "Starting port number for the automatic ${PORT} macro. The ${PORT} macro is incremented for every model that uses it." + }, + "sendLoadingState": { + "type": "boolean", + "default": false, + "description": "Inject loading status updates into the reasoning field. When true, a stream of loading messages will be sent to the client." + }, + "includeAliasesInList": { + "type": "boolean", + "default": false, + "description": "Present aliases within the /v1/models OpenAI API listing. when true, model aliases will be output to the API model listing duplicating all fields except for Id so chat UIs can use the alias equivalent to the original." + }, + "macros": { + "$ref": "#/definitions/macros" + }, + "models": { + "type": "object", + "description": "A dictionary of model configurations. Each key is a model's ID. Model settings have defaults if not defined. The model's ID is available as ${MODEL_ID}.", + "additionalProperties": { + "type": "object", + "required": [ + "cmd" + ], + "properties": { + "macros": { + "$ref": "#/definitions/macros" + }, + "cmd": { + "type": "string", + "minLength": 1, + "description": "Command to run to start the inference server. Macros can be used. Comments allowed with |." + }, + "cmdStop": { + "type": "string", + "default": "", + "description": "Command to run to stop the model gracefully. Uses ${PID} macro for upstream process id. If empty, default shutdown behavior is used." + }, + "name": { + "type": "string", + "default": "", + "maxLength": 128, + "description": "Display name for the model. Used in v1/models API response." + }, + "description": { + "type": "string", + "default": "", + "maxLength": 1024, + "description": "Description for the model. Used in v1/models API response." + }, + "env": { + "type": "array", + "items": { + "type": "string", + "pattern": "^[A-Z_][A-Z0-9_]*=.*$" + }, + "default": [], + "description": "Array of environment variables to inject into cmd's environment. Each value is a string in ENV_NAME=value format." + }, + "proxy": { + "type": "string", + "default": "http://localhost:${PORT}", + "format": "uri", + "description": "URL where llama-swap routes API requests. If custom port is used in cmd, this must be set." + }, + "aliases": { + "type": "array", + "items": { + "type": "string", + "minLength": 1 + }, + "default": [], + "description": "Alternative model names for this configuration. Must be unique globally." + }, + "checkEndpoint": { + "type": "string", + "default": "/health", + "pattern": "^/.*$|^none$", + "description": "URL path to check if the server is ready. Use 'none' to skip health checking." + }, + "ttl": { + "type": "integer", + "minimum": -1, + "default": -1, + "description": "Automatically unload the model after ttl seconds. -1 uses the global TTL value, 0 disables unloading. Must be >0 to enable." + }, + "useModelName": { + "type": "string", + "default": "", + "description": "Override the model name sent to upstream server. Useful if upstream expects a different name." + }, + "filters": { + "type": "object", + "properties": { + "stripParams": { + "type": "string", + "default": "", + "pattern": "^[a-zA-Z0-9_, ]*$", + "description": "Comma separated list of parameters to remove from the request. Used for server-side enforcement of sampling parameters." + }, + "setParams": { + "type": "object", + "additionalProperties": true, + "default": {}, + "description": "Dictionary of parameters to set/override in requests. Useful for enforcing specific parameter values. Protected params like 'model' cannot be overridden. Values can be strings, numbers, booleans, arrays, or objects." + }, + "setParamsByID": { + "type": "object", + "additionalProperties": { + "type": "object", + "additionalProperties": true + }, + "default": {}, + "description": "Dictionary mapping requested model IDs (or aliases) to parameters to set/override in requests. Applied after setParams and can override those values. Useful with aliases to vary behaviour depending on which alias the client used (e.g. different reasoning_effort per alias). Keys support ${MODEL_ID} macro substitution. Protected params like 'model' cannot be overridden." + } + }, + "additionalProperties": false, + "default": {}, + "description": "Dictionary of filter settings. Supports stripParams, setParams, and setParamsByID." + }, + "metadata": { + "type": "object", + "additionalProperties": true, + "default": {}, + "description": "Dictionary of arbitrary values included in /v1/models. Can contain complex types. Only passed through in /v1/models responses." + }, + "concurrencyLimit": { + "type": "integer", + "minimum": 0, + "default": 0, + "description": "Overrides allowed number of active parallel requests to a model. 0 uses internal default of 10. >0 overrides default. Requests exceeding limit get HTTP 429." + }, + "sendLoadingState": { + "type": "boolean", + "description": "Overrides the global sendLoadingState for this model. Ommitting this property will use the global setting." + }, + "unlisted": { + "type": "boolean", + "default": false, + "description": "If true the model will not show up in /v1/models responses. It can still be used as normal in API requests." + }, + "timeouts": { + "$ref": "#/definitions/timeouts" + } + } + } + }, + "groups": { + "$ref": "#/definitions/groupsConfig" + }, + "matrix": { + "$ref": "#/definitions/matrixConfig" + }, + "hooks": { + "type": "object", + "properties": { + "on_startup": { + "type": "object", + "properties": { + "preload": { + "type": "array", + "items": { + "type": "string" + }, + "default": [], + "description": "List of model IDs to load on startup. Model names must match keys in models. When preloading multiple models, define a group to prevent swapping." + } + }, + "additionalProperties": false, + "description": "Actions to perform on startup. Only supported action is preload." + } + }, + "additionalProperties": false, + "description": "A dictionary of event triggers and actions. Only supported hook is on_startup." + }, + "logToStdout": { + "type": "string", + "enum": [ + "proxy", + "upstream", + "both", + "none" + ], + "default": "proxy", + "description": "Controls what is logged to stdout. 'proxy': logs generated by llama-swap, 'upstream': copy of upstream process stdout logs, 'both': both interleaved together, 'none': no logs written to stdout." + }, + "apiKeys": { + "type": "array", + "items": { + "type": "string", + "minLength": 1 + }, + "default": [], + "description": "Require an API key when making requests to inference endpoints. When empty, authorization will not be checked. Each key is a non-empty string." + }, + "peers": { + "type": "object", + "additionalProperties": { + "type": "object", + "required": [ + "proxy", + "models" + ], + "properties": { + "proxy": { + "type": "string", + "format": "uri", + "description": "A valid base URL to proxy requests to. Requested path to llama-swap will be appended to the end of the proxy value." + }, + "apiKey": { + "type": "string", + "default": "", + "description": "A string key to be injected into the request. If blank, no key will be added. Key will be injected into headers: Authorization: Bearer and x-api-key: ." + }, + "models": { + "type": "array", + "items": { + "type": "string", + "minLength": 1 + }, + "description": "A list of models served by the peer." + }, + "filters": { + "type": "object", + "properties": { + "stripParams": { + "type": "string", + "default": "", + "pattern": "^[a-zA-Z0-9_, ]*$", + "description": "Comma separated list of parameters to remove from the request. Useful for removing parameters that the peer doesn't support." + }, + "setParams": { + "type": "object", + "additionalProperties": true, + "default": {}, + "description": "Dictionary of parameters to set/override in requests to this peer. Useful for injecting provider-specific settings. Protected params like 'model' cannot be overridden. Values can be strings, numbers, booleans, arrays, or objects." + } + }, + "additionalProperties": false, + "default": {}, + "description": "Dictionary of filter settings for peer requests. Supports stripParams and setParams." + }, + "timeouts": { + "type": "object", + "properties": { + "connect": { + "type": "integer", + "minimum": 0, + "default": 30, + "description": "TCP connection timeout in seconds." + }, + "keepalive": { + "type": "integer", + "minimum": 0, + "default": 30, + "description": "TCP keepalive connection timeout in seconds." + }, + "responseHeader": { + "type": "integer", + "minimum": 0, + "default": 0, + "description": "Time to wait for response headers in seconds." + }, + "tlsHandshake": { + "type": "integer", + "minimum": 0, + "default": 10, + "description": "TLS handshake timeout in seconds." + }, + "idleConn": { + "type": "integer", + "minimum": 0, + "default": 90, + "description": "Idle connection timeout in seconds." + } + }, + "additionalProperties": false, + "description": "Timeout settings for proxy connections to this peer." + } + } + }, + "default": {}, + "description": "A dictionary of remote peers and models they provide. Peers can be another llama-swap or any server that provides the /v1/ generative API endpoints supported by llama-swap." + }, + "routing": { + "type": "object", + "description": "Canonical routing/scheduling configuration. Alternative to the legacy top-level 'groups'/'matrix' keys; a config must not use both styles.", + "properties": { + "scheduler": { + "type": "object", + "description": "Scheduler configuration. Decides the order in which queued requests are serviced.", + "properties": { + "use": { + "type": "string", + "enum": [ + "fifo" + ], + "default": "fifo", + "description": "Scheduler to use. Only 'fifo' is currently supported." + }, + "settings": { + "type": "object", + "properties": { + "fifo": { + "type": "object", + "properties": { + "priority": { + "type": "object", + "description": "Per-model priority. Keys are model IDs, values are integers (default 0). Higher values are serviced first.", + "additionalProperties": { + "type": "integer" + } + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + }, + "router": { + "type": "object", + "description": "Router configuration. Selects between the group and matrix swapping strategies.", + "properties": { + "use": { + "type": "string", + "enum": [ + "group", + "matrix" + ], + "default": "group", + "description": "Router to use. 'group' uses static groups, 'matrix' uses the solver-based swap matrix." + }, + "settings": { + "type": "object", + "properties": { + "groups": { + "$ref": "#/definitions/groupsConfig" + }, + "matrix": { + "$ref": "#/definitions/matrixConfig" + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + } + }, + "additionalProperties": false + } + }, + "allOf": [ + { + "if": { + "required": [ + "groups" + ] + }, + "then": { + "not": { + "required": [ + "matrix" + ] + } + } + }, + { + "if": { + "required": [ + "matrix" + ] + }, + "then": { + "not": { + "required": [ + "groups" + ] + } + } + } + ] +} diff --git a/apps/control/data/suite-agent-coding.yaml b/apps/control/data/suite-agent-coding.yaml new file mode 100644 index 0000000..e71b419 --- /dev/null +++ b/apps/control/data/suite-agent-coding.yaml @@ -0,0 +1,32 @@ +id: agent-coding +name: Agent Coding Tasks +kind: code +version: 1 +description: TypeScript/code-edit tasks similar to BooCoder dispatches, sandboxed pass@1. +judge_model: null +tasks: + - id: ts-function-implement + prompt: "Write a TypeScript function `flatten(arr: T[][]): T[]` that flattens a nested array one level deep. Export it as default. Include the type signature." + test_code: "import flatten from './output.js'; const result = flatten([[1, 2], [3], [4, 5, 6]]); console.log(JSON.stringify(result));" + expected_output: "[1,2,3,4,5,6]" + language: typescript + - id: ts-binary-search + prompt: "Implement binary search in TypeScript: `binarySearch(arr: number[], target: number): number` that returns the index or -1. Export as default." + test_code: "import binarySearch from './output.js'; console.log(binarySearch([1, 3, 5, 7, 9], 5)); console.log(binarySearch([1, 3, 5, 7, 9], 4));" + expected_output: "2\n-1" + language: typescript + - id: ts-debounce + prompt: "Write a TypeScript debounce function: `debounce unknown>(fn: T, ms: number): (...args: Parameters) => void`. Export as default." + test_code: "import debounce from './output.js'; typeof debounce(() => {}, 100) === 'function' && console.log('ok');" + expected_output: "ok" + language: typescript + - id: ts-lru-cache + prompt: "Implement an LRU Cache in TypeScript: class LRUCache { constructor(capacity: number); get(key: string): string | undefined; set(key: string, value: string): void; } Export as default." + test_code: "import LRUCache from './output.js'; const cache = new LRUCache(2); cache.set('a', '1'); cache.set('b', '2'); console.log(cache.get('a')); cache.set('c', '3'); console.log(cache.get('a'));" + expected_output: "1\nundefined" + language: typescript + - id: ts-promise-allsettled + prompt: "Implement `myAllSettled(promises: Promise[]): Promise>` without using Promise.allSettled. Export as default." + test_code: "import myAllSettled from './output.js'; const results = await myAllSettled([Promise.resolve(1), Promise.reject('err')]); console.log(results.map(r => r.status).join(','));" + expected_output: "fulfilled,rejected" + language: typescript diff --git a/apps/control/data/suite-chat-quality.yaml b/apps/control/data/suite-chat-quality.yaml new file mode 100644 index 0000000..90d27a0 --- /dev/null +++ b/apps/control/data/suite-chat-quality.yaml @@ -0,0 +1,77 @@ +id: chat-quality +name: Chat Assistant Quality +kind: chat +version: 1 +description: Curated prompts scored by LLM-as-judge using rubric criteria. +judge_model: null +tasks: + - id: code-explanation + prompt: "Explain what this function does in plain English: function fibonacci(n: number): number { if (n <= 1) return n; return fibonacci(n - 1) + fibonacci(n - 2); }" + rubric: + criteria: + - criterion: accuracy + description: "Correctly identifies the function computes Fibonacci numbers" + weight: 3 + - criterion: clarity + description: "Explanation is clear and accessible to a non-expert" + weight: 2 + - criterion: completeness + description: "Mentions recursion, base case, and performance concern" + weight: 2 + max_score: 7 + - id: debugging-help + prompt: "My React component re-renders infinitely. Here's the code: function Counter() { const [count, setCount] = useState(0); useEffect(() => { setCount(c => c + 1); }); return
{count}
; } What's wrong and how do I fix it?" + rubric: + criteria: + - criterion: accuracy + description: "Identifies the useEffect missing dependency array causing infinite loop" + weight: 3 + - criterion: solution + description: "Provides correct fix with dependency array or removed effect" + weight: 3 + - criterion: explanation + description: "Explains why the fix works" + weight: 1 + max_score: 7 + - id: creative-writing + prompt: "Write a short haiku about debugging software at 3 AM." + rubric: + criteria: + - criterion: form + description: "Follows 5-7-5 syllable structure" + weight: 2 + - criterion: relevance + description: "Topic relates to late-night debugging" + weight: 2 + - criterion: quality + description: "Poetic language, not just literal description" + weight: 2 + max_score: 6 + - id: technical-comparison + prompt: "Compare Docker containers vs VMs for running a Node.js API. Give me pros and cons of each for this specific use case." + rubric: + criteria: + - criterion: accuracy + description: "Technically correct comparison points" + weight: 3 + - criterion: balance + description: "Covers both pros and cons for each option" + weight: 2 + - criterion: specificity + description: "Tailored to Node.js API use case, not generic" + weight: 2 + max_score: 7 + - id: sql-query-help + prompt: "I have a users table (id, name, created_at) and orders table (id, user_id, total, created_at). Write a SQL query to find the top 5 users by total spending in the last 30 days." + rubric: + criteria: + - criterion: correctness + description: "Query is syntactically valid and produces correct results" + weight: 3 + - criterion: date-filter + description: "Properly filters to last 30 days" + weight: 2 + - criterion: aggregation + description: "Correctly aggregates and orders by total spending" + weight: 2 + max_score: 7 diff --git a/apps/control/data/suite-long-context.yaml b/apps/control/data/suite-long-context.yaml new file mode 100644 index 0000000..f27bfbf --- /dev/null +++ b/apps/control/data/suite-long-context.yaml @@ -0,0 +1,46 @@ +id: long-context-retrieval +name: Long Context Retrieval +kind: chat +version: 1 +description: Needle-in-haystack and document-QA tasks for file-heavy sessions. +judge_model: null +tasks: + - id: needle-in-haystack + prompt: "Here is a long document. Find the value for 'target_key' and return nothing else." + prompt_template: "Here is a long document. Find the value for 'target_key' and return nothing else.\n\n{context}\n\nWhat is the value of target_key?" + context_generator: "Generate ~4000 words of technical documentation about PostgreSQL performance tuning. Embed the sentence 'target_key: 42' exactly once somewhere in the middle." + rubric: + criteria: + - criterion: accuracy + description: "Returns exactly '42' or 'target_key: 42'" + weight: 3 + - criterion: conciseness + description: "Answer is brief, not a long explanation" + weight: 1 + max_score: 4 + - id: multi-doc-qa + prompt: "Based on these three documents, answer: What is the recommended maximum heap size for the application?" + prompt_template: "Based on these three documents, answer: What is the recommended maximum heap size for the application?\n\n{context}" + context_generator: "Generate three ~1000-word technical documents about JVM tuning, with conflicting recommendations. The correct answer is 4GB mentioned in document 2." + rubric: + criteria: + - criterion: accuracy + description: "Identifies 4GB as the recommended value" + weight: 3 + - criterion: source-attribution + description: "References which document contains the answer" + weight: 2 + max_score: 5 + - id: codebase-navigation + prompt: "In this codebase excerpt, find the function that handles WebSocket connections and explain its parameters." + prompt_template: "In this codebase excerpt, find the function that handles WebSocket connections and explain its parameters.\n\n{context}" + context_generator: "Generate ~3000 words of TypeScript source code with multiple classes. One class contains a 'handleWebSocket' method with (ws, sessionId, broker) parameters." + rubric: + criteria: + - criterion: accuracy + description: "Correctly identifies the handleWebSocket function" + weight: 3 + - criterion: parameters + description: "Lists all three parameters correctly" + weight: 2 + max_score: 5 diff --git a/apps/control/data/suite-utility-calls.yaml b/apps/control/data/suite-utility-calls.yaml new file mode 100644 index 0000000..4b87bc3 --- /dev/null +++ b/apps/control/data/suite-utility-calls.yaml @@ -0,0 +1,57 @@ +id: utility-calls +name: Utility Calls +kind: chat +version: 1 +description: Titles, summaries, compaction -- directly tunes the FAST_MODEL choice. +judge_model: null +tasks: + - id: auto-title + prompt: "Generate a concise title (max 5 words) for this chat session. The conversation is about: A user asking how to fix a PostgreSQL connection pool exhaustion error in their Express.js application." + rubric: + criteria: + - criterion: relevance + description: "Title relates to PostgreSQL connection pool issue" + weight: 2 + - criterion: conciseness + description: "5 words or fewer" + weight: 2 + - criterion: clarity + description: "Title is specific, not generic" + weight: 1 + max_score: 5 + - id: chat-summary + prompt: "Summarize this conversation in 2-3 sentences: User asked about Docker networking. Assistant explained bridge vs host mode. User asked about port mapping. Assistant showed docker run -p syntax. User confirmed it works." + rubric: + criteria: + - criterion: accuracy + description: "Summary captures all key topics discussed" + weight: 2 + - criterion: length + description: "2-3 sentences as requested" + weight: 1 + - criterion: readability + description: "Flows naturally, not a list of facts" + weight: 1 + max_score: 4 + - id: context-compaction + prompt: "Compress this conversation history into a single paragraph that preserves the essential context for continuing the discussion." + rubric: + criteria: + - criterion: preservation + description: "Retains key technical concepts: retry, backoff, circuit breaker" + weight: 2 + - criterion: brevity + description: "Single paragraph, significantly shorter than original" + weight: 2 + - criterion: usability + description: "Useful context for continuing the conversation" + weight: 1 + max_score: 5 + - id: label-generation + prompt: "Classify this user message into one of these labels: [question, bug-report, feature-request, small-talk, code-review]. Message: 'The app crashes when I click the submit button on the settings page. I'm using Chrome 120 on macOS.'" + rubric: + criteria: + - criterion: accuracy + description: "Classifies as 'bug-report'" + weight: 3 + max_score: 3 diff --git a/apps/control/package.json b/apps/control/package.json new file mode 100644 index 0000000..a09057c --- /dev/null +++ b/apps/control/package.json @@ -0,0 +1,34 @@ +{ + "name": "@boocode/control", + "version": "2.0.0", + "private": true, + "type": "module", + "main": "dist/index.js", + "scripts": { + "dev": "tsx watch src/index.ts", + "build": "tsc && node -e \"import('node:fs').then(fs=>{fs.copyFileSync('src/schema.sql','dist/schema.sql');fs.mkdirSync('dist/data',{recursive:true});fs.copyFileSync('data/config-schema.json','dist/data/config-schema.json');})\"", + "start": "node dist/index.js", + "typecheck": "tsc --noEmit", + "test": "vitest run" + }, + "dependencies": { + "@boocode/contracts": "workspace:*", + "@fastify/websocket": "^10.0.1", + "ajv": "^8.20.0", + "ajv-formats": "^3.0.1", + "fastify": "^4.28.1", + "js-yaml": "^4.1.1", + "postgres": "^3.4.4", + "ws": "^8.18.0", + "zod": "^3.23.8" + }, + "devDependencies": { + "@types/js-yaml": "^4.0.9", + "@types/node": "^20.14.10", + "@types/ws": "^8.5.10", + "tsx": "^4.16.2", + "typescript": "^5.5.0", + "vitest": "^3.0.0" + }, + "license": "MIT" +} diff --git a/apps/control/remote/boocontrol-edit.ps1 b/apps/control/remote/boocontrol-edit.ps1 new file mode 100644 index 0000000..3b9d267 --- /dev/null +++ b/apps/control/remote/boocontrol-edit.ps1 @@ -0,0 +1,46 @@ +# BooControl forced-command wrapper (sam-desktop / Windows). +# +# Bound to the BooControl SSH key via authorized_keys: +# command="powershell -NoProfile -ExecutionPolicy Bypass -File D:\llama-swap\boocontrol-edit.ps1",restrict ssh-ed25519 AAAA... boocontrol@sam-desktop +# +# The key can do NOTHING but the verbs below, all hardcoded to D:\llama-swap and +# D:\models. The only client-supplied value is the HF repo id, regex-validated. +# Place this file at D:\llama-swap\boocontrol-edit.ps1. + +$ErrorActionPreference = 'Stop' +$cfg = 'D:\llama-swap\config.yaml' +$models = 'D:\models' +$service = 'llama-swap' # nssm service name + +$parts = ($env:SSH_ORIGINAL_COMMAND ?? '') -split ' ', 2 +$verb = $parts[0] +$arg = if ($parts.Count -gt 1) { $parts[1].Trim() } else { '' } + +switch ($verb) { + 'read' { + if (Test-Path $cfg) { Get-Content -Raw $cfg } else { '' } + } + 'backup' { + $stamp = Get-Date -Format 'yyyyMMddTHHmmssZ' + Copy-Item $cfg "$cfg.bak-$stamp" + Write-Output "$cfg.bak-$stamp" + } + 'write' { + $in = [Console]::In.ReadToEnd() + Set-Content -Path $cfg -Value $in -NoNewline + } + 'restart' { + nssm restart $service + } + 'pull' { + if ($arg -notmatch '^[A-Za-z0-9][A-Za-z0-9._-]*/[A-Za-z0-9][A-Za-z0-9._-]*$') { + Write-Error "bad repo id: $arg"; exit 1 + } + $dest = Join-Path $models ($arg -replace '/', '__') + # arg is regex-validated to org/name with no spaces/metacharacters. + huggingface-cli download $arg --local-dir $dest + } + default { + Write-Error "denied: $verb"; exit 1 + } +} diff --git a/apps/control/remote/boocontrol-edit.sh b/apps/control/remote/boocontrol-edit.sh new file mode 100644 index 0000000..2f85887 --- /dev/null +++ b/apps/control/remote/boocontrol-edit.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash +# BooControl forced-command wrapper (embedding / Linux). +# +# Bound to the BooControl SSH key via authorized_keys: +# command="/home/samkintop/llama-swap/boocontrol-edit.sh",restrict ssh-ed25519 AAAA... boocontrol@embedding +# +# The key can do NOTHING but the verbs below, all hardcoded to +# /home/samkintop/llama-swap and /home/samkintop/models. The only client-supplied +# value is the HF repo id, regex-validated. Place at the path above and chmod +x. + +set -euo pipefail + +CFG=/home/samkintop/llama-swap/config.yaml +MODELS=/home/samkintop/models +SERVICE=llama-swap # systemctl --user unit name + +read -r verb arg <<<"${SSH_ORIGINAL_COMMAND:-}" + +case "$verb" in + read) + [ -f "$CFG" ] && cat "$CFG" || true + ;; + backup) + bak="$CFG.bak-$(date -u +%Y%m%dT%H%M%SZ)" + cp "$CFG" "$bak" + echo "$bak" + ;; + write) + cat > "$CFG" + ;; + restart) + systemctl --user restart "$SERVICE" + ;; + pull) + if [[ ! "$arg" =~ ^[A-Za-z0-9][A-Za-z0-9._-]*/[A-Za-z0-9][A-Za-z0-9._-]*$ ]]; then + echo "bad repo id: $arg" >&2; exit 1 + fi + huggingface-cli download "$arg" --local-dir "$MODELS/${arg//\//__}" + ;; + *) + echo "denied: $verb" >&2; exit 1 + ;; +esac diff --git a/apps/control/src/config.ts b/apps/control/src/config.ts new file mode 100644 index 0000000..c1171b6 --- /dev/null +++ b/apps/control/src/config.ts @@ -0,0 +1,29 @@ +import { z } from 'zod'; + +const schema = z.object({ + NODE_ENV: z.enum(['development', 'production']).default('production'), + PORT: z.coerce.number().default(9503), + HOST: z.string().default('100.114.205.53'), + DATABASE_URL: z.string(), + LOG_LEVEL: z.enum(['fatal', 'error', 'warn', 'info', 'debug', 'trace']).default('info'), + RETENTION_RAW_HOURS: z.coerce.number().default(48), + RETENTION_ROLLUP_DAYS: z.coerce.number().default(90), + CAPTURE_SIZE_KB: z.coerce.number().default(256), + CAPTURE_BUDGET_MB: z.coerce.number().default(50), + LLAMA_PROVIDERS_PATH: z.string().optional(), + LLAMA_SWAP_URL: z.string().default('http://localhost:8080'), + // P9.1: path to the llama-swap config-schema.json (fork). Defaults to the + // copy bundled under dist/data; override to point at the live fork schema. + LLAMA_CONFIG_SCHEMA_PATH: z.string().optional(), +}); + +export type Config = z.infer; + +export function loadConfig(): Config { + const result = schema.safeParse(process.env); + if (!result.success) { + console.error('Invalid env:', result.error.message); + process.exit(1); + } + return result.data; +} diff --git a/apps/control/src/db.ts b/apps/control/src/db.ts new file mode 100644 index 0000000..0e396e9 --- /dev/null +++ b/apps/control/src/db.ts @@ -0,0 +1,67 @@ +import postgres from 'postgres'; +import { readFile } from 'node:fs/promises'; +import { fileURLToPath } from 'node:url'; +import { dirname, resolve } from 'node:path'; +import type { Config } from './config.js'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); + +export type Sql = ReturnType; + +let sqlInstance: Sql | null = null; + +export function getSql(config: Config): Sql { + if (sqlInstance) return sqlInstance; + sqlInstance = postgres(config.DATABASE_URL, { + max: 10, + idle_timeout: 30, + connect_timeout: 10, + onnotice: () => {}, + }); + return sqlInstance; +} + +/** + * Poll information_schema.tables for a table name with exponential backoff. + * Throws on timeout so systemd Restart=on-failure retries. + */ +export async function waitForTable(sql: Sql, tableName: string, timeoutMs: number): Promise { + const start = Date.now(); + const baseDelay = 100; + const cap = 2000; + while (true) { + const rows = await sql<{ table_name: string }[]>` + SELECT table_name FROM information_schema.tables + WHERE table_schema = 'public' AND table_name = ${tableName} + `; + if (rows.length > 0) return; + if (Date.now() - start >= timeoutMs) { + throw new Error(`timeout waiting for table '${tableName}' after ${timeoutMs}ms`); + } + const delay = Math.min(cap, baseDelay * 2 ** Math.floor((Date.now() - start) / 1000)); + await new Promise((r) => setTimeout(r, delay)); + } +} + +export async function applySchema(sql: Sql): Promise { + const schemaPath = resolve(__dirname, 'schema.sql'); + const ddl = await readFile(schemaPath, 'utf8'); + await sql.unsafe(ddl); +} + +export async function pingDb(sql: Sql): Promise { + try { + await sql`SELECT 1`; + return true; + } catch { + return false; + } +} + +export async function closeDb(): Promise { + if (sqlInstance) { + await sqlInstance.end({ timeout: 5 }); + sqlInstance = null; + } +} diff --git a/apps/control/src/index.ts b/apps/control/src/index.ts new file mode 100644 index 0000000..932a70c --- /dev/null +++ b/apps/control/src/index.ts @@ -0,0 +1,624 @@ +import Fastify from 'fastify'; +import fastifyWebsocket from '@fastify/websocket'; +import { loadConfig } from './config.js'; +import { getSql, applySchema, pingDb, waitForTable } from './db.js'; +import type { FleetState, HostState } from './services/fleet-state.js'; +import { createFleetState, ensureHostState, stampLastSeen, incrementSeq } from './services/fleet-state.js'; +import { registerControlWebSocket } from './routes/ws.js'; +import type { LlamaSweepSSEEvent, MetricsEntry } from './services/fleet-connector.js'; +import { startFleetConnector } from './services/fleet-connector.js'; +import { buildRetentionConfig, runRollup, pruneRawSamples, pruneActivity, pruneModelEvents, trimCapture, parseCaptureJson } from './services/retention.js'; +import { detectGap } from './services/reconcile.js'; +import { jsonbObject } from './services/jsonb.js'; +import { ActionQueue } from './services/action-queue.js'; +import { LogRelay } from './services/log-relay.js'; +import { registerActionRoutes } from './routes/actions.js'; +import { registerCaptureRoutes } from './routes/captures.js'; +import { registerBenchRoutes, setBenchApp } from './routes/bench.js'; +import { registerPlaygroundRoutes } from './routes/playground.js'; +import { registerEvalRoutes } from './routes/evals.js'; +import { registerRoutingRoutes } from './routes/routing.js'; +import { registerReportRoutes, startReportScheduler } from './routes/reports.js'; +import { registerGatewayRoutes } from './routes/gateway.js'; +import { registerPolicyRoutes } from './routes/policies.js'; +import { registerSshConfigRoutes } from './routes/ssh-config.js'; +import { loadLlamaProviders, getLlamaProviders, resolveProviderBaseUrl } from './services/llama-providers.js'; + +// ─── delta emitter (B3 fix) ───────────────────────────────────────────────── + +export type DeltaCallback = (delta: unknown) => void; +export type DeltaEmitter = { + subscribe(cb: DeltaCallback): () => void; + publish(delta: unknown): void; +}; + +export function createDeltaEmitter(): DeltaEmitter { + const listeners = new Set(); + return { + subscribe(cb: DeltaCallback): () => void { + listeners.add(cb); + return () => { listeners.delete(cb); }; + }, + publish(delta: unknown): void { + for (const cb of listeners) { + try { cb(delta); } catch { /* ignore emitter errors */ } + } + }, + }; +} + +// ─── metrics entry field-name mapper ───────────────────────────────────────── +// Real /api/metrics shape has nested tokens and different field names: +// {id, timestamp, model, req_path, resp_status_code, tokens:{...}, duration_ms, has_capture} +// Map to the column names used in control_requests. + +interface MappedMetricsEntry { + id: number; + ts: string; + model: string; + req_path: string; + status_code: number; + duration_ms: number; + cache_tokens: number; + input_tokens: number; + output_tokens: number; + prompt_tps: number; + gen_tps: number; + has_capture: boolean; + /** P4: NULL for ring data — ActivityLogEntry does not carry request headers. */ + source: string | null; +} + +function mapMetricsEntry(entry: MetricsEntry): MappedMetricsEntry { + return { + id: entry.id, + ts: entry.timestamp, + model: entry.model, + req_path: entry.req_path, + status_code: entry.resp_status_code, + duration_ms: entry.duration_ms, + cache_tokens: entry.tokens.cache_tokens, + input_tokens: entry.tokens.input_tokens, + output_tokens: entry.tokens.output_tokens, + prompt_tps: entry.tokens.prompt_per_second, + gen_tps: entry.tokens.tokens_per_second, + has_capture: entry.has_capture, + /** P4: NULL — ActivityLogEntry does not carry request headers. */ + source: null, + }; +} + +// ─── SSE event handlers (B5 fix: await onEvent; B2 fix: incrementSeq) ─────── + +export async function handleLlamaSweepEvent( + fleet: FleetState, + sql: ReturnType, + config: ReturnType, + providerId: string, + emitter: DeltaEmitter, + event: LlamaSweepSSEEvent, + logRelay: LogRelay | null = null, +): Promise { + const state = ensureHostState(fleet, providerId); + stampLastSeen(state); + + switch (event.type) { + case 'modelStatus': { + // Real payload: FULL-FLEET array of {id, state, ...} (fork apiModel). + // Derive transitions by diffing against current state; persist only changes. + state.liveness = 'connected'; + const changed: Array<{ model: string; state: string }> = []; + for (const m of event.data) { + const prev = state.models.get(m.id); + if (!prev || prev.state !== m.state) { + changed.push({ model: m.id, state: m.state }); + } + state.models.set(m.id, { + model: m.id, + state: m.state, + ts: new Date(), + ttlDeadline: prev?.ttlDeadline ?? null, + inflight: prev?.inflight ?? 0, + }); + } + if (changed.length === 0) break; + const seq = incrementSeq(state); + for (const c of changed) { + await sql` + INSERT INTO control_model_events (provider_id, model, state, ts, detail) + VALUES (${providerId}, ${c.model}, ${c.state}, clock_timestamp(), ${sql.json({} as never)}) + ON CONFLICT (provider_id, model, state, ts) DO NOTHING + `; + } + // Publish delta to WS subscribers (B3 fix). + emitter.publish({ + type: 'control_fleet' as const, + seq, + hosts: [{ + providerId: state.providerId, + liveness: state.liveness, + lastSeenAt: state.lastSeenAt?.toISOString() ?? null, + seq: state.seq, + models: Array.from(state.models.values()).map((m) => ({ + model: m.model, + state: m.state, + ts: m.ts.toISOString(), + ttlDeadline: m.ttlDeadline?.toISOString() ?? null, + inflight: m.inflight, + })), + }], + }); + break; + } + case 'logData': { + // Logs are relay-only; no persistence by default. + const source = event.data.source as 'proxy' | 'upstream' | 'model'; + // Real payload field is 'data' (fork sendLogData), may contain multiple lines. + const text = event.data.data; + if (logRelay) { + logRelay.append(providerId, source, text); + } + const seq = incrementSeq(state); + emitter.publish({ + type: 'control_log' as const, + seq, + providerId, + source, + line: text, + }); + break; + } + case 'metrics': { + // Real payload: BARE array of ActivityLogEntry (fork sendMetrics). + const entries = event.data; + // B5 fix: await onEvent (handleReconcile is async). + const seq = incrementSeq(state); + await handleReconcile(fleet, sql, config, providerId, emitter, event.data).catch((err) => { + // A1: log the error instead of swallowing silently. + const msg = (err as Error).message ?? String(err); + console.warn({ providerId, err: msg }, 'fleet: reconcile failed'); + }); + // Publish activity deltas. + for (const entry of entries) { + const captureTrimmed = entry.capture ? trimCapture(entry.capture, config.CAPTURE_SIZE_KB) : null; + const captureObj = captureTrimmed ? parseCaptureJson(captureTrimmed) : null; + // Map real field names: resp_status_code -> status_code, tokens.* nested, timestamp -> ts. + const mapped = mapMetricsEntry(entry); + await sql` + INSERT INTO control_requests (provider_id, swap_entry_id, ts, model, req_path, status_code, duration_ms, cache_tokens, input_tokens, output_tokens, prompt_tps, gen_tps, has_capture, capture, source) + VALUES (${providerId}, ${mapped.id}, ${mapped.ts}, ${mapped.model}, ${mapped.req_path}, ${mapped.status_code}, ${mapped.duration_ms}, ${mapped.cache_tokens}, ${mapped.input_tokens}, ${mapped.output_tokens}, ${mapped.prompt_tps}, ${mapped.gen_tps}, ${mapped.has_capture}, ${captureObj ? sql.json(captureObj as never) : sql`NULL::jsonb`}, ${mapped.source}) + ON CONFLICT (provider_id, swap_entry_id, ts) DO NOTHING + `; + emitter.publish({ + type: 'control_activity' as const, + seq: state.seq, + providerId, + entry: { + id: mapped.id, + ts: mapped.ts, + model: mapped.model, + reqPath: mapped.req_path, + statusCode: mapped.status_code, + durationMs: mapped.duration_ms, + }, + }); + } + break; + } + case 'inflight': { + // Real payload: {total} -- host-level total (fork sendInFlight); the fork + // does not publish per-model inflight over SSE. + state.inflightTotal = event.data.total; + break; + } + } +} + +// ─── reconcile handler (B7 fix: called from metrics event) ─────────────────── + +async function handleReconcile( + fleet: FleetState, + sql: ReturnType, + config: ReturnType, + providerId: string, + emitter: DeltaEmitter, + metrics: MetricsEntry[], +): Promise { + const state = ensureHostState(fleet, providerId); + stampLastSeen(state); + state.liveness = 'connected'; + +// Detect gap: if oldest reconcile entry is newer than newest persisted entry + // for that provider, the ring wrapped past our tail. + const entries = metrics ?? []; + const oldestReconcileTs = entries.length > 0 + ? entries[entries.length - 1]!.timestamp + : null; + + if (oldestReconcileTs) { + const newestPersisted = await sql<{ ts: string }[]>` + SELECT ts FROM control_requests + WHERE provider_id = ${providerId} + ORDER BY ts DESC LIMIT 1 + `; + + if (newestPersisted.length > 0) { + const newestRow = newestPersisted[0]!; + if (detectGap(oldestReconcileTs, newestRow.ts)) { + await sql` + INSERT INTO control_model_events (provider_id, model, state, ts, detail) + VALUES (${providerId}, '*', 'gap_suspected', clock_timestamp(), ${sql.json({ + oldestReconcile: oldestReconcileTs, + newestPersisted: newestRow.ts, + } as never)}) + ON CONFLICT (provider_id, model, state, ts) DO NOTHING + `; + } + } + } + + // Ingest reconcile entries (dedup via UNIQUE constraint). + for (const entry of entries) { + const mapped = mapMetricsEntry(entry); + await sql` + INSERT INTO control_requests (provider_id, swap_entry_id, ts, model, req_path, status_code, duration_ms, cache_tokens, input_tokens, output_tokens, prompt_tps, gen_tps, has_capture, source) + VALUES (${providerId}, ${mapped.id}, ${mapped.ts}, ${mapped.model}, ${mapped.req_path}, ${mapped.status_code}, ${mapped.duration_ms}, ${mapped.cache_tokens}, ${mapped.input_tokens}, ${mapped.output_tokens}, ${mapped.prompt_tps}, ${mapped.gen_tps}, ${mapped.has_capture}, ${mapped.source}) + ON CONFLICT (provider_id, swap_entry_id, ts) DO NOTHING + `; + } + + return true; +} + +// ─── perf poller (A7 fix: add timeout; A8 fix: log errors) ─────────────────── + +async function pollPerformance( + sql: ReturnType, + config: ReturnType, + providerId: string, + baseUrl: string, + fleet: FleetState, + emitter: DeltaEmitter, +): Promise { + const state = ensureHostState(fleet, providerId); + + // Recover watermark from MAX(ts) per provider. + const watermark = await sql<{ ts: string | null }[]>` + SELECT MAX(ts) AS ts FROM control_perf_samples WHERE provider_id = ${providerId} + `; + + // porsager returns timestamptz as a Date object; interpolating it raw yields + // Date.toString() ("Thu Jun 12 2026 ...") which llama-swap rejects with 400. + const afterParam = watermark[0]?.ts + ? `?after=${encodeURIComponent(new Date(watermark[0].ts).toISOString())}` + : ''; + const url = `${baseUrl}/api/performance${afterParam}`; + + try { + // A7 fix: add fetch timeout via AbortController. + const fetchSignal = AbortSignal.timeout(10_000); + const res = await fetch(url, { signal: fetchSignal }); + if (!res.ok) return; + + // Real shape: { gpu_stats: GpuStat[], sys_stats: SysStat[] } + const data = await res.json() as { gpu_stats?: unknown[]; sys_stats?: unknown[] } | null; + if (!data) return; + + // Pair gpu_stats and sys_stats by timestamp. + const gpuMap = new Map(); + for (const g of data.gpu_stats ?? []) { + const gpu = g as { timestamp?: string }; + if (gpu.timestamp) { + gpuMap.set(gpu.timestamp, g); + } + } + + const sysMap = new Map(); + for (const s of data.sys_stats ?? []) { + const sys = s as { timestamp?: string }; + if (sys.timestamp) { + sysMap.set(sys.timestamp, s); + } + } + + // Collect all unique timestamps. + const allTimestamps = new Set([...gpuMap.keys(), ...sysMap.keys()]); + if (allTimestamps.size === 0) return; + + stampLastSeen(state); + + for (const ts of allTimestamps) { + const gpu = gpuMap.get(ts) ?? null; + const sys = sysMap.get(ts) ?? null; + + await sql` + INSERT INTO control_perf_samples (provider_id, ts, gpu, sys) + VALUES (${providerId}, ${ts}, ${sql.json(gpu as never)}, ${sql.json(sys as never)}) + ON CONFLICT (provider_id, ts) DO NOTHING + `; + + const seq = incrementSeq(state); + emitter.publish({ + type: 'control_perf' as const, + seq, + providerId, + ts, + gpu, + sys, + }); + } + } catch (err) { + // A8 fix: log the error instead of swallowing silently. + const msg = (err as Error).message ?? String(err); + console.warn({ providerId, err: msg }, 'fleet: perf poll failed'); + } +} + +// ─── fleet-state rebuild from DB (A1/F2 fix) ───────────────────────────────── + +async function rebuildFleetFromDB(fleet: FleetState, sql: ReturnType): Promise { + // Query control_model_events for latest model state per provider. + // B3: ORDER BY ASC so iteration processes oldest first; Map.set() overwrites + // with the latest state for each model, so the newest event wins. + const modelEvents = await sql<{ provider_id: string; model: string; state: string; ts: string; detail: string }[]>` + SELECT provider_id, model, state, ts, detail + FROM control_model_events + WHERE ts IN ( + SELECT MAX(ts) FROM control_model_events + GROUP BY provider_id, model, state + ) + ORDER BY ts ASC + `; + + for (const row of modelEvents) { + const state = ensureHostState(fleet, row.provider_id); + state.liveness = 'down'; + stampLastSeen(state); + // row.detail is jsonb (porsager returns it parsed); jsonbObject tolerates + // both a parsed object and a JSON string. + const detail: unknown = jsonbObject(row.detail); + // B4: ttlDeadline recalculation. The live modelStatus handler (index.ts:57) + // computes ttlDeadline = new Date(Date.now() + ttl * 1000), relative to event + // arrival time. For rebuild, use the event timestamp so the deadline reflects + // when the model was actually loaded, not when we rebuild. + const ttl = (detail as { ttl?: number })?.ttl; + const eventTs = new Date(row.ts).getTime(); + const ttlDeadline = ttl ? new Date(eventTs + ttl * 1000) : null; + state.models.set(row.model, { + model: row.model, + state: row.state, + ts: new Date(row.ts), + ttlDeadline, + inflight: 0, + }); + } + + // Query control_requests for last activity. + const lastRequests = await sql<{ provider_id: string; ts: string }[]>` + SELECT provider_id, ts FROM control_requests + WHERE ts IN ( + SELECT MAX(ts) FROM control_requests GROUP BY provider_id + ) + ORDER BY ts DESC + `; + + for (const row of lastRequests) { + const state = ensureHostState(fleet, row.provider_id); + stampLastSeen(state); + } + + // Query control_perf_samples for latest perf sample. + const lastPerf = await sql<{ provider_id: string; ts: string }[]>` + SELECT provider_id, ts FROM control_perf_samples + WHERE ts IN ( + SELECT MAX(ts) FROM control_perf_samples GROUP BY provider_id + ) + ORDER BY ts DESC + `; + + for (const row of lastPerf) { + const state = ensureHostState(fleet, row.provider_id); + stampLastSeen(state); + } +} + +// ─── main ─────────────────────────────────────────────────────────────────── + +async function main() { + const config = loadConfig(); + const app = Fastify({ logger: { level: config.LOG_LEVEL } }); + + app.removeContentTypeParser(['application/json']); + app.addContentTypeParser('application/json', { parseAs: 'string' }, (_req: unknown, body: unknown, done: (err: Error | null, body: unknown) => void) => { + const str = (body as string) ?? ''; + if (str.trim().length === 0) { + done(null, {}); + return; + } + try { + done(null, JSON.parse(str)); + } catch (err) { + done(err as Error, undefined); + } + }); + + const sql = getSql(config); + + // Startup ordering guard: wait for server-owned tables before applying schema. + await waitForTable(sql, 'sessions', 30_000); + await applySchema(sql); + app.log.info('database schema applied'); + + // Register WebSocket endpoint. + const fleet = createFleetState(); + const emitter = createDeltaEmitter(); + + // P2: Action queue + log relay + const actionQueue = new ActionQueue(); + const logRelay = new LogRelay(); + registerControlWebSocket(app, fleet, emitter, logRelay); + registerActionRoutes(app, actionQueue, fleet, emitter); + registerCaptureRoutes(app, sql); + setBenchApp(app.log); + registerBenchRoutes(app, sql, fleet, emitter); + registerPlaygroundRoutes(app); + registerEvalRoutes(app, sql, fleet, emitter); + registerRoutingRoutes(app, sql, fleet); + registerReportRoutes(app, sql); + registerGatewayRoutes(app, sql, fleet, emitter); + registerPolicyRoutes(app, sql); + registerSshConfigRoutes(app, sql, config, fleet, emitter); + + // Health endpoint. + app.get('/api/health', async (_req: unknown, reply: import('fastify').FastifyReply) => { + const dbOk = await pingDb(sql); + const status = dbOk ? 200 : 503; + return reply.status(status).send({ + ok: dbOk, + db: dbOk, + }); + }); + + // Rebuild fleet state from DB on startup (A1/F2 fix). + await rebuildFleetFromDB(fleet, sql).catch((err) => { + app.log.warn({ err: (err as Error).message }, 'fleet: rebuild from DB failed'); + }); + + // Load the provider registry — baseUrl comes from the registry, never from ssh_host. + const registry = loadLlamaProviders(config.LLAMA_PROVIDERS_PATH, config.LLAMA_SWAP_URL); + app.log.info({ count: registry.providers.length }, 'fleet: provider registry loaded'); + + // P7.2: the auto:* gateway is itself a registry entry (kind boocontrol-gateway) + // so BooChat adopts it as a provider. BooControl must NOT treat it as a fleet + // host — it has no llama-swap SSE/perf surface and its baseUrl points back at + // this service. Filter it out of every fleet operation. + const fleetProviders = registry.providers.filter((p) => p.kind !== 'boocontrol-gateway'); + + // JOIN registry providers with control_hosts for the enabled flag. + // Insert a control_hosts row ON CONFLICT DO NOTHING for any registry provider + // missing one, so the fleet state has a row to key off. + const enabledHosts = await sql<{ provider_id: string; enabled: boolean }[]>` + SELECT provider_id, enabled FROM control_hosts + WHERE provider_id = ANY(${fleetProviders.map((p) => p.id)}::text[]) + `; + const enabledMap = new Map(); + for (const row of enabledHosts) { + enabledMap.set(row.provider_id, row.enabled); + } + + // Seed missing control_hosts rows so the registry is the source of truth. + for (const provider of fleetProviders) { + if (!enabledMap.has(provider.id)) { + await sql` + INSERT INTO control_hosts (provider_id, enabled) + VALUES (${provider.id}, true) + ON CONFLICT (provider_id) DO NOTHING + `; + enabledMap.set(provider.id, true); + } + } + + const abortControllers = new Map(); + + for (const provider of fleetProviders) { + const enabled = enabledMap.get(provider.id) ?? true; + if (!enabled) continue; + + const baseUrl = provider.baseUrl; + + // P2: Register host with action queue + actionQueue.registerHost(provider.id, { + baseUrl, + isLivenessUp: () => { + const hs = fleet.hosts.get(provider.id); + return hs?.liveness !== 'down'; + }, + isInflightRequests: () => { + // Host-level total from the SSE inflight event (per-model is not published). + return fleet.hosts.get(provider.id)?.inflightTotal ?? 0; + }, + log: app.log, + }); + + const abort = startFleetConnector(provider.id, baseUrl, { + isUp: () => true, + sql, + log: app.log, + onEvent: (pid, event) => handleLlamaSweepEvent(fleet, sql, config, pid, emitter, event, logRelay), + onReconcile: (pid, metrics) => handleReconcile(fleet, sql, config, pid, emitter, metrics), + onReconnectGiveUp: async (pid) => { + const state = ensureHostState(fleet, pid); + state.liveness = 'down'; + }, + sleep: (ms) => new Promise((r) => setTimeout(r, ms)), + }); + abortControllers.set(provider.id, abort); + } + + // Perf poller: 5s interval per enabled provider — baseUrl from registry. + const pollTimer = setInterval(async () => { + for (const provider of fleetProviders) { + const enabled = enabledMap.get(provider.id) ?? true; + if (!enabled) continue; + await pollPerformance(sql, config, provider.id, provider.baseUrl, fleet, emitter); + } + }, 5_000); + + // Retention job: daily timer — iterate registry providers. + const retentionConfig = buildRetentionConfig(config); + const retentionTimer = setInterval(async () => { + for (const provider of fleetProviders) { + const enabled = enabledMap.get(provider.id) ?? true; + if (!enabled) continue; + await runRollup(sql, provider.id, retentionConfig.rawHours); + // A2 fix: chunk pruneRawSamples (already chunked), also chunk pruneActivity and pruneModelEvents. + await pruneRawSamples(sql, provider.id, retentionConfig.rawHours); + await pruneActivity(sql, retentionConfig.rawHours); + await pruneModelEvents(sql, retentionConfig.rollupDays * 24); + } + }, 24 * 3600_000); // daily + + // P6.2: Report digest scheduler (catch-up on boot, then hourly). + const stopReportScheduler = startReportScheduler(sql, app.log); + + app.addHook('onClose', async () => { + clearInterval(pollTimer); + clearInterval(retentionTimer); + stopReportScheduler(); + for (const abort of abortControllers.values()) { + abort.abort(); + } + }); + + // Graceful shutdown. + const shutdown = async () => { + app.log.info('shutting down'); + await app.close(); + await sql.end({ timeout: 5 }); + process.exit(0); + }; + process.on('SIGTERM', shutdown); + process.on('SIGINT', shutdown); + + await app.listen({ port: config.PORT, host: config.HOST }); + app.log.info(`BooControl listening on ${config.HOST}:${config.PORT}`); +} + +// P2 exports for tests +export { ActionQueue } from './services/action-queue.js'; +export { LogRelay } from './services/log-relay.js'; + +// P3 exports for tests +export { runSingleBenchRequest, parseLlamaTimings, computeAggregates } from './services/bench-engine.js'; +export { computeRegressionFlag } from './services/bench-engine.js'; + +// P5 exports for tests +export { loadEvalSuitesFromData } from './services/eval-suites.js'; +export { runCodeEval } from './services/sandbox-runner.js'; + +if (!process.env.VITEST) { + main().catch((err) => { + console.error('fatal:', err); + process.exit(1); + }); +} diff --git a/apps/control/src/routes/actions.ts b/apps/control/src/routes/actions.ts new file mode 100644 index 0000000..8eb7184 --- /dev/null +++ b/apps/control/src/routes/actions.ts @@ -0,0 +1,108 @@ +import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify'; +import { randomUUID } from 'node:crypto'; +import type { ActionQueue } from '../services/action-queue.js'; +import type { FleetState } from '../services/fleet-state.js'; +import type { DeltaEmitter } from '../index.js'; + +/** + * Register action submission routes. + * + * POST /api/action/submit — enqueue a warm or unload action + * GET /api/action/queue/:providerId — get current queue state + */ +export function registerActionRoutes( + app: FastifyInstance, + actionQueue: ActionQueue, + fleet: FleetState, + emitter: DeltaEmitter, +): void { + app.post('/api/action/submit', async (req: FastifyRequest, reply: FastifyReply) => { + const body = req.body as Record; + const type = body.type as string; + const providerId = body.providerId as string; + const model = body.model as string | undefined; + const confirmed = body.confirmed === true; + + if (!type || !['warm', 'unload'].includes(type)) { + return reply.status(400).send({ error: 'type must be warm or unload' }); + } + if (!providerId) { + return reply.status(400).send({ error: 'providerId is required' }); + } + + // Check host liveness + const hostState = fleet.hosts.get(providerId); + if (!hostState || hostState.liveness === 'down') { + return reply.status(409).send({ error: 'host offline' }); + } + + const action = { + actionId: randomUUID(), + type: type as 'warm' | 'unload', + providerId, + model, + confirmed, + createdAt: new Date(), + }; + + const result = actionQueue.submit(action); + + if (!result.ok) { + if (result.requiresConfirmation) { + return reply.status(409).send({ + error: result.error, + requiresConfirmation: true, + }); + } + if (result.pending) { + return reply.status(429).send({ + error: result.error, + pending: result.pending, + }); + } + return reply.status(409).send({ error: result.error }); + } + + // Publish action queued event + emitter.publish({ + type: 'control_job' as const, + seq: hostState.seq, + jobType: 'action' as const, + jobId: action.actionId, + status: 'queued' as const, + detail: { + actionType: action.type, + providerId: action.providerId, + model: action.model ?? null, + }, + }); + + return reply.status(202).send({ + actionId: action.actionId, + status: 'queued', + }); + }); + + app.get('/api/action/queue/:providerId', async (req: FastifyRequest, reply: FastifyReply) => { + const providerId = req.params as { providerId: string }; + const state = actionQueue.getState(providerId.providerId); + + if (!state) { + return reply.status(404).send({ error: 'host not found' }); + } + + return reply.send({ + providerId: providerId.providerId, + depth: state.queue.length, + running: state.running, + entries: state.queue.map((e) => ({ + actionId: e.action.actionId, + type: e.action.type, + model: e.action.model ?? null, + status: e.status, + error: e.error ?? null, + enqueuedAt: e.enqueuedAt.toISOString(), + })), + }); + }); +} diff --git a/apps/control/src/routes/bench.ts b/apps/control/src/routes/bench.ts new file mode 100644 index 0000000..9582b04 --- /dev/null +++ b/apps/control/src/routes/bench.ts @@ -0,0 +1,492 @@ +import { randomUUID } from 'node:crypto'; +import type { FastifyBaseLogger, FastifyInstance, FastifyRequest, FastifyReply } from 'fastify'; +import type { Sql } from '../db.js'; +import type { FleetState } from '../services/fleet-state.js'; +import type { DeltaEmitter } from '../index.js'; +import { acquireHostAccess } from '../services/host-access.js'; +import type { BenchSuite, BenchRunProgress } from '../services/bench-engine.js'; +import { runBenchSuite } from '../services/bench-engine.js'; +import { resolveProviderBaseUrl } from '../services/llama-providers.js'; +import { jsonbNumberArray, jsonbObject } from '../services/jsonb.js'; + +/** + * Register bench routes. + * + * POST /api/bench/suite — create a suite definition + * GET /api/bench/suites — list suites + * GET /api/bench/suites/:id — get suite + * POST /api/bench/run — start a bench run (gated through acquireHostAccess) + * GET /api/bench/runs — list runs + * GET /api/bench/runs/:id — get run + samples + * GET /api/bench/baselines — get baselines per (provider_id, model) + */ +export function registerBenchRoutes( + app: FastifyInstance, + sql: Sql, + fleet: FleetState, + emitter: DeltaEmitter, +): void { + // ─── suite CRUD ────────────────────────────────────────────────────────── + + app.post('/api/bench/suite', async (req: FastifyRequest, reply: FastifyReply) => { + const body = req.body as Record; + const suiteId = body.id as string; + const name = body.name as string; + const providerId = body.providerId as string; + const model = body.model as string; + const promptTokens = body.promptTokens as number[]; + const genTokens = body.genTokens as number[]; + const concurrency = body.concurrency as number[]; + const repetitions = (body.repetitions as number) ?? 1; + const metadata = body.metadata as Record | undefined; + + if (!name || !providerId || !model) { + return reply.status(400).send({ error: 'name, providerId, and model are required' }); + } + if (!promptTokens?.length || !genTokens?.length || !concurrency?.length) { + return reply.status(400).send({ error: 'promptTokens, genTokens, and concurrency must each have at least one value' }); + } + + const id = suiteId ?? randomUUID(); + await sql` + INSERT INTO bench_suites (id, name, provider_id, model, prompt_tokens, gen_tokens, concurrency, repetitions, metadata) + VALUES (${id}, ${name}, ${providerId}, ${model}, ${sql.json(promptTokens as never)}, ${sql.json(genTokens as never)}, ${sql.json(concurrency as never)}, ${repetitions}, ${metadata ? sql.json(metadata as never) : sql`NULL::jsonb`}) + ON CONFLICT (id) DO UPDATE SET + name = EXCLUDED.name, + provider_id = EXCLUDED.provider_id, + model = EXCLUDED.model, + prompt_tokens = EXCLUDED.prompt_tokens, + gen_tokens = EXCLUDED.gen_tokens, + concurrency = EXCLUDED.concurrency, + repetitions = EXCLUDED.repetitions, + metadata = EXCLUDED.metadata + `; + + return reply.status(201).send({ id }); + }); + + app.get('/api/bench/suites', async (_req: FastifyRequest, reply: FastifyReply) => { + const suites = await sql<{ + id: string; + name: string; + provider_id: string; + model: string; + prompt_tokens: string; + gen_tokens: string; + concurrency: string; + repetitions: number; + metadata: string | null; + created_at: string; + }[]>` + SELECT id, name, provider_id, model, prompt_tokens, gen_tokens, concurrency, repetitions, metadata, created_at + FROM bench_suites + ORDER BY created_at DESC + `; + + return reply.send({ + suites: suites.map((s) => ({ + id: s.id, + name: s.name, + providerId: s.provider_id, + model: s.model, + promptTokens: jsonbNumberArray(s.prompt_tokens), + genTokens: jsonbNumberArray(s.gen_tokens), + concurrency: jsonbNumberArray(s.concurrency), + repetitions: s.repetitions, + metadata: jsonbObject(s.metadata) ?? undefined, + createdAt: s.created_at, + })), + }); + }); + + app.get('/api/bench/suites/:id', async (req: FastifyRequest, reply: FastifyReply) => { + const { id } = req.params as { id: string }; + const rows = await sql<{ + id: string; + name: string; + provider_id: string; + model: string; + prompt_tokens: string; + gen_tokens: string; + concurrency: string; + repetitions: number; + metadata: string | null; + created_at: string; + }[]>` + SELECT id, name, provider_id, model, prompt_tokens, gen_tokens, concurrency, repetitions, metadata, created_at + FROM bench_suites WHERE id = ${id} + `; + + if (rows.length === 0) { + return reply.status(404).send({ error: 'suite not found' }); + } + + const s = rows[0]!; + return reply.send({ + id: s.id, + name: s.name, + providerId: s.provider_id, + model: s.model, + promptTokens: jsonbNumberArray(s.prompt_tokens), + genTokens: jsonbNumberArray(s.gen_tokens), + concurrency: jsonbNumberArray(s.concurrency), + repetitions: s.repetitions, + metadata: jsonbObject(s.metadata) ?? undefined, + createdAt: s.created_at, + }); + }); + + // ─── run launcher (P3.3: safety gates + P3.4: acquireHostAccess) ───────── + + app.post('/api/bench/run', async (req: FastifyRequest, reply: FastifyReply) => { + const body = req.body as Record; + const suiteId = body.suiteId as string; + const temperature = (body.temperature as number) ?? 0.7; + const topP = (body.topP as number) ?? 0.9; + + if (!suiteId) { + return reply.status(400).send({ error: 'suiteId is required' }); + } + + // Load suite. + const suiteRows = await sql<{ + id: string; + name: string; + provider_id: string; + model: string; + prompt_tokens: string; + gen_tokens: string; + concurrency: string; + repetitions: number; + metadata: string | null; + }[]>` + SELECT id, name, provider_id, model, prompt_tokens, gen_tokens, concurrency, repetitions, metadata + FROM bench_suites WHERE id = ${suiteId} + `; + + if (suiteRows.length === 0) { + return reply.status(404).send({ error: 'suite not found' }); + } + + const s = suiteRows[0]!; + const suite: BenchSuite = { + id: s.id, + name: s.name, + providerId: s.provider_id, + model: s.model, + promptTokens: jsonbNumberArray(s.prompt_tokens), + genTokens: jsonbNumberArray(s.gen_tokens), + concurrency: jsonbNumberArray(s.concurrency), + repetitions: s.repetitions, + metadata: jsonbObject(s.metadata) ?? undefined, + }; + + // P3.3: Safety check — check recent traffic on the target host. + const hostState = fleet.hosts.get(suite.providerId); + const recentTraffic = checkRecentTraffic(hostState); + + // P3.4: Gate through acquireHostAccess seam. + const grant = await acquireHostAccess(suite.providerId, 'bench'); + if (!grant.ok) { + return reply.status(409).send({ + error: 'host access denied', + reason: grant.reason, + }); + } + + // Resolve base URL from registry. + const baseUrl = resolveBaseUrl(suite.providerId); + if (!baseUrl) { + return reply.status(400).send({ error: `no base URL configured for provider ${suite.providerId}` }); + } + + // Get seq for the host. + const seq = hostState?.seq ?? 0; + + // Run the bench suite asynchronously (non-blocking HTTP response). + void runBenchAsync( + { suite, baseUrl, temperature, topP }, + sql, + emitter, + seq, + suite.providerId, + ); + + return reply.status(202).send({ + status: 'queued', + suiteId: suite.id, + recentTraffic, + }); + }); + + // ─── runs listing ──────────────────────────────────────────────────────── + + app.get('/api/bench/runs', async (req: FastifyRequest, reply: FastifyReply) => { + const query = req.query as Record; + const suiteId = query.suiteId; + + let runs: Array<{ + id: string; + suite_id: string; + job_type: string; + status: string; + started_at: string | null; + finished_at: string | null; + total_samples: number; + completed_samples: number; + concurrent_foreign_requests: number; + regression_flag: string | null; + aggregate: string | null; + error: string | null; + created_at: string; + }>; + + if (suiteId) { + runs = await sql` + SELECT id, suite_id, job_type, status, started_at, finished_at, total_samples, completed_samples, concurrent_foreign_requests, regression_flag, aggregate, error, created_at + FROM bench_runs WHERE suite_id = ${suiteId} + ORDER BY created_at DESC + `; + } else { + runs = await sql` + SELECT id, suite_id, job_type, status, started_at, finished_at, total_samples, completed_samples, concurrent_foreign_requests, regression_flag, aggregate, error, created_at + FROM bench_runs + ORDER BY created_at DESC + LIMIT 100 + `; + } + + return reply.send({ + runs: runs.map((r) => ({ + id: r.id, + suiteId: r.suite_id, + jobType: r.job_type, + status: r.status, + startedAt: r.started_at, + finishedAt: r.finished_at, + totalSamples: r.total_samples, + completedSamples: r.completed_samples, + concurrentForeignRequests: r.concurrent_foreign_requests, + regressionFlag: r.regression_flag, + aggregate: jsonbObject(r.aggregate), + error: r.error, + createdAt: r.created_at, + })), + }); + }); + + app.get('/api/bench/runs/:id', async (req: FastifyRequest, reply: FastifyReply) => { + const { id } = req.params as { id: string }; + + const runRows = await sql<{ + id: string; + suite_id: string; + job_type: string; + status: string; + started_at: string | null; + finished_at: string | null; + total_samples: number; + completed_samples: number; + concurrent_foreign_requests: number; + regression_flag: string | null; + aggregate: string | null; + error: string | null; + created_at: string; + }[]>` + SELECT id, suite_id, job_type, status, started_at, finished_at, total_samples, completed_samples, concurrent_foreign_requests, regression_flag, aggregate, error, created_at + FROM bench_runs WHERE id = ${id} + `; + + if (runRows.length === 0) { + return reply.status(404).send({ error: 'run not found' }); + } + + const r = runRows[0]!; + + const samples = await sql<{ + id: number; + prompt_tokens: number; + gen_tokens: number; + concurrency: number; + repetition: number; + ttft_ms: number | null; + total_ms: number | null; + prompt_tps: number | null; + gen_tps: number | null; + cache_n: number | null; + error: string | null; + }[]>` + SELECT id, prompt_tokens, gen_tokens, concurrency, repetition, ttft_ms, total_ms, prompt_tps, gen_tps, cache_n, error + FROM bench_samples WHERE run_id = ${id} + ORDER BY prompt_tokens, gen_tokens, concurrency, repetition + `; + + return reply.send({ + run: { + id: r.id, + suiteId: r.suite_id, + jobType: r.job_type, + status: r.status, + startedAt: r.started_at, + finishedAt: r.finished_at, + totalSamples: r.total_samples, + completedSamples: r.completed_samples, + concurrentForeignRequests: r.concurrent_foreign_requests, + regressionFlag: r.regression_flag, + aggregate: jsonbObject(r.aggregate), + error: r.error, + createdAt: r.created_at, + }, + samples: samples.map((s) => ({ + id: s.id, + promptTokens: s.prompt_tokens, + genTokens: s.gen_tokens, + concurrency: s.concurrency, + repetition: s.repetition, + ttftMs: s.ttft_ms, + totalMs: s.total_ms, + promptTps: s.prompt_tps, + genTps: s.gen_tps, + cacheN: s.cache_n, + error: s.error, + })), + }); + }); + + // ─── baselines ─────────────────────────────────────────────────────────── + + app.get('/api/bench/baselines', async (_req: FastifyRequest, reply: FastifyReply) => { + const rows = await sql<{ + provider_id: string; + model: string; + run_id: string; + aggregate: string; + created_at: string; + }[]>` + SELECT provider_id, model, run_id, aggregate, created_at + FROM bench_baselines + ORDER BY provider_id, model + `; + + return reply.send({ + baselines: rows.map((r) => ({ + providerId: r.provider_id, + model: r.model, + runId: r.run_id, + aggregate: jsonbObject(r.aggregate), + createdAt: r.created_at, + })), + }); + }); +} + +/** + * P3.3: Check if the target host has recent traffic (for takeover confirmation). + */ +function checkRecentTraffic(hostState: { models: Map } | undefined): { hasRecentTraffic: boolean; inflightCount: number } { + if (!hostState) { + return { hasRecentTraffic: false, inflightCount: 0 }; + } + let total = 0; + for (const m of hostState.models.values()) { + total += m.inflight; + } + return { + hasRecentTraffic: total > 0, + inflightCount: total, + }; +} + +/** + * Resolve the base URL for a provider from the loaded registry. + * baseUrl comes from LlamaProvider.baseUrl, never from ssh_host. + */ +function resolveBaseUrl(providerId: string): string | null { + return resolveProviderBaseUrl(providerId); +} + +/** + * Async bench runner: fire-and-forget, records concurrent_foreign_requests. + * A6: sources from activity stream during [started_at, finished_at] window, + * minus the bench's own samples count. + */ +async function runBenchAsync( + params: { suite: BenchSuite; baseUrl: string; temperature?: number; topP?: number }, + sql: Sql, + emitter: DeltaEmitter, + seq: number, + providerId: string, +): Promise { + const { suite } = params; + + // Find the latest running run for this suite. + const latestRun = await sql<{ id: string; started_at: string | null }[]>` + SELECT id, started_at FROM bench_runs + WHERE suite_id = ${suite.id} AND status = 'running' + ORDER BY created_at DESC LIMIT 1 + `; + + if (latestRun.length === 0) { + benchLogger?.error?.({}, 'bench: no running run found'); + return; + } + + const runId = latestRun[0]!.id; + + const progressHandler = (_progress: BenchRunProgress) => { + // Progress is published via emitter in runBenchSuite. + }; + + try { + await runBenchSuite(params, sql, emitter, seq, progressHandler); + + // A6: Record concurrent_foreign_requests from activity stream during run window. + // Count control_requests for this provider in [started_at, finished_at], + // minus the bench's own sample count. + const runData = await sql<{ started_at: string | null; finished_at: string | null; completed_samples: number }[]>` + SELECT started_at, finished_at, completed_samples FROM bench_runs WHERE id = ${runId} + `; + const rd = runData[0]!; + + if (rd.started_at && rd.finished_at) { + const foreignCount = await sql<{ count: number }[]>` + SELECT COUNT(*)::INT AS count FROM control_requests + WHERE provider_id = ${providerId} + AND ts >= ${rd.started_at}::timestamptz + AND ts <= ${rd.finished_at}::timestamptz + `; + const totalForeign = (foreignCount[0]?.count ?? 0) - rd.completed_samples; + await sql` + UPDATE bench_runs SET concurrent_foreign_requests = ${Math.max(0, totalForeign)} + WHERE id = ${runId} + `; + } + } catch (err) { + const msg = (err as Error).message ?? String(err); + benchLogger?.error?.({ err: msg }, 'bench: run failed'); + + await sql` + UPDATE bench_runs + SET status = 'failed', finished_at = clock_timestamp(), error = ${msg} + WHERE id = ${runId} + `; + + emitter.publish({ + type: 'control_job' as const, + seq, + jobType: 'bench' as const, + jobId: runId, + status: 'failed' as const, + detail: { error: msg }, + }); + } +} + +/** + * Set the Fastify logger for the async bench runner. + */ +let benchLogger: FastifyBaseLogger | undefined; + +export function setBenchApp(logger: FastifyBaseLogger): void { + benchLogger = logger; +} diff --git a/apps/control/src/routes/captures.ts b/apps/control/src/routes/captures.ts new file mode 100644 index 0000000..4d8f108 --- /dev/null +++ b/apps/control/src/routes/captures.ts @@ -0,0 +1,52 @@ +import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify'; +import type { Sql } from '../db.js'; +import { fetchCapture, persistCapture } from '../services/capture-fetch.js'; + +/** + * Register capture inspection routes. + * + * GET /api/capture/:providerId/:swapEntryId — fetch capture from host, persist trimmed copy + */ +export function registerCaptureRoutes( + app: FastifyInstance, + sql: Sql, +): void { + app.get( + '/api/capture/:providerId/:swapEntryId', + async (req: FastifyRequest, reply: FastifyReply) => { + const params = req.params as { providerId: string; swapEntryId: string }; + const swapEntryId = parseInt(params.swapEntryId, 10); + + if (isNaN(swapEntryId)) { + return reply.status(400).send({ error: 'invalid swapEntryId' }); + } + + // Resolve host URL from control_hosts + const hosts = await sql<{ ssh_host: string }[]>` + SELECT ssh_host FROM control_hosts WHERE provider_id = ${params.providerId} + `; + + if (hosts.length === 0 || !hosts[0]?.ssh_host) { + return reply.status(404).send({ error: 'host not found or no SSH host configured' }); + } + + const baseUrl = `http://${hosts[0].ssh_host}:8401`; + + const result = await fetchCapture(baseUrl, params.providerId, swapEntryId); + + if (!result.ok) { + return reply.status(404).send({ error: result.error }); + } + + // Persist trimmed copy + try { + await persistCapture(sql, result.capture!); + } catch (err) { + // Persistence failure is non-fatal — still return the capture + app.log.warn({ err: (err as Error).message }, 'capture: persist failed'); + } + + return reply.send(result.capture); + }, + ); +} diff --git a/apps/control/src/routes/evals.ts b/apps/control/src/routes/evals.ts new file mode 100644 index 0000000..e2d79b4 --- /dev/null +++ b/apps/control/src/routes/evals.ts @@ -0,0 +1,366 @@ +import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify'; +import type { Sql } from '../db.js'; +import type { DeltaEmitter } from '../index.js'; +import type { FleetState } from '../services/fleet-state.js'; +import { + listEvalSuites, + getEvalSuite, + upsertEvalSuite, + listEvalRuns, + getEvalResults, + seedEvalSuites, +} from '../services/eval-suites.js'; +import { jsonbArray, jsonbObject } from '../services/jsonb.js'; + +/** + * Register eval routes. + * + * POST /api/eval/suite — create/update an eval suite + * GET /api/eval/suites — list suites + * GET /api/eval/suites/:id — get suite + * POST /api/eval/seed — seed suites from data/ YAML + * POST /api/eval/run — start an eval run + * GET /api/eval/runs — list runs + * GET /api/eval/runs/:id — get run + results + * GET /api/eval/leaderboard — per (provider_id, model) aggregate scores + */ +export function registerEvalRoutes( + app: FastifyInstance, + sql: Sql, + fleet: FleetState, + emitter: DeltaEmitter, +): void { + // Seed suites from data/ YAML on startup (idempotent). + app.addHook('onReady', async () => { + await seedEvalSuites(sql).catch((err) => { + app.log.warn({ err: (err as Error).message }, 'eval: seed failed'); + }); + }); + + // ─── suite CRUD ────────────────────────────────────────────────────────── + + app.post('/api/eval/suite', async (req: FastifyRequest, reply: FastifyReply) => { + const body = req.body as Record; + const id = (body.id as string) ?? null; + const name = body.name as string; + const kind = body.kind as 'chat' | 'code'; + const tasks = body.tasks as unknown[]; + const judgeModel = (body.judgeModel as string) ?? null; + const metadata = body.metadata as Record | undefined; + + if (!name || !kind || !tasks?.length) { + return reply.status(400).send({ error: 'name, kind, and tasks are required' }); + } + + const suiteId = await upsertEvalSuite(sql, id, name, kind, tasks, judgeModel, metadata); + return reply.status(201).send({ id: suiteId }); + }); + + app.get('/api/eval/suites', async (_req: FastifyRequest, reply: FastifyReply) => { + const suites = await listEvalSuites(sql); + return reply.send({ + suites: suites.map((s) => ({ + id: s.id, + name: s.name, + kind: s.kind, + version: s.version, + tasks: jsonbArray(s.tasks), + judgeModel: s.judge_model, + judgeModelVersion: s.judge_model_version, + metadata: jsonbObject(s.metadata) ?? undefined, + createdAt: s.created_at, + })), + }); + }); + + app.get('/api/eval/suites/:id', async (req: FastifyRequest, reply: FastifyReply) => { + const { id } = req.params as { id: string }; + const suite = await getEvalSuite(sql, id); + if (!suite) { + return reply.status(404).send({ error: 'suite not found' }); + } + return reply.send({ + id: suite.id, + name: suite.name, + kind: suite.kind, + version: suite.version, + tasks: jsonbArray(suite.tasks), + judgeModel: suite.judge_model, + judgeModelVersion: suite.judge_model_version, + metadata: jsonbObject(suite.metadata) ?? undefined, + createdAt: suite.created_at, + }); + }); + + // ─── seed from data/ ───────────────────────────────────────────────────── + + app.post('/api/eval/seed', async (_req: FastifyRequest, reply: FastifyReply) => { + await seedEvalSuites(sql); + return reply.send({ ok: true }); + }); + + // ─── run launcher ──────────────────────────────────────────────────────── + + app.post('/api/eval/run', async (req: FastifyRequest, reply: FastifyReply) => { + const body = req.body as Record; + const suiteId = body.suiteId as string; + const providerId = body.providerId as string; + const model = body.model as string; + const quant = (body.quant as string) ?? null; + + if (!suiteId || !providerId || !model) { + return reply.status(400).send({ error: 'suiteId, providerId, and model are required' }); + } + + const suite = await getEvalSuite(sql, suiteId); + if (!suite) { + return reply.status(404).send({ error: 'suite not found' }); + } + + const tasks = jsonbArray(suite.tasks); + const judgeModel = suite.judge_model; + const seq = fleet.hosts.get(providerId)?.seq ?? 0; + + // Start the eval run asynchronously. + void runEvalAsync( + { suiteId, providerId, model, quant, tasks, judgeModel }, + sql, + emitter, + seq, + app.log, + ); + + return reply.status(202).send({ status: 'queued', suiteId, providerId, model }); + }); + + // ─── runs listing ──────────────────────────────────────────────────────── + + app.get('/api/eval/runs', async (req: FastifyRequest, reply: FastifyReply) => { + const query = req.query as Record; + const runs = await listEvalRuns(sql, query.suiteId, query.providerId); + return reply.send({ + runs: runs.map((r) => ({ + id: r.id, + suiteId: r.suite_id, + jobType: r.job_type, + providerId: r.provider_id, + model: r.model, + quant: r.quant, + status: r.status, + judgeModel: r.judge_model, + startedAt: r.started_at, + finishedAt: r.finished_at, + totalTasks: r.total_tasks, + completedTasks: r.completed_tasks, + aggregate: jsonbObject(r.aggregate), + error: r.error, + createdAt: r.created_at, + })), + }); + }); + + app.get('/api/eval/runs/:id', async (req: FastifyRequest, reply: FastifyReply) => { + const { id } = req.params as { id: string }; + const runs = await listEvalRuns(sql); + const run = runs.find((r) => r.id === id); + if (!run) { + return reply.status(404).send({ error: 'run not found' }); + } + + const results = await getEvalResults(sql, id); + + return reply.send({ + run: { + id: run.id, + suiteId: run.suite_id, + jobType: run.job_type, + providerId: run.provider_id, + model: run.model, + quant: run.quant, + status: run.status, + judgeModel: run.judge_model, + startedAt: run.started_at, + finishedAt: run.finished_at, + totalTasks: run.total_tasks, + completedTasks: run.completed_tasks, + aggregate: jsonbObject(run.aggregate), + error: run.error, + createdAt: run.created_at, + }, + results: results.map((r) => ({ + id: r.id, + taskId: r.task_id, + taskIndex: r.task_index, + score: r.score, + maxScore: r.max_score, + rationale: r.rationale, + sandboxExitCode: r.sandbox_exit_code, + sandboxStderr: r.sandbox_stderr, + sandboxStdout: r.sandbox_stdout, + executionMs: r.execution_ms, + error: r.error, + })), + }); + }); + + // ─── leaderboard ───────────────────────────────────────────────────────── + + app.get('/api/eval/leaderboard', async (req: FastifyRequest, reply: FastifyReply) => { + const query = req.query as Record; + const kind = query.kind as 'chat' | 'code' | undefined; + + // Aggregate scores per (provider_id, model) from completed eval_runs. + const rows = await sql<{ + provider_id: string; + model: string; + quant: string | null; + suite_kind: string; + avg_score: number; + run_count: number; + latest_run_at: string; + }[]>` + SELECT + er.provider_id, + er.model, + er.quant, + es.kind AS suite_kind, + AVG(CASE WHEN er.aggregate IS NOT NULL THEN (er.aggregate::jsonb ->> 'avgScore')::float ELSE NULL END) AS avg_score, + COUNT(DISTINCT er.id) AS run_count, + MAX(er.finished_at) AS latest_run_at + FROM eval_runs er + JOIN eval_suites es ON er.suite_id = es.id + WHERE er.status = 'completed' + ${kind ? sql`AND es.kind = ${kind}` : sql`AND 1=1`} + GROUP BY er.provider_id, er.model, er.quant, es.kind + ORDER BY avg_score DESC NULLS LAST + `; + + return reply.send({ + leaderboard: rows.map((r) => ({ + providerId: r.provider_id, + model: r.model, + quant: r.quant, + suiteKind: r.suite_kind, + avgScore: r.avg_score, + runCount: r.run_count, + latestRunAt: r.latest_run_at, + })), + }); + }); +} + +/** + * Async eval runner: fire-and-forget. + * Delegates to judge runner (chat) or sandbox runner (code). + */ +async function runEvalAsync( + params: { + suiteId: string; + providerId: string; + model: string; + quant: string | null; + tasks: unknown[]; + judgeModel: string | null; + }, + sql: Sql, + emitter: DeltaEmitter, + seq: number, + logger: import('fastify').FastifyBaseLogger, +): Promise { + const { suiteId, providerId, model, quant, tasks, judgeModel } = params; + const runId = `eval_${Date.now()}_${crypto.randomUUID().slice(0, 8)}`; + + try { + await sql` + INSERT INTO eval_runs (id, suite_id, job_type, provider_id, model, quant, status, judge_model, started_at, total_tasks) + VALUES (${runId}, ${suiteId}, 'eval', ${providerId}, ${model}, ${quant}, 'running', ${judgeModel}, clock_timestamp(), ${tasks.length}) + `; + + emitter.publish({ + type: 'control_job' as const, + seq, + jobType: 'eval' as const, + jobId: runId, + status: 'running' as const, + detail: { suiteId, providerId, model, totalTasks: tasks.length }, + }); + + // Import runners dynamically to avoid circular deps. + const suiteKind = tasks[0] as Record; + const isCodeSuite = !!(suiteKind && suiteKind.test_code); + + let completed = 0; + let error: string | null = null; + + if (isCodeSuite) { + const { runCodeEval } = await import('../services/sandbox-runner.js'); + const result = await runCodeEval( + { runId, providerId, model, tasks: tasks as Array>, quant }, + sql, + emitter, + seq, + (progress) => { + completed = progress.completedTasks; + }, + ); + if (result.error) error = result.error; + } else { + const { runJudgeEval } = await import('../services/judge-runner.js'); + const result = await runJudgeEval( + { runId, providerId, model, tasks: tasks as Array>, judgeModel, quant }, + sql, + emitter, + seq, + logger, + (progress) => { + completed = progress.completedTasks; + }, + ); + if (result.error) error = result.error; + } + + // Compute aggregate. + const results = await sql<{ score: number | null; max_score: number | null }[]>` + SELECT score, max_score FROM eval_results WHERE run_id = ${runId} + `; + const scores = results.map((r) => r.score).filter((s): s is number => s != null); + const avgScore = scores.length ? scores.reduce((a, b) => a + b, 0) / scores.length : null; + + await sql` + UPDATE eval_runs + SET status = ${error ? 'failed' : 'completed'}, + finished_at = clock_timestamp(), + completed_tasks = ${completed}, + aggregate = ${avgScore != null ? sql.json({ avgScore, totalTasks: tasks.length, passedTasks: scores.filter((s, i) => { const m = results[i]?.max_score; return m ? s / m >= 0.7 : s != null; }).length } as never) : sql`NULL::jsonb`}, + error = ${error} + WHERE id = ${runId} + `; + + emitter.publish({ + type: 'control_job' as const, + seq, + jobType: 'eval' as const, + jobId: runId, + status: error ? 'failed' as const : 'completed' as const, + detail: { avgScore, error }, + }); + } catch (err) { + const msg = (err as Error).message ?? String(err); + logger.error({ err: msg }, 'eval: run failed'); + + await sql` + UPDATE eval_runs + SET status = 'failed', finished_at = clock_timestamp(), error = ${msg} + WHERE id = ${runId} + `.catch(() => {}); + + emitter.publish({ + type: 'control_job' as const, + seq, + jobType: 'eval' as const, + jobId: runId, + status: 'failed' as const, + detail: { error: msg }, + }); + } +} diff --git a/apps/control/src/routes/gateway.ts b/apps/control/src/routes/gateway.ts new file mode 100644 index 0000000..0f28752 --- /dev/null +++ b/apps/control/src/routes/gateway.ts @@ -0,0 +1,205 @@ +import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify'; +import type { Sql } from '../db.js'; +import type { FleetState } from '../services/fleet-state.js'; +import type { DeltaEmitter } from '../index.js'; +import { + VIRTUAL_MODELS, + resolveCandidates, + splitComposite, +} from '../services/gateway.js'; +import { resolveProviderBaseUrl } from '../services/llama-providers.js'; + +/** + * P7.1: OpenAI-compatible auto:* gateway. + * + * BooChat reaches this server directly (registry baseUrl), NOT through the + * /api/control proxy, so streaming works end to end. Endpoints mirror the + * llama-swap wire surface BooChat's provider adapter expects: + * + * GET /v1/models — advertise the virtual models + * POST /v1/chat/completions — resolve a policy, dispatch with failover + * GET /upstream/:model/props — props for getModelContext (best candidate) + * + * Every dispatch forwards X-Boo-Source to the chosen target so attribution + * survives the extra hop, and is recorded in route_dispatch_log. + */ +export function registerGatewayRoutes( + app: FastifyInstance, + sql: Sql, + fleet: FleetState, + _emitter: DeltaEmitter, +): void { + // ─── model catalog ─────────────────────────────────────────────────────── + + app.get('/v1/models', async (_req: FastifyRequest, reply: FastifyReply) => { + return reply.send({ + object: 'list', + data: VIRTUAL_MODELS.map((id) => ({ + id, + object: 'model', + created: 0, + owned_by: 'boocontrol-gateway', + })), + }); + }); + + // ─── props (for getModelContext) ───────────────────────────────────────── + // Resolve candidates and proxy the first healthy candidate's props so the + // caller can read default_generation_settings.n_ctx. + + app.get('/upstream/:model/props', async (req: FastifyRequest, reply: FastifyReply) => { + const { model } = req.params as { model: string }; + const { candidates } = await resolveCandidates(sql, fleet, model); + + for (const compositeId of candidates) { + const split = splitComposite(compositeId); + if (!split) continue; + const baseUrl = resolveProviderBaseUrl(split.providerId); + if (!baseUrl) continue; + try { + const url = `${baseUrl.replace(/\/+$/, '')}/upstream/${encodeURIComponent(split.model)}/props`; + const res = await fetch(url, { signal: AbortSignal.timeout(5_000) }); + if (!res.ok) continue; + const body = await res.json(); + return reply.send(body); + } catch { + continue; + } + } + return reply.status(503).send({ error: 'no healthy candidate for virtual model', model }); + }); + + // ─── chat completions (dispatch with failover) ─────────────────────────── + + app.post('/v1/chat/completions', async (req: FastifyRequest, reply: FastifyReply) => { + const body = req.body as Record; + const requestedModel = body?.model as string | undefined; + if (!requestedModel) { + return reply.status(400).send({ error: { message: 'model is required' } }); + } + + const source = (req.headers['x-boo-source'] as string | undefined) ?? null; + const stream = body.stream === true; + const { virtualModel, candidates } = await resolveCandidates(sql, fleet, requestedModel); + + if (candidates.length === 0) { + await logDispatch(sql, { virtualModel, chosen: null, tried: [], status: 'no_candidates', source, error: 'no healthy candidates', durationMs: 0 }); + return reply.status(503).send({ + error: { message: `routing gateway: no healthy candidate for ${virtualModel}`, type: 'gateway_error' }, + }); + } + + const tried: string[] = []; + const startedAt = Date.now(); + + for (const compositeId of candidates) { + const split = splitComposite(compositeId); + if (!split) continue; + const baseUrl = resolveProviderBaseUrl(split.providerId); + if (!baseUrl) continue; + tried.push(compositeId); + + const upstreamHeaders: Record = { 'Content-Type': 'application/json' }; + if (source) upstreamHeaders['X-Boo-Source'] = source; + + const upstreamBody = JSON.stringify({ ...body, model: split.model }); + + try { + const res = await fetch(`${baseUrl.replace(/\/+$/, '')}/v1/chat/completions`, { + method: 'POST', + headers: upstreamHeaders, + body: upstreamBody, + signal: AbortSignal.timeout(300_000), + }); + + if (!res.ok) { + // HTTP error before body — eligible for failover to the next candidate. + continue; + } + + // Success: dispatch chosen. Log and stream/return through. + await logDispatch(sql, { + virtualModel, + chosen: compositeId, + tried, + status: 'dispatched', + source, + error: null, + durationMs: Date.now() - startedAt, + }); + + if (stream) { + reply.header('Content-Type', 'text/event-stream'); + reply.header('Cache-Control', 'no-cache'); + reply.header('Connection', 'keep-alive'); + reply.raw.writeHead(200); + const reader = res.body?.getReader(); + if (!reader) { + reply.raw.end(); + return; + } + const decoder = new TextDecoder(); + try { + while (true) { + const { done, value } = await reader.read(); + if (done) break; + reply.raw.write(decoder.decode(value, { stream: true })); + } + } finally { + reply.raw.end(); + } + return; + } + + // Non-streaming: pass JSON through. + const json = await res.json(); + return reply.send(json); + } catch { + // Connection error — failover to the next candidate. + continue; + } + } + + // All candidates exhausted. + await logDispatch(sql, { + virtualModel, + chosen: null, + tried, + status: 'failed', + source, + error: 'all candidates failed', + durationMs: Date.now() - startedAt, + }); + return reply.status(502).send({ + error: { message: `routing gateway: all candidates failed for ${virtualModel}`, type: 'gateway_error' }, + }); + }); +} + +async function logDispatch( + sql: Sql, + entry: { + virtualModel: string; + chosen: string | null; + tried: string[]; + status: string; + source: string | null; + error: string | null; + durationMs: number; + }, +): Promise { + const split = entry.chosen ? splitComposite(entry.chosen) : null; + await sql` + INSERT INTO route_dispatch_log (virtual_model, chosen_provider_id, chosen_model, candidates_tried, status, source, error, duration_ms) + VALUES ( + ${entry.virtualModel}, + ${split?.providerId ?? null}, + ${split?.model ?? null}, + ${sql.json(entry.tried as never)}, + ${entry.status}, + ${entry.source}, + ${entry.error}, + ${entry.durationMs} + ) + `.catch(() => { /* logging must never break dispatch */ }); +} diff --git a/apps/control/src/routes/playground.ts b/apps/control/src/routes/playground.ts new file mode 100644 index 0000000..08022a4 --- /dev/null +++ b/apps/control/src/routes/playground.ts @@ -0,0 +1,235 @@ +import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify'; +import { getLlamaProviders, resolveProviderBaseUrl } from '../services/llama-providers.js'; + +/** + * Playground routes: model select, param controls, streaming chat. + * + * GET /api/playground/models — list available models from providers + * POST /api/playground/chat — streaming chat against a model + * POST /api/playground/chat-ab — side-by-side A/B compare + */ +export function registerPlaygroundRoutes( + app: FastifyInstance, +): void { + // ─── model catalog ─────────────────────────────────────────────────────── + + app.get('/api/playground/models', async (_req: FastifyRequest, reply: FastifyReply) => { + // Resolve provider URLs from the loaded registry. + const registry = getLlamaProviders(); + const providers = registry.providers.map((p) => ({ + id: p.id, + baseUrl: p.baseUrl, + })); + + const results = await Promise.allSettled( + providers.map(async (p) => { + try { + const res = await fetch(`${p.baseUrl}/v1/models`, { + signal: AbortSignal.timeout(5_000), + }); + if (!res.ok) return null; + const data = await res.json() as { data?: Array<{ id: string }> }; + return { + providerId: p.id, + models: data?.data?.map((m) => m.id) ?? [], + }; + } catch { + return null; + } + }), + ); + + const models: Array<{ providerId: string; models: string[] }> = []; + for (const r of results) { + if (r.status === 'fulfilled' && r.value) { + models.push(r.value); + } + } + + return reply.send({ models }); + }); + + // ─── streaming chat ────────────────────────────────────────────────────── + + app.post('/api/playground/chat', async (req: FastifyRequest, reply: FastifyReply) => { + const body = req.body as Record; + const providerId = body.providerId as string; + const model = body.model as string; + const messages = body.messages as Array<{ role: string; content: string }>; + const temperature = (body.temperature as number) ?? 0.7; + const topP = (body.topP as number) ?? 0.9; + const maxTokens = (body.maxTokens as number) ?? 1024; + + if (!providerId || !model || !messages?.length) { + return reply.status(400).send({ error: 'providerId, model, and messages are required' }); + } + + const baseUrl = resolveProviderBaseUrl(providerId); + if (!baseUrl) { + return reply.status(400).send({ error: `unknown provider: ${providerId}` }); + } + + // Stream the response back to the client via SSE. + reply.header('Content-Type', 'text/event-stream'); + reply.header('Cache-Control', 'no-cache'); + reply.header('Connection', 'keep-alive'); + reply.raw.writeHead(200); + + try { + const res = await fetch(`${baseUrl}/v1/chat/completions`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + model, + messages, + temperature, + top_p: topP, + max_tokens: maxTokens, + stream: true, + }), + signal: AbortSignal.timeout(120_000), + }); + + if (!res.ok) { + const errBody = await res.text().catch(() => ''); + reply.raw.write(`data: ${JSON.stringify({ error: `Request failed: ${res.status} ${errBody.slice(0, 200)}` })}\n\n`); + reply.raw.end(); + return; + } + + const reader = res.body?.getReader(); + if (!reader) { + reply.raw.write('data: {"error": "No response body"}\n\n'); + reply.raw.end(); + return; + } + + const decoder = new TextDecoder(); + let buffer = ''; + + while (true) { + const { done, value } = await reader.read(); + if (done) break; + + buffer += decoder.decode(value, { stream: true }); + const lines = buffer.split('\n'); + buffer = lines.pop() ?? ''; + + for (const line of lines) { + const trimmed = line.trim(); + if (!trimmed) continue; + if (trimmed === 'data: [DONE]') { + reply.raw.write('data: [DONE]\n\n'); + continue; + } + // N3: pass through the raw SSE line from upstream as-is. + // If it already has 'data: ' prefix, don't double-prefix. + const payload = trimmed.startsWith('data: ') ? trimmed : `data: ${trimmed}`; + reply.raw.write(`${payload}\n\n`); + } + } + + reply.raw.write('data: [DONE]\n\n'); + } catch (err) { + const msg = (err as Error).message ?? String(err); + reply.raw.write(`data: ${JSON.stringify({ error: msg })}\n\n`); + } finally { + reply.raw.end(); + } + }); + + // ─── A/B compare ───────────────────────────────────────────────────────── + + app.post('/api/playground/chat-ab', async (req: FastifyRequest, reply: FastifyReply) => { + const body = req.body as Record; + const providerIdA = body.providerIdA as string; + const modelA = body.modelA as string; + const providerIdB = body.providerIdB as string; + const modelB = body.modelB as string; + const messages = body.messages as Array<{ role: string; content: string }>; + const temperature = (body.temperature as number) ?? 0.7; + const topP = (body.topP as number) ?? 0.9; + const maxTokens = (body.maxTokens as number) ?? 1024; + + if (!providerIdA || !modelA || !providerIdB || !modelB || !messages?.length) { + return reply.status(400).send({ error: 'Both models and messages are required' }); + } + + const baseUrlA = resolveProviderBaseUrl(providerIdA); + const baseUrlB = resolveProviderBaseUrl(providerIdB); + + if (!baseUrlA || !baseUrlB) { + return reply.status(400).send({ error: 'One or both providers unknown' }); + } + + // Stream both responses via SSE with lane identifiers. + reply.header('Content-Type', 'text/event-stream'); + reply.header('Cache-Control', 'no-cache'); + reply.header('Connection', 'keep-alive'); + reply.raw.writeHead(200); + + const streamModel = async (lane: 'A' | 'B', baseUrl: string, model: string) => { + try { + const res = await fetch(`${baseUrl}/v1/chat/completions`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + model, + messages, + temperature, + top_p: topP, + max_tokens: maxTokens, + stream: true, + }), + signal: AbortSignal.timeout(120_000), + }); + + if (!res.ok) { + const errBody = await res.text().catch(() => ''); + reply.raw.write(`data: ${JSON.stringify({ lane, error: `Request failed: ${res.status}` })}\n\n`); + return; + } + + const reader = res.body?.getReader(); + if (!reader) return; + + const decoder = new TextDecoder(); + let buffer = ''; + + while (true) { + const { done, value } = await reader.read(); + if (done) break; + + buffer += decoder.decode(value, { stream: true }); + const lines = buffer.split('\n'); + buffer = lines.pop() ?? ''; + + for (const line of lines) { + const trimmed = line.trim(); + if (!trimmed) continue; + if (trimmed === 'data: [DONE]') { + reply.raw.write(`data: ${JSON.stringify({ lane, done: true })}\n\n`); + continue; + } + // N3: strip 'data: ' prefix from upstream before re-wrapping with lane info. + const payload = trimmed.startsWith('data: ') ? trimmed.slice(6) : trimmed; + reply.raw.write(`data: ${JSON.stringify({ lane, raw: payload })}\n\n`); + } + } + + reply.raw.write(`data: ${JSON.stringify({ lane, done: true })}\n\n`); + } catch (err) { + const msg = (err as Error).message ?? String(err); + reply.raw.write(`data: ${JSON.stringify({ lane, error: msg })}\n\n`); + } + }; + + // Run both streams concurrently. + await Promise.all([ + streamModel('A', baseUrlA, modelA), + streamModel('B', baseUrlB, modelB), + ]); + + reply.raw.end(); + }); +} \ No newline at end of file diff --git a/apps/control/src/routes/policies.ts b/apps/control/src/routes/policies.ts new file mode 100644 index 0000000..ed53e18 --- /dev/null +++ b/apps/control/src/routes/policies.ts @@ -0,0 +1,136 @@ +import { randomUUID } from 'node:crypto'; +import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify'; +import type { Sql } from '../db.js'; +import { VIRTUAL_MODELS } from '../services/gateway.js'; +import { jsonbStringArray } from '../services/jsonb.js'; + +/** + * P7.4: Route policy CRUD + dispatch log. + * + * GET /api/policies — list policies + * POST /api/policies — create/update a policy (upsert by virtual_model) + * DELETE /api/policies/:id — delete a policy + * GET /api/policies/dispatch-log — recent gateway dispatches + * GET /api/policies/virtual-models — the available virtual model tokens + */ +export function registerPolicyRoutes(app: FastifyInstance, sql: Sql): void { + app.get('/api/policies/virtual-models', async (_req: FastifyRequest, reply: FastifyReply) => { + return reply.send({ virtualModels: VIRTUAL_MODELS }); + }); + + app.get('/api/policies', async (_req: FastifyRequest, reply: FastifyReply) => { + const rows = await sql<{ + id: string; + name: string; + virtual_model: string; + candidates: string; + fallback: string | null; + enabled: boolean; + created_at: string; + updated_at: string; + }[]>` + SELECT id, name, virtual_model, candidates, fallback, enabled, created_at, updated_at + FROM route_policies + ORDER BY virtual_model + `; + return reply.send({ + policies: rows.map((r) => ({ + id: r.id, + name: r.name, + virtualModel: r.virtual_model, + candidates: safeParseArray(r.candidates), + fallback: r.fallback, + enabled: r.enabled, + createdAt: r.created_at, + updatedAt: r.updated_at, + })), + }); + }); + + app.post('/api/policies', async (req: FastifyRequest, reply: FastifyReply) => { + const body = req.body as Record; + const id = (body.id as string) ?? randomUUID(); + const name = body.name as string; + const virtualModel = body.virtualModel as string; + const candidates = body.candidates as unknown; + const fallback = (body.fallback as string) ?? null; + const enabled = body.enabled !== false; + + if (!name || !virtualModel) { + return reply.status(400).send({ error: 'name and virtualModel are required' }); + } + if (!(VIRTUAL_MODELS as readonly string[]).includes(virtualModel)) { + return reply.status(400).send({ error: `virtualModel must be one of ${VIRTUAL_MODELS.join(', ')}` }); + } + const candidateList = Array.isArray(candidates) + ? candidates.filter((c): c is string => typeof c === 'string') + : []; + + // Upsert by virtual_model (UNIQUE) so there is one policy per virtual model. + await sql` + INSERT INTO route_policies (id, name, virtual_model, candidates, fallback, enabled, updated_at) + VALUES (${id}, ${name}, ${virtualModel}, ${sql.json(candidateList as never)}, ${fallback}, ${enabled}, clock_timestamp()) + ON CONFLICT (virtual_model) DO UPDATE SET + name = EXCLUDED.name, + candidates = EXCLUDED.candidates, + fallback = EXCLUDED.fallback, + enabled = EXCLUDED.enabled, + updated_at = clock_timestamp() + `; + return reply.status(201).send({ id }); + }); + + app.delete('/api/policies/:id', async (req: FastifyRequest, reply: FastifyReply) => { + const { id } = req.params as { id: string }; + await sql`DELETE FROM route_policies WHERE id = ${id}`; + return reply.send({ ok: true }); + }); + + app.get('/api/policies/dispatch-log', async (req: FastifyRequest, reply: FastifyReply) => { + const query = req.query as Record; + const virtualModel = query.virtualModel; + + const rows = virtualModel + ? await sql` + SELECT id, ts, virtual_model, chosen_provider_id, chosen_model, candidates_tried, status, source, error, duration_ms + FROM route_dispatch_log WHERE virtual_model = ${virtualModel} + ORDER BY ts DESC LIMIT 200 + ` + : await sql` + SELECT id, ts, virtual_model, chosen_provider_id, chosen_model, candidates_tried, status, source, error, duration_ms + FROM route_dispatch_log + ORDER BY ts DESC LIMIT 200 + `; + + return reply.send({ + dispatches: rows.map((r) => ({ + id: r.id, + ts: r.ts, + virtualModel: r.virtual_model, + chosenProviderId: r.chosen_provider_id, + chosenModel: r.chosen_model, + candidatesTried: safeParseArray(r.candidates_tried), + status: r.status, + source: r.source, + error: r.error, + durationMs: r.duration_ms, + })), + }); + }); +} + +interface DispatchLogRow { + id: number; + ts: string; + virtual_model: string; + chosen_provider_id: string | null; + chosen_model: string | null; + candidates_tried: unknown; + status: string; + source: string | null; + error: string | null; + duration_ms: number | null; +} + +// jsonb columns come back parsed from porsager; jsonbStringArray tolerates both. +const safeParseArray = jsonbStringArray; diff --git a/apps/control/src/routes/reports.ts b/apps/control/src/routes/reports.ts new file mode 100644 index 0000000..318b5de --- /dev/null +++ b/apps/control/src/routes/reports.ts @@ -0,0 +1,122 @@ +import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyBaseLogger } from 'fastify'; +import type { Sql } from '../db.js'; +import { generateReport, runReportSchedulerTick } from '../services/reports.js'; +import { jsonbObject } from '../services/jsonb.js'; + +/** + * P6.2: Reports tab API + scheduled digest. + * + * GET /api/reports — list generated reports (newest first) + * GET /api/reports/:id — single report (markdown + stats) + * POST /api/reports/generate — manually trigger a digest now + * GET /api/reports/schedule — current schedule meta + * POST /api/reports/schedule — update schedule meta {interval, enabled} + */ +export function registerReportRoutes(app: FastifyInstance, sql: Sql): void { + app.get('/api/reports', async (_req: FastifyRequest, reply: FastifyReply) => { + const rows = await sql<{ + id: string; + kind: string; + interval: string; + period_start: string; + period_end: string; + created_at: string; + }[]>` + SELECT id, kind, interval, period_start, period_end, created_at + FROM control_reports + ORDER BY created_at DESC + LIMIT 100 + `; + return reply.send({ + reports: rows.map((r) => ({ + id: r.id, + kind: r.kind, + interval: r.interval, + periodStart: r.period_start, + periodEnd: r.period_end, + createdAt: r.created_at, + })), + }); + }); + + app.get('/api/reports/:id', async (req: FastifyRequest, reply: FastifyReply) => { + const { id } = req.params as { id: string }; + const rows = await sql<{ + id: string; + kind: string; + interval: string; + period_start: string; + period_end: string; + markdown: string; + stats: unknown; + created_at: string; + }[]>` + SELECT id, kind, interval, period_start, period_end, markdown, stats, created_at + FROM control_reports WHERE id = ${id} + `; + if (rows.length === 0) { + return reply.status(404).send({ error: 'report not found' }); + } + const r = rows[0]!; + return reply.send({ + id: r.id, + kind: r.kind, + interval: r.interval, + periodStart: r.period_start, + periodEnd: r.period_end, + markdown: r.markdown, + stats: jsonbObject(r.stats), + createdAt: r.created_at, + }); + }); + + app.post('/api/reports/generate', async (req: FastifyRequest, reply: FastifyReply) => { + const body = (req.body as Record) ?? {}; + const interval = body.interval === 'weekly' ? 'weekly' : 'daily'; + const id = await generateReport(sql, interval); + return reply.status(201).send({ id }); + }); + + app.get('/api/reports/schedule', async (_req: FastifyRequest, reply: FastifyReply) => { + const rows = await sql<{ interval: string; enabled: boolean; last_run_at: string | null }[]>` + SELECT interval, enabled, last_run_at FROM control_schedule_meta WHERE name = 'report-digest' + `; + const m = rows[0]; + return reply.send({ + interval: m?.interval ?? 'daily', + enabled: m?.enabled ?? true, + lastRunAt: m?.last_run_at ?? null, + }); + }); + + app.post('/api/reports/schedule', async (req: FastifyRequest, reply: FastifyReply) => { + const body = (req.body as Record) ?? {}; + const interval = body.interval === 'weekly' ? 'weekly' : 'daily'; + const enabled = body.enabled !== false; + await sql` + UPDATE control_schedule_meta + SET interval = ${interval}, enabled = ${enabled} + WHERE name = 'report-digest' + `; + return reply.send({ interval, enabled }); + }); +} + +/** + * Start the in-process report scheduler: an immediate catch-up tick on boot, + * then hourly. Returns a stop function for onClose. + */ +export function startReportScheduler(sql: Sql, log: FastifyBaseLogger): () => void { + const tick = async () => { + try { + const result = await runReportSchedulerTick(sql); + if (result.ran) log.info({ reportId: result.reportId }, 'reports: digest generated'); + } catch (err) { + log.warn({ err: (err as Error).message }, 'reports: scheduler tick failed'); + } + }; + // Catch-up on boot. + void tick(); + const timer = setInterval(tick, 3600_000); // hourly + return () => clearInterval(timer); +} diff --git a/apps/control/src/routes/routing.ts b/apps/control/src/routes/routing.ts new file mode 100644 index 0000000..77cb27c --- /dev/null +++ b/apps/control/src/routes/routing.ts @@ -0,0 +1,32 @@ +import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify'; +import type { Sql } from '../db.js'; +import type { FleetState } from '../services/fleet-state.js'; +import { computeRoutingScores, BADGE_LABELS } from '../services/routing-scores.js'; + +/** + * P6.1: Advisory routing scores. + * + * GET /api/routing/scores — per (provider_id, model) advisory scores + badges. + * Surfaced as model-picker badges in BooChat. Advisory only; no enforcement. + */ +export function registerRoutingRoutes( + app: FastifyInstance, + sql: Sql, + fleet: FleetState, +): void { + app.get('/api/routing/scores', async (_req: FastifyRequest, reply: FastifyReply) => { + const scores = await computeRoutingScores(sql, fleet); + + // Map of compositeId -> badge kinds, for cheap picker lookup. + const badges: Record = {}; + for (const s of scores) { + if (s.badges.length > 0) badges[s.compositeId] = s.badges; + } + + return reply.send({ + scores, + badges, + badgeLabels: BADGE_LABELS, + }); + }); +} diff --git a/apps/control/src/routes/ssh-config.ts b/apps/control/src/routes/ssh-config.ts new file mode 100644 index 0000000..5117bd8 --- /dev/null +++ b/apps/control/src/routes/ssh-config.ts @@ -0,0 +1,262 @@ +import { readFileSync } from 'node:fs'; +import { randomUUID } from 'node:crypto'; +import { fileURLToPath } from 'node:url'; +import { dirname, resolve } from 'node:path'; +import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify'; +import type { Sql } from '../db.js'; +import type { Config } from '../config.js'; +import type { FleetState } from '../services/fleet-state.js'; +import type { DeltaEmitter } from '../index.js'; +import { resolveProviderBaseUrl } from '../services/llama-providers.js'; +import { + validateLlamaConfig, + computeDiff, + readRemoteConfig, + applyRemoteConfig, + sshExec, + type SshTarget, + type SshExec, + type SshMode, +} from '../services/ssh-config.js'; +import { runModelPull, validateRepoId } from '../services/model-pull.js'; + +/** + * P9.1: SSH config editor for llama-swap hosts. + * + * GET /api/hosts — list control_hosts with SSH config status + * PATCH /api/hosts/:id — set ssh_host/ssh_user/ssh_key_path/config_path/restart_cmd + * GET /api/hosts/:id/config — SSH read the remote config + * POST /api/hosts/:id/config/validate — validate a candidate config (no host touch) + * POST /api/hosts/:id/config/diff — diff a candidate vs the live remote config + * POST /api/hosts/:id/config/apply — validate -> backup -> write -> restart -> health-wait + * POST /api/hosts/:id/pull — pull a HuggingFace model (non-blocking job) + * + * `exec` is injectable for tests; production uses the real `sshExec` (spawn ssh). + */ +export function registerSshConfigRoutes( + app: FastifyInstance, + sql: Sql, + config: Config, + fleet: FleetState, + emitter: DeltaEmitter, + exec: SshExec = sshExec, +): void { + const schema = loadConfigSchema(config); + + app.get('/api/hosts', async (_req: FastifyRequest, reply: FastifyReply) => { + const rows = await sql` + SELECT provider_id, ssh_host, ssh_user, ssh_key_path, config_path, restart_cmd, ssh_mode, os, gpu_label, enabled + FROM control_hosts ORDER BY provider_id + `; + return reply.send({ + hosts: rows.map((r) => ({ + providerId: r.provider_id, + sshHost: r.ssh_host, + sshUser: r.ssh_user, + sshKeyPath: r.ssh_key_path, + configPath: r.config_path, + restartCmd: r.restart_cmd, + sshMode: r.ssh_mode ?? 'shell', + os: r.os, + gpuLabel: r.gpu_label, + enabled: r.enabled, + sshConfigured: !!(r.ssh_host && r.ssh_user && r.ssh_key_path && r.config_path), + })), + }); + }); + + app.patch('/api/hosts/:id', async (req: FastifyRequest, reply: FastifyReply) => { + const { id } = req.params as { id: string }; + const body = (req.body as Record) ?? {}; + const sshHost = (body.sshHost as string) ?? null; + const sshUser = (body.sshUser as string) ?? null; + const sshKeyPath = (body.sshKeyPath as string) ?? null; + const configPath = (body.configPath as string) ?? null; + const restartCmd = (body.restartCmd as string) ?? null; + const sshMode: SshMode = body.sshMode === 'wrapper' ? 'wrapper' : 'shell'; + + const rows = await sql` + UPDATE control_hosts + SET ssh_host = ${sshHost}, ssh_user = ${sshUser}, ssh_key_path = ${sshKeyPath}, + config_path = ${configPath}, restart_cmd = ${restartCmd}, ssh_mode = ${sshMode} + WHERE provider_id = ${id} + RETURNING provider_id + `; + if (rows.length === 0) { + return reply.status(404).send({ error: 'host not found' }); + } + return reply.send({ ok: true }); + }); + + app.get('/api/hosts/:id/config', async (req: FastifyRequest, reply: FastifyReply) => { + const { id } = req.params as { id: string }; + const host = await loadHost(sql, id); + if (!host) return reply.status(404).send({ error: 'host not found' }); + const target = sshTargetOf(host); + if (!target || !host.config_path) { + return reply.status(400).send({ error: 'host has no SSH config configured (set ssh_host/ssh_user/ssh_key_path/config_path first)' }); + } + try { + const content = await readRemoteConfig(target, host.config_path, exec, hostMode(host)); + return reply.send({ configPath: host.config_path, content }); + } catch (err) { + return reply.status(502).send({ error: (err as Error).message }); + } + }); + + app.post('/api/hosts/:id/config/validate', async (req: FastifyRequest, reply: FastifyReply) => { + const body = (req.body as Record) ?? {}; + const content = body.content as string; + if (typeof content !== 'string') { + return reply.status(400).send({ error: 'content (string) is required' }); + } + if (!schema) { + return reply.status(500).send({ error: 'config schema not available on this host' }); + } + const result = validateLlamaConfig(content, schema); + return reply.send({ valid: result.valid, errors: result.errors }); + }); + + app.post('/api/hosts/:id/config/diff', async (req: FastifyRequest, reply: FastifyReply) => { + const { id } = req.params as { id: string }; + const body = (req.body as Record) ?? {}; + const content = body.content as string; + if (typeof content !== 'string') { + return reply.status(400).send({ error: 'content (string) is required' }); + } + const host = await loadHost(sql, id); + if (!host) return reply.status(404).send({ error: 'host not found' }); + const target = sshTargetOf(host); + if (!target || !host.config_path) { + return reply.status(400).send({ error: 'host has no SSH config configured' }); + } + try { + const current = await readRemoteConfig(target, host.config_path, exec, hostMode(host)); + return reply.send({ diff: computeDiff(current, content) }); + } catch (err) { + return reply.status(502).send({ error: (err as Error).message }); + } + }); + + app.post('/api/hosts/:id/config/apply', async (req: FastifyRequest, reply: FastifyReply) => { + const { id } = req.params as { id: string }; + const body = (req.body as Record) ?? {}; + const content = body.content as string; + const confirm = body.confirm === true; + if (typeof content !== 'string') { + return reply.status(400).send({ error: 'content (string) is required' }); + } + if (!confirm) { + return reply.status(409).send({ error: 'apply requires confirmation', requiresConfirmation: true }); + } + if (!schema) { + return reply.status(500).send({ error: 'config schema not available on this host' }); + } + const host = await loadHost(sql, id); + if (!host) return reply.status(404).send({ error: 'host not found' }); + const target = sshTargetOf(host); + const mode = hostMode(host); + // restart_cmd is only used in shell mode; in wrapper mode the wrapper's + // `restart` verb hardcodes the service, so restart_cmd is not required. + if (!target || !host.config_path || (mode === 'shell' && !host.restart_cmd)) { + return reply.status(400).send({ error: 'host needs ssh_host/ssh_user/ssh_key_path/config_path (+ restart_cmd in shell mode) set first' }); + } + const baseUrl = resolveProviderBaseUrl(id); + if (!baseUrl) { + return reply.status(400).send({ error: `no base URL in registry for provider ${id}` }); + } + + const result = await applyRemoteConfig({ + target, + configPath: host.config_path, + restartCmd: host.restart_cmd ?? '', + newConfig: content, + schema, + baseUrl, + exec, + mode, + }); + + const status = result.ok ? 200 : (result.step === 'validate' ? 400 : 502); + return reply.status(status).send(result); + }); + + // ─── model pull (non-blocking job) ───────────────────────────────────────── + app.post('/api/hosts/:id/pull', async (req: FastifyRequest, reply: FastifyReply) => { + const { id } = req.params as { id: string }; + const body = (req.body as Record) ?? {}; + const repo = body.repo as string; + const modelsDir = (body.modelsDir as string) ?? undefined; + + if (typeof repo !== 'string' || !validateRepoId(repo)) { + return reply.status(400).send({ error: 'repo must be a valid HuggingFace id (org/name)' }); + } + const host = await loadHost(sql, id); + if (!host) return reply.status(404).send({ error: 'host not found' }); + const target = sshTargetOf(host); + if (!target) { + return reply.status(400).send({ error: 'host has no SSH configured' }); + } + const mode = hostMode(host); + if (mode === 'shell' && !modelsDir) { + return reply.status(400).send({ error: 'shell-mode host requires a modelsDir in the request body' }); + } + + const jobId = `pull_${Date.now()}_${randomUUID().slice(0, 8)}`; + const seq = fleet.hosts.get(id)?.seq ?? 0; + // Fire and forget; progress streams over control_job frames. + void runModelPull({ jobId, target, repo, mode, modelsDir }, exec, emitter, seq); + + return reply.status(202).send({ status: 'queued', jobId, repo }); + }); +} + +function hostMode(host: HostRow): SshMode { + return host.ssh_mode === 'wrapper' ? 'wrapper' : 'shell'; +} + +interface HostRow { + provider_id: string; + ssh_host: string | null; + ssh_user: string | null; + ssh_key_path: string | null; + config_path: string | null; + restart_cmd: string | null; + ssh_mode: string | null; + os: string | null; + gpu_label: string | null; + enabled: boolean; +} + +async function loadHost(sql: Sql, id: string): Promise { + const rows = await sql` + SELECT provider_id, ssh_host, ssh_user, ssh_key_path, config_path, restart_cmd, ssh_mode, os, gpu_label, enabled + FROM control_hosts WHERE provider_id = ${id} + `; + return rows[0] ?? null; +} + +function sshTargetOf(host: HostRow): SshTarget | null { + if (!host.ssh_host || !host.ssh_user || !host.ssh_key_path) return null; + return { host: host.ssh_host, user: host.ssh_user, keyPath: host.ssh_key_path }; +} + +/** Load the config schema from the configured path or the bundled copy. */ +function loadConfigSchema(config: Config): object | null { + const here = dirname(fileURLToPath(import.meta.url)); + // dist/routes/ssh-config.js -> dist/data/config-schema.json + const bundled = resolve(here, '../data/config-schema.json'); + const path = config.LLAMA_CONFIG_SCHEMA_PATH ?? bundled; + try { + return JSON.parse(readFileSync(path, 'utf8')); + } catch { + if (path !== bundled) { + try { + return JSON.parse(readFileSync(bundled, 'utf8')); + } catch { + return null; + } + } + return null; + } +} diff --git a/apps/control/src/routes/ws.ts b/apps/control/src/routes/ws.ts new file mode 100644 index 0000000..770bd3e --- /dev/null +++ b/apps/control/src/routes/ws.ts @@ -0,0 +1,109 @@ +import type { FastifyInstance } from 'fastify'; +import WebSocket from 'ws'; +import type { FleetState, HostState } from '../services/fleet-state.js'; +import type { DeltaEmitter } from '../index.js'; +import type { LogRelay } from '../services/log-relay.js'; + +/** + * WS endpoint: /api/ws/control + * + * On join: send snapshot carrying current fleet state + seqs. + * B6: After snapshot, replay in-memory log tail for late joiners. + * On delta: forward seq-stamped deltas to subscribers. + * + * Client rule: buffer pre-snapshot deltas, replay after snapshot applying only + * seq > snapshot_seq. On service restart, rebuild fleet state from DB before + * serving snapshots. + */ +export function registerControlWebSocket( + app: FastifyInstance, + fleet: FleetState, + emitter: DeltaEmitter, + logRelay: LogRelay | null = null, +): void { + app.get('/api/ws/control', { websocket: true }, (socket, req) => { + const fleetState = fleet; + const snapshot = buildSnapshot(fleetState); + + // B4 fix: send snapshot at top level matching ControlFleetFrame Zod schema. + const maxSeq = snapshot.hosts.reduce((max, h) => Math.max(max, h.seq), 0); + socket.send(JSON.stringify({ + type: 'control_fleet' as const, + seq: maxSeq, + hosts: snapshot.hosts, + })); + + // B6: Replay in-memory log tail for late joiners. + if (logRelay && socket.readyState === WebSocket.OPEN) { + const tails = logRelay.getAllTails(); + for (const entry of tails) { + socket.send(JSON.stringify({ + type: 'control_log' as const, + seq: maxSeq, // tail lines don't carry per-host seq; use snapshot seq + providerId: entry.providerId, + source: entry.source, + line: entry.line, + })); + } + } + + // B3 fix: subscribe to delta emitter so WS clients receive live updates. + const unsub = emitter.subscribe((delta: unknown) => { + if (socket.readyState === WebSocket.OPEN) { + socket.send(JSON.stringify(delta)); + } + }); + + const heartbeat = setInterval(() => { + if (socket.readyState !== WebSocket.OPEN) { + clearInterval(heartbeat); + return; + } + socket.send(JSON.stringify({ type: 'ping' as const })); + }, 30_000); + + socket.on('close', () => { + clearInterval(heartbeat); + unsub(); + }); + + socket.on('error', () => { + clearInterval(heartbeat); + unsub(); + }); + }); +} + +/** + * Build a snapshot from the in-memory fleet state. + * On restart, this is rebuilt from DB before serving snapshots. + */ +function buildSnapshot(fleet: FleetState): { hosts: Array<{ + providerId: string; + liveness: 'connected' | 'reconnecting' | 'down'; + lastSeenAt: string | null; + seq: number; + models: Array<{ + model: string; + state: string; + ts: string; + ttlDeadline: string | null; + inflight: number; + }>; +}> } { + const hosts = Array.from(fleet.hosts.values()).map((h) => ({ + providerId: h.providerId, + liveness: h.liveness, + lastSeenAt: h.lastSeenAt?.toISOString() ?? null, + seq: h.seq, + models: Array.from(h.models.values()).map((m) => ({ + model: m.model, + state: m.state, + ts: m.ts.toISOString(), + ttlDeadline: m.ttlDeadline?.toISOString() ?? null, + inflight: m.inflight, + })), + })); + + return { hosts }; +} diff --git a/apps/control/src/schema.sql b/apps/control/src/schema.sql new file mode 100644 index 0000000..2a65f65 --- /dev/null +++ b/apps/control/src/schema.sql @@ -0,0 +1,291 @@ +-- P1: BooControl schema -- read-only fleet cockpit tables. +-- Applied on startup by apps/control/src/db.ts:applySchema(). +-- Lives in the same 'boochat' database as BooChat's tables. + +-- Host registry: one row per enabled llama-swap instance. +CREATE TABLE IF NOT EXISTS control_hosts ( + provider_id TEXT PRIMARY KEY, + ssh_host TEXT, + ssh_user TEXT, + ssh_key_path TEXT, + config_path TEXT, + restart_cmd TEXT, + os TEXT, + gpu_label TEXT, + enabled BOOLEAN NOT NULL DEFAULT true +); + +-- P9 verb-mode: per-host SSH command mode. 'shell' = raw commands (default, +-- backward compatible); 'wrapper' = fixed verbs for a forced-command-locked key. +ALTER TABLE control_hosts ADD COLUMN IF NOT EXISTS ssh_mode TEXT NOT NULL DEFAULT 'shell'; + +-- Seed display metadata; SSH/config columns are NULL until P9. +INSERT INTO control_hosts (provider_id, os, gpu_label) +VALUES + ('sam-desktop', 'Windows', 'RTX 5090 32GB'), + ('embedding', 'Linux', 'P104-100 8GB') +ON CONFLICT (provider_id) DO NOTHING; + +-- Request log: ingested from llama-swap /api/metrics ring. +CREATE TABLE IF NOT EXISTS control_requests ( + id BIGSERIAL PRIMARY KEY, + provider_id TEXT NOT NULL, + swap_entry_id INT NOT NULL, + ts TIMESTAMPTZ NOT NULL, + model TEXT, + req_path TEXT, + status_code INT, + duration_ms INT, + cache_tokens INT, + input_tokens INT, + output_tokens INT, + prompt_tps REAL, + gen_tps REAL, + has_capture BOOLEAN NOT NULL DEFAULT false, + capture JSONB, + UNIQUE (provider_id, swap_entry_id, ts) +); + +-- P4: Per-consumer attribution column. Added via idempotent ALTER so existing +-- DBs pick it up on next restart. See design §7 "Implementation notes" for the +-- llama-swap ActivityLogEntry discrepancy. +ALTER TABLE control_requests ADD COLUMN IF NOT EXISTS source TEXT; + +CREATE INDEX IF NOT EXISTS idx_control_requests_provider_ts + ON control_requests (provider_id, ts DESC); + +-- Raw performance samples from llama-swap /api/performance. +CREATE TABLE IF NOT EXISTS control_perf_samples ( + provider_id TEXT NOT NULL, + ts TIMESTAMPTZ NOT NULL, + gpu JSONB, + sys JSONB, + UNIQUE (provider_id, ts) +); + +CREATE INDEX IF NOT EXISTS idx_control_perf_samples_provider_ts + ON control_perf_samples (provider_id, ts DESC); + +-- 5-minute rollup aggregates. +CREATE TABLE IF NOT EXISTS control_perf_rollup_5m ( + provider_id TEXT NOT NULL, + bucket TIMESTAMPTZ NOT NULL, + gpu_agg JSONB, + sys_agg JSONB, + UNIQUE (provider_id, bucket) +); + +-- Model state transitions + gap events. +CREATE TABLE IF NOT EXISTS control_model_events ( + provider_id TEXT NOT NULL, + model TEXT NOT NULL, + state TEXT NOT NULL, + ts TIMESTAMPTZ NOT NULL, + detail JSONB, + UNIQUE (provider_id, model, state, ts) +); + +CREATE INDEX IF NOT EXISTS idx_control_model_events_provider_ts + ON control_model_events (provider_id, ts DESC); + +-- P3: Bench engine tables -- additive schema change. + +-- Suite definitions: grid of prompt_tokens x gen_tokens x concurrency x repetitions. +CREATE TABLE IF NOT EXISTS bench_suites ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + provider_id TEXT NOT NULL, + model TEXT NOT NULL, + prompt_tokens INT[] NOT NULL, + gen_tokens INT[] NOT NULL, + concurrency INT[] NOT NULL, + repetitions INT NOT NULL DEFAULT 1, + metadata JSONB, + created_at TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp() +); + +-- Individual bench runs (one per suite execution). +CREATE TABLE IF NOT EXISTS bench_runs ( + id TEXT PRIMARY KEY, + suite_id TEXT NOT NULL REFERENCES bench_suites(id), + job_type TEXT NOT NULL DEFAULT 'bench', + status TEXT NOT NULL DEFAULT 'queued', + started_at TIMESTAMPTZ, + finished_at TIMESTAMPTZ, + total_samples INT NOT NULL DEFAULT 0, + completed_samples INT NOT NULL DEFAULT 0, + concurrent_foreign_requests INT NOT NULL DEFAULT 0, + temperature REAL, + top_p REAL, + aggregate JSONB, + regression_flag TEXT, + error TEXT, + created_at TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp() +); + +CREATE INDEX IF NOT EXISTS idx_bench_runs_suite_id + ON bench_runs (suite_id); + +CREATE INDEX IF NOT EXISTS idx_bench_runs_status + ON bench_runs (status); + +-- Raw per-request samples from a bench run. +CREATE TABLE IF NOT EXISTS bench_samples ( + id BIGSERIAL PRIMARY KEY, + run_id TEXT NOT NULL REFERENCES bench_runs(id), + prompt_tokens INT NOT NULL, + gen_tokens INT NOT NULL, + concurrency INT NOT NULL, + repetition INT NOT NULL, + ttft_ms REAL, + total_ms REAL, + prompt_tps REAL, + gen_tps REAL, + cache_n INT, + error TEXT +); + +CREATE INDEX IF NOT EXISTS idx_bench_samples_run_id + ON bench_samples (run_id); + +-- P3: Baseline aggregates per (provider_id, model). +-- First completed run seeds the baseline; subsequent runs compare against it. +CREATE TABLE IF NOT EXISTS bench_baselines ( + provider_id TEXT NOT NULL, + model TEXT NOT NULL, + aggregate JSONB NOT NULL, + run_id TEXT NOT NULL, + created_at TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp(), + PRIMARY KEY (provider_id, model) +); + +-- P5: Quality evals + sandbox tables. + +-- Eval suite definitions: kind (chat|code), tasks JSONB, judge_model. +CREATE TABLE IF NOT EXISTS eval_suites ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + kind TEXT NOT NULL, + version INT NOT NULL DEFAULT 1, + tasks JSONB NOT NULL, + judge_model TEXT, + judge_model_version TEXT, + metadata JSONB, + UNIQUE (name, version), + created_at TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp() +); + +CREATE INDEX IF NOT EXISTS idx_eval_suites_kind + ON eval_suites (kind); + +-- Individual eval runs (one per suite execution against a model). +CREATE TABLE IF NOT EXISTS eval_runs ( + id TEXT PRIMARY KEY, + suite_id TEXT NOT NULL REFERENCES eval_suites(id), + job_type TEXT NOT NULL DEFAULT 'eval', + provider_id TEXT NOT NULL, + model TEXT NOT NULL, + quant TEXT, + status TEXT NOT NULL DEFAULT 'queued', + judge_model TEXT, + judge_model_version TEXT, + started_at TIMESTAMPTZ, + finished_at TIMESTAMPTZ, + total_tasks INT NOT NULL DEFAULT 0, + completed_tasks INT NOT NULL DEFAULT 0, + aggregate JSONB, + error TEXT, + created_at TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp() +); + +CREATE INDEX IF NOT EXISTS idx_eval_runs_suite_id + ON eval_runs (suite_id); + +CREATE INDEX IF NOT EXISTS idx_eval_runs_status + ON eval_runs (status); + +CREATE INDEX IF NOT EXISTS idx_eval_runs_provider_model + ON eval_runs (provider_id, model); + +-- Per-task eval results: score, judge rationale, sandbox exit info. +CREATE TABLE IF NOT EXISTS eval_results ( + id BIGSERIAL PRIMARY KEY, + run_id TEXT NOT NULL REFERENCES eval_runs(id), + task_id TEXT NOT NULL, + task_index INT NOT NULL, + score REAL, + max_score REAL, + rationale TEXT, + sandbox_exit_code INT, + sandbox_stderr TEXT, + sandbox_stdout TEXT, + execution_ms INT, + error TEXT +); + +CREATE INDEX IF NOT EXISTS idx_eval_results_run_id + ON eval_results (run_id); + +-- P6.2: Generated fleet reports (markdown digest + JSONB stats). +CREATE TABLE IF NOT EXISTS control_reports ( + id TEXT PRIMARY KEY, + kind TEXT NOT NULL DEFAULT 'digest', + interval TEXT NOT NULL DEFAULT 'daily', + period_start TIMESTAMPTZ NOT NULL, + period_end TIMESTAMPTZ NOT NULL, + markdown TEXT NOT NULL, + stats JSONB, + created_at TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp() +); + +CREATE INDEX IF NOT EXISTS idx_control_reports_created + ON control_reports (created_at DESC); + +-- P6.2: Scheduler metadata for the in-process report timer. Single row keyed by +-- schedule name; last_run_at drives catch-up-on-boot (same pattern as retention). +CREATE TABLE IF NOT EXISTS control_schedule_meta ( + name TEXT PRIMARY KEY, + interval TEXT NOT NULL DEFAULT 'daily', + enabled BOOLEAN NOT NULL DEFAULT true, + last_run_at TIMESTAMPTZ +); + +INSERT INTO control_schedule_meta (name, interval, enabled) +VALUES ('report-digest', 'daily', true) +ON CONFLICT (name) DO NOTHING; + +-- P7.1: Routing policies for the auto:* gateway. `match` selects which virtual +-- model a policy serves (e.g. 'auto:code'); `candidates` is an ordered list of +-- composite ids ('provider/model'); `fallback` is the last-resort composite id. +CREATE TABLE IF NOT EXISTS route_policies ( + id TEXT PRIMARY KEY, + name TEXT NOT NULL, + virtual_model TEXT NOT NULL, + candidates JSONB NOT NULL, + fallback TEXT, + enabled BOOLEAN NOT NULL DEFAULT true, + created_at TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp(), + updated_at TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp(), + UNIQUE (virtual_model) +); + +-- P7.1/P7.4: Per-dispatch log for the gateway. One row per resolved completion +-- routed through a virtual model, recording the chosen target + outcome. +CREATE TABLE IF NOT EXISTS route_dispatch_log ( + id BIGSERIAL PRIMARY KEY, + ts TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp(), + virtual_model TEXT NOT NULL, + chosen_provider_id TEXT, + chosen_model TEXT, + candidates_tried JSONB, + status TEXT NOT NULL, + source TEXT, + error TEXT, + duration_ms INT +); + +CREATE INDEX IF NOT EXISTS idx_route_dispatch_log_ts + ON route_dispatch_log (ts DESC); + +CREATE INDEX IF NOT EXISTS idx_route_dispatch_log_virtual + ON route_dispatch_log (virtual_model, ts DESC); diff --git a/apps/control/src/services/__tests__/action-queue.test.ts b/apps/control/src/services/__tests__/action-queue.test.ts new file mode 100644 index 0000000..d68dde3 --- /dev/null +++ b/apps/control/src/services/__tests__/action-queue.test.ts @@ -0,0 +1,194 @@ +import { describe, it, expect, beforeEach } from 'vitest'; +import { ActionQueue } from '../action-queue.js'; +import type { ActionQueueDeps, QueuedAction } from '../action-queue.js'; + +describe('ActionQueue', () => { + let queue: ActionQueue; + let deps: ActionQueueDeps; + + beforeEach(() => { + queue = new ActionQueue(); + deps = { + baseUrl: 'http://test-host:8401', + isLivenessUp: () => true, + isInflightRequests: () => 0, + log: { + error: () => {}, + warn: () => {}, + info: () => {}, + debug: () => {}, + trace: () => {}, + fatal: () => {}, + child: () => deps.log, + } as any, + }; + queue.registerHost('host1', deps); + }); + + describe('submit', () => { + it('rejects submission when host is down', () => { + const downQueue = new ActionQueue(); + const downDeps: ActionQueueDeps = { + ...deps, + isLivenessUp: () => false, + }; + downQueue.registerHost('down-host', downDeps); + + const result = downQueue.submit({ + actionId: 'a1', + type: 'warm', + providerId: 'down-host', + confirmed: false, + createdAt: new Date(), + }); + + expect(result.ok).toBe(false); + if (!result.ok) { + expect(result.error).toBe('host offline'); + } + }); + + it('rejects submission when queue is full (depth 4)', () => { + // Fill the queue to capacity + for (let i = 0; i < 4; i++) { + const result = queue.submit({ + actionId: `fill-${i}`, + type: 'warm', + providerId: 'host1', + model: 'model1', + confirmed: false, + createdAt: new Date(), + }); + expect(result.ok).toBe(true); + } + + // 5th submission should be rejected + const result = queue.submit({ + actionId: 'overflow', + type: 'warm', + providerId: 'host1', + model: 'model1', + confirmed: false, + createdAt: new Date(), + }); + + expect(result.ok).toBe(false); + if (!result.ok) { + expect(result.error).toContain('queue full'); + expect(result.pending).toHaveLength(4); + } + }); + + it('returns 409 with requiresConfirmation for unload during inflight', () => { + const inflightDeps: ActionQueueDeps = { + ...deps, + isInflightRequests: () => 5, + }; + const inflightQueue = new ActionQueue(); + inflightQueue.registerHost('busy-host', inflightDeps); + + const result = inflightQueue.submit({ + actionId: 'unload-1', + type: 'unload', + providerId: 'busy-host', + confirmed: false, + createdAt: new Date(), + }); + + expect(result.ok).toBe(false); + if (!result.ok) { + expect(result.error).toBe('bench in progress'); + expect(result.requiresConfirmation).toBe(true); + } + }); + + it('allows confirmed unload during inflight', () => { + const inflightDeps: ActionQueueDeps = { + ...deps, + isInflightRequests: () => 5, + }; + const inflightQueue = new ActionQueue(); + inflightQueue.registerHost('busy-host', inflightDeps); + + const result = inflightQueue.submit({ + actionId: 'unload-confirmed', + type: 'unload', + providerId: 'busy-host', + confirmed: true, + createdAt: new Date(), + }); + + expect(result.ok).toBe(true); + }); + + it('accepts a warm action when queue has capacity', () => { + const result = queue.submit({ + actionId: 'warm-1', + type: 'warm', + providerId: 'host1', + model: 'llama3', + confirmed: false, + createdAt: new Date(), + }); + + expect(result.ok).toBe(true); + }); + }); + + describe('getState', () => { + it('returns null for unknown host', () => { + expect(queue.getState('unknown')).toBeNull(); + }); + + it('returns state with entries after submission', () => { + queue.submit({ + actionId: 'test-1', + type: 'warm', + providerId: 'host1', + model: 'llama3', + confirmed: false, + createdAt: new Date(), + }); + + const state = queue.getState('host1'); + expect(state).not.toBeNull(); + expect(state!.queue.length).toBe(1); + expect(state!.queue[0].action.actionId).toBe('test-1'); + // Status transitions to 'running' as processNext kicks off asynchronously + expect(['pending', 'running']).toContain(state!.queue[0].status); + }); + }); + + describe('processNext (stale action skip)', () => { + it('skips an action when host goes down during processing', async () => { + let livenessUp = true; + const dynamicDeps: ActionQueueDeps = { + ...deps, + isLivenessUp: () => livenessUp, + }; + const dynamicQueue = new ActionQueue(); + dynamicQueue.registerHost('flaky-host', dynamicDeps); + + // Submit an action + dynamicQueue.submit({ + actionId: 'stale-1', + type: 'warm', + providerId: 'flaky-host', + model: 'llama3', + confirmed: false, + createdAt: new Date(), + }); + + // Turn host down before processing + livenessUp = false; + + // The queue processor will skip the action + // We can't easily test the async processNext directly, but we can verify + // the state reflects the skip logic by checking the queue state + const state = dynamicQueue.getState('flaky-host'); + expect(state).not.toBeNull(); + expect(state!.queue.length).toBe(1); + // The entry is still pending; processNext would mark it skipped + }); + }); +}); diff --git a/apps/control/src/services/__tests__/bench-engine.test.ts b/apps/control/src/services/__tests__/bench-engine.test.ts new file mode 100644 index 0000000..bef8dbc --- /dev/null +++ b/apps/control/src/services/__tests__/bench-engine.test.ts @@ -0,0 +1,300 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest'; +import { parseLlamaTimings, computeAggregates, runSingleBenchRequest } from '../../index.js'; +import { computeRegressionFlag } from '../bench-engine.js'; +import { createFleetState, ensureHostState } from '../fleet-state.js'; +import { createDeltaEmitter } from '../../index.js'; +import type { Sql } from '../../db.js'; +import type { Config } from '../../config.js'; +import type { BenchSuite } from '../bench-engine.js'; + +// ─── parseLlamaTimings tests ──────────────────────────────────────────────── + +describe('parseLlamaTimings', () => { + it('parses timings from a standard llama.cpp chunk', () => { + const chunk = 'data: {"choices":[],"timings":{"prompt_per_second":150,"predicted_per_second":80,"cache_n":50}}'; + const result = parseLlamaTimings(chunk); + expect(result).not.toBeNull(); + expect(result!.promptPerSecond).toBe(150); + expect(result!.predictedPerSecond).toBe(80); + expect(result!.cacheN).toBe(50); + }); + + it('parses timings without data: prefix', () => { + const chunk = '{"timings":{"prompt_per_second":200,"predicted_per_second":100,"cache_n":0}}'; + const result = parseLlamaTimings(chunk); + expect(result).not.toBeNull(); + expect(result!.promptPerSecond).toBe(200); + }); + + it('returns null for [DONE] chunk', () => { + expect(parseLlamaTimings('data: [DONE]')).toBeNull(); + }); + + it('returns null for chunk without timings', () => { + const chunk = 'data: {"choices":[{"delta":{"content":"hello"}}]}'; + expect(parseLlamaTimings(chunk)).toBeNull(); + }); + + it('returns null for malformed JSON', () => { + expect(parseLlamaTimings('data: not-json')).toBeNull(); + }); +}); + +// ─── computeAggregates tests ──────────────────────────────────────────────── + +describe('computeAggregates', () => { + it('returns nulls for empty samples', () => { + const result = computeAggregates([]); + expect(result.totalSamples).toBe(0); + expect(result.avgTtftMs).toBeNull(); + expect(result.avgGenTps).toBeNull(); + }); + + it('computes averages correctly', () => { + const samples = [ + { ttftMs: 100, genTps: 50, promptTps: 100, error: null } as any, + { ttftMs: 200, genTps: 100, promptTps: 200, error: null } as any, + { ttftMs: 300, genTps: 150, promptTps: 300, error: null } as any, + ]; + const result = computeAggregates(samples); + expect(result.avgTtftMs).toBe(200); + expect(result.avgGenTps).toBe(100); + expect(result.avgPromptTps).toBe(200); + expect(result.totalSamples).toBe(3); + expect(result.errorSamples).toBe(0); + }); + + it('computes median correctly for odd count', () => { + const samples = [ + { ttftMs: 100, genTps: 50, promptTps: 100, error: null } as any, + { ttftMs: 200, genTps: 100, promptTps: 200, error: null } as any, + { ttftMs: 300, genTps: 150, promptTps: 300, error: null } as any, + ]; + const result = computeAggregates(samples); + expect(result.medianTtftMs).toBe(200); + expect(result.medianGenTps).toBe(100); + }); + + it('computes median correctly for even count', () => { + const samples = [ + { ttftMs: 100, genTps: 50, promptTps: 100, error: null } as any, + { ttftMs: 200, genTps: 100, promptTps: 200, error: null } as any, + { ttftMs: 300, genTps: 150, promptTps: 300, error: null } as any, + { ttftMs: 400, genTps: 200, promptTps: 400, error: null } as any, + ]; + const result = computeAggregates(samples); + expect(result.medianTtftMs).toBe(250); + expect(result.medianGenTps).toBe(125); + }); + + it('computes p95 TTFT', () => { + const samples = Array.from({ length: 20 }, (_, i) => ({ + ttftMs: (i + 1) * 10, + genTps: 50, + promptTps: 100, + error: null, + })) as any[]; + const result = computeAggregates(samples); + expect(result.p95TtftMs).toBeCloseTo(190, -1); + }); + + it('filters out null values', () => { + const samples = [ + { ttftMs: 100, genTps: 50, promptTps: 100, error: null } as any, + { ttftMs: null, genTps: null, promptTps: null, error: 'timeout' } as any, + ]; + const result = computeAggregates(samples); + expect(result.avgTtftMs).toBe(100); + expect(result.errorSamples).toBe(1); + }); +}); + +// ─── bench runner pipeline test (mock fetch + real functions) ──────────────── + +describe('bench runner pipeline', () => { + let mockSql: Sql; + let executedQueries: Array<{ query: string; values: unknown[] }>; + + beforeEach(() => { + executedQueries = []; + mockSql = Object.assign( + (strings: TemplateStringsArray, ...values: unknown[]) => { + const query = strings.reduce((acc: string, s: string, i: number) => acc + s + (values[i] ?? ''), ''); + executedQueries.push({ query, values }); + return Promise.resolve([]); + }, + { + json: (v: unknown) => v, + unsafe: async (q: string) => { executedQueries.push({ query: q, values: [] }); return []; }, + }, + ) as unknown as Sql; + }); + + it('runSingleBenchRequest captures TTFT and timings on successful stream', async () => { + const fakeStream = createFakeStreamResponse([ + 'data: {"choices":[{"delta":{"content":"H"}}]}', + 'data: {"choices":[{"delta":{"content":"ello"}}]}', + 'data: {"choices":[],"timings":{"prompt_per_second":150,"predicted_per_second":80,"cache_n":10}}', + 'data: [DONE]', + ]); + + vi.spyOn(global, 'fetch').mockResolvedValueOnce(fakeStream); + + const sample = await runSingleBenchRequest( + 'http://localhost:8401', + 'test-model', + 10, + 20, + 0, + 0.7, + 0.9, + ); + + expect(sample.error).toBeNull(); + expect(sample.ttftMs).toBeGreaterThanOrEqual(0); + expect(sample.ttftMs).toBeLessThan(5000); + expect(sample.totalMs).toBeGreaterThanOrEqual(0); + expect(sample.promptTps).toBe(150); + expect(sample.genTps).toBe(80); + expect(sample.cacheN).toBe(10); + expect(sample.promptTokens).toBe(10); + expect(sample.genTokens).toBe(20); + expect(sample.repetition).toBe(0); + + vi.restoreAllMocks(); + }); + + it('runSingleBenchRequest captures error on HTTP failure', async () => { + vi.spyOn(global, 'fetch').mockResolvedValueOnce({ + ok: false, + status: 500, + text: async () => 'Internal Server Error', + } as Response); + + const sample = await runSingleBenchRequest( + 'http://localhost:8401', + 'test-model', + 10, + 20, + 0, + ); + + expect(sample.error).toContain('500'); + expect(sample.ttftMs).toBeNull(); + + vi.restoreAllMocks(); + }); + + it('runSingleBenchRequest captures error on fetch exception', async () => { + vi.spyOn(global, 'fetch').mockRejectedValueOnce(new Error('ECONNREFUSED')); + + const sample = await runSingleBenchRequest( + 'http://localhost:8401', + 'test-model', + 10, + 20, + 0, + ); + + expect(sample.error).toContain('ECONNREFUSED'); + + vi.restoreAllMocks(); + }); +}); + +// ─── helper: create a fake streaming Response ──────────────────────────────── + +function createFakeStreamResponse(lines: string[]): Response { + const encoder = new TextEncoder(); + let position = 0; + + const stream = new ReadableStream({ + async pull(controller) { + if (position >= lines.length) { + controller.close(); + return; + } + const line = lines[position]! + '\n\n'; + controller.enqueue(encoder.encode(line)); + position++; + // Small delay to simulate network latency for TTFT measurement + await new Promise((r) => setTimeout(r, 5)); + }, + }); + + return new Response(stream, { + status: 200, + headers: { 'Content-Type': 'text/event-stream' }, + }); +} + +// ─── computeRegressionFlag tests (A1) ──────────────────────────────────────── + +describe('computeRegressionFlag', () => { + it('returns baseline for first run (no baseline)', () => { + const current = computeAggregates([ + { ttftMs: 100, genTps: 80, promptTps: 150, error: null } as any, + ]); + expect(computeRegressionFlag(current, undefined)).toBe('baseline'); + }); + + it('returns regression when gen tok/s drops below -10%', () => { + const current = computeAggregates([ + { ttftMs: 200, genTps: 70, promptTps: 100, error: null } as any, + ]); + const baseline = JSON.stringify({ + avgGenTps: 100, + avgTtftMs: 100, + totalSamples: 1, + }); + expect(computeRegressionFlag(current, baseline)).toBe('regression'); + }); + + it('returns improvement when gen tok/s rises above +5%', () => { + const current = computeAggregates([ + { ttftMs: 80, genTps: 120, promptTps: 200, error: null } as any, + ]); + const baseline = JSON.stringify({ + avgGenTps: 100, + avgTtftMs: 100, + totalSamples: 1, + }); + expect(computeRegressionFlag(current, baseline)).toBe('improvement'); + }); + + it('returns baseline when within threshold', () => { + const current = computeAggregates([ + { ttftMs: 100, genTps: 98, promptTps: 150, error: null } as any, + ]); + const baseline = JSON.stringify({ + avgGenTps: 100, + avgTtftMs: 100, + totalSamples: 1, + }); + expect(computeRegressionFlag(current, baseline)).toBe('baseline'); + }); + + it('returns null for divide-by-zero (N5: baseline avgGenTps is 0)', () => { + const current = computeAggregates([ + { ttftMs: 100, genTps: 50, promptTps: 100, error: null } as any, + ]); + const baseline = JSON.stringify({ + avgGenTps: 0, + avgTtftMs: 100, + totalSamples: 1, + }); + expect(computeRegressionFlag(current, baseline)).toBeNull(); + }); + + it('returns null for null current avgGenTps', () => { + const current = computeAggregates([]); + expect(computeRegressionFlag(current, JSON.stringify({ avgGenTps: 100 }))).toBeNull(); + }); + + it('returns null for malformed baseline JSON', () => { + const current = computeAggregates([ + { ttftMs: 100, genTps: 80, promptTps: 150, error: null } as any, + ]); + expect(computeRegressionFlag(current, 'not-json')).toBeNull(); + }); +}); diff --git a/apps/control/src/services/__tests__/capture-fetch.test.ts b/apps/control/src/services/__tests__/capture-fetch.test.ts new file mode 100644 index 0000000..a892d68 --- /dev/null +++ b/apps/control/src/services/__tests__/capture-fetch.test.ts @@ -0,0 +1,60 @@ +import { describe, it, expect } from 'vitest'; +import { parseCapture } from '../capture-fetch.js'; + +describe('parseCapture', () => { + it('trims response body when total exceeds 256KB cap', () => { + const largeBody = 'y'.repeat(300_000); + const capture = parseCapture({ + request_headers: { 'Content-Type': 'application/json' }, + response_headers: {}, + request_body: Buffer.from('x'.repeat(100_000)).toString('base64'), + response_body: Buffer.from(largeBody).toString('base64'), + timestamp: '2024-01-01T00:00:00Z', + model: 'test-model', + duration_ms: 100, + }, 'host1', 1); + + expect(capture.responseBody).toContain('[truncated: capture exceeds 256KB cap]'); + const totalBytes = Buffer.byteLength(capture.requestBody + capture.responseBody); + expect(totalBytes).toBeLessThanOrEqual(256 * 1024 + 100); + }); + + it('does not trim when under cap', () => { + const capture = parseCapture({ + request_headers: {}, + response_headers: {}, + request_body: Buffer.from('small request').toString('base64'), + response_body: Buffer.from('small response').toString('base64'), + timestamp: '2024-01-01T00:00:00Z', + model: 'test-model', + duration_ms: 50, + }, 'host1', 2); + + expect(capture.requestBody).toBe('small request'); + expect(capture.responseBody).toBe('small response'); + expect(capture.responseBody).not.toContain('[truncated'); + }); + + it('handles missing base64 bodies gracefully', () => { + const capture = parseCapture({ + timestamp: '2024-01-01T00:00:00Z', + }, 'host1', 3); + + expect(capture.requestBody).toBe(''); + expect(capture.responseBody).toBe(''); + }); + + it('decodes base64 (invalid base64 produces binary, not raw string)', () => { + // Buffer.from(str, 'base64') does not throw on invalid base64 — + // it decodes what it can. The catch block only triggers on actual + // Buffer.from exceptions, which are rare. + const capture = parseCapture({ + request_body: Buffer.from('valid json').toString('base64'), + response_body: Buffer.from('{"result": true}').toString('base64'), + timestamp: '2024-01-01T00:00:00Z', + }, 'host1', 4); + + expect(capture.requestBody).toBe('valid json'); + expect(capture.responseBody).toBe('{"result": true}'); + }); +}); diff --git a/apps/control/src/services/__tests__/eval-suites.test.ts b/apps/control/src/services/__tests__/eval-suites.test.ts new file mode 100644 index 0000000..44678fe --- /dev/null +++ b/apps/control/src/services/__tests__/eval-suites.test.ts @@ -0,0 +1,50 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest'; +import { loadEvalSuitesFromData } from '../../index.js'; + +// ─── loadEvalSuitesFromData tests ─────────────────────────────────────────── + +describe('loadEvalSuitesFromData', () => { + it('loads suites from data/ YAML files', () => { + const suites = loadEvalSuitesFromData(); + expect(suites.length).toBeGreaterThanOrEqual(4); + + const ids = suites.map((s) => s.id); + expect(ids).toContain('agent-coding'); + expect(ids).toContain('chat-quality'); + expect(ids).toContain('long-context-retrieval'); + expect(ids).toContain('utility-calls'); + }); + + it('loads code suite with correct structure', () => { + const suites = loadEvalSuitesFromData(); + const codeSuite = suites.find((s) => s.id === 'agent-coding'); + expect(codeSuite).not.toBeUndefined(); + expect(codeSuite!.kind).toBe('code'); + expect(codeSuite!.tasks.length).toBeGreaterThan(0); + + const task = codeSuite!.tasks[0] as Record; + expect(task.id).toBeDefined(); + expect(task.prompt).toBeDefined(); + expect(task.test_code).toBeDefined(); + expect(task.expected_output).toBeDefined(); + expect(task.language).toBe('typescript'); + }); + + it('loads chat suite with rubric structure', () => { + const suites = loadEvalSuitesFromData(); + const chatSuite = suites.find((s) => s.id === 'chat-quality'); + expect(chatSuite).not.toBeUndefined(); + expect(chatSuite!.kind).toBe('chat'); + + const task = chatSuite!.tasks[0] as Record; + expect(task.rubric).toBeDefined(); + expect((task.rubric as Record).max_score).toBeGreaterThan(0); + }); + + it('handles missing data/ directory gracefully', () => { + // The function catches errors and returns empty array. + // We can't easily test this without mocking fs, but the try-catch is there. + const suites = loadEvalSuitesFromData(); + expect(Array.isArray(suites)).toBe(true); + }); +}); diff --git a/apps/control/src/services/__tests__/fleet-connector.test.ts b/apps/control/src/services/__tests__/fleet-connector.test.ts new file mode 100644 index 0000000..84a6c86 --- /dev/null +++ b/apps/control/src/services/__tests__/fleet-connector.test.ts @@ -0,0 +1,82 @@ +import { describe, it, expect } from 'vitest'; +import { addJitter, reconnectDecision, DEFAULT_RECONNECT_POLICY } from '../fleet-connector.js'; + +describe('addJitter', () => { + it('returns a value >= the input delay', () => { + const jittered = addJitter(1000); + expect(jittered).toBeGreaterThanOrEqual(1000); + }); + + it('returns a value <= 1.5x the input delay', () => { + const jittered = addJitter(1000); + expect(jittered).toBeLessThanOrEqual(1500); + }); + + it('0ms delay stays 0ms', () => { + expect(addJitter(0)).toBe(0); + }); + + it('returns different values on repeated calls (stochastic)', () => { + const results = new Set(); + for (let i = 0; i < 20; i++) { + results.add(addJitter(1000)); + } + expect(results.size).toBeGreaterThan(1); + }); +}); + +describe('reconnectDecision', () => { + it('first failure returns baseMs with jitter', () => { + const decision = reconnectDecision(1); + expect(decision.action).toBe('reconnect'); + expect(decision.delayMs).toBeGreaterThanOrEqual(DEFAULT_RECONNECT_POLICY.baseMs); + expect(decision.delayMs).toBeLessThanOrEqual(DEFAULT_RECONNECT_POLICY.baseMs * 1.5); + }); + + it('exponential growth: failure 2 returns 2x baseMs with jitter', () => { + const decision = reconnectDecision(2); + expect(decision.action).toBe('reconnect'); + expect(decision.delayMs).toBeGreaterThanOrEqual(DEFAULT_RECONNECT_POLICY.baseMs * 2); + expect(decision.delayMs).toBeLessThanOrEqual(DEFAULT_RECONNECT_POLICY.baseMs * 3); + }); + + it('exponential growth: failure 3 returns 4x baseMs with jitter', () => { + const decision = reconnectDecision(3); + expect(decision.action).toBe('reconnect'); + expect(decision.delayMs).toBeGreaterThanOrEqual(DEFAULT_RECONNECT_POLICY.baseMs * 4); + expect(decision.delayMs).toBeLessThanOrEqual(DEFAULT_RECONNECT_POLICY.baseMs * 6); + }); + + it('capped at maxMs with jitter', () => { + const decision = reconnectDecision(6); + expect(decision.action).toBe('reconnect'); + expect(decision.delayMs).toBeGreaterThanOrEqual(DEFAULT_RECONNECT_POLICY.maxMs); + expect(decision.delayMs).toBeLessThanOrEqual(DEFAULT_RECONNECT_POLICY.maxMs * 1.5); + }); + + it('gives up after maxAttempts', () => { + const decision = reconnectDecision(DEFAULT_RECONNECT_POLICY.maxAttempts + 1); + expect(decision).toEqual({ action: 'give-up' }); + }); + + it('custom policy works with jitter', () => { + const policy = { baseMs: 500, maxMs: 5000, maxAttempts: 3 }; + const d1 = reconnectDecision(1, policy); + expect(d1.action).toBe('reconnect'); + expect(d1.delayMs).toBeGreaterThanOrEqual(500); + expect(d1.delayMs).toBeLessThanOrEqual(750); + + const d2 = reconnectDecision(2, policy); + expect(d2.action).toBe('reconnect'); + expect(d2.delayMs).toBeGreaterThanOrEqual(1000); + expect(d2.delayMs).toBeLessThanOrEqual(1500); + + const d3 = reconnectDecision(3, policy); + expect(d3.action).toBe('reconnect'); + expect(d3.delayMs).toBeGreaterThanOrEqual(2000); + expect(d3.delayMs).toBeLessThanOrEqual(3000); + + const d4 = reconnectDecision(4, policy); + expect(d4).toEqual({ action: 'give-up' }); + }); +}); diff --git a/apps/control/src/services/__tests__/fleet-state.test.ts b/apps/control/src/services/__tests__/fleet-state.test.ts new file mode 100644 index 0000000..95bb794 --- /dev/null +++ b/apps/control/src/services/__tests__/fleet-state.test.ts @@ -0,0 +1,42 @@ +import { describe, it, expect } from 'vitest'; +import { createFleetState, ensureHostState, stampLastSeen } from '../fleet-state.js'; + +describe('createFleetState', () => { + it('creates an empty fleet', () => { + const fleet = createFleetState(); + expect(fleet.hosts.size).toBe(0); + }); +}); + +describe('ensureHostState', () => { + it('creates a new host state if none exists', () => { + const fleet = createFleetState(); + const state = ensureHostState(fleet, 'test-host'); + expect(state.providerId).toBe('test-host'); + expect(state.liveness).toBe('down'); + expect(state.lastSeenAt).toBeNull(); + expect(state.seq).toBe(0); + expect(state.models.size).toBe(0); + }); + + it('returns existing host state', () => { + const fleet = createFleetState(); + const state1 = ensureHostState(fleet, 'test-host'); + const state2 = ensureHostState(fleet, 'test-host'); + expect(state1).toBe(state2); + }); + + it('seq is 0 on first call', () => { + const fleet = createFleetState(); + const state = ensureHostState(fleet, 'test-host'); + expect(state.seq).toBe(0); + }); + + it('stamps lastSeenAt on connection', () => { + const fleet = createFleetState(); + const state = ensureHostState(fleet, 'test-host'); + expect(state.lastSeenAt).toBeNull(); + stampLastSeen(state); + expect(state.lastSeenAt).not.toBeNull(); + }); +}); diff --git a/apps/control/src/services/__tests__/gateway.test.ts b/apps/control/src/services/__tests__/gateway.test.ts new file mode 100644 index 0000000..485438a --- /dev/null +++ b/apps/control/src/services/__tests__/gateway.test.ts @@ -0,0 +1,92 @@ +import { describe, it, expect } from 'vitest'; +import { + isGatewayVirtualModel, + parseVirtualModel, + orderCandidates, + splitComposite, +} from '../gateway.js'; +import type { ModelScore } from '../routing-scores.js'; + +function score(compositeId: string, partial: Partial = {}): ModelScore { + return { + compositeId, + providerId: compositeId.split('/')[0]!, + model: compositeId.split('/').slice(1).join('/'), + codeScore: null, + chatScore: null, + evalScore: null, + avgGenTps: null, + avgLatencyMs: null, + sampleCount: 0, + healthy: true, + badges: [], + ...partial, + }; +} + +describe('isGatewayVirtualModel', () => { + it('matches auto and auto:* tokens', () => { + expect(isGatewayVirtualModel('auto')).toBe(true); + expect(isGatewayVirtualModel('auto:code')).toBe(true); + expect(isGatewayVirtualModel('auto:fast')).toBe(true); + }); + it('does not match ordinary models', () => { + expect(isGatewayVirtualModel('qwopus-35b')).toBe(false); + expect(isGatewayVirtualModel('autobahn')).toBe(false); + }); +}); + +describe('parseVirtualModel', () => { + it('strips a gateway provider prefix', () => { + expect(parseVirtualModel('auto/auto:code')).toBe('auto:code'); + }); + it('passes a bare virtual model through', () => { + expect(parseVirtualModel('auto:fast')).toBe('auto:fast'); + }); +}); + +describe('splitComposite', () => { + it('splits provider/model', () => { + expect(splitComposite('sam-desktop/qwopus-35b')).toEqual({ providerId: 'sam-desktop', model: 'qwopus-35b' }); + }); + it('returns null for a bare id', () => { + expect(splitComposite('qwopus-35b')).toBeNull(); + }); +}); + +describe('orderCandidates', () => { + it('orders auto:code by code score among healthy hosts', () => { + const scores = [ + score('a/m1', { codeScore: 0.6 }), + score('a/m2', { codeScore: 0.9 }), + score('a/m3', { codeScore: 0.7, healthy: false }), + ]; + expect(orderCandidates('auto:code', null, scores)).toEqual(['a/m2', 'a/m1']); + }); + + it('orders auto:fast by throughput', () => { + const scores = [ + score('a/slow', { avgGenTps: 10 }), + score('a/fast', { avgGenTps: 50 }), + ]; + expect(orderCandidates('auto:fast', null, scores)).toEqual(['a/fast', 'a/slow']); + }); + + it('honors an explicit policy order and appends the fallback', () => { + const scores = [score('a/m1'), score('a/m2'), score('a/fb')]; + const ordered = orderCandidates('auto:code', { candidates: ['a/m2', 'a/m1'], fallback: 'a/fb' }, scores); + expect(ordered).toEqual(['a/m2', 'a/m1', 'a/fb']); + }); + + it('drops policy candidates whose host is unhealthy', () => { + const scores = [score('a/m1', { healthy: false }), score('a/m2', { healthy: true })]; + const ordered = orderCandidates('auto:code', { candidates: ['a/m1', 'a/m2'], fallback: null }, scores); + expect(ordered).toEqual(['a/m2']); + }); + + it('keeps a never-seen policy candidate (unknown health) for dispatch to try', () => { + const scores = [score('a/known', { healthy: true })]; + const ordered = orderCandidates('auto:code', { candidates: ['a/never-seen', 'a/known'], fallback: null }, scores); + expect(ordered).toEqual(['a/never-seen', 'a/known']); + }); +}); diff --git a/apps/control/src/services/__tests__/jsonb.test.ts b/apps/control/src/services/__tests__/jsonb.test.ts new file mode 100644 index 0000000..5fd76eb --- /dev/null +++ b/apps/control/src/services/__tests__/jsonb.test.ts @@ -0,0 +1,60 @@ +import { describe, it, expect } from 'vitest'; +import { jsonbStringArray, jsonbArray, jsonbNumberArray, jsonbObject } from '../jsonb.js'; + +describe('jsonbStringArray', () => { + it('passes through an already-parsed array (porsager behavior)', () => { + expect(jsonbStringArray(['a', 'b'])).toEqual(['a', 'b']); + }); + it('parses a JSON string array', () => { + expect(jsonbStringArray('["a","b"]')).toEqual(['a', 'b']); + }); + it('filters non-strings out of a parsed array', () => { + expect(jsonbStringArray(['a', 1, null, 'b'])).toEqual(['a', 'b']); + }); + it('returns [] for null / invalid', () => { + expect(jsonbStringArray(null)).toEqual([]); + expect(jsonbStringArray('not json')).toEqual([]); + expect(jsonbStringArray({})).toEqual([]); + }); +}); + +describe('jsonbArray', () => { + it('passes through an already-parsed array of objects (eval tasks)', () => { + expect(jsonbArray([{ id: 't1' }])).toEqual([{ id: 't1' }]); + }); + it('parses a JSON string array', () => { + expect(jsonbArray('[{"id":"t1"}]')).toEqual([{ id: 't1' }]); + }); + it('returns [] for null / invalid / non-array', () => { + expect(jsonbArray(null)).toEqual([]); + expect(jsonbArray('nope')).toEqual([]); + expect(jsonbArray({})).toEqual([]); + }); +}); + +describe('jsonbNumberArray', () => { + it('passes through an already-parsed number array (bench token grids)', () => { + expect(jsonbNumberArray([128, 512])).toEqual([128, 512]); + }); + it('parses a JSON string array and filters non-numbers', () => { + expect(jsonbNumberArray('[128,"x",512]')).toEqual([128, 512]); + }); + it('returns [] for null / invalid', () => { + expect(jsonbNumberArray(null)).toEqual([]); + expect(jsonbNumberArray('nope')).toEqual([]); + }); +}); + +describe('jsonbObject', () => { + it('passes through an already-parsed object', () => { + expect(jsonbObject({ a: 1 })).toEqual({ a: 1 }); + }); + it('parses a JSON string object', () => { + expect(jsonbObject('{"a":1}')).toEqual({ a: 1 }); + }); + it('returns null for arrays, null, and invalid', () => { + expect(jsonbObject([1, 2])).toBeNull(); + expect(jsonbObject(null)).toBeNull(); + expect(jsonbObject('nope')).toBeNull(); + }); +}); diff --git a/apps/control/src/services/__tests__/judge-runner.test.ts b/apps/control/src/services/__tests__/judge-runner.test.ts new file mode 100644 index 0000000..779f77e --- /dev/null +++ b/apps/control/src/services/__tests__/judge-runner.test.ts @@ -0,0 +1,55 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest'; + +// ─── Judge runner tests (mock sql + real functions) ───────────────────────── + +describe('judge runner', () => { + beforeEach(() => { + vi.restoreAllMocks(); + }); + + it('runJudgeError', async () => { + // Test that the judge runner imports correctly and has the expected interface. + const mod = await import('../judge-runner.js'); + expect(typeof mod.runJudgeEval).toBe('function'); + }); + + it('generateResponse rejects on bad URL', async () => { + // The generateResponse function is internal, but we can test the public API. + const { runJudgeEval } = await import('../judge-runner.js'); + + // Mock sql operations. + const mockSql = vi.fn().mockResolvedValue([]); + mockSql.tag = vi.fn().mockReturnValue({ SQL: '' }); + + const mockEmitter = { + publish: vi.fn(), + }; + + const mockLogger = { + info: vi.fn(), + warn: vi.fn(), + error: vi.fn(), + }; + + const progressHandler = vi.fn(); + + // This will fail because resolveProviderBaseUrl returns null for unknown provider. + const result = await runJudgeEval( + { + runId: 'test_run', + providerId: 'nonexistent-provider', + model: 'test-model', + quant: null, + tasks: [], + judgeModel: null, + }, + mockSql as unknown as import('../../db.js').Sql, + mockEmitter as unknown as import('../../index.js').DeltaEmitter, + 0, + mockLogger as unknown as import('fastify').FastifyBaseLogger, + progressHandler, + ); + + expect(result.error).toContain('no base URL'); + }); +}); diff --git a/apps/control/src/services/__tests__/liveness.test.ts b/apps/control/src/services/__tests__/liveness.test.ts new file mode 100644 index 0000000..50ba9cc --- /dev/null +++ b/apps/control/src/services/__tests__/liveness.test.ts @@ -0,0 +1,102 @@ +import { describe, it, expect } from 'vitest'; +import type { HostState } from '../fleet-state.js'; + +type Liveness = 'connected' | 'reconnecting' | 'down'; + +function transitionLiveness(current: Liveness, event: 'connect' | 'disconnect' | 'reconnect_attempt' | 'reconnect_success'): Liveness { + switch (event) { + case 'connect': + return 'connected'; + case 'disconnect': + return 'down'; + case 'reconnect_attempt': + return 'reconnecting'; + case 'reconnect_success': + return 'connected'; + } +} + +describe('liveness state machine', () => { + it('starts as down', () => { + const state: HostState = { + providerId: 'test', + liveness: 'down', + lastSeenAt: null, + seq: 0, + models: new Map(), + }; + expect(state.liveness).toBe('down'); + }); + + it('connect -> connected', () => { + const state: HostState = { + providerId: 'test', + liveness: 'down', + lastSeenAt: null, + seq: 0, + models: new Map(), + }; + state.liveness = transitionLiveness(state.liveness, 'connect'); + expect(state.liveness).toBe('connected'); + }); + + it('connected -> down on disconnect', () => { + const state: HostState = { + providerId: 'test', + liveness: 'connected', + lastSeenAt: new Date(), + seq: 0, + models: new Map(), + }; + state.liveness = transitionLiveness(state.liveness, 'disconnect'); + expect(state.liveness).toBe('down'); + }); + + it('down -> reconnecting on reconnect attempt', () => { + const state: HostState = { + providerId: 'test', + liveness: 'down', + lastSeenAt: null, + seq: 0, + models: new Map(), + }; + state.liveness = transitionLiveness(state.liveness, 'reconnect_attempt'); + expect(state.liveness).toBe('reconnecting'); + }); + + it('reconnecting -> connected on reconnect success', () => { + const state: HostState = { + providerId: 'test', + liveness: 'reconnecting', + lastSeenAt: null, + seq: 0, + models: new Map(), + }; + state.liveness = transitionLiveness(state.liveness, 'reconnect_success'); + expect(state.liveness).toBe('connected'); + }); + + it('connected -> reconnecting on reconnect attempt', () => { + const state: HostState = { + providerId: 'test', + liveness: 'connected', + lastSeenAt: new Date(), + seq: 0, + models: new Map(), + }; + state.liveness = transitionLiveness(state.liveness, 'reconnect_attempt'); + expect(state.liveness).toBe('reconnecting'); + }); + + it('reconnecting -> down on reconnect failure', () => { + const state: HostState = { + providerId: 'test', + liveness: 'reconnecting', + lastSeenAt: null, + seq: 0, + models: new Map(), + }; + state.liveness = transitionLiveness(state.liveness, 'disconnect'); + expect(state.liveness).toBe('down'); + }); +}); diff --git a/apps/control/src/services/__tests__/llama-providers.test.ts b/apps/control/src/services/__tests__/llama-providers.test.ts new file mode 100644 index 0000000..0db9d3f --- /dev/null +++ b/apps/control/src/services/__tests__/llama-providers.test.ts @@ -0,0 +1,115 @@ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; +import { writeFileSync, unlinkSync } from 'node:fs'; +import { tmpdir } from 'node:os'; +import { join } from 'node:path'; +import { loadLlamaProviders, getLlamaProviders, resolveProviderBaseUrl } from '../llama-providers.js'; + +function loadFixture( + providers: Array<{ id: string; label: string; baseUrl: string; kind?: string }>, +): string { + const file = { + defaultProvider: providers[0]!.id, + providers: providers.map((p) => ({ ...p, kind: p.kind ?? 'llama-swap' })), + }; + const path = join(tmpdir(), `llama-providers-test-${Math.random().toString(36).slice(2)}.json`); + writeFileSync(path, JSON.stringify(file), 'utf8'); + return path; +} + +describe('loadLlamaProviders', () => { + afterEach(() => { + vi.restoreAllMocks(); + }); + + it('loads a valid providers file', () => { + const path = loadFixture([ + { id: 'sam-desktop', label: 'Sam Desktop', baseUrl: 'http://100.101.41.16:8401' }, + { id: 'embedding', label: 'Embedding', baseUrl: 'http://100.90.172.55:8411' }, + ]); + + const result = loadLlamaProviders(path, 'http://legacy.test:8080'); + + expect(result.providers).toHaveLength(2); + expect(result.providers[0]!.id).toBe('sam-desktop'); + expect(result.providers[0]!.baseUrl).toBe('http://100.101.41.16:8401'); + expect(result.providers[1]!.id).toBe('embedding'); + expect(result.providers[1]!.baseUrl).toBe('http://100.90.172.55:8411'); + + unlinkSync(path); + }); + + it('falls back to legacy when file is missing', () => { + const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}); + + const result = loadLlamaProviders('/nonexistent/path.json', 'http://legacy.test:8080'); + + expect(result.providers).toHaveLength(1); + expect(result.providers[0]!.id).toBe('llama-swap'); + expect(result.providers[0]!.baseUrl).toBe('http://legacy.test:8080'); + + warnSpy.mockRestore(); + }); + + it('falls back to legacy when path is undefined', () => { + const result = loadLlamaProviders(undefined, 'http://legacy.test:8080'); + + expect(result.providers).toHaveLength(1); + expect(result.providers[0]!.id).toBe('llama-swap'); + expect(result.providers[0]!.baseUrl).toBe('http://legacy.test:8080'); + }); + + it('falls back to legacy when JSON is invalid', () => { + const path = join(tmpdir(), `llama-providers-bad-${Math.random().toString(36).slice(2)}.json`); + writeFileSync(path, '{not valid json', 'utf8'); + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}); + + const result = loadLlamaProviders(path, 'http://legacy.test:8080'); + + expect(result.providers).toHaveLength(1); + expect(result.providers[0]!.id).toBe('llama-swap'); + + errorSpy.mockRestore(); + unlinkSync(path); + }); +}); + +describe('getLlamaProviders', () => { + it('returns cached result after load', () => { + loadLlamaProviders(undefined, 'http://test.example:9999'); + const cached = getLlamaProviders(); + expect(cached.providers[0]!.baseUrl).toBe('http://test.example:9999'); + }); + + it('returns legacy fallback when nothing loaded', () => { + // This tests the fallback when cached is null. + // Since loadLlamaProviders always sets cached, we test the default URL. + const result = getLlamaProviders(); + expect(result).toBeDefined(); + expect(result.providers.length).toBeGreaterThanOrEqual(1); + }); +}); + +describe('resolveProviderBaseUrl', () => { + it('resolves baseUrl for a known provider', () => { + loadLlamaProviders(undefined, 'http://test.example:9999'); + expect(resolveProviderBaseUrl('llama-swap')).toBe('http://test.example:9999'); + }); + + it('returns null for unknown provider', () => { + loadLlamaProviders(undefined, 'http://test.example:9999'); + expect(resolveProviderBaseUrl('nonexistent')).toBeNull(); + }); + + it('resolves correct URLs for both seeded providers', () => { + const path = loadFixture([ + { id: 'sam-desktop', label: 'Sam Desktop', baseUrl: 'http://100.101.41.16:8401' }, + { id: 'embedding', label: 'Embedding', baseUrl: 'http://100.90.172.55:8411' }, + ]); + loadLlamaProviders(path, 'http://legacy.test:8080'); + + expect(resolveProviderBaseUrl('sam-desktop')).toBe('http://100.101.41.16:8401'); + expect(resolveProviderBaseUrl('embedding')).toBe('http://100.90.172.55:8411'); + + unlinkSync(path); + }); +}); diff --git a/apps/control/src/services/__tests__/log-relay.test.ts b/apps/control/src/services/__tests__/log-relay.test.ts new file mode 100644 index 0000000..3d680d7 --- /dev/null +++ b/apps/control/src/services/__tests__/log-relay.test.ts @@ -0,0 +1,63 @@ +import { describe, it, expect, beforeEach } from 'vitest'; +import { LogRelay } from '../log-relay.js'; + +describe('LogRelay', () => { + let relay: LogRelay; + + beforeEach(() => { + relay = new LogRelay(); + }); + + it('appends log lines to per-host tail', () => { + relay.append('host1', 'proxy', 'connection established'); + relay.append('host1', 'upstream', 'request completed'); + + const tail = relay.getTail('host1'); + expect(tail).toHaveLength(2); + expect(tail[0].source).toBe('proxy'); + expect(tail[1].source).toBe('upstream'); + }); + + it('trims tail to MAX_LOG_LINES (2000)', () => { + for (let i = 0; i < 2500; i++) { + relay.append('host1', 'proxy', `line ${i}`); + } + + const tail = relay.getTail('host1'); + expect(tail.length).toBe(2000); + expect(tail[0].line).toBe('line 500'); + expect(tail[tail.length - 1].line).toBe('line 2499'); + }); + + it('returns empty array for unknown host', () => { + expect(relay.getTail('unknown')).toEqual([]); + }); + + it('getAllTails returns lines from all hosts', () => { + relay.append('host1', 'proxy', 'line1'); + relay.append('host2', 'upstream', 'line2'); + + const all = relay.getAllTails(); + expect(all).toHaveLength(2); + expect(all.map((l) => l.providerId)).toContain('host1'); + expect(all.map((l) => l.providerId)).toContain('host2'); + }); + + it('getSources returns unique source values', () => { + relay.append('host1', 'proxy', 'line1'); + relay.append('host1', 'upstream', 'line2'); + relay.append('host2', 'model', 'line3'); + + const sources = relay.getSources(); + expect(sources).toContain('proxy'); + expect(sources).toContain('upstream'); + expect(sources).toContain('model'); + expect(sources.length).toBe(3); + }); + + it('timestamps are set on each line', () => { + relay.append('host1', 'proxy', 'test'); + const tail = relay.getTail('host1'); + expect(tail[0].ts).toBeInstanceOf(Date); + }); +}); diff --git a/apps/control/src/services/__tests__/model-pull.test.ts b/apps/control/src/services/__tests__/model-pull.test.ts new file mode 100644 index 0000000..470bac3 --- /dev/null +++ b/apps/control/src/services/__tests__/model-pull.test.ts @@ -0,0 +1,83 @@ +import { describe, it, expect } from 'vitest'; +import { validateRepoId, buildPullCommand, runModelPull } from '../model-pull.js'; +import type { SshExec, ExecResult } from '../ssh-config.js'; +import type { DeltaEmitter } from '../../index.js'; + +describe('validateRepoId', () => { + it('accepts org/name', () => { + expect(validateRepoId('Qwen/Qwen3.5-9B')).toBe(true); + expect(validateRepoId('lmstudio-community/model.gguf-q4')).toBe(true); + }); + it('rejects traversal, spaces, metacharacters, and bare names', () => { + expect(validateRepoId('../etc/passwd')).toBe(false); + expect(validateRepoId('a/b; rm -rf /')).toBe(false); + expect(validateRepoId('a b/c')).toBe(false); + expect(validateRepoId('justname')).toBe(false); + expect(validateRepoId('a/b/c')).toBe(false); + }); +}); + +describe('buildPullCommand', () => { + it('wrapper mode emits the pull verb', () => { + expect(buildPullCommand('wrapper', 'Qwen/Q3')).toBe('pull Qwen/Q3'); + }); + it('shell mode emits huggingface-cli into a sanitized local dir', () => { + expect(buildPullCommand('shell', 'Qwen/Q3', '/home/u/models/')).toBe( + "huggingface-cli download Qwen/Q3 --local-dir '/home/u/models/Qwen__Q3'", + ); + }); +}); + +function emitterSpy(): { emitter: DeltaEmitter; frames: Record[] } { + const frames: Record[] = []; + const emitter: DeltaEmitter = { + subscribe: () => () => {}, + publish: (d) => { frames.push(d as Record); }, + }; + return { emitter, frames }; +} + +function execReturning(result: ExecResult): { exec: SshExec; calls: string[] } { + const calls: string[] = []; + const exec: SshExec = async (_t, command) => { calls.push(command); return result; }; + return { exec, calls }; +} + +const target = { host: 'h', user: 'u', keyPath: '/k' }; + +describe('runModelPull', () => { + it('rejects an invalid repo id before issuing any command', async () => { + const { emitter, frames } = emitterSpy(); + const { exec, calls } = execReturning({ code: 0, stdout: '', stderr: '' }); + const r = await runModelPull({ jobId: 'j1', target, repo: '../x', mode: 'wrapper' }, exec, emitter); + expect(r.ok).toBe(false); + expect(calls).toHaveLength(0); + expect(frames[frames.length - 1]).toMatchObject({ type: 'control_job', status: 'failed' }); + }); + + it('runs the wrapper pull verb and emits running then completed', async () => { + const { emitter, frames } = emitterSpy(); + const { exec, calls } = execReturning({ code: 0, stdout: 'done', stderr: '' }); + const r = await runModelPull({ jobId: 'j2', target, repo: 'Qwen/Q3', mode: 'wrapper' }, exec, emitter); + expect(r.ok).toBe(true); + expect(calls).toEqual(['pull Qwen/Q3']); + expect(frames.map((f) => f.status)).toEqual(['running', 'completed']); + expect(frames.every((f) => (f.detail as { kind?: string }).kind === 'pull')).toBe(true); + }); + + it('reports a non-zero exit as failed', async () => { + const { emitter, frames } = emitterSpy(); + const { exec } = execReturning({ code: 1, stdout: '', stderr: 'no such repo' }); + const r = await runModelPull({ jobId: 'j3', target, repo: 'Qwen/Q3', mode: 'wrapper' }, exec, emitter); + expect(r.ok).toBe(false); + expect(frames[frames.length - 1]).toMatchObject({ status: 'failed' }); + }); + + it('shell mode without a models dir fails fast', async () => { + const { emitter } = emitterSpy(); + const { exec, calls } = execReturning({ code: 0, stdout: '', stderr: '' }); + const r = await runModelPull({ jobId: 'j4', target, repo: 'Qwen/Q3', mode: 'shell' }, exec, emitter); + expect(r.ok).toBe(false); + expect(calls).toHaveLength(0); + }); +}); diff --git a/apps/control/src/services/__tests__/pipeline.test.ts b/apps/control/src/services/__tests__/pipeline.test.ts new file mode 100644 index 0000000..f23312e --- /dev/null +++ b/apps/control/src/services/__tests__/pipeline.test.ts @@ -0,0 +1,337 @@ +import { describe, it, expect, vi, beforeEach } from 'vitest'; +import { parseSseLine } from '../fleet-connector.js'; +import type { LlamaSweepSSEEvent, MetricsEntry, ModelStatusEntry } from '../fleet-connector.js'; +import { createFleetState, ensureHostState, incrementSeq } from '../fleet-state.js'; +import { createDeltaEmitter, handleLlamaSweepEvent } from '../../index.js'; +import type { DeltaEmitter } from '../../index.js'; +import type { Sql } from '../../db.js'; +import type { Config } from '../../config.js'; + +// ─── SSE parser tests (REAL wire shapes from apigroup.go) ──────────────────── +// Real format: event:message / data:{"type":"","data":""} + +describe('parseSseLine (real wire shapes)', () => { + it('parses double-encoded modelStatus (real full-fleet array payload)', () => { + const inner = JSON.stringify([ + { id: 'llama3', name: '', description: '', state: 'ready', unlisted: false, peerID: '' }, + ]); + const outer = JSON.stringify({ type: 'modelStatus', data: inner }); + const result = parseSseLine(`data: ${outer}`); + expect(result).not.toBeNull(); + expect(result!.type).toBe('modelStatus'); + expect(result!.data).toEqual([ + { id: 'llama3', name: '', description: '', state: 'ready', unlisted: false, peerID: '' }, + ]); + }); + + it('ignores event: lines (always event:message)', () => { + expect(parseSseLine('event:message')).toBeNull(); + }); + + it('returns null for data: with missing inner data field', () => { + expect(parseSseLine('data:{"type":"modelStatus"}')).toBeNull(); + }); + + it('returns null for empty line', () => { + expect(parseSseLine('')).toBeNull(); + expect(parseSseLine(' ')).toBeNull(); + }); + + it('returns null for malformed JSON', () => { + expect(parseSseLine('data: not-json')).toBeNull(); + }); +}); + +// ─── Pipeline integration test (real functions) ────────────────────────────── + + +function apiModel(id: string, state: string): ModelStatusEntry { + return { id, name: '', description: '', state, unlisted: false, peerID: '' }; +} + +describe('SSE pipeline: parse -> handleLlamaSweepEvent -> emit deltas', () => { + let mockSql: Sql; + let mockConfig: Config; + let executedQueries: string[]; + + beforeEach(() => { + executedQueries = []; + mockSql = Object.assign( + (strings: TemplateStringsArray, ...values: unknown[]) => { + const query = strings.reduce((acc: string, s: string, i: number) => acc + s + (values[i] ?? ''), ''); + executedQueries.push(query); + return Promise.resolve([]); + }, + { + json: (v: unknown) => v, + unsafe: async (q: string) => { executedQueries.push(q); return []; }, + }, + ) as unknown as Sql; + + mockConfig = { + NODE_ENV: 'production', + PORT: 9503, + HOST: '127.0.0.1', + DATABASE_URL: 'postgres://test', + LOG_LEVEL: 'info', + RETENTION_RAW_HOURS: 48, + RETENTION_ROLLUP_DAYS: 90, + CAPTURE_SIZE_KB: 256, + CAPTURE_BUDGET_MB: 50, + } as unknown as Config; + }); + + it('processes modelStatus SSE event and emits delta with seq=1', async () => { + const fleet = createFleetState(); + const emitter = createDeltaEmitter(); + const deltas: unknown[] = []; + emitter.subscribe((d) => deltas.push(d)); + + const event: LlamaSweepSSEEvent = { + type: 'modelStatus', + data: [apiModel('llama3', 'ready')], + }; + + await handleLlamaSweepEvent(fleet, mockSql, mockConfig, 'host1', emitter, event); + + // Assert: delta was emitted + expect(deltas).toHaveLength(1); + const delta = deltas[0] as { type: string; seq: number; hosts: Array<{ seq: number; models: Array<{ model: string; state: string }> }> }; + expect(delta.type).toBe('control_fleet'); + expect(delta.seq).toBe(1); + expect(delta.hosts[0].seq).toBe(1); + expect(delta.hosts[0].models[0].model).toBe('llama3'); + expect(delta.hosts[0].models[0].state).toBe('ready'); + + // Assert: SQL INSERT was called + expect(executedQueries.length).toBe(1); + expect(executedQueries[0]).toContain('control_model_events'); + expect(executedQueries[0]).toContain('llama3'); + }); + + it('increments seq monotonically across multiple events', async () => { + const fleet = createFleetState(); + const emitter = createDeltaEmitter(); + const deltas: unknown[] = []; + emitter.subscribe((d) => deltas.push(d)); + + for (let i = 0; i < 3; i++) { + // Each snapshot adds a new model -> a transition -> a delta. + await handleLlamaSweepEvent(fleet, mockSql, mockConfig, 'host1', emitter, { + type: 'modelStatus', + data: [apiModel(`model${i}`, 'ready')], + }); + } + + expect(deltas).toHaveLength(3); + const seqs = deltas.map((d) => (d as { seq: number }).seq); + expect(seqs).toEqual([1, 2, 3]); + }); + + it('processes metrics event with multiple entries and emits activity deltas', async () => { + const fleet = createFleetState(); + const emitter = createDeltaEmitter(); + const deltas: unknown[] = []; + emitter.subscribe((d) => deltas.push(d)); + + const metricsEvent: LlamaSweepSSEEvent = { + type: 'metrics', + data: [ + { + id: 1, + timestamp: '2024-01-01T00:00:00Z', + model: 'llama3', + req_path: '/v1/chat/completions', + resp_status_code: 200, + duration_ms: 1500, + tokens: { + cache_tokens: 100, + input_tokens: 50, + output_tokens: 200, + prompt_per_second: 30, + tokens_per_second: 50, + }, + has_capture: false, + }, + { + id: 2, + timestamp: '2024-01-01T00:01:00Z', + model: 'llama3', + req_path: '/v1/chat/completions', + resp_status_code: 200, + duration_ms: 1200, + tokens: { + cache_tokens: 0, + input_tokens: 100, + output_tokens: 300, + prompt_per_second: 25, + tokens_per_second: 45, + }, + has_capture: false, + }, + ], + }; + + await handleLlamaSweepEvent(fleet, mockSql, mockConfig, 'host1', emitter, metricsEvent); + + // handleReconcile is called (gap detection), then 2 activity deltas + // The reconcile SQL call + 2 INSERT calls = 3 queries + expect(executedQueries.length).toBeGreaterThanOrEqual(2); + + // Activity deltas (2 entries) + const activityDeltas = deltas.filter((d) => (d as { type: string }).type === 'control_activity'); + expect(activityDeltas).toHaveLength(2); + + const d1 = activityDeltas[0] as { entry: { id: number } }; + const d2 = activityDeltas[1] as { entry: { id: number } }; + expect(d1.entry.id).toBe(1); + expect(d2.entry.id).toBe(2); + }); + + it('snapshot seq is max of all host seqs', () => { + const fleet = createFleetState(); + + const host1 = ensureHostState(fleet, 'host1'); + incrementSeq(host1); + incrementSeq(host1); + + const host2 = ensureHostState(fleet, 'host2'); + incrementSeq(host2); + incrementSeq(host2); + incrementSeq(host2); + + const hosts = Array.from(fleet.hosts.values()).map((h) => ({ + providerId: h.providerId, + seq: h.seq, + })); + const snapshotMaxSeq = hosts.reduce((max: number, h: { seq: number }) => Math.max(max, h.seq), 0); + expect(snapshotMaxSeq).toBe(3); + }); +}); + +// ─── 2-host delta merge test (B9) ──────────────────────────────────────────── + +// ─── P4: source column mapping ────────────────────────────────────────────── + +describe('P4: source column in metrics ingest', () => { + let mockSql: Sql; + let mockConfig: Config; + let executedQueries: string[]; + + beforeEach(() => { + executedQueries = []; + mockSql = Object.assign( + (strings: TemplateStringsArray, ...values: unknown[]) => { + const query = strings.reduce((acc: string, s: string, i: number) => acc + s + (values[i] ?? ''), ''); + executedQueries.push(query); + return Promise.resolve([]); + }, + { + json: (v: unknown) => v, + unsafe: async (q: string) => { executedQueries.push(q); return []; }, + }, + ) as unknown as Sql; + + mockConfig = { + NODE_ENV: 'production', + PORT: 9503, + HOST: '127.0.0.1', + DATABASE_URL: 'postgres://test', + LOG_LEVEL: 'info', + RETENTION_RAW_HOURS: 48, + RETENTION_ROLLUP_DAYS: 90, + CAPTURE_SIZE_KB: 256, + CAPTURE_BUDGET_MB: 50, + } as unknown as Config; + }); + + it('maps source as NULL for ring data (ActivityLogEntry has no headers)', async () => { + const fleet = createFleetState(); + const emitter = createDeltaEmitter(); + const deltas: unknown[] = []; + emitter.subscribe((d) => deltas.push(d)); + + const metricsEvent: LlamaSweepSSEEvent = { + type: 'metrics', + data: [ + { + id: 1, + timestamp: '2024-01-01T00:00:00Z', + model: 'llama3', + req_path: '/v1/chat/completions', + resp_status_code: 200, + duration_ms: 1500, + tokens: { + cache_tokens: 100, + input_tokens: 50, + output_tokens: 200, + prompt_per_second: 30, + tokens_per_second: 50, + }, + has_capture: false, + }, + ], + }; + + await handleLlamaSweepEvent(fleet, mockSql, mockConfig, 'host1', emitter, metricsEvent); + + // The INSERT query should include the source column + const insertQueries = executedQueries.filter((q) => q.includes('control_requests')); + expect(insertQueries.length).toBeGreaterThanOrEqual(2); + // The SSE handler INSERT (second one) includes source; reconcile INSERT (first) does not + expect(insertQueries[1]).toContain('source'); + }); +}); + +describe('2-host delta merge (B9)', () => { + it('delta for host2 does not wipe host1 from the hosts array', () => { + // Simulate the merge logic from useControlStream.tsx + const hosts = [ + { providerId: 'host1', liveness: 'connected' as const, lastSeenAt: '', seq: 5, models: [] }, + { providerId: 'host2', liveness: 'connected' as const, lastSeenAt: '', seq: 3, models: [] }, + ]; + + // Delta arrives for host2 only + const deltaHosts = [ + { providerId: 'host2', liveness: 'connected' as const, lastSeenAt: '', seq: 4, models: [] }, + ]; + + const merged = [...hosts]; + for (const dh of deltaHosts) { + const idx = merged.findIndex((h) => h.providerId === dh.providerId); + if (idx >= 0) { + merged[idx] = dh; + } else { + merged.push(dh); + } + } + + expect(merged).toHaveLength(2); + expect(merged.find((h) => h.providerId === 'host1')).toBeDefined(); + expect(merged.find((h) => h.providerId === 'host2')!.seq).toBe(4); + expect(merged.find((h) => h.providerId === 'host1')!.seq).toBe(5); + }); + + it('new host is appended when not in existing array', () => { + const hosts = [ + { providerId: 'host1', liveness: 'connected' as const, lastSeenAt: '', seq: 5, models: [] }, + ]; + + const deltaHosts = [ + { providerId: 'host3', liveness: 'connected' as const, lastSeenAt: '', seq: 1, models: [] }, + ]; + + const merged = [...hosts]; + for (const dh of deltaHosts) { + const idx = merged.findIndex((h) => h.providerId === dh.providerId); + if (idx >= 0) { + merged[idx] = dh; + } else { + merged.push(dh); + } + } + + expect(merged).toHaveLength(2); + expect(merged.map((h) => h.providerId)).toEqual(['host1', 'host3']); + }); +}); diff --git a/apps/control/src/services/__tests__/reconcile.test.ts b/apps/control/src/services/__tests__/reconcile.test.ts new file mode 100644 index 0000000..2d16089 --- /dev/null +++ b/apps/control/src/services/__tests__/reconcile.test.ts @@ -0,0 +1,34 @@ +import { describe, it, expect } from 'vitest'; +import { detectGap } from '../reconcile.js'; + +describe('detectGap', () => { + it('detects gap when oldest reconcile is newer than newest persisted', () => { + expect(detectGap('2024-01-02T00:00:00Z', '2024-01-01T00:00:00Z')).toBe(true); + }); + + it('does not detect gap when overlap exists', () => { + expect(detectGap('2024-01-01T00:00:00Z', '2024-01-02T00:00:00Z')).toBe(false); + }); + + it('does not detect gap when timestamps are equal', () => { + expect(detectGap('2024-01-01T00:00:00Z', '2024-01-01T00:00:00Z')).toBe(false); + }); + + it('returns false when oldest reconcile is null', () => { + expect(detectGap(null, '2024-01-01T00:00:00Z')).toBe(false); + }); + + it('returns false when newest persisted is null', () => { + expect(detectGap('2024-01-01T00:00:00Z', null)).toBe(false); + }); + + it('returns false when both are null', () => { + expect(detectGap(null, null)).toBe(false); + }); + + it('handles timezone offsets correctly', () => { + // 2024-01-01T12:00:00Z == 2024-01-01T14:00:00+02:00 + expect(detectGap('2024-01-01T12:00:00Z', '2024-01-01T14:00:00+02:00')).toBe(false); + expect(detectGap('2024-01-01T13:00:00Z', '2024-01-01T14:00:00+02:00')).toBe(true); + }); +}); diff --git a/apps/control/src/services/__tests__/reports.test.ts b/apps/control/src/services/__tests__/reports.test.ts new file mode 100644 index 0000000..39cbc9d --- /dev/null +++ b/apps/control/src/services/__tests__/reports.test.ts @@ -0,0 +1,66 @@ +import { describe, it, expect } from 'vitest'; +import { renderReportMarkdown, isReportDue, type ReportStats } from '../reports.js'; + +function makeStats(partial: Partial = {}): ReportStats { + return { + periodStart: '2026-06-11T00:00:00.000Z', + periodEnd: '2026-06-12T00:00:00.000Z', + interval: 'daily', + totalRequests: 100, + priorRequests: 50, + totalInputTokens: 1000, + totalOutputTokens: 2000, + bySource: [{ source: 'boochat', requests: 80, inputTokens: 800, outputTokens: 1600 }], + byProvider: [{ providerId: 'sam-desktop', requests: 100, swaps: 4 }], + leaderboard: [{ providerId: 'sam-desktop', model: 'qwopus-35b', kind: 'code', avgScore: 0.82 }], + regressions: [], + ...partial, + }; +} + +describe('renderReportMarkdown', () => { + it('renders usage with a trend vs the prior period', () => { + const md = renderReportMarkdown(makeStats()); + expect(md).toContain('# Fleet daily report'); + expect(md).toContain('Requests: 100 (+100% vs prior period)'); + expect(md).toContain('| boochat | 80 |'); + expect(md).toContain('| sam-desktop | 100 | 4 |'); + expect(md).toContain('No speed regressions flagged this period.'); + }); + + it('renders regression anomalies when present', () => { + const md = renderReportMarkdown(makeStats({ + regressions: [{ providerId: 'sam-desktop', model: 'qwopus-35b', avgGenTps: 42.5 }], + })); + expect(md).toContain('Regression: sam-desktop/qwopus-35b'); + expect(md).toContain('42.5 tok/s'); + }); + + it('handles a zero prior period without dividing by zero', () => { + const md = renderReportMarkdown(makeStats({ totalRequests: 5, priorRequests: 0 })); + expect(md).toContain('Requests: 5 (new vs prior period)'); + }); +}); + +describe('isReportDue', () => { + const now = new Date('2026-06-12T12:00:00.000Z'); + + it('is due when never run', () => { + expect(isReportDue(null, 'daily', now)).toBe(true); + }); + + it('is not due within the interval', () => { + const lastRun = new Date('2026-06-12T06:00:00.000Z'); // 6h ago + expect(isReportDue(lastRun, 'daily', now)).toBe(false); + }); + + it('is due once the interval has elapsed', () => { + const lastRun = new Date('2026-06-11T06:00:00.000Z'); // 30h ago + expect(isReportDue(lastRun, 'daily', now)).toBe(true); + }); + + it('uses a 7-day window for weekly', () => { + const lastRun = new Date('2026-06-09T12:00:00.000Z'); // 3 days ago + expect(isReportDue(lastRun, 'weekly', now)).toBe(false); + }); +}); diff --git a/apps/control/src/services/__tests__/retention.test.ts b/apps/control/src/services/__tests__/retention.test.ts new file mode 100644 index 0000000..f7b772e --- /dev/null +++ b/apps/control/src/services/__tests__/retention.test.ts @@ -0,0 +1,68 @@ +import { describe, it, expect } from 'vitest'; +import { trimCapture, parseCaptureJson } from '../retention.js'; + +describe('trimCapture', () => { + it('returns null for null input', () => { + expect(trimCapture(null, 256)).toBeNull(); + }); + + it('returns unchanged capture when within cap', () => { + const capture = JSON.stringify({ data: 'x'.repeat(100) }); + const result = trimCapture(capture, 256); + expect(result).toBe(capture); + }); + + it('trims capture when over cap', () => { + const capture = JSON.stringify({ data: 'x'.repeat(300_000) }); // ~600KB + const result = trimCapture(capture, 256); + expect(result).not.toBe(capture); + expect(result!.length).toBeLessThan(capture.length); + }); + + it('trims to roughly the cap size', () => { + const capture = JSON.stringify({ data: 'x'.repeat(1_000_000) }); // ~2MB + const result = trimCapture(capture, 256); + // trimCapture slices to sizeKB * 1024 bytes + const expectedLength = Math.floor(256 * 1024); + expect(result!.length).toBeLessThanOrEqual(expectedLength); + }); +}); + +describe('parseCaptureJson', () => { + it('parses valid JSON string into object', () => { + const input = JSON.stringify({ requestHeaders: {}, requestBody: '{}', responseHeaders: {}, responseBody: '{}' }); + const result = parseCaptureJson(input); + expect(result).toEqual({ requestHeaders: {}, requestBody: '{}', responseHeaders: {}, responseBody: '{}' }); + }); + + it('returns null for null input', () => { + expect(parseCaptureJson(null)).toBeNull(); + }); + + it('returns null for invalid JSON', () => { + expect(parseCaptureJson('not json')).toBeNull(); + }); + + it('B7: trimmed capture produces a JSONB-ready object, not a string', () => { + // Simulate the pipeline: trim -> parse -> ready for sql.json() + // A capture within the cap parses cleanly to an object for sql.json() + const withinCap = JSON.stringify({ requestHeaders: {}, requestBody: '{}', responseBody: '{}' }); + const parsed = parseCaptureJson(withinCap); + expect(typeof parsed).toBe('object'); + expect(parsed).not.toBeNull(); + // sql.json() expects an object/array; a string would double-serialize + expect(Array.isArray(parsed) || typeof parsed === 'object').toBe(true); + }); + + it('B7: oversized capture trims to invalid JSON -> parseCaptureJson returns null -> stored as NULL', () => { + // trimCapture slices by byte count, which produces invalid JSON for large captures. + // parseCaptureJson returns null for invalid JSON, and the insert stores NULL::jsonb. + // This is acceptable: a truncated capture is not useful anyway. + const raw = JSON.stringify({ data: 'x'.repeat(300_000) }); + const trimmed = trimCapture(raw, 256); + expect(trimmed).not.toBeNull(); + const parsed = parseCaptureJson(trimmed!); + // Trimmed capture is invalid JSON (sliced mid-object), so parse returns null + expect(parsed).toBeNull(); + }); +}); diff --git a/apps/control/src/services/__tests__/routing-scores.test.ts b/apps/control/src/services/__tests__/routing-scores.test.ts new file mode 100644 index 0000000..159a419 --- /dev/null +++ b/apps/control/src/services/__tests__/routing-scores.test.ts @@ -0,0 +1,57 @@ +import { describe, it, expect } from 'vitest'; +import { assignBadges, type ModelScore } from '../routing-scores.js'; + +function makeScore(partial: Partial & { compositeId: string }): ModelScore { + return { + providerId: partial.compositeId.split('/')[0]!, + model: partial.compositeId.split('/').slice(1).join('/'), + codeScore: null, + chatScore: null, + evalScore: null, + avgGenTps: null, + avgLatencyMs: null, + sampleCount: 0, + healthy: true, + badges: [], + ...partial, + }; +} + +describe('assignBadges', () => { + it('awards best-code to the highest healthy code score', () => { + const scores = [ + makeScore({ compositeId: 'a/m1', codeScore: 0.7 }), + makeScore({ compositeId: 'a/m2', codeScore: 0.9 }), + makeScore({ compositeId: 'a/m3', codeScore: 0.5 }), + ]; + assignBadges(scores); + expect(scores.find((s) => s.compositeId === 'a/m2')!.badges).toContain('best-code'); + expect(scores.find((s) => s.compositeId === 'a/m1')!.badges).not.toContain('best-code'); + }); + + it('excludes unhealthy hosts from winning any badge', () => { + const scores = [ + makeScore({ compositeId: 'a/m1', codeScore: 0.95, healthy: false }), + makeScore({ compositeId: 'a/m2', codeScore: 0.6, healthy: true }), + ]; + assignBadges(scores); + expect(scores.find((s) => s.compositeId === 'a/m1')!.badges).toHaveLength(0); + expect(scores.find((s) => s.compositeId === 'a/m2')!.badges).toContain('best-code'); + }); + + it('awards best-fast by throughput independently of eval scores', () => { + const scores = [ + makeScore({ compositeId: 'a/slow', codeScore: 0.9, avgGenTps: 10 }), + makeScore({ compositeId: 'a/fast', codeScore: 0.4, avgGenTps: 80 }), + ]; + assignBadges(scores); + expect(scores.find((s) => s.compositeId === 'a/fast')!.badges).toContain('best-fast'); + expect(scores.find((s) => s.compositeId === 'a/slow')!.badges).toContain('best-code'); + }); + + it('awards nothing for a category when no model has that metric', () => { + const scores = [makeScore({ compositeId: 'a/m1', avgGenTps: 20 })]; + assignBadges(scores); + expect(scores[0]!.badges).toEqual(['best-fast']); + }); +}); diff --git a/apps/control/src/services/__tests__/sandbox-runner.test.ts b/apps/control/src/services/__tests__/sandbox-runner.test.ts new file mode 100644 index 0000000..99d63fb --- /dev/null +++ b/apps/control/src/services/__tests__/sandbox-runner.test.ts @@ -0,0 +1,130 @@ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; + +// ─── Sandbox lifecycle tests (mock docker spawn, test orchestration) ───────── + +describe('sandbox runner lifecycle', () => { + beforeEach(() => { + vi.restoreAllMocks(); + }); + + afterEach(() => { + vi.restoreAllMocks(); + }); + + it('runCodeEval is importable', async () => { + const mod = await import('../sandbox-runner.js'); + expect(typeof mod.runCodeEval).toBe('function'); + }); + + it('bounded fan-out via Promise.allSettled', async () => { + // Test the bounded concurrency pattern directly. + const tasks = Array.from({ length: 10 }, (_, i) => ({ id: `task_${i}` })); + const concurrency = 4; + const executionOrder: number[] = []; + const activeCount: number[] = []; + let currentlyActive = 0; + + const results = await Promise.allSettled( + tasks.slice(0, concurrency).map(async (task, idx) => { + currentlyActive++; + activeCount.push(currentlyActive); + await new Promise((r) => setTimeout(r, 10 + idx * 5)); + executionOrder.push(idx); + currentlyActive--; + return { taskId: task.id, idx }; + }), + ); + + // All should fulfill. + expect(results.filter((r) => r.status === 'fulfilled').length).toBe(concurrency); + // Max concurrent should not exceed concurrency limit. + expect(Math.max(...activeCount)).toBeLessThanOrEqual(concurrency); + }); + + it('per-task finally cleanup runs on error', async () => { + const cleanupCalls: string[] = []; + + const tasks = [ + { id: 'task_ok' }, + { id: 'task_fail' }, + { id: 'task_ok2' }, + ]; + + const results = await Promise.allSettled( + tasks.map(async (task) => { + try { + if (task.id === 'task_fail') { + throw new Error('simulated failure'); + } + return { ok: true }; + } finally { + cleanupCalls.push(task.id); + } + }), + ); + + // All cleanup calls should run, even for the failed task. + expect(cleanupCalls).toContain('task_ok'); + expect(cleanupCalls).toContain('task_fail'); + expect(cleanupCalls).toContain('task_ok2'); + + // One rejection, two fulfillments. + expect(results.filter((r) => r.status === 'fulfilled').length).toBe(2); + expect(results.filter((r) => r.status === 'rejected').length).toBe(1); + }); + + it('kill-on-timeout pattern', async () => { + // Test that spawn with timeout + SIGKILL works. + const { spawn } = await import('node:child_process'); + const child = spawn('sleep', ['300']); + const timeoutHandle = setTimeout(() => { + child.kill('SIGKILL'); + }, 100); + + await new Promise((resolve) => { + child.on('close', () => { + clearTimeout(timeoutHandle); + resolve(); + }); + }); + + // SIGKILL gives signal, not exit code. + expect(child.killed).toBe(true); + }); + + it('allSettled isolation: one failure does not abort others', async () => { + const completed: string[] = []; + + const results = await Promise.allSettled([ + (async () => { + await new Promise((r) => setTimeout(r, 50)); + completed.push('task1'); + return 'ok1'; + })(), + (async () => { + await new Promise((r) => setTimeout(r, 20)); + throw new Error('fail'); + })(), + (async () => { + await new Promise((r) => setTimeout(r, 50)); + completed.push('task3'); + return 'ok3'; + })(), + ]); + + // Both successful tasks completed despite the failure. + expect(completed).toContain('task1'); + expect(completed).toContain('task3'); + + expect(results[0].status).toBe('fulfilled'); + expect(results[1].status).toBe('rejected'); + expect(results[2].status).toBe('fulfilled'); + }); + + it('pruneOrphanContainers handles missing docker gracefully', async () => { + // The pruneOrphanContainers function is internal but handles docker errors gracefully. + // We verify the module loads without error even if docker is not available. + const mod = await import('../sandbox-runner.js'); + expect(typeof mod.runCodeEval).toBe('function'); + }); +}); diff --git a/apps/control/src/services/__tests__/seq-logic.test.ts b/apps/control/src/services/__tests__/seq-logic.test.ts new file mode 100644 index 0000000..715a854 --- /dev/null +++ b/apps/control/src/services/__tests__/seq-logic.test.ts @@ -0,0 +1,106 @@ +import { describe, it, expect } from 'vitest'; + +// Seq logic test: verify the buffer-then-filter rule. +// Client buffers pre-snapshot deltas, discards seq <= snapshot_seq per-host. + +interface Delta { + type: 'control_fleet'; + seq: number; + hosts: Array<{ providerId: string; seq: number }>; +} + +interface Snapshot { + type: 'control_fleet'; + seq: number; + hosts: Array<{ providerId: string; seq: number }>; +} + +function applyDelta(delta: Delta, snapshotSeqs: Map): boolean { + // Apply only if seq > snapshot seq for that host. + const firstHost = delta.hosts[0]; + if (!firstHost) return false; + const snapshotSeq = snapshotSeqs.get(firstHost.providerId) ?? 0; + return delta.seq > snapshotSeq; +} + +function applySnapshot(snapshot: Snapshot, snapshotSeqs: Map): void { + for (const host of snapshot.hosts) { + snapshotSeqs.set(host.providerId, host.seq); + } +} + +describe('seq logic: buffer-then-filter', () => { + it('applies delta when seq > snapshot seq', () => { + const snapshotSeqs = new Map([['host1', 5]]); + const delta: Delta = { + type: 'control_fleet', + seq: 10, + hosts: [{ providerId: 'host1', seq: 10 }], + }; + expect(applyDelta(delta, snapshotSeqs)).toBe(true); + }); + + it('discards delta when seq <= snapshot seq', () => { + const snapshotSeqs = new Map([['host1', 10]]); + const delta: Delta = { + type: 'control_fleet', + seq: 5, + hosts: [{ providerId: 'host1', seq: 5 }], + }; + expect(applyDelta(delta, snapshotSeqs)).toBe(false); + }); + + it('discards delta when seq equals snapshot seq', () => { + const snapshotSeqs = new Map([['host1', 10]]); + const delta: Delta = { + type: 'control_fleet', + seq: 10, + hosts: [{ providerId: 'host1', seq: 10 }], + }; + expect(applyDelta(delta, snapshotSeqs)).toBe(false); + }); + + it('updates snapshot seqs on snapshot apply', () => { + const snapshotSeqs = new Map(); + const snapshot: Snapshot = { + type: 'control_fleet', + seq: 0, + hosts: [ + { providerId: 'host1', seq: 100 }, + { providerId: 'host2', seq: 50 }, + ], + }; + applySnapshot(snapshot, snapshotSeqs); + expect(snapshotSeqs.get('host1')).toBe(100); + expect(snapshotSeqs.get('host2')).toBe(50); + }); + + it('handles missing snapshot seq (treats as 0)', () => { + const snapshotSeqs = new Map(); + const delta: Delta = { + type: 'control_fleet', + seq: 1, + hosts: [{ providerId: 'host1', seq: 1 }], + }; + // Without a snapshot, seq 1 > 0, so delta applies. + expect(applyDelta(delta, snapshotSeqs)).toBe(true); + }); + + it('discards out-of-order delta after snapshot', () => { + // Simulate: snapshot arrives at seq 10, then delta at seq 5 arrives. + const snapshotSeqs = new Map(); + const snapshot: Snapshot = { + type: 'control_fleet', + seq: 0, + hosts: [{ providerId: 'host1', seq: 10 }], + }; + applySnapshot(snapshot, snapshotSeqs); + + const delta: Delta = { + type: 'control_fleet', + seq: 5, + hosts: [{ providerId: 'host1', seq: 5 }], + }; + expect(applyDelta(delta, snapshotSeqs)).toBe(false); + }); +}); diff --git a/apps/control/src/services/__tests__/ssh-config.test.ts b/apps/control/src/services/__tests__/ssh-config.test.ts new file mode 100644 index 0000000..abc4c6c --- /dev/null +++ b/apps/control/src/services/__tests__/ssh-config.test.ts @@ -0,0 +1,234 @@ +import { describe, it, expect } from 'vitest'; +import { + validateLlamaConfig, + computeDiff, + backupFilename, + applyRemoteConfig, + healthWait, + type SshExec, + type ExecResult, +} from '../ssh-config.js'; + +// A minimal subset of the llama-swap config schema sufficient for these tests: +// top-level object with a required non-empty `models` object. +const SCHEMA = { + type: 'object', + required: ['models'], + properties: { + models: { + type: 'object', + minProperties: 1, + additionalProperties: { + type: 'object', + properties: { cmd: { type: 'string' } }, + }, + }, + }, +} as const; + +const VALID_YAML = `models:\n m1:\n cmd: "llama-server -m m1.gguf"\n`; + +describe('validateLlamaConfig', () => { + it('accepts a valid config', () => { + const r = validateLlamaConfig(VALID_YAML, SCHEMA); + expect(r.valid).toBe(true); + expect(r.errors).toEqual([]); + }); + + it('rejects broken YAML with a parse error', () => { + const r = validateLlamaConfig('models:\n m1:\n cmd: "x\n : :', SCHEMA); + expect(r.valid).toBe(false); + expect(r.errors[0]).toMatch(/YAML parse error/); + }); + + it('rejects a config missing required models', () => { + const r = validateLlamaConfig('healthCheckTimeout: 30\n', SCHEMA); + expect(r.valid).toBe(false); + expect(r.errors.join(' ')).toMatch(/models/); + }); + + it('rejects a non-mapping document', () => { + const r = validateLlamaConfig('- just\n- a\n- list\n', SCHEMA); + expect(r.valid).toBe(false); + }); +}); + +describe('computeDiff', () => { + it('returns empty for identical text', () => { + expect(computeDiff('a\nb\n', 'a\nb\n')).toBe(''); + }); + it('marks changed lines with -/+', () => { + const d = computeDiff('a\nb\nc\n', 'a\nX\nc\n'); + expect(d).toContain('- b'); + expect(d).toContain('+ X'); + }); +}); + +describe('backupFilename', () => { + it('produces a timestamped path', () => { + const name = backupFilename('/etc/llama/config.yaml', new Date('2026-06-12T03:04:05.678Z')); + expect(name).toBe('/etc/llama/config.yaml.bak-20260612T030405Z'); + }); +}); + +// ─── apply pipeline failure paths ──────────────────────────────────────────── + +function makeExec(handlers: Record): { exec: SshExec; calls: string[] } { + const calls: string[] = []; + const exec: SshExec = async (_t, command) => { + calls.push(command); + for (const [pattern, result] of Object.entries(handlers)) { + if (command.includes(pattern)) return result; + } + return { code: 0, stdout: '', stderr: '' }; + }; + return { exec, calls }; +} + +const target = { host: 'h', user: 'u', keyPath: '/k' }; +const okFetcher = (async () => new Response('{}', { status: 200 })) as unknown as typeof fetch; + +describe('applyRemoteConfig', () => { + it('aborts at validate for an invalid config and never touches the host', async () => { + const { exec, calls } = makeExec({}); + const r = await applyRemoteConfig({ + target, configPath: '/c.yaml', restartCmd: 'restart', newConfig: 'not: valid: yaml: here:::', + schema: SCHEMA, baseUrl: 'http://h', exec, fetcher: okFetcher, + }); + expect(r.ok).toBe(false); + expect(r.step).toBe('validate'); + expect(calls).toHaveLength(0); + }); + + it('aborts at validate when the host config is unreadable', async () => { + const { exec } = makeExec({ "cat '": { code: 1, stdout: '', stderr: 'no such file' } }); + const r = await applyRemoteConfig({ + target, configPath: '/c.yaml', restartCmd: 'restart', newConfig: VALID_YAML, + schema: SCHEMA, baseUrl: 'http://h', exec, fetcher: okFetcher, + }); + expect(r.ok).toBe(false); + expect(r.step).toBe('validate'); + expect(r.error).toMatch(/read current failed/); + }); + + it('backs up BEFORE write and aborts on write failure (backup retained)', async () => { + const { exec, calls } = makeExec({ + "cat '": { code: 0, stdout: 'models:\n old: {}\n', stderr: '' }, // read current + 'cp ': { code: 0, stdout: '', stderr: '' }, // backup + 'cat >': { code: 1, stdout: '', stderr: 'disk full' }, // write fails + }); + const r = await applyRemoteConfig({ + target, configPath: '/c.yaml', restartCmd: 'restart', newConfig: VALID_YAML, + schema: SCHEMA, baseUrl: 'http://h', exec, fetcher: okFetcher, + now: new Date('2026-06-12T00:00:00Z'), + }); + expect(r.ok).toBe(false); + expect(r.step).toBe('write'); + expect(r.backupPath).toBe('/c.yaml.bak-20260612T000000Z'); + // backup (cp) must precede write (cat >) + const cpIdx = calls.findIndex((c) => c.startsWith('cp ')); + const writeIdx = calls.findIndex((c) => c.startsWith('cat >')); + expect(cpIdx).toBeGreaterThanOrEqual(0); + expect(writeIdx).toBeGreaterThan(cpIdx); + }); + + it('aborts at restart on restart failure', async () => { + const { exec } = makeExec({ + "cat '": { code: 0, stdout: 'models:\n old: {}\n', stderr: '' }, + 'cp ': { code: 0, stdout: '', stderr: '' }, + 'cat >': { code: 0, stdout: '', stderr: '' }, + restart: { code: 1, stdout: '', stderr: 'service not found' }, + }); + const r = await applyRemoteConfig({ + target, configPath: '/c.yaml', restartCmd: 'restart-svc', newConfig: VALID_YAML, + schema: SCHEMA, baseUrl: 'http://h', exec, fetcher: okFetcher, + }); + expect(r.ok).toBe(false); + expect(r.step).toBe('restart'); + }); + + it('aborts at health when the service never comes back', async () => { + const { exec } = makeExec({ + "cat '": { code: 0, stdout: 'models:\n old: {}\n', stderr: '' }, + 'cp ': { code: 0, stdout: '', stderr: '' }, + 'cat >': { code: 0, stdout: '', stderr: '' }, + 'restart-svc': { code: 0, stdout: '', stderr: '' }, + }); + const downFetcher = (async () => { throw new Error('refused'); }) as unknown as typeof fetch; + const r = await applyRemoteConfig({ + target, configPath: '/c.yaml', restartCmd: 'restart-svc', newConfig: VALID_YAML, + schema: SCHEMA, baseUrl: 'http://h', exec, fetcher: downFetcher, + healthAttempts: 2, healthDelayMs: 1, + }); + expect(r.ok).toBe(false); + expect(r.step).toBe('health'); + }); + + it('succeeds through the full pipeline', async () => { + const { exec } = makeExec({ + "cat '": { code: 0, stdout: 'models:\n old: {}\n', stderr: '' }, + 'cp ': { code: 0, stdout: '', stderr: '' }, + 'cat >': { code: 0, stdout: '', stderr: '' }, + 'restart-svc': { code: 0, stdout: '', stderr: '' }, + }); + const r = await applyRemoteConfig({ + target, configPath: '/c.yaml', restartCmd: 'restart-svc', newConfig: VALID_YAML, + schema: SCHEMA, baseUrl: 'http://h', exec, fetcher: okFetcher, + healthAttempts: 1, healthDelayMs: 1, + }); + expect(r.ok).toBe(true); + expect(r.step).toBe('done'); + expect(r.backupPath).toBeDefined(); + }); +}); + +describe('healthWait', () => { + it('returns true on first OK', async () => { + const ok = await healthWait('http://h', okFetcher, 3, 1); + expect(ok).toBe(true); + }); + it('returns false after exhausting attempts', async () => { + const downFetcher = (async () => new Response('', { status: 503 })) as unknown as typeof fetch; + const ok = await healthWait('http://h', downFetcher, 2, 1); + expect(ok).toBe(false); + }); +}); + +// ─── wrapper mode (forced-command verbs) ───────────────────────────────────── + +describe('applyRemoteConfig wrapper mode', () => { + it('sends verbs (not raw shell) and reads the backup path from the backup verb', async () => { + const { exec, calls } = makeExec({ + read: { code: 0, stdout: 'models:\n old: {}\n', stderr: '' }, + backup: { code: 0, stdout: '/c.yaml.bak-WRAP\n', stderr: '' }, + write: { code: 0, stdout: '', stderr: '' }, + restart: { code: 0, stdout: '', stderr: '' }, + }); + const r = await applyRemoteConfig({ + target, configPath: '/c.yaml', restartCmd: 'ignored-in-wrapper', newConfig: VALID_YAML, + schema: SCHEMA, baseUrl: 'http://h', exec, fetcher: okFetcher, mode: 'wrapper', + healthAttempts: 1, healthDelayMs: 1, + }); + expect(r.ok).toBe(true); + // backup path comes from the wrapper's stdout, not a client-computed name + expect(r.backupPath).toBe('/c.yaml.bak-WRAP'); + // verbs only — no cat/cp/cat > shell commands + expect(calls).toEqual(['read', 'backup', 'write', 'restart']); + expect(calls.some((c) => c.includes('cat') || c.includes('cp '))).toBe(false); + }); + + it('aborts at write when the wrapper write verb fails (backup retained)', async () => { + const { exec } = makeExec({ + read: { code: 0, stdout: 'old\n', stderr: '' }, + backup: { code: 0, stdout: '/c.yaml.bak-WRAP\n', stderr: '' }, + write: { code: 1, stdout: '', stderr: 'denied' }, + }); + const r = await applyRemoteConfig({ + target, configPath: '/c.yaml', restartCmd: 'x', newConfig: VALID_YAML, + schema: SCHEMA, baseUrl: 'http://h', exec, fetcher: okFetcher, mode: 'wrapper', + }); + expect(r.ok).toBe(false); + expect(r.step).toBe('write'); + expect(r.backupPath).toBe('/c.yaml.bak-WRAP'); + }); +}); diff --git a/apps/control/src/services/action-queue.ts b/apps/control/src/services/action-queue.ts new file mode 100644 index 0000000..78dd1c1 --- /dev/null +++ b/apps/control/src/services/action-queue.ts @@ -0,0 +1,236 @@ +/** + * Per-host FIFO action queue. + * + * All host-mutating actions (warm, unload) from BooControl serialize through + * a single FIFO queue per provider_id. Queue discipline: + * + * - Submissions rejected immediately while host liveness is 'down' + * - Queue depth capped at 4; reject-on-full includes pending queue contents + * - Each action re-checks liveness on dequeue and skips if stale + * - Unload-during-bench returns 409 {error: 'bench in progress', requiresConfirmation: true} + * + * Pattern: arena-runner.ts advanceChain promise-chain + read-fresh-state-or-skip. + */ + +import type { FastifyBaseLogger } from 'fastify'; + +export type ActionType = 'warm' | 'unload'; + +export interface QueuedAction { + actionId: string; + type: ActionType; + providerId: string; + model?: string; // for warm: target model; for unload: specific model or undefined for all + confirmed: boolean; // true if client confirmed takeover + createdAt: Date; +} + +export interface ActionQueueEntry { + action: QueuedAction; + status: 'pending' | 'running' | 'completed' | 'failed' | 'skipped'; + error?: string; + enqueuedAt: Date; +} + +export interface ActionQueueState { + queue: ActionQueueEntry[]; + running: boolean; +} + +export interface ActionQueueDeps { + baseUrl: string; + isLivenessUp: () => boolean; + isInflightRequests: () => number; + log: FastifyBaseLogger; +} + +const MAX_QUEUE_DEPTH = 4; + +export class ActionQueue { + private queues: Map = new Map(); + private depsMap: Map = new Map(); + + registerHost(providerId: string, deps: ActionQueueDeps): void { + this.depsMap.set(providerId, deps); + if (!this.queues.has(providerId)) { + this.queues.set(providerId, { queue: [], running: false }); + } + } + + /** + * Submit an action to the per-host queue. + * Returns rejection reasons for: host down, queue full, bench in progress. + */ + submit(action: QueuedAction): { ok: true } | { ok: false; error: string; pending?: QueuedAction[]; requiresConfirmation?: boolean } { + const deps = this.depsMap.get(action.providerId); + if (!deps) { + return { ok: false, error: `unknown host: ${action.providerId}` }; + } + + // Reject if host is down + if (!deps.isLivenessUp()) { + return { ok: false, error: 'host offline' }; + } + + const state = this.queues.get(action.providerId); + if (!state) { + return { ok: false, error: `queue not initialized for ${action.providerId}` }; + } + + // Check bench in progress for unload actions + if (action.type === 'unload' && !action.confirmed) { + const inflight = deps.isInflightRequests(); + if (inflight > 0) { + return { + ok: false, + error: 'bench in progress', + requiresConfirmation: true, + }; + } + } + + // Depth cap + if (state.queue.length >= MAX_QUEUE_DEPTH) { + const pending = state.queue.map((e) => e.action); + return { + ok: false, + error: `queue full (${state.queue.length}/${MAX_QUEUE_DEPTH})`, + pending, + }; + } + + const entry: ActionQueueEntry = { + action, + status: 'pending', + enqueuedAt: new Date(), + }; + state.queue.push(entry); + + // Kick the processor + void this.processNext(action.providerId, deps); + return { ok: true }; + } + + /** + * Get the current queue state for a host. + */ + getState(providerId: string): ActionQueueState | null { + return this.queues.get(providerId) ?? null; + } + + /** + * Process the next action in the queue for a host. + * Uses promise-chain pattern: each action runs to completion before the next. + */ + private async processNext(providerId: string, deps: ActionQueueDeps): Promise { + const state = this.queues.get(providerId); + if (!state || state.running || state.queue.length === 0) return; + + state.running = true; + const entry = state.queue[0]; + if (!entry) { + state.running = false; + return; + } + + entry.status = 'running'; + + try { + // Re-check liveness on dequeue — skip stale actions + if (!deps.isLivenessUp()) { + entry.status = 'skipped'; + entry.error = 'host went down during queue wait'; + state.queue.shift(); + state.running = false; + // Process next + void this.processNext(providerId, deps); + return; + } + + // Re-check if action is still valid (stale warm after model loaded, etc.) + if (entry.action.type === 'warm' && this.isModelAlreadyLoaded(providerId, entry.action.model)) { + entry.status = 'skipped'; + entry.error = 'model already loaded'; + state.queue.shift(); + state.running = false; + void this.processNext(providerId, deps); + return; + } + + await this.executeAction(entry.action, deps); + entry.status = 'completed'; + } catch (err) { + entry.status = 'failed'; + entry.error = (err as Error).message ?? String(err); + deps.log.error({ actionId: entry.action.actionId, err: entry.error }, 'action: failed'); + } + + state.queue.shift(); + state.running = false; + void this.processNext(providerId, deps); + } + + private async executeAction(action: QueuedAction, deps: ActionQueueDeps): Promise { + const baseUrl = deps.baseUrl; + + switch (action.type) { + case 'warm': { + // 1-token POST /v1/chat/completions with bare wire ID + if (!action.model) { + throw new Error('warm action requires model'); + } + const res = await fetch(`${baseUrl}/v1/chat/completions`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + model: action.model, + prompt: '.', + max_tokens: 1, + stream: false, + }), + signal: AbortSignal.timeout(60_000), + }); + if (!res.ok) { + const body = await res.text().catch(() => ''); + throw new Error(`warm failed: ${res.status} ${body.slice(0, 200)}`); + } + break; + } + + case 'unload': { + let url: string; + if (action.model) { + url = `${baseUrl}/api/models/unload/${encodeURIComponent(action.model)}`; + } else { + url = `${baseUrl}/api/models/unload`; + } + const res = await fetch(url, { + method: 'POST', + signal: AbortSignal.timeout(30_000), + }); + if (!res.ok) { + const body = await res.text().catch(() => ''); + throw new Error(`unload failed: ${res.status} ${body.slice(0, 200)}`); + } + break; + } + } + } + + /** + * Check if a model is already loaded on the host (stale-action guard). + * This is a placeholder — the real check reads from fleet state. + */ + private isModelAlreadyLoaded(_providerId: string, _model: string | undefined): boolean { + // Will be wired to fleet state in index.ts + return false; + } + + /** + * Set the model-loaded check callback (wired from index.ts). + */ + setModelLoadedCheck(fn: (providerId: string, model: string | undefined) => boolean): void { + const original = this.isModelAlreadyLoaded.bind(this); + this.isModelAlreadyLoaded = fn; + } +} diff --git a/apps/control/src/services/bench-engine.ts b/apps/control/src/services/bench-engine.ts new file mode 100644 index 0000000..dfbf03e --- /dev/null +++ b/apps/control/src/services/bench-engine.ts @@ -0,0 +1,517 @@ +/** + * Bench engine: speed benchmark runner. + * + * Suite = grid of (prompt_tokens x gen_tokens x concurrency) x repetitions. + * TTFT measured client-side at first stream delta. + * llama.cpp timings parsed from final stream chunk. + * Bounded fan-out via Promise.allSettled at suite-declared concurrency. + * Warmup excluded from results. + */ + +import type { Sql } from '../db.js'; +import type { DeltaEmitter } from '../index.js'; +import { jsonbObject } from './jsonb.js'; + +// ─── types ────────────────────────────────────────────────────────────────── + +export interface BenchSuite { + id: string; + name: string; + providerId: string; + model: string; + promptTokens: number[]; + genTokens: number[]; + concurrency: number[]; + repetitions: number; + temperature?: number; + topP?: number; + metadata?: Record; +} + +export interface BenchRunParams { + suite: BenchSuite; + baseUrl: string; + temperature?: number; + topP?: number; +} + +export interface BenchTimings { + promptPerSecond: number; + predictedPerSecond: number; + cacheN: number; +} + +export interface BenchSample { + promptTokens: number; + genTokens: number; + concurrency: number; + repetition: number; + ttftMs: number | null; + totalMs: number | null; + promptTps: number | null; + genTps: number | null; + cacheN: number | null; + error: string | null; +} + +// ─── stream parser ────────────────────────────────────────────────────────── + +/** + * Parse llama.cpp timings from the final chunk of a streaming response. + * llama.cpp returns timings in the last chunk's usage or as a separate field: + * { "timings": { "prompt_per_second": N, "predicted_per_second": N, "cache_n": N } } + * or in the usage object. + */ +export function parseLlamaTimings(chunk: string): BenchTimings | null { + try { + // Strip "data: " prefix if present + const jsonStr = chunk.startsWith('data: ') ? chunk.slice(6) : chunk; + if (jsonStr.trim() === '[DONE]') return null; + + const parsed = JSON.parse(jsonStr) as Record; + + // Try the timings object first (llama.cpp standard) + const timings = parsed.timings as { + prompt_per_second?: number; + predicted_per_second?: number; + cache_n?: number; + } | undefined; + if (timings) { + return { + promptPerSecond: timings.prompt_per_second ?? 0, + predictedPerSecond: timings.predicted_per_second ?? 0, + cacheN: timings.cache_n ?? 0, + }; + } + + // Fallback: check usage.completion_tokens_details or completion_tokens + const usage = parsed.usage as { + prompt_tokens?: number; + completion_tokens?: number; + } | undefined; + if (usage) { + return { + promptPerSecond: 0, + predictedPerSecond: 0, + cacheN: 0, + }; + } + + return null; + } catch { + return null; + } +} + +// ─── single request runner ────────────────────────────────────────────────── + +/** + * Run a single bench request: stream completion, capture TTFT, parse timings. + * Returns a BenchSample. + */ +export async function runSingleBenchRequest( + baseUrl: string, + model: string, + promptTokens: number, + genTokens: number, + repetition: number, + temperature: number = 0.7, + topP: number = 0.9, +): Promise { + const sample: BenchSample = { + promptTokens, + genTokens, + concurrency: 1, // set by the fan-out caller + repetition, + ttftMs: null, + totalMs: null, + promptTps: null, + genTps: null, + cacheN: null, + error: null, + }; + + // Generate a deterministic prompt of the target length. + const prompt = generatePrompt(promptTokens); + + const startTime = Date.now(); + let firstDeltaTime: number | null = null; + let timings: BenchTimings | null = null; + + try { + const res = await fetch(`${baseUrl}/v1/chat/completions`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + model, + messages: [{ role: 'user', content: prompt }], + temperature, + top_p: topP, + max_tokens: genTokens, + stream: true, + }), + signal: AbortSignal.timeout(120_000), + }); + + if (!res.ok) { + const errBody = await res.text().catch(() => ''); + throw new Error(`bench request failed: ${res.status} ${errBody.slice(0, 200)}`); + } + + const reader = res.body?.getReader(); + if (!reader) { + throw new Error('no response body'); + } + + const decoder = new TextDecoder(); + let buffer = ''; + + while (true) { + const { done, value } = await reader.read(); + if (done) break; + + buffer += decoder.decode(value, { stream: true }); + const lines = buffer.split('\n'); + buffer = lines.pop() ?? ''; + + for (const line of lines) { + const trimmed = line.trim(); + if (!trimmed || trimmed === 'data: [DONE]') continue; + + // TTFT: capture at first delta + if (firstDeltaTime === null) { + firstDeltaTime = Date.now(); + } + + // Parse timings from the final chunk + const t = parseLlamaTimings(trimmed); + if (t) { + timings = t; + } + } + } + + sample.ttftMs = firstDeltaTime !== null ? firstDeltaTime - startTime : null; + sample.totalMs = Date.now() - startTime; + + if (timings) { + sample.promptTps = timings.promptPerSecond; + sample.genTps = timings.predictedPerSecond; + sample.cacheN = timings.cacheN; + } + } catch (err) { + sample.error = (err as Error).message ?? String(err); + } + + return sample; +} + +/** + * Generate a deterministic prompt with approximately the target token count. + * Uses a repeating pattern that averages ~1.3 chars per token for GPT-style tokenizers. + */ +function generatePrompt(targetTokens: number): string { + // Simple pattern: repeat a sentence that tokenizes predictably. + // ~1.3 chars/token is a rough average for English text. + const charsPerToken = 4; + const targetChars = targetTokens * charsPerToken; + const base = 'The quick brown fox jumps over the lazy dog. '; + let result = ''; + while (result.length < targetChars) { + result += base; + } + return result.slice(0, targetChars); +} + +// ─── bench runner ─────────────────────────────────────────────────────────── + +export interface BenchRunProgress { + jobId: string; + totalSamples: number; + completedSamples: number; + currentPromptTokens: number; + currentGenTokens: number; + currentConcurrency: number; + currentRepetition: number; +} + +/** + * Run a full bench suite: grid of all combinations. + * Bounded fan-out via Promise.allSettled at suite-declared concurrency. + * Warmup excluded from results (1 warmup request per unique grid cell, discarded). + */ +export async function runBenchSuite( + params: BenchRunParams, + sql: Sql, + emitter: DeltaEmitter, + seq: number, + onProgress: (progress: BenchRunProgress) => void, +): Promise { + const { suite, baseUrl } = params; + + // A4: suite-defined sampling params with fallback defaults. + const temperature = suite.temperature ?? params.temperature ?? 0.7; + const topP = suite.topP ?? params.topP ?? 0.9; + const jobId = suite.id; + + // Build the full grid of combinations. + const grid: Array<{ + promptTokens: number; + genTokens: number; + concurrency: number; + repetition: number; + }> = []; + + for (const pt of suite.promptTokens) { + for (const gt of suite.genTokens) { + for (const conc of suite.concurrency) { + for (let rep = 0; rep < suite.repetitions; rep++) { + grid.push({ promptTokens: pt, genTokens: gt, concurrency: conc, repetition: rep }); + } + } + } + } + + const totalSamples = grid.length; + + // Persist the run record with jobType (A2) and sampling params (A4). + const runId = `${jobId}_${Date.now()}`; + await sql` + INSERT INTO bench_runs (id, suite_id, job_type, status, started_at, total_samples, temperature, top_p) + VALUES (${runId}, ${suite.id}, 'bench', 'running', clock_timestamp(), ${totalSamples}, ${temperature}, ${topP}) + `; + + // Publish run started. + emitter.publish({ + type: 'control_job' as const, + seq, + jobType: 'bench' as const, + jobId: runId, + status: 'running' as const, + detail: { + suiteId: suite.id, + providerId: suite.providerId, + model: suite.model, + totalSamples, + }, + }); + + // A5: Warmup pass — 1 request per unique (promptTokens, genTokens) cell, discarded. + const uniqueCells = new Set(); + for (const item of grid) { + const cellKey = `${item.promptTokens}_${item.genTokens}`; + if (!uniqueCells.has(cellKey)) { + uniqueCells.add(cellKey); + } + } + const warmupPromises = Array.from(uniqueCells).map(async (cellKey) => { + const parts = cellKey.split('_').map(Number); + const pt = parts[0] ?? 0; + const gt = parts[1] ?? 0; + return runSingleBenchRequest(baseUrl, suite.model, pt, gt, 0, temperature, topP); + }); + await Promise.allSettled(warmupPromises); + + let completed = 0; + const samples: BenchSample[] = []; + + // Group by (promptTokens, genTokens, concurrency) for fan-out; each group + // runs 'repetitions' requests concurrently. + const groups = new Map(); + for (const item of grid) { + const key = `${item.promptTokens}_${item.genTokens}_${item.concurrency}`; + if (!groups.has(key)) { + groups.set(key, []); + } + groups.get(key)!.push(item); + } + + for (const [key, group] of groups) { + const concurrency = group[0]!.concurrency; + const batchSize = Math.min(concurrency, group.length); + + // Process in batches of 'concurrency' size using Promise.allSettled. + for (let batchStart = 0; batchStart < group.length; batchStart += batchSize) { + const batch = group.slice(batchStart, batchStart + batchSize); + + const promises = batch.map(async (item) => { + const sample = await runSingleBenchRequest( + baseUrl, + suite.model, + item.promptTokens, + item.genTokens, + item.repetition, + temperature, + topP, + ); + sample.concurrency = item.concurrency; + return sample; + }); + + const results = await Promise.allSettled(promises); + for (const result of results) { + if (result.status === 'fulfilled') { + samples.push(result.value); + } + completed++; + + // Progress callback + const current = batch[0]!; + onProgress({ + jobId: runId, + totalSamples, + completedSamples: completed, + currentPromptTokens: current.promptTokens, + currentGenTokens: current.genTokens, + currentConcurrency: current.concurrency, + currentRepetition: current.repetition, + }); + + // Publish progress + emitter.publish({ + type: 'control_job' as const, + seq, + jobType: 'bench' as const, + jobId: runId, + status: 'running' as const, + detail: { + completedSamples: completed, + totalSamples, + percent: Math.round((completed / totalSamples) * 100), + }, + }); + } + } + } + + // Persist all samples. + for (const s of samples) { + await sql` + INSERT INTO bench_samples (run_id, prompt_tokens, gen_tokens, concurrency, repetition, ttft_ms, total_ms, prompt_tps, gen_tps, cache_n, error) + VALUES (${runId}, ${s.promptTokens}, ${s.genTokens}, ${s.concurrency}, ${s.repetition}, ${s.ttftMs ?? null}, ${s.totalMs ?? null}, ${s.promptTps ?? null}, ${s.genTps ?? null}, ${s.cacheN ?? null}, ${s.error ?? null}) + `; + } + + // Compute aggregates. + const validSamples = samples.filter((s) => !s.error && s.genTps != null); + const aggregate = computeAggregates(validSamples); + + // A1: Baseline persistence + regression flag. + // Compare against existing baseline; first run seeds it. + const baselineRows = await sql<{ aggregate: string }[]>` + SELECT aggregate FROM bench_baselines + WHERE provider_id = ${suite.providerId} AND model = ${suite.model} + `; + + const regressionFlag = computeRegressionFlag(aggregate, baselineRows[0]?.aggregate); + + // Upsert baseline. + await sql` + INSERT INTO bench_baselines (provider_id, model, aggregate, run_id) + VALUES (${suite.providerId}, ${suite.model}, ${sql.json(aggregate as never)}, ${runId}) + ON CONFLICT (provider_id, model) DO UPDATE SET + aggregate = EXCLUDED.aggregate, + run_id = EXCLUDED.run_id, + created_at = clock_timestamp() + `; + + // Update run record with regression flag. + await sql` + UPDATE bench_runs + SET status = 'completed', finished_at = clock_timestamp(), completed_samples = ${completed}, + aggregate = ${sql.json(aggregate as never)}, regression_flag = ${regressionFlag} + WHERE id = ${runId} + `; + + // Publish completion. + emitter.publish({ + type: 'control_job' as const, + seq, + jobType: 'bench' as const, + jobId: runId, + status: 'completed' as const, + detail: { ...aggregate, regressionFlag }, + }); +} + +/** + * A1: Compute regression flag against baseline. + * Threshold: gen tok/s -10% = regression, +5% = improvement. + * N5: guards against divide-by-zero. + */ +export function computeRegressionFlag( + current: BenchAggregate, + // Accepts the raw bench_baselines.aggregate value: porsager returns jsonb + // already-parsed (object), while tests pass a JSON string. jsonbObject handles + // both. undefined => no baseline row yet => seed. + baselineJson: unknown, +): 'baseline' | 'regression' | 'improvement' | null { + if (!current.avgGenTps) return null; + if (!baselineJson) return 'baseline'; + + const baseline = jsonbObject(baselineJson) as BenchAggregate | null; + if (!baseline) return null; + + if (!baseline.avgGenTps || baseline.avgGenTps === 0) return null; + + const delta = (current.avgGenTps - baseline.avgGenTps) / baseline.avgGenTps; + if (delta < -0.1) return 'regression'; + if (delta > 0.05) return 'improvement'; + return 'baseline'; +} + +export interface BenchAggregate { + avgTtftMs: number | null; + medianTtftMs: number | null; + avgGenTps: number | null; + medianGenTps: number | null; + avgPromptTps: number | null; + medianPromptTps: number | null; + totalSamples: number; + errorSamples: number; + p95TtftMs: number | null; +} + +export function computeAggregates(samples: BenchSample[]): BenchAggregate { + if (samples.length === 0) { + return { + avgTtftMs: null, + medianTtftMs: null, + avgGenTps: null, + medianGenTps: null, + avgPromptTps: null, + medianPromptTps: null, + totalSamples: 0, + errorSamples: 0, + p95TtftMs: null, + }; + } + + const ttfts = samples.map((s) => s.ttftMs).filter((v): v is number => v != null).sort((a, b) => a - b); + const genTps = samples.map((s) => s.genTps).filter((v): v is number => v != null).sort((a, b) => a - b); + const promptTps = samples.map((s) => s.promptTps).filter((v): v is number => v != null).sort((a, b) => a - b); + + const avg = (arr: number[]) => arr.length ? arr.reduce((a, b) => a + b, 0) / arr.length : null; + const median = (arr: number[]) => { + if (arr.length === 0) return null; + const mid = Math.floor(arr.length / 2); + return arr.length % 2 ? arr[mid]! : (arr[mid - 1]! + arr[mid]!) / 2; + }; + const p95 = (arr: number[]) => { + if (arr.length === 0) return null; + const idx = Math.ceil(arr.length * 0.95) - 1; + return arr[Math.max(0, idx)] ?? null; + }; + + return { + avgTtftMs: avg(ttfts), + medianTtftMs: median(ttfts), + avgGenTps: avg(genTps), + medianGenTps: median(genTps), + avgPromptTps: avg(promptTps), + medianPromptTps: median(promptTps), + totalSamples: samples.length, + errorSamples: samples.filter((s) => s.error).length, + p95TtftMs: p95(ttfts), + }; +} diff --git a/apps/control/src/services/capture-fetch.ts b/apps/control/src/services/capture-fetch.ts new file mode 100644 index 0000000..f33b778 --- /dev/null +++ b/apps/control/src/services/capture-fetch.ts @@ -0,0 +1,142 @@ +/** + * Capture fetch: GET /api/captures/:id on llama-swap host, decode base64, + * persist trimmed copy (256KB cap app-enforced), render with shiki JSON. + * + * The 256KB cap is application-enforced in the fetch handler, not a DB constraint. + * Total budget: 50MB default, configurable via CAPTURE_BUDGET_MB env var. + */ + +import type { Sql } from '../db.js'; + +const MAX_CAPTURE_BYTES = 256 * 1024; // 256KB + +export interface CaptureData { + id: number; + providerId: string; + timestamp: string; + model: string; + requestHeaders: Record; + requestBody: string; + responseHeaders: Record; + responseBody: string; + durationMs: number; + sizeBytes: number; +} + +export interface CaptureFetchResult { + ok: boolean; + capture?: CaptureData; + error?: string; +} + +/** + * Fetch a capture from a llama-swap host by its swap_entry_id. + */ +export async function fetchCapture( + baseUrl: string, + providerId: string, + swapEntryId: number, +): Promise { + try { + const res = await fetch(`${baseUrl}/api/captures/${swapEntryId}`, { + signal: AbortSignal.timeout(10_000), + }); + + if (!res.ok) { + if (res.status === 404) { + return { ok: false, error: 'capture not found on host' }; + } + return { ok: false, error: `fetch failed: ${res.status}` }; + } + + const raw = await res.json() as Record; + return { ok: true, capture: parseCapture(raw, providerId, swapEntryId) }; + } catch (err) { + return { ok: false, error: (err as Error).message ?? String(err) }; + } +} + +/** + * Parse raw capture data from llama-swap into our structured format. + * Trims to 256KB cap. + */ +export function parseCapture( + raw: Record, + providerId: string, + swapEntryId: number, +): CaptureData { + const requestHeaders = (raw.request_headers ?? raw.headers ?? {}) as Record; + const responseHeaders = (raw.response_headers ?? {}) as Record; + + let requestBody = ''; + let responseBody = ''; + + // Decode base64 bodies if present + const reqBodyRaw = raw.request_body as string | undefined; + const respBodyRaw = raw.response_body as string | undefined; + + if (reqBodyRaw) { + try { + requestBody = Buffer.from(reqBodyRaw, 'base64').toString('utf8'); + } catch { + requestBody = reqBodyRaw; + } + } + + if (respBodyRaw) { + try { + responseBody = Buffer.from(respBodyRaw, 'base64').toString('utf8'); + } catch { + responseBody = respBodyRaw; + } + } + + // Enforce 256KB cap by trimming response body (largest component) + const totalSize = requestBody.length + responseBody.length; + if (totalSize > MAX_CAPTURE_BYTES) { + const remaining = MAX_CAPTURE_BYTES - requestBody.length; + responseBody = responseBody.slice(0, Math.max(0, Math.floor(remaining))); + responseBody += '\n\n[truncated: capture exceeds 256KB cap]'; + } + + const sizeBytes = Buffer.byteLength(requestBody + responseBody); + + return { + id: swapEntryId, + providerId, + timestamp: (raw.timestamp ?? raw.ts ?? new Date().toISOString()) as string, + model: (raw.model ?? '') as string, + requestHeaders, + requestBody, + responseHeaders, + responseBody, + durationMs: (raw.duration_ms ?? 0) as number, + sizeBytes, + }; +} + +/** + * Persist a trimmed capture to the control_requests table. + * Uses sql.json(value as never) per convention. + */ +export async function persistCapture( + sql: Sql, + capture: CaptureData, +): Promise { + // Pass the OBJECT to sql.json — wrapping a pre-stringified value stores a + // JSON string in the JSONB column (the double-serialization gotcha). + const captureObj = { + requestHeaders: capture.requestHeaders, + requestBody: capture.requestBody, + responseHeaders: capture.responseHeaders, + responseBody: capture.responseBody, + durationMs: capture.durationMs, + }; + + await sql` + INSERT INTO control_requests (provider_id, swap_entry_id, ts, model, capture) + VALUES (${capture.providerId}, ${capture.id}, ${capture.timestamp}, ${capture.model}, ${sql.json(captureObj as never)}) + ON CONFLICT (provider_id, swap_entry_id, ts) DO UPDATE SET + capture = EXCLUDED.capture + `; +} diff --git a/apps/control/src/services/eval-suites.ts b/apps/control/src/services/eval-suites.ts new file mode 100644 index 0000000..f3bfbc4 --- /dev/null +++ b/apps/control/src/services/eval-suites.ts @@ -0,0 +1,409 @@ +import { randomUUID } from 'node:crypto'; +import { readFileSync, readdirSync } from 'node:fs'; +import { resolve, dirname } from 'node:path'; +import { fileURLToPath } from 'node:url'; +import { load as loadYaml } from 'js-yaml'; +import type { Sql } from '../db.js'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); + +// ─── types ────────────────────────────────────────────────────────────────── + +export interface CodeTask { + id: string; + prompt: string; + test_code: string; + expected_output: string; + language: string; +} + +export interface RubricCriterion { + criterion: string; + description: string; + weight: number; +} + +export interface ChatTask { + id: string; + prompt: string; + prompt_template?: string; + context_generator?: string; + rubric: { + criteria: RubricCriterion[]; + max_score: number; + }; +} + +export interface EvalSuiteData { + id: string; + name: string; + kind: 'chat' | 'code'; + version: number; + description?: string; + judge_model: string | null; + tasks: (CodeTask | ChatTask)[]; +} + +export interface EvalSuiteRow { + id: string; + name: string; + kind: string; + version: number; + tasks: string; + judge_model: string | null; + judge_model_version: string | null; + metadata: string | null; + created_at: string; +} + +// ─── YAML loader ──────────────────────────────────────────────────────────── + +const DATA_DIR = resolve(dirname(__filename), '../../data'); + +/** + * Load all eval suite YAML files from the data/ directory. + */ +export function loadEvalSuitesFromData(): EvalSuiteData[] { + const suites: EvalSuiteData[] = []; + try { + const files = readdirSync(DATA_DIR).filter((f) => f.startsWith('suite-') && f.endsWith('.yaml')); + for (const file of files) { + const path = resolve(DATA_DIR, file); + const content = readFileSync(path, 'utf8'); + const parsed = loadYaml(content) as Record; + const tasks = parsed.tasks as (CodeTask | ChatTask)[] | undefined; + if (!tasks || !Array.isArray(tasks)) continue; + + const chatTasks: ChatTask[] = []; + const codeTasks: CodeTask[] = []; + + for (const task of tasks) { + const t = task as unknown as Record; + if (t.rubric) { + const rubric = t.rubric as Record; + chatTasks.push({ + id: t.id as string, + prompt: t.prompt as string, + prompt_template: (t.prompt_template as string) ?? undefined, + context_generator: (t.context_generator as string) ?? undefined, + rubric: { + criteria: normalizeCriteria(rubric), + max_score: (rubric.max_score as number) ?? 7, + }, + }); + } else if (t.test_code) { + codeTasks.push({ + id: t.id as string, + prompt: t.prompt as string, + test_code: t.test_code as string, + expected_output: t.expected_output as string, + language: t.language as string, + }); + } + } + + suites.push({ + id: parsed.id as string, + name: parsed.name as string, + kind: parsed.kind as 'chat' | 'code', + version: (parsed.version as number) ?? 1, + description: (parsed.description as string) ?? undefined, + judge_model: (parsed.judge_model as string) ?? null, + tasks: [...codeTasks, ...chatTasks], + }); + } + } catch (err) { + console.warn({ err: (err as Error).message }, 'eval: failed to load suites from data/'); + } + return suites; +} + +function normalizeCriteria(rubric: Record): RubricCriterion[] { + const criteria = rubric.criteria as RubricCriterion[] | undefined; + if (criteria && Array.isArray(criteria)) { + return criteria.filter((c) => c.criterion && c.weight); + } + const maxScore = rubric.max_score as number | undefined; + const entries = Object.entries(rubric); + const result: RubricCriterion[] = []; + let totalWeight = 0; + for (const [key, val] of entries) { + if (key === 'max_score' || key === 'criteria') continue; + const entry = val as { criterion?: string; description?: string; weight?: number }; + if (entry.weight && entry.description) { + result.push({ criterion: key, description: entry.description, weight: entry.weight }); + totalWeight += entry.weight; + } + } + if (result.length === 0) { + for (const [key, val] of entries) { + if (key === 'max_score' || key === 'criteria') continue; + result.push({ criterion: key, description: String(val), weight: 1 }); + } + } + if (maxScore && totalWeight > 0) { + const scale = maxScore / totalWeight; + for (const c of result) { + c.weight = Math.round(c.weight * scale * 10) / 10; + } + } + return result; +} + +// ─── DB operations ────────────────────────────────────────────────────────── + +/** + * Seed eval suites from data/ YAML files into the database. + * Uses INSERT ... ON CONFLICT DO NOTHING for idempotency. + */ +export async function seedEvalSuites(sql: Sql): Promise { + const suites = loadEvalSuitesFromData(); + for (const suite of suites) { + await sql` + INSERT INTO eval_suites (id, name, kind, version, tasks, judge_model, judge_model_version, metadata) + VALUES ( + ${suite.id}, + ${suite.name}, + ${suite.kind}, + ${suite.version}, + ${sql.json(suite.tasks as never)}, + ${suite.judge_model}, + NULL, + ${suite.description ? sql.json({ description: suite.description } as never) : sql`NULL::jsonb`} + ) + ON CONFLICT (id) DO NOTHING + `; + } +} + +/** + * List all eval suites. + */ +export async function listEvalSuites(sql: Sql): Promise { + return await sql` + SELECT id, name, kind, version, tasks, judge_model, judge_model_version, metadata, created_at + FROM eval_suites + ORDER BY created_at DESC + `; +} + +/** + * Get a single eval suite by ID. + */ +export async function getEvalSuite(sql: Sql, id: string): Promise { + const rows = await sql` + SELECT id, name, kind, version, tasks, judge_model, judge_model_version, metadata, created_at + FROM eval_suites WHERE id = ${id} + `; + return rows[0] ?? null; +} + +/** + * Create or update an eval suite. + */ +export async function upsertEvalSuite( + sql: Sql, + id: string | null, + name: string, + kind: 'chat' | 'code', + tasks: unknown[], + judgeModel: string | null, + metadata?: Record, +): Promise { + const suiteId = id ?? randomUUID(); + const existing = await getEvalSuite(sql, suiteId); + const version = existing ? existing.version + 1 : 1; + + await sql` + INSERT INTO eval_suites (id, name, kind, version, tasks, judge_model, judge_model_version, metadata) + VALUES ( + ${suiteId}, + ${name}, + ${kind}, + ${version}, + ${sql.json(tasks as never)}, + ${judgeModel}, + NULL, + ${metadata ? sql.json(metadata as never) : sql`NULL::jsonb`} + ) + ON CONFLICT (id) DO UPDATE SET + name = EXCLUDED.name, + kind = EXCLUDED.kind, + version = EXCLUDED.version, + tasks = EXCLUDED.tasks, + judge_model = EXCLUDED.judge_model, + metadata = EXCLUDED.metadata + `; + return suiteId; +} + +/** + * Create a new eval run record. + */ +export async function createEvalRun( + sql: Sql, + suiteId: string, + providerId: string, + model: string, + quant: string | null, + judgeModel: string | null, + judgeModelVersion: string | null, + totalTasks: number, +): Promise { + const runId = `eval_${Date.now()}_${randomUUID().slice(0, 8)}`; + await sql` + INSERT INTO eval_runs (id, suite_id, job_type, provider_id, model, quant, status, judge_model, judge_model_version, started_at, total_tasks) + VALUES ( + ${runId}, ${suiteId}, 'eval', ${providerId}, ${model}, ${quant}, + 'running', ${judgeModel}, ${judgeModelVersion}, + clock_timestamp(), ${totalTasks} + ) + `; + return runId; +} + +/** + * Record a single eval result. + */ +export async function recordEvalResult( + sql: Sql, + runId: string, + taskId: string, + taskIndex: number, + score: number | null, + maxScore: number | null, + rationale: string | null, + sandboxExitCode: number | null, + sandboxStderr: string | null, + sandboxStdout: string | null, + executionMs: number | null, + error: string | null, +): Promise { + await sql` + INSERT INTO eval_results (run_id, task_id, task_index, score, max_score, rationale, sandbox_exit_code, sandbox_stderr, sandbox_stdout, execution_ms, error) + VALUES ( + ${runId}, ${taskId}, ${taskIndex}, ${score}, ${maxScore}, + ${rationale}, ${sandboxExitCode}, ${sandboxStderr}, ${sandboxStdout}, + ${executionMs}, ${error} + ) + `; +} + +/** + * Update eval run completion. + */ +export async function completeEvalRun( + sql: Sql, + runId: string, + completedTasks: number, + aggregate: Record | null, + error: string | null, +): Promise { + await sql` + UPDATE eval_runs + SET status = ${error ? 'failed' : 'completed'}, + finished_at = clock_timestamp(), + completed_tasks = ${completedTasks}, + aggregate = ${aggregate ? sql.json(aggregate as never) : sql`NULL::jsonb`}, + error = ${error} + WHERE id = ${runId} + `; +} + +/** + * List eval runs with optional filters. + */ +export async function listEvalRuns( + sql: Sql, + suiteId?: string, + providerId?: string, +): Promise> { + let query = sql` + SELECT id, suite_id, job_type, provider_id, model, quant, status, judge_model, + started_at, finished_at, total_tasks, completed_tasks, aggregate, error, created_at + FROM eval_runs + WHERE 1=1 + `; + + if (suiteId) { + query = sql`${query} AND suite_id = ${suiteId}`; + } + if (providerId) { + query = sql`${query} AND provider_id = ${providerId}`; + } + + query = sql`${query} ORDER BY created_at DESC LIMIT 200`; + return query as unknown as Array<{ + id: string; + suite_id: string; + job_type: string; + provider_id: string; + model: string; + quant: string | null; + status: string; + judge_model: string | null; + started_at: string | null; + finished_at: string | null; + total_tasks: number; + completed_tasks: number; + aggregate: string | null; + error: string | null; + created_at: string; + }>; +} + +/** + * Get eval results for a run. + */ +export async function getEvalResults( + sql: Sql, + runId: string, +): Promise> { + return await sql>` + SELECT id, task_id, task_index, score, max_score, rationale, + sandbox_exit_code, sandbox_stderr, sandbox_stdout, execution_ms, error + FROM eval_results WHERE run_id = ${runId} + ORDER BY task_index + `; +} diff --git a/apps/control/src/services/fleet-connector.ts b/apps/control/src/services/fleet-connector.ts new file mode 100644 index 0000000..304a342 --- /dev/null +++ b/apps/control/src/services/fleet-connector.ts @@ -0,0 +1,264 @@ +/** + * Fleet connector: SSE client consuming llama-swap /api/events per enabled host. + * + * Ports the opencode-sse.ts reconnectDecision pattern (exponential backoff + + * circuit-breaker) with one critical addition: **jitter**. The source pattern + * has NO jitter, which causes thundering-herd reconnections across N hosts. + * + * Jitter: random 0-50% of computed delay. Pure function for testability. + * + * Event parsing is NEW code — llama-swap's SSE envelope (modelStatus | logData | + * metrics | inflight) differs from the opencode SDK's Event type. + */ + +import type { FastifyBaseLogger } from 'fastify'; +import type { Sql } from '../db.js'; + +// ─── jitter (pure) ────────────────────────────────────────────────────────── + +/** Add random 0-50% jitter to a delay value. */ +export function addJitter(delayMs: number): number { + const jitter = delayMs * Math.random() * 0.5; + return delayMs + jitter; +} + +// ─── reconnect backoff ────────────────────────────────────────────────────── + +export interface ReconnectPolicy { + baseMs: number; + maxMs: number; + maxAttempts: number; +} + +export const DEFAULT_RECONNECT_POLICY: ReconnectPolicy = { + baseMs: 1_000, + maxMs: 30_000, + maxAttempts: 6, +}; + +export type ReconnectDecision = + | { action: 'reconnect'; delayMs: number } + | { action: 'give-up' }; + +export function reconnectDecision( + failures: number, + policy: ReconnectPolicy = DEFAULT_RECONNECT_POLICY, +): ReconnectDecision { + if (failures > policy.maxAttempts) return { action: 'give-up' }; + const exp = policy.baseMs * 2 ** (failures - 1); + const capped = Math.min(policy.maxMs, exp); + return { action: 'reconnect', delayMs: addJitter(capped) }; +} + +// ─── llama-swap SSE envelope types ────────────────────────────────────────── +// Real wire shape (apigroup.go): +// event:message +// data:{"type":"modelStatus|logData|metrics|inflight","data":""} +// The SSE event name is ALWAYS 'message'. The discriminator is the outer JSON's +// .type field. The payload is DOUBLE-ENCODED: JSON.parse(data) gives {type, data:string}, +// then JSON.parse(that.data) gives the actual payload. + +// Per-type payload shapes, verified against the fork source +// (/opt/forks/llama-swap/internal/server/apigroup.go sendModels/sendLogData/ +// sendMetrics/sendInFlight, apiModel struct at :20): +// modelStatus -> []apiModel (FULL-FLEET snapshot array, not a single transition) +// logData -> {source, data} (field is 'data', not 'line') +// metrics -> []ActivityLogEntry (BARE array, tokens nested) +// inflight -> {total} (host-level total, NOT per-model) +export type LlamaSweepSSEEvent = + | { type: 'modelStatus'; data: ModelStatusEntry[] } + | { type: 'logData'; data: LogData } + | { type: 'metrics'; data: MetricsEntry[] } + | { type: 'inflight'; data: InflightData }; + +/** One entry of the modelStatus full-fleet array (fork apiModel struct). */ +export interface ModelStatusEntry { + id: string; + name: string; + description: string; + state: string; + unlisted: boolean; + peerID: string; + aliases?: string[]; +} + +export interface LogData { + source: string; + data: string; +} + +// Real /api/metrics shape: bare JSON array of entries with NESTED tokens. +// {id, timestamp, model, req_path, resp_status_code, tokens:{...}, duration_ms, has_capture} +// NOTE: ActivityLogEntry does NOT carry request headers or source field. +// Headers exist only in ReqRespCapture (fetched on-demand via /api/captures/:id). +// See design §7 "Implementation notes" for the discrepancy. +export interface MetricsEntry { + id: number; + timestamp: string; + model: string; + req_path: string; + resp_status_code: number; + tokens: { + cache_tokens: number; + input_tokens: number; + output_tokens: number; + prompt_per_second: number; + tokens_per_second: number; + }; + duration_ms: number; + has_capture: boolean; + capture?: string; +} + +export interface InflightData { + total: number; +} + +// ─── the loop ─────────────────────────────────────────────────────────────── + +export interface FleetConnectorDeps { + isUp: () => boolean; + sql: Sql; + log: FastifyBaseLogger; + onEvent: (providerId: string, event: LlamaSweepSSEEvent) => void | Promise; + onReconcile: (providerId: string, metrics: MetricsEntry[]) => Promise; + onReconnectGiveUp: (providerId: string) => Promise; + sleep?: (ms: number) => Promise; + policy?: ReconnectPolicy; +} + +function defaultSleep(ms: number): Promise { + return new Promise((r) => setTimeout(r, ms)); +} + +/** + * Parse llama-swap SSE lines. + * + * Real wire shape (apigroup.go): + * event:message + * data:{"type":"modelStatus","data":""} + * + * The SSE event name is always 'message'. The discriminator is the outer JSON's + * .type field. The payload is DOUBLE-ENCODED: JSON.parse(data) gives {type, data:string}, + * then JSON.parse(that.data) gives the actual payload. + * + * Returns the fully-decoded event, or null for non-data lines. + */ +export function parseSseLine(line: string): LlamaSweepSSEEvent | null { + const trimmed = line.trim(); + if (!trimmed) return null; + + // The SSE event name is always 'event:message' -- we ignore it. + if (trimmed.startsWith('event:')) { + return null; + } + + // "data: " -- the only line that carries payload. + if (trimmed.startsWith('data:')) { + const dataStr = trimmed.slice(5).trimStart(); + if (!dataStr) return null; + + // First JSON parse: { type: "modelStatus", data: "" } + let outer: { type: string; data: string }; + try { + outer = JSON.parse(dataStr) as { type: string; data: string }; + } catch { + return null; + } + + if (!outer.type || typeof outer.data !== 'string' || !outer.data) { + return null; + } + + // Second JSON parse: the actual payload (double-encoded string). + let inner: unknown; + try { + inner = JSON.parse(outer.data); + } catch { + return null; + } + + return { type: outer.type, data: inner } as LlamaSweepSSEEvent; + } + + return null; +} + +export function startFleetConnector(providerId: string, baseUrl: string, deps: FleetConnectorDeps): AbortController { + const abort = new AbortController(); + void runFleetConnector(providerId, baseUrl, abort, deps).finally(() => { + if (abort.signal.aborted) { + // connection dropped — cleanup handled by caller + } + }); + return abort; +} + +export async function runFleetConnector( + providerId: string, + baseUrl: string, + abort: AbortController, + deps: FleetConnectorDeps, +): Promise { + const signal = abort.signal; + const sleep = deps.sleep ?? defaultSleep; + const policy = deps.policy ?? DEFAULT_RECONNECT_POLICY; + let failures = 0; + + while (deps.isUp() && !signal.aborted) { + const url = `${baseUrl}/api/events`; + try { + const res = await fetch(url, { signal }); + if (!res.ok) { + throw new Error(`SSE connect failed: ${res.status} ${res.statusText}`); + } + + const reader = res.body?.getReader(); + if (!reader) throw new Error('no response body'); + + const decoder = new TextDecoder(); + let buffer = ''; + + while (!signal.aborted) { + const { done, value } = await reader.read(); + if (done) break; + buffer += decoder.decode(value, { stream: true }); + + const lines = buffer.split('\n'); + buffer = lines.pop() ?? ''; + + for (const line of lines) { + if (signal.aborted) break; + const event = parseSseLine(line); + if (!event) continue; + + try { + await Promise.resolve(deps.onEvent(providerId, event)); + } catch (err) { + deps.log.error({ providerId, err: (err as Error).message }, 'fleet: onEvent failed'); + } + } + } + + // Clean stream end — healthy reconnect at base delay (pre-hardening). + failures = 0; + if (deps.isUp() && !signal.aborted) { + await sleep(policy.baseMs); + } + } catch (err) { + if (!deps.isUp() || signal.aborted) break; + failures += 1; + const decision = reconnectDecision(failures, policy); + deps.log.warn( + { providerId, failures, action: decision.action, err: (err as Error).message }, + 'fleet: SSE error; reconnecting', + ); + if (decision.action === 'give-up') { + deps.log.warn({ providerId, failures }, 'fleet: SSE reconnect gave up (circuit breaker)'); + await deps.onReconnectGiveUp(providerId); + break; + } + await sleep(decision.delayMs); + } + } +} diff --git a/apps/control/src/services/fleet-state.ts b/apps/control/src/services/fleet-state.ts new file mode 100644 index 0000000..ff26003 --- /dev/null +++ b/apps/control/src/services/fleet-state.ts @@ -0,0 +1,89 @@ +export interface HostConfig { + providerId: string; + baseUrl: string; + enabled: boolean; +} + +export interface FleetState { + hosts: Map; +} + +export interface HostState { + providerId: string; + liveness: 'connected' | 'reconnecting' | 'down'; + lastSeenAt: Date | null; + seq: number; + /** Host-level inflight total (the fork's SSE publishes only a total, not per-model). */ + inflightTotal: number; + models: Map; +} + +export interface ModelState { + model: string; + state: string; + ts: Date; + ttlDeadline: Date | null; + inflight: number; +} + +export interface SnapshotData { + hosts: Array<{ + providerId: string; + liveness: 'connected' | 'reconnecting' | 'down'; + lastSeenAt: string | null; + seq: number; + models: Array<{ + model: string; + state: string; + ts: string; + ttlDeadline: string | null; + inflight: number; + }>; + }>; + requests?: Array<{ + id: number; + providerId: string; + ts: string; + model: string | null; + reqPath: string | null; + statusCode: number | null; + durationMs: number | null; + }>; + perfSamples?: Array<{ + providerId: string; + ts: string; + gpu: unknown; + sys: unknown; + }>; +} + +// ─── helpers for tests ────────────────────────────────────────────────────── + +export function createFleetState(): FleetState { + return { hosts: new Map() }; +} + +export function ensureHostState(fleet: FleetState, providerId: string): HostState { + let state = fleet.hosts.get(providerId); + if (!state) { + state = { + providerId, + liveness: 'down', + lastSeenAt: null, + seq: 0, + inflightTotal: 0, + models: new Map(), + }; + fleet.hosts.set(providerId, state); + } + return state; +} + +export function stampLastSeen(state: HostState): void { + state.lastSeenAt = new Date(); +} + +export function incrementSeq(state: HostState): number { + state.seq += 1; + return state.seq; +} diff --git a/apps/control/src/services/gateway.ts b/apps/control/src/services/gateway.ts new file mode 100644 index 0000000..b65b87e --- /dev/null +++ b/apps/control/src/services/gateway.ts @@ -0,0 +1,140 @@ +/** + * P7.1: auto:* gateway candidate resolution. + * + * The gateway exposes OpenAI-compatible virtual models. A completion against + * `auto:code` (etc.) is resolved to an ordered list of concrete candidate + * composite ids ('provider/model'), then dispatched with failover. + * + * Ordering source: + * - An explicit route_policy for the virtual model (admin-curated candidates). + * - Otherwise, advisory routing scores ranked by the category metric. + * + * Health filtering (only connected hosts are eligible) is applied last so a + * curated policy never dispatches to a down host. + * + * Pure helpers (orderCandidates, parseVirtualModel) are unit-tested; the DB + * read lives in resolveCandidates(). + */ + +import type { Sql } from '../db.js'; +import type { FleetState } from './fleet-state.js'; +import { computeRoutingScores, type ModelScore } from './routing-scores.js'; +import { jsonbStringArray } from './jsonb.js'; + +export const VIRTUAL_MODELS = ['auto', 'auto:code', 'auto:fast', 'auto:cheap'] as const; +export type VirtualModel = (typeof VIRTUAL_MODELS)[number]; + +export function isGatewayVirtualModel(id: string): boolean { + return id === 'auto' || id.startsWith('auto:'); +} + +/** + * Strip a composite/provider prefix the picker may prepend. The gateway + * registry provider id is 'auto', so BooChat may send 'auto/auto:code'. + * Normalize to the bare virtual model token. + */ +export function parseVirtualModel(modelId: string): string { + // Composite form: '/' — take the part after '/'. + const slash = modelId.indexOf('/'); + const tail = slash >= 0 ? modelId.slice(slash + 1) : modelId; + return tail; +} + +export interface RoutePolicyRow { + virtual_model: string; + candidates: unknown; // jsonb: porsager returns a parsed array (see jsonb.ts) + fallback: string | null; + enabled: boolean; +} + +/** + * Order concrete candidates for a virtual model. Pure. + * + * When an explicit policy is provided, its candidate list defines the order + * (with the fallback appended last). Otherwise candidates are derived from + * advisory scores ranked by the virtual model's category metric. + * + * The returned list is health-filtered: only composite ids whose host is + * connected survive (a curated candidate on a down host is skipped, not + * dispatched to). + */ +export function orderCandidates( + virtualModel: string, + policy: { candidates: string[]; fallback: string | null } | null, + scores: ModelScore[], +): string[] { + const healthy = new Set(scores.filter((s) => s.healthy).map((s) => s.compositeId)); + + if (policy) { + const ordered = [...policy.candidates]; + if (policy.fallback && !ordered.includes(policy.fallback)) ordered.push(policy.fallback); + // Keep curated order; drop unhealthy. If a candidate isn't in the scores + // set at all (never seen), keep it — health is unknown, let dispatch try. + return ordered.filter((id) => !scores.some((s) => s.compositeId === id) || healthy.has(id)); + } + + // Derive from advisory scores by category metric. + const metric = (s: ModelScore): number | null => { + switch (virtualModel) { + case 'auto:code': + return s.codeScore; + case 'auto:fast': + case 'auto:cheap': + return s.avgGenTps; + case 'auto': + default: + // Overall: prefer eval score, then throughput. + return s.evalScore ?? (s.avgGenTps != null ? s.avgGenTps / 1000 : null); + } + }; + + return scores + .filter((s) => s.healthy && metric(s) != null) + .sort((a, b) => (metric(b) ?? -Infinity) - (metric(a) ?? -Infinity)) + .map((s) => s.compositeId); +} + +export interface ResolvedCandidates { + virtualModel: string; + candidates: string[]; + policyName: string | null; +} + +/** + * Resolve the ordered candidate list for a virtual model against the live + * fleet + policies + advisory scores. + */ +export async function resolveCandidates( + sql: Sql, + fleet: FleetState, + modelId: string, +): Promise { + const virtualModel = parseVirtualModel(modelId); + + const policyRows = await sql<(RoutePolicyRow & { name: string })[]>` + SELECT name, virtual_model, candidates, fallback, enabled + FROM route_policies + WHERE virtual_model = ${virtualModel} AND enabled = true + LIMIT 1 + `; + + const scores = await computeRoutingScores(sql, fleet); + + let policy: { candidates: string[]; fallback: string | null } | null = null; + let policyName: string | null = null; + if (policyRows.length > 0) { + const row = policyRows[0]!; + policy = { candidates: jsonbStringArray(row.candidates as unknown), fallback: row.fallback }; + policyName = row.name; + } + + const candidates = orderCandidates(virtualModel, policy, scores); + return { virtualModel, candidates, policyName }; +} + +/** Split a composite id 'provider/model' into parts. */ +export function splitComposite(compositeId: string): { providerId: string; model: string } | null { + const slash = compositeId.indexOf('/'); + if (slash <= 0) return null; + return { providerId: compositeId.slice(0, slash), model: compositeId.slice(slash + 1) }; +} diff --git a/apps/control/src/services/host-access.ts b/apps/control/src/services/host-access.ts new file mode 100644 index 0000000..4249435 --- /dev/null +++ b/apps/control/src/services/host-access.ts @@ -0,0 +1,19 @@ +/** + * Host-access seam: acquire exclusive access to a host for a purpose. + * + * V1 body: no-op returning {ok: true}. This is the P8 seam — P8 swaps the + * body for a DB lease without touching the bench engine. + */ + +export interface HostGrant { + ok: boolean; + reason?: string; +} + +export async function acquireHostAccess( + providerId: string, + purpose: string, +): Promise { + // V1: no-op — always grant access. + return { ok: true }; +} diff --git a/apps/control/src/services/jsonb.ts b/apps/control/src/services/jsonb.ts new file mode 100644 index 0000000..b11bbe0 --- /dev/null +++ b/apps/control/src/services/jsonb.ts @@ -0,0 +1,41 @@ +/** + * JSONB read helpers. + * + * porsager/postgres returns `jsonb` columns already parsed into JS values (an + * object/array), NOT a JSON string. Calling JSON.parse on that throws + * ("[object Object] is not valid JSON"). These helpers accept either shape so a + * read works whether the driver parsed the column or handed back a string. + */ + +/** Coerce a JSONB column value to a string array. */ +export function jsonbStringArray(value: unknown): string[] { + let v = value; + if (typeof v === 'string') { + try { v = JSON.parse(v); } catch { return []; } + } + return Array.isArray(v) ? v.filter((x): x is string => typeof x === 'string') : []; +} + +/** Coerce a JSONB column value to an array (elements untyped). */ +export function jsonbArray(value: unknown): unknown[] { + let v = value; + if (typeof v === 'string') { + try { v = JSON.parse(v); } catch { return []; } + } + return Array.isArray(v) ? v : []; +} + +/** Coerce a JSONB column value to a number array. */ +export function jsonbNumberArray(value: unknown): number[] { + return jsonbArray(value).filter((x): x is number => typeof x === 'number'); +} + +/** Coerce a JSONB column value to a plain object, or null. */ +export function jsonbObject(value: unknown): Record | null { + let v = value; + if (v == null) return null; + if (typeof v === 'string') { + try { v = JSON.parse(v); } catch { return null; } + } + return v && typeof v === 'object' && !Array.isArray(v) ? (v as Record) : null; +} diff --git a/apps/control/src/services/judge-runner.ts b/apps/control/src/services/judge-runner.ts new file mode 100644 index 0000000..0fd3442 --- /dev/null +++ b/apps/control/src/services/judge-runner.ts @@ -0,0 +1,288 @@ +import type { Sql } from '../db.js'; +import type { DeltaEmitter } from '../index.js'; +import { recordEvalResult, completeEvalRun } from './eval-suites.js'; +import { resolveProviderBaseUrl } from './llama-providers.js'; + +// ─── types ────────────────────────────────────────────────────────────────── + +export interface JudgeEvalParams { + runId: string; + providerId: string; + model: string; + quant: string | null; + tasks: Array>; + judgeModel: string | null; +} + +export interface JudgeProgress { + completedTasks: number; +} + +export interface JudgeResult { + error: string | null; +} + +// ─── judge runner ─────────────────────────────────────────────────────────── + +/** + * Run a judge-based eval (chat quality, rubric scoring). + * + * Judge requests go through llama-swap with: + * - temperature 0 + * - judge model + version pinned per run + * - X-Boo-Source: control-eval + * - BARE wire model id + * + * Rubric scoring: each criterion gets a score, weighted average produces the task score. + * Rationale is captured per criterion. + */ +export async function runJudgeEval( + params: JudgeEvalParams, + sql: Sql, + emitter: DeltaEmitter, + seq: number, + logger: import('fastify').FastifyBaseLogger, + onProgress: (progress: JudgeProgress) => void, +): Promise { + const { runId, providerId, model, tasks, judgeModel, quant } = params; + + // Resolve the target model's base URL. + const baseUrl = resolveProviderBaseUrl(providerId); + if (!baseUrl) { + const err = `no base URL for provider ${providerId}`; + await completeEvalRun(sql, runId, 0, null, err).catch(() => {}); + return { error: err }; + } + + // Determine judge model: suite default -> strongest local model. + const judgeModelId = judgeModel ?? resolveDefaultJudgeModel(); + const judgeModelVersion = `${judgeModelId}@${Date.now()}`; + + logger.info( + { runId, judgeModel: judgeModelId, targetModel: model, taskCount: tasks.length }, + 'eval: judge run started', + ); + + let completedTasks = 0; + let error: string | null = null; + + for (let i = 0; i < tasks.length; i++) { + const task = tasks[i]; + if (!task) continue; + const taskId = (task.id as string) ?? `task_${i}`; + const prompt = (task.prompt as string) ?? ''; + const rubric = (task.rubric as { criteria: Array<{ criterion: string; description: string; weight: number }>; max_score: number }) ?? null; + + const startTime = Date.now(); + + try { + // Generate the response from the target model. + const response = await generateResponse(baseUrl, model, prompt); + + // Score the response. + let score: number | null = null; + let maxScore: number | null = null; + let rationale: string | null = null; + + if (rubric) { + const scoring = await scoreWithRubric( + baseUrl, + judgeModelId, + prompt, + response, + rubric, + ); + score = scoring.score; + maxScore = scoring.maxScore; + rationale = scoring.rationale; + } else { + // Simple pass/fail for tasks without rubric. + score = response.trim().length > 0 ? 1 : 0; + maxScore = 1; + rationale = response.trim().length > 0 ? 'Response generated' : 'Empty response'; + } + + const executionMs = Date.now() - startTime; + + await recordEvalResult( + sql, + runId, + taskId, + i, + score, + maxScore, + rationale, + null, + null, + null, + executionMs, + null, + ); + + completedTasks++; + onProgress({ completedTasks }); + + emitter.publish({ + type: 'control_job' as const, + seq, + jobType: 'eval' as const, + jobId: runId, + status: 'running' as const, + detail: { + completedTasks, + totalTasks: tasks.length, + taskId, + score, + }, + }); + } catch (err) { + const msg = (err as Error).message ?? String(err); + logger.warn({ taskId, err: msg }, 'eval: judge task failed'); + + await recordEvalResult( + sql, + runId, + taskId, + i, + null, + null, + null, + null, + null, + null, + Date.now() - startTime, + msg, + ).catch(() => {}); + + completedTasks++; + onProgress({ completedTasks }); + } + } + + return { error }; +} + +/** + * Generate a response from the target model through llama-swap. + */ +async function generateResponse( + baseUrl: string, + model: string, + prompt: string, +): Promise { + const res = await fetch(`${baseUrl}/v1/chat/completions`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'X-Boo-Source': 'control-eval', + }, + body: JSON.stringify({ + model, + messages: [{ role: 'user', content: prompt }], + // Design S8: temperature 0 everywhere in the eval pipeline -- response + // generation must be as reproducible as the judging (audit B1). + temperature: 0, + max_tokens: 2048, + }), + signal: AbortSignal.timeout(120_000), + }); + + if (!res.ok) { + const body = await res.text().catch(() => ''); + throw new Error(`model response failed: ${res.status} ${body.slice(0, 200)}`); + } + + const data = await res.json() as { choices?: Array<{ message?: { content?: string } }> }; + return data.choices?.[0]?.message?.content ?? ''; +} + +/** + * Score a response using a rubric via LLM-as-judge. + */ +async function scoreWithRubric( + baseUrl: string, + judgeModelId: string, + prompt: string, + response: string, + rubric: { criteria: Array<{ criterion: string; description: string; weight: number }>; max_score: number }, +): Promise<{ score: number; maxScore: number; rationale: string }> { + const criteriaText = rubric.criteria + .map((c, i) => `${i + 1}. **${c.criterion}** (weight: ${c.weight}): ${c.description}`) + .join('\n'); + + const judgePrompt = `You are an evaluation judge. Score the following response against the given prompt using the rubric criteria. + +**Prompt:** +${prompt} + +**Response:** +${response} + +**Rubric Criteria (score each 0-3, then compute weighted average):** +${criteriaText} + +**Max Score:** ${rubric.max_score} + +Return your evaluation in JSON format: +{ + "criterion_scores": { + "criterion_name": { "score": 0-3, "rationale": "explanation" } + }, + "weighted_score": , + "overall_rationale": "" +}`; + + const res = await fetch(`${baseUrl}/v1/chat/completions`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'X-Boo-Source': 'control-eval', + }, + body: JSON.stringify({ + model: judgeModelId, + messages: [{ role: 'user', content: judgePrompt }], + temperature: 0, + max_tokens: 1024, + response_format: { type: 'json_object' }, + }), + signal: AbortSignal.timeout(120_000), + }); + + if (!res.ok) { + const body = await res.text().catch(() => ''); + throw new Error(`judge failed: ${res.status} ${body.slice(0, 200)}`); + } + + const data = await res.json() as { choices?: Array<{ message?: { content?: string } }> }; + const content = data.choices?.[0]?.message?.content ?? '{}'; + + let parsed: { weighted_score?: number; overall_rationale?: string }; + try { + parsed = JSON.parse(content); + } catch { + // Fallback: try to extract JSON from markdown code blocks. + const match = content.match(/```(?:json)?\s*([\s\S]*?)```/); + if (match && match[1]) { + parsed = JSON.parse(match[1]); + } else { + parsed = {}; + } + } + + const score = parsed.weighted_score ?? 0; + const rationale = parsed.overall_rationale ?? 'No rationale provided'; + + return { + score: Math.min(score, rubric.max_score), + maxScore: rubric.max_score, + rationale, + }; +} + +/** + * Resolve the default judge model. + * Strongest local model by default -- configurable via config. + */ +function resolveDefaultJudgeModel(): string { + return process.env.EVAL_JUDGE_MODEL ?? 'qwen2.5-72b-instruct'; +} diff --git a/apps/control/src/services/llama-providers.ts b/apps/control/src/services/llama-providers.ts new file mode 100644 index 0000000..9d0d313 --- /dev/null +++ b/apps/control/src/services/llama-providers.ts @@ -0,0 +1,101 @@ +/** + * Local provider registry loader (control-side). + * + * Reads the shared llama-providers config file at startup and caches the + * parsed result. When the file is absent or invalid, synthesizes a single + * legacy provider from LLAMA_SWAP_URL so the service starts with only + * legacy env vars (D-1). + * + * Schema and pure helpers live in @boocode/contracts/llama-providers. + * File I/O stays app-local per D-1. + */ +import { readFileSync } from 'node:fs'; +import { + LlamaProvidersFileSchema, + type LlamaProvidersFile, + type LlamaProvider, +} from '@boocode/contracts/llama-providers'; + +export type { LlamaProvidersFile, LlamaProvider }; + +/** Synthesize a single legacy provider from env vars. */ +function buildLegacyProvider(llamaSwapUrl: string): LlamaProvidersFile { + return { + defaultProvider: 'llama-swap', + providers: [ + { + id: 'llama-swap', + label: 'llama-swap', + baseUrl: llamaSwapUrl, + kind: 'llama-swap', + }, + ], + }; +} + +let cached: LlamaProvidersFile | null = null; + +/** + * Load (or re-load) the local provider config. Never throws on bad input -- + * falls back to the legacy single-provider shape. + */ +export function loadLlamaProviders( + providersPath: string | undefined, + llamaSwapUrl: string, +): LlamaProvidersFile { + if (!providersPath) { + cached = buildLegacyProvider(llamaSwapUrl); + return cached; + } + + let raw: string; + try { + raw = readFileSync(providersPath, 'utf8'); + } catch { + console.warn( + `llama-providers: file not found at ${providersPath} -- falling back to legacy single-provider`, + ); + cached = buildLegacyProvider(llamaSwapUrl); + return cached; + } + + let json: unknown; + try { + json = JSON.parse(raw); + } catch (err) { + console.error( + `llama-providers: invalid JSON in ${providersPath} -- falling back to legacy single-provider`, + err, + ); + cached = buildLegacyProvider(llamaSwapUrl); + return cached; + } + + const parsed = LlamaProvidersFileSchema.safeParse(json); + if (!parsed.success) { + console.error( + `llama-providers: schema validation failed for ${providersPath} -- falling back to legacy single-provider`, + parsed.error.flatten(), + ); + cached = buildLegacyProvider(llamaSwapUrl); + return cached; + } + + cached = parsed.data; + return cached; +} + +/** The cached provider config. Returns legacy fallback if nothing loaded yet. */ +export function getLlamaProviders(): LlamaProvidersFile { + return cached ?? buildLegacyProvider('http://localhost:8080'); +} + +/** + * Resolve a provider's baseUrl by id from the cached registry. + * Returns null if the provider is not found. + */ +export function resolveProviderBaseUrl(providerId: string): string | null { + const file = getLlamaProviders(); + const provider = file.providers.find((p) => p.id === providerId); + return provider?.baseUrl ?? null; +} diff --git a/apps/control/src/services/log-relay.ts b/apps/control/src/services/log-relay.ts new file mode 100644 index 0000000..09f2441 --- /dev/null +++ b/apps/control/src/services/log-relay.ts @@ -0,0 +1,67 @@ +/** + * Log relay: in-memory tail buffer per host for logData SSE events. + * + * - 2k-line tail per host for late joiners + * - Relays /api/events logData into control_log frames + * - Source filter: proxy | upstream | model + */ + +const MAX_LOG_LINES = 2000; + +export interface LogLine { + providerId: string; + source: 'proxy' | 'upstream' | 'model'; + line: string; + ts: Date; +} + +export class LogRelay { + private tails: Map = new Map(); + + /** + * Append a log line to the per-host tail buffer. + */ + append(providerId: string, source: 'proxy' | 'upstream' | 'model', line: string): void { + let tail = this.tails.get(providerId); + if (!tail) { + tail = []; + this.tails.set(providerId, tail); + } + tail.push({ providerId, source, line, ts: new Date() }); + // Trim to max lines + while (tail.length > MAX_LOG_LINES) { + tail.shift(); + } + } + + /** + * Get the tail buffer for a host (for late joiners). + */ + getTail(providerId: string): LogLine[] { + return this.tails.get(providerId) ?? []; + } + + /** + * Get all tails (for snapshot-on-join). + */ + getAllTails(): LogLine[] { + const all: LogLine[] = []; + for (const tail of this.tails.values()) { + all.push(...tail); + } + return all; + } + + /** + * Get unique source values across all logs. + */ + getSources(): string[] { + const sources = new Set(); + for (const tail of this.tails.values()) { + for (const entry of tail) { + sources.add(entry.source); + } + } + return Array.from(sources); + } +} diff --git a/apps/control/src/services/model-pull.ts b/apps/control/src/services/model-pull.ts new file mode 100644 index 0000000..7af649b --- /dev/null +++ b/apps/control/src/services/model-pull.ts @@ -0,0 +1,105 @@ +/** + * P9 model pull: download a HuggingFace repo onto a host into its models dir. + * + * Non-blocking job (fire-and-forget like bench/eval), progress over the existing + * control_job frame (jobType 'action', detail.kind = 'pull'). The repo id is + * validated server-side as defense in depth on top of the wrapper's own check, + * then passed as a single token (never interpolated into a shell string in + * wrapper mode; in shell mode it is the only argument and is regex-clean). + */ + +import type { DeltaEmitter } from '../index.js'; +import type { SshExec, SshTarget, SshMode } from './ssh-config.js'; + +/** + * HF repo id: org/name. Each segment MUST start with an alphanumeric (HF's own + * rule), which also rejects `..`/`.` traversal segments that a plain `[._-]+` + * class would let through (e.g. `../x`). Exactly one slash; no spaces/metachars. + */ +export const REPO_ID_RE = /^[A-Za-z0-9][A-Za-z0-9._-]*\/[A-Za-z0-9][A-Za-z0-9._-]*$/; + +export function validateRepoId(repo: string): boolean { + return REPO_ID_RE.test(repo); +} + +/** + * Build the pull command for a host. Pure helper for testing. + * - wrapper mode: the `pull ` verb (wrapper hardcodes the models dir). + * - shell mode: a direct `huggingface-cli download` into /. + */ +export function buildPullCommand(mode: SshMode, repo: string, modelsDir?: string): string { + if (mode === 'wrapper') return `pull ${repo}`; + const dir = (modelsDir ?? '').replace(/\/+$/, ''); + const local = `${dir}/${repo.replace(/\//g, '__')}`; + return `huggingface-cli download ${repo} --local-dir '${local}'`; +} + +export interface PullParams { + jobId: string; + target: SshTarget; + repo: string; + mode: SshMode; + modelsDir?: string; // required for shell mode +} + +export interface PullResult { + ok: boolean; + error?: string; +} + +/** + * Run a model pull as a control_job. Resolves when the pull finishes; callers + * invoke it fire-and-forget so the HTTP response can return 202 immediately. + */ +export async function runModelPull( + params: PullParams, + exec: SshExec, + emitter: DeltaEmitter, + seq: number = 0, +): Promise { + const { jobId, target, repo, mode, modelsDir } = params; + + if (!validateRepoId(repo)) { + emitter.publish({ + type: 'control_job' as const, seq, jobType: 'action' as const, jobId, + status: 'failed' as const, detail: { kind: 'pull', repo, error: 'invalid repo id' }, + }); + return { ok: false, error: 'invalid repo id' }; + } + if (mode === 'shell' && !modelsDir) { + emitter.publish({ + type: 'control_job' as const, seq, jobType: 'action' as const, jobId, + status: 'failed' as const, detail: { kind: 'pull', repo, error: 'shell mode requires a models directory' }, + }); + return { ok: false, error: 'shell mode requires a models directory' }; + } + + emitter.publish({ + type: 'control_job' as const, seq, jobType: 'action' as const, jobId, + status: 'running' as const, detail: { kind: 'pull', repo }, + }); + + try { + const res = await exec(target, buildPullCommand(mode, repo, modelsDir)); + if (res.code !== 0) { + const error = `pull failed (exit ${res.code}): ${res.stderr.slice(0, 500)}`; + emitter.publish({ + type: 'control_job' as const, seq, jobType: 'action' as const, jobId, + status: 'failed' as const, detail: { kind: 'pull', repo, error }, + }); + return { ok: false, error }; + } + emitter.publish({ + type: 'control_job' as const, seq, jobType: 'action' as const, jobId, + status: 'completed' as const, detail: { kind: 'pull', repo, output: res.stdout.slice(-500) }, + }); + return { ok: true }; + } catch (err) { + const error = (err as Error).message ?? String(err); + emitter.publish({ + type: 'control_job' as const, seq, jobType: 'action' as const, jobId, + status: 'failed' as const, detail: { kind: 'pull', repo, error }, + }); + return { ok: false, error }; + } +} diff --git a/apps/control/src/services/reconcile.ts b/apps/control/src/services/reconcile.ts new file mode 100644 index 0000000..05ed767 --- /dev/null +++ b/apps/control/src/services/reconcile.ts @@ -0,0 +1,12 @@ +/** + * Reconcile gap detection: if the oldest entry in a reconcile fetch is newer + * than the newest already-persisted entry for that provider, the ring wrapped + * past our tail and we have a gap. + */ +export function detectGap( + oldestReconcileTs: string | null, + newestPersistedTs: string | null, +): boolean { + if (!oldestReconcileTs || !newestPersistedTs) return false; + return new Date(oldestReconcileTs) > new Date(newestPersistedTs); +} diff --git a/apps/control/src/services/reports.ts b/apps/control/src/services/reports.ts new file mode 100644 index 0000000..8deab9f --- /dev/null +++ b/apps/control/src/services/reports.ts @@ -0,0 +1,299 @@ +/** + * P6.2: Scheduled fleet digest reports. + * + * Same in-process timer pattern as the retention job (design §3/§6): an hourly + * tick reads control_schedule_meta.last_run_at and runs the digest when due, + * so a boot after a missed window catches up immediately. No cron dependency, + * no new scheduler abstraction. + * + * The report gathers usage, trends vs the prior period, swap counts, the eval + * leaderboard, and bench regression anomalies, renders a markdown digest, and + * persists both the markdown and the structured stats to control_reports. + */ + +import type { Sql } from '../db.js'; + +export type ReportInterval = 'daily' | 'weekly'; + +export interface ReportStats { + periodStart: string; + periodEnd: string; + interval: ReportInterval; + totalRequests: number; + priorRequests: number; + totalInputTokens: number; + totalOutputTokens: number; + bySource: Array<{ source: string; requests: number; inputTokens: number; outputTokens: number }>; + byProvider: Array<{ providerId: string; requests: number; swaps: number }>; + leaderboard: Array<{ providerId: string; model: string; kind: string; avgScore: number | null }>; + regressions: Array<{ providerId: string; model: string; avgGenTps: number | null }>; +} + +function intervalHours(interval: ReportInterval): number { + return interval === 'weekly' ? 24 * 7 : 24; +} + +/** + * Gather the structured stats for a report window. Pure read; no writes. + */ +export async function gatherReportStats( + sql: Sql, + interval: ReportInterval, + now: Date, +): Promise { + const hours = intervalHours(interval); + const periodEnd = now; + const periodStart = new Date(now.getTime() - hours * 3600_000); + const priorStart = new Date(periodStart.getTime() - hours * 3600_000); + + const startIso = periodStart.toISOString(); + const endIso = periodEnd.toISOString(); + const priorIso = priorStart.toISOString(); + + const totals = await sql<{ requests: number; in_tokens: number; out_tokens: number }[]>` + SELECT COUNT(*)::int AS requests, + COALESCE(SUM(input_tokens), 0)::int AS in_tokens, + COALESCE(SUM(output_tokens), 0)::int AS out_tokens + FROM control_requests + WHERE ts >= ${startIso} AND ts < ${endIso} + `; + + const prior = await sql<{ requests: number }[]>` + SELECT COUNT(*)::int AS requests + FROM control_requests + WHERE ts >= ${priorIso} AND ts < ${startIso} + `; + + const bySource = await sql<{ source: string | null; requests: number; in_tokens: number; out_tokens: number }[]>` + SELECT source, + COUNT(*)::int AS requests, + COALESCE(SUM(input_tokens), 0)::int AS in_tokens, + COALESCE(SUM(output_tokens), 0)::int AS out_tokens + FROM control_requests + WHERE ts >= ${startIso} AND ts < ${endIso} + GROUP BY source + ORDER BY requests DESC + `; + + const byProviderReqs = await sql<{ provider_id: string; requests: number }[]>` + SELECT provider_id, COUNT(*)::int AS requests + FROM control_requests + WHERE ts >= ${startIso} AND ts < ${endIso} + GROUP BY provider_id + `; + + // Swap counts: a model entering 'ready' / 'starting' marks a load/swap. + const swaps = await sql<{ provider_id: string; swaps: number }[]>` + SELECT provider_id, COUNT(*)::int AS swaps + FROM control_model_events + WHERE ts >= ${startIso} AND ts < ${endIso} + AND state IN ('ready', 'starting') + GROUP BY provider_id + `; + + const swapMap = new Map(); + for (const r of swaps) swapMap.set(r.provider_id, r.swaps); + const providerIds = new Set([ + ...byProviderReqs.map((r) => r.provider_id), + ...swaps.map((r) => r.provider_id), + ]); + const reqMap = new Map(); + for (const r of byProviderReqs) reqMap.set(r.provider_id, r.requests); + + const byProvider = Array.from(providerIds) + .sort() + .map((providerId) => ({ + providerId, + requests: reqMap.get(providerId) ?? 0, + swaps: swapMap.get(providerId) ?? 0, + })); + + // Leaderboard: latest completed eval avgScore per (provider, model, kind). + const leaderboard = await sql<{ provider_id: string; model: string; kind: string; avg_score: number | null }[]>` + SELECT er.provider_id, er.model, es.kind, + (er.aggregate::jsonb ->> 'avgScore')::float AS avg_score + FROM eval_runs er + JOIN eval_suites es ON er.suite_id = es.id + WHERE er.status = 'completed' AND er.aggregate IS NOT NULL + AND er.finished_at = ( + SELECT MAX(er2.finished_at) FROM eval_runs er2 + JOIN eval_suites es2 ON er2.suite_id = es2.id + WHERE er2.provider_id = er.provider_id AND er2.model = er.model + AND es2.kind = es.kind AND er2.status = 'completed' + ) + ORDER BY avg_score DESC NULLS LAST + LIMIT 20 + `; + + // Regression anomalies: bench runs flagged 'regression' in the window. + const regressions = await sql<{ provider_id: string; model: string; avg_gen_tps: number | null }[]>` + SELECT bs.provider_id, bs.model, + (br.aggregate::jsonb ->> 'avgGenTps')::float AS avg_gen_tps + FROM bench_runs br + JOIN bench_suites bs ON br.suite_id = bs.id + WHERE br.regression_flag = 'regression' + AND br.finished_at >= ${startIso} AND br.finished_at < ${endIso} + ORDER BY br.finished_at DESC + `; + + return { + periodStart: startIso, + periodEnd: endIso, + interval, + totalRequests: totals[0]?.requests ?? 0, + priorRequests: prior[0]?.requests ?? 0, + totalInputTokens: totals[0]?.in_tokens ?? 0, + totalOutputTokens: totals[0]?.out_tokens ?? 0, + bySource: bySource.map((r) => ({ + source: r.source ?? '(unattributed)', + requests: r.requests, + inputTokens: r.in_tokens, + outputTokens: r.out_tokens, + })), + byProvider, + leaderboard: leaderboard.map((r) => ({ + providerId: r.provider_id, + model: r.model, + kind: r.kind, + avgScore: r.avg_score, + })), + regressions: regressions.map((r) => ({ + providerId: r.provider_id, + model: r.model, + avgGenTps: r.avg_gen_tps, + })), + }; +} + +/** + * Render a markdown digest from gathered stats. Pure — unit-testable. + */ +export function renderReportMarkdown(stats: ReportStats): string { + const lines: string[] = []; + const pct = (cur: number, prev: number): string => { + if (prev === 0) return cur === 0 ? '0%' : 'new'; + const d = ((cur - prev) / prev) * 100; + return `${d >= 0 ? '+' : ''}${d.toFixed(0)}%`; + }; + + lines.push(`# Fleet ${stats.interval} report`); + lines.push(''); + lines.push(`Period: ${stats.periodStart} to ${stats.periodEnd}`); + lines.push(''); + + lines.push('## Usage'); + lines.push(''); + lines.push(`- Requests: ${stats.totalRequests} (${pct(stats.totalRequests, stats.priorRequests)} vs prior period)`); + lines.push(`- Input tokens: ${stats.totalInputTokens}`); + lines.push(`- Output tokens: ${stats.totalOutputTokens}`); + lines.push(''); + + if (stats.bySource.length > 0) { + lines.push('## By source'); + lines.push(''); + lines.push('| Source | Requests | Input tok | Output tok |'); + lines.push('| --- | ---: | ---: | ---: |'); + for (const s of stats.bySource) { + lines.push(`| ${s.source} | ${s.requests} | ${s.inputTokens} | ${s.outputTokens} |`); + } + lines.push(''); + } + + if (stats.byProvider.length > 0) { + lines.push('## By host'); + lines.push(''); + lines.push('| Host | Requests | Swaps |'); + lines.push('| --- | ---: | ---: |'); + for (const p of stats.byProvider) { + lines.push(`| ${p.providerId} | ${p.requests} | ${p.swaps} |`); + } + lines.push(''); + } + + if (stats.leaderboard.length > 0) { + lines.push('## Leaderboard'); + lines.push(''); + lines.push('| Model | Kind | Score |'); + lines.push('| --- | --- | ---: |'); + for (const l of stats.leaderboard) { + lines.push(`| ${l.providerId}/${l.model} | ${l.kind} | ${l.avgScore != null ? l.avgScore.toFixed(3) : 'n/a'} |`); + } + lines.push(''); + } + + lines.push('## Anomalies'); + lines.push(''); + if (stats.regressions.length === 0) { + lines.push('No speed regressions flagged this period.'); + } else { + for (const r of stats.regressions) { + lines.push(`- Regression: ${r.providerId}/${r.model} (avg gen ${r.avgGenTps != null ? r.avgGenTps.toFixed(1) : 'n/a'} tok/s)`); + } + } + lines.push(''); + + return lines.join('\n'); +} + +/** + * Generate a report for the given interval and persist it. Returns the new id. + */ +export async function generateReport( + sql: Sql, + interval: ReportInterval, + now: Date = new Date(), +): Promise { + const stats = await gatherReportStats(sql, interval, now); + const markdown = renderReportMarkdown(stats); + const id = `report_${now.getTime()}_${interval}`; + + await sql` + INSERT INTO control_reports (id, kind, interval, period_start, period_end, markdown, stats) + VALUES (${id}, 'digest', ${interval}, ${stats.periodStart}, ${stats.periodEnd}, ${markdown}, ${sql.json(stats as never)}) + ON CONFLICT (id) DO NOTHING + `; + + return id; +} + +/** + * Decide whether a scheduled report is due. Pure helper for testing. + */ +export function isReportDue( + lastRunAt: Date | null, + interval: ReportInterval, + now: Date, +): boolean { + if (!lastRunAt) return true; + const elapsed = now.getTime() - lastRunAt.getTime(); + return elapsed >= intervalHours(interval) * 3600_000; +} + +/** + * Run one scheduler tick: check control_schedule_meta and generate the digest + * if due. Catch-up-on-boot is achieved by calling this once at startup, then + * hourly. + */ +export async function runReportSchedulerTick( + sql: Sql, + now: Date = new Date(), +): Promise<{ ran: boolean; reportId?: string }> { + const rows = await sql<{ interval: string; enabled: boolean; last_run_at: string | null }[]>` + SELECT interval, enabled, last_run_at + FROM control_schedule_meta WHERE name = 'report-digest' + `; + const meta = rows[0]; + if (!meta || !meta.enabled) return { ran: false }; + + const interval = (meta.interval === 'weekly' ? 'weekly' : 'daily') as ReportInterval; + const lastRunAt = meta.last_run_at ? new Date(meta.last_run_at) : null; + + if (!isReportDue(lastRunAt, interval, now)) return { ran: false }; + + const reportId = await generateReport(sql, interval, now); + await sql` + UPDATE control_schedule_meta SET last_run_at = ${now.toISOString()} + WHERE name = 'report-digest' + `; + return { ran: true, reportId }; +} diff --git a/apps/control/src/services/retention.ts b/apps/control/src/services/retention.ts new file mode 100644 index 0000000..42436f5 --- /dev/null +++ b/apps/control/src/services/retention.ts @@ -0,0 +1,159 @@ +/** + * Retention job: daily in-process timer that rolls up raw perf samples and + * prunes old data. + * + * Crash-safe by construction: + * 1. Rollup is an idempotent upsert (INSERT ... ON CONFLICT DO UPDATE). + * 2. Delete raw only AFTER covering buckets are committed. + * 3. Chunked transactions: one per provider per 1-hour window. + */ + +import type { Sql } from '../db.js'; +import type { Config } from '../config.js'; + +export interface RetentionConfig { + rawHours: number; + rollupDays: number; + captureSizeKB: number; + captureBudgetMB: number; +} + +export function buildRetentionConfig(cfg: Config): RetentionConfig { + return { + rawHours: cfg.RETENTION_RAW_HOURS, + rollupDays: cfg.RETENTION_ROLLUP_DAYS, + captureSizeKB: cfg.CAPTURE_SIZE_KB, + captureBudgetMB: cfg.CAPTURE_BUDGET_MB, + }; +} + +/** + * Roll up raw perf samples into 5-minute buckets. + * Idempotent: re-running the same window produces identical rollups. + */ +export async function runRollup(sql: Sql, providerId: string, hours: number): Promise { + const cutoff = new Date(Date.now() - hours * 3600_000); + const buckets = await sql<{ bucket: Date }[]>` + SELECT date_trunc('5 minutes', ts) AS bucket + FROM control_perf_samples + WHERE provider_id = ${providerId} + AND ts >= ${cutoff.toISOString()} + GROUP BY bucket + ORDER BY bucket + `; + + for (const { bucket } of buckets) { + const bucketStart = new Date(bucket); + const bucketEnd = new Date(bucket.getTime() + 5 * 60_000); + + // Idempotent upsert: re-run recomputes the same buckets, never double-counts. + await sql` + INSERT INTO control_perf_rollup_5m (provider_id, bucket, gpu_agg, sys_agg) + SELECT + ${providerId}, + ${bucketStart.toISOString()}, + jsonb_agg(DISTINCT jsonb_build_object('ts', ts, 'gpu', gpu)) AS gpu_agg, + jsonb_agg(DISTINCT jsonb_build_object('ts', ts, 'sys', sys)) AS sys_agg + FROM control_perf_samples + WHERE provider_id = ${providerId} + AND ts >= ${bucketStart.toISOString()} + AND ts < ${bucketEnd.toISOString()} + GROUP BY provider_id + ON CONFLICT (provider_id, bucket) DO UPDATE SET + gpu_agg = EXCLUDED.gpu_agg, + sys_agg = EXCLUDED.sys_agg + `; + } +} + +/** + * Prune raw perf samples older than the retention window. + * Chunked: one transaction per provider per 1-hour window. + */ +export async function pruneRawSamples(sql: Sql, providerId: string, hours: number): Promise { + const cutoff = new Date(Date.now() - hours * 3600_000); + const chunkSize = 1000; + + while (true) { + const toDelete = await sql<{ ts: Date }[]>` + SELECT ts FROM control_perf_samples + WHERE provider_id = ${providerId} + AND ts < ${cutoff.toISOString()} + ORDER BY ts DESC + LIMIT ${chunkSize} + `; + if (toDelete.length === 0) break; + + const timestamps = toDelete.map((r) => r.ts); + await sql`DELETE FROM control_perf_samples WHERE provider_id = ${providerId} AND ts = ANY(${timestamps})`; + } +} + +/** + * Prune activity (control_requests) older than the retention window. + * Chunked: one transaction per batch to avoid long lock hold times. + */ +export async function pruneActivity(sql: Sql, hours: number): Promise { + const cutoff = new Date(Date.now() - hours * 3600_000); + const chunkSize = 1000; + + while (true) { + const toDelete = await sql<{ ts: Date }[]>` + SELECT ts FROM control_requests + WHERE ts < ${cutoff.toISOString()} + ORDER BY ts DESC + LIMIT ${chunkSize} + `; + if (toDelete.length === 0) break; + + const timestamps = toDelete.map((r) => r.ts); + await sql`DELETE FROM control_requests WHERE ts = ANY(${timestamps})`; + } +} + +/** + * Prune model events older than the retention window. + * Chunked: one transaction per batch to avoid long lock hold times. + */ +export async function pruneModelEvents(sql: Sql, hours: number): Promise { + const cutoff = new Date(Date.now() - hours * 3600_000); + const chunkSize = 1000; + + while (true) { + const toDelete = await sql<{ ts: Date }[]>` + SELECT ts FROM control_model_events + WHERE ts < ${cutoff.toISOString()} + ORDER BY ts DESC + LIMIT ${chunkSize} + `; + if (toDelete.length === 0) break; + + const timestamps = toDelete.map((r) => r.ts); + await sql`DELETE FROM control_model_events WHERE ts = ANY(${timestamps})`; + } +} + +/** + * Trim capture JSONB per-row to the configured size cap. + * Returns the trimmed JSON string, or null. + */ +export function trimCapture(captureJson: string | null, sizeKB: number): string | null { + if (!captureJson) return null; + const sizeBytes = Buffer.byteLength(captureJson, 'utf8'); + if (sizeBytes <= sizeKB * 1024) return captureJson; + // Trim the capture to fit within the cap. + return captureJson.slice(0, Math.floor(sizeKB * 1024)); +} + +/** + * Parse a capture JSON string into an object for sql.json(). + * Returns null if the input is null or invalid JSON. + */ +export function parseCaptureJson(captureJson: string | null): Record | null { + if (!captureJson) return null; + try { + return JSON.parse(captureJson) as Record; + } catch { + return null; + } +} diff --git a/apps/control/src/services/routing-scores.ts b/apps/control/src/services/routing-scores.ts new file mode 100644 index 0000000..12c74da --- /dev/null +++ b/apps/control/src/services/routing-scores.ts @@ -0,0 +1,194 @@ +/** + * P6.1: Advisory routing scores. + * + * Combines three signals per (provider_id, model) into an advisory score and + * a set of category badges surfaced in the BooChat model picker: + * - eval results (eval_runs.aggregate.avgScore, split by suite kind) + * - live latency (control_requests gen_tps + duration over a recent window) + * - host health (fleet liveness — an unhealthy host can win no badge) + * + * Advisory only: this never enforces routing. It powers display badges + * ("best code model right now") and the P7 gateway candidate ordering. + * + * The pure scoring/badge helpers are extracted for unit testing per the + * turn-guard.ts pattern; the DB read lives in computeRoutingScores(). + */ + +import type { Sql } from '../db.js'; +import type { FleetState } from './fleet-state.js'; + +/** Recent-activity window for live latency signals. */ +const LIVE_WINDOW_HOURS = 24; + +export interface ModelScore { + /** Composite picker id: `${providerId}/${model}` (matches /api/models). */ + compositeId: string; + providerId: string; + model: string; + /** Avg score (0..1) from completed code-suite eval runs, or null. */ + codeScore: number | null; + /** Avg score (0..1) from completed chat-suite eval runs, or null. */ + chatScore: number | null; + /** Best eval score across kinds, or null when never evaluated. */ + evalScore: number | null; + /** Avg gen tok/s over the live window, or null when no recent traffic. */ + avgGenTps: number | null; + /** Avg request duration (ms) over the live window, or null. */ + avgLatencyMs: number | null; + /** Recent request count in the live window. */ + sampleCount: number; + /** Whether the owning host is currently connected. */ + healthy: boolean; + /** Category badges this model currently wins. */ + badges: BadgeKind[]; +} + +export type BadgeKind = 'best-code' | 'best-chat' | 'best-fast'; + +export const BADGE_LABELS: Record = { + 'best-code': 'Best code model now', + 'best-chat': 'Best chat model now', + 'best-fast': 'Fastest model now', +}; + +interface EvalRow { + provider_id: string; + model: string; + suite_kind: string; + avg_score: number | null; +} + +interface LatencyRow { + provider_id: string; + model: string; + avg_gen_tps: number | null; + avg_duration_ms: number | null; + sample_count: number; +} + +/** + * Pure badge assignment: given the per-model signals, award one winner per + * category. Only healthy hosts are eligible; ties broken by first-seen order + * (callers sort deterministically before passing in). + */ +export function assignBadges(scores: ModelScore[]): void { + const eligible = scores.filter((s) => s.healthy); + + const award = ( + pick: (s: ModelScore) => number | null, + badge: BadgeKind, + ): void => { + let best: ModelScore | null = null; + let bestVal = -Infinity; + for (const s of eligible) { + const v = pick(s); + if (v == null) continue; + if (v > bestVal) { + bestVal = v; + best = s; + } + } + if (best && bestVal > -Infinity) { + best.badges.push(badge); + } + }; + + award((s) => s.codeScore, 'best-code'); + award((s) => s.chatScore, 'best-chat'); + award((s) => s.avgGenTps, 'best-fast'); +} + +/** + * Compute advisory routing scores across all (provider_id, model) pairs that + * have either eval history or recent live traffic. + */ +export async function computeRoutingScores( + sql: Sql, + fleet: FleetState, +): Promise { + // 1. Eval scores — latest completed run per (provider, model, kind). + // Take the most recent finished run's aggregate avgScore per kind so a + // fresh run supersedes stale numbers. + const evalRows = await sql` + SELECT er.provider_id, + er.model, + es.kind AS suite_kind, + (er.aggregate::jsonb ->> 'avgScore')::float AS avg_score + FROM eval_runs er + JOIN eval_suites es ON er.suite_id = es.id + WHERE er.status = 'completed' + AND er.aggregate IS NOT NULL + AND er.finished_at = ( + SELECT MAX(er2.finished_at) + FROM eval_runs er2 + JOIN eval_suites es2 ON er2.suite_id = es2.id + WHERE er2.provider_id = er.provider_id + AND er2.model = er.model + AND es2.kind = es.kind + AND er2.status = 'completed' + ) + `; + + // 2. Live latency/throughput — recent control_requests per (provider, model). + const cutoff = new Date(Date.now() - LIVE_WINDOW_HOURS * 3600_000).toISOString(); + const latencyRows = await sql` + SELECT provider_id, + model, + AVG(gen_tps) FILTER (WHERE gen_tps > 0) AS avg_gen_tps, + AVG(duration_ms) FILTER (WHERE duration_ms > 0) AS avg_duration_ms, + COUNT(*)::int AS sample_count + FROM control_requests + WHERE ts >= ${cutoff} + AND model IS NOT NULL + GROUP BY provider_id, model + `; + + // 3. Merge signals keyed by compositeId. + const byKey = new Map(); + const keyOf = (providerId: string, model: string) => `${providerId}/${model}`; + + const ensure = (providerId: string, model: string): ModelScore => { + const compositeId = keyOf(providerId, model); + let s = byKey.get(compositeId); + if (!s) { + s = { + compositeId, + providerId, + model, + codeScore: null, + chatScore: null, + evalScore: null, + avgGenTps: null, + avgLatencyMs: null, + sampleCount: 0, + healthy: fleet.hosts.get(providerId)?.liveness === 'connected', + badges: [], + }; + byKey.set(compositeId, s); + } + return s; + }; + + for (const row of evalRows) { + const s = ensure(row.provider_id, row.model); + if (row.suite_kind === 'code') s.codeScore = row.avg_score; + else if (row.suite_kind === 'chat') s.chatScore = row.avg_score; + const best = Math.max(s.codeScore ?? -Infinity, s.chatScore ?? -Infinity); + s.evalScore = best > -Infinity ? best : null; + } + + for (const row of latencyRows) { + const s = ensure(row.provider_id, row.model); + s.avgGenTps = row.avg_gen_tps; + s.avgLatencyMs = row.avg_duration_ms; + s.sampleCount = row.sample_count; + } + + // Deterministic order before badge assignment so ties are stable. + const scores = Array.from(byKey.values()).sort((a, b) => + a.compositeId < b.compositeId ? -1 : a.compositeId > b.compositeId ? 1 : 0, + ); + + assignBadges(scores); + return scores; +} diff --git a/apps/control/src/services/sandbox-runner.ts b/apps/control/src/services/sandbox-runner.ts new file mode 100644 index 0000000..912d84c --- /dev/null +++ b/apps/control/src/services/sandbox-runner.ts @@ -0,0 +1,410 @@ +import { spawn, type ChildProcess } from 'node:child_process'; +import { randomUUID } from 'node:crypto'; +import type { Sql } from '../db.js'; +import type { DeltaEmitter } from '../index.js'; +import { recordEvalResult } from './eval-suites.js'; + +// ─── types ────────────────────────────────────────────────────────────────── + +export interface SandboxEvalParams { + runId: string; + providerId: string; + model: string; + quant: string | null; + tasks: Array>; +} + +export interface SandboxProgress { + completedTasks: number; +} + +export interface SandboxResult { + error: string | null; +} + +export interface SandboxContainer { + id: string; + process: ChildProcess; + timeoutHandle: NodeJS.Timeout | null; +} + +// ─── hardening constants (LAW, not suggestions) ───────────────────────────── + +const SANDBOX_IMAGE = process.env.SANDBOX_IMAGE ?? 'node:20-bookworm-slim'; +const SANDBOX_MEMORY = process.env.SANDBOX_MEMORY ?? '512m'; +const SANDBOX_CPU = process.env.SANDBOX_CPU ?? '0.5'; +const SANDBOX_PIDS = process.env.SANDBOX_PIDS ?? '100'; +const SANDBOX_TIMEOUT_MS = Number(process.env.SANDBOX_TIMEOUT_MS ?? '30000'); +const SANDBOX_CONCURRENCY = Number(process.env.SANDBOX_CONCURRENCY ?? '4'); +const SANDBOX_LABEL = 'boocontrol-eval'; + +// ─── sandbox runner ───────────────────────────────────────────────────────── + +/** + * Run a code sandbox eval: each task generates code via LLM, executes in + * an ephemeral Docker container with hardening flags, and scores pass@1. + * + * HARDENING FLAGS (LAW): + * - --network none: NO network access + * - --user 1000:1000: non-root user + * - --memory, --cpus, --pids-limit: resource caps + * - --tmpfs /workspace:tmpfs workdir + * - --rm: auto-remove on exit + * - --label boocontrol-eval: orphan findability + * - --security-opt=no-new-privileges: no privilege escalation + * - --cap-drop=ALL: drop all capabilities + * + * NO volume mounts from the repo. + * NO docker socket inside containers. + * + * Bounded concurrency via Promise.allSettled. + * Per-task finally cleanup. + * Kill-on-timeout. + */ +export async function runCodeEval( + params: SandboxEvalParams, + sql: Sql, + emitter: DeltaEmitter, + seq: number, + onProgress: (progress: SandboxProgress) => void, +): Promise { + const { runId, tasks } = params; + + // Orphan prune at engine start. + await pruneOrphanContainers(); + + let completedTasks = 0; + let error: string | null = null; + + // Bounded concurrency: process tasks in batches. + const batchSizes: number[] = []; + for (let i = 0; i < tasks.length; i += SANDBOX_CONCURRENCY) { + const batch = tasks.slice(i, i + SANDBOX_CONCURRENCY); + batchSizes.push(batch.length); + + // Promise.allSettled: a single task failure never abandons in-flight containers. + const results = await Promise.allSettled( + batch.map(async (task, batchIdx) => { + const globalIdx = i + batchIdx; + const taskId = (task.id as string) ?? `task_${globalIdx}`; + const prompt = (task.prompt as string) ?? ''; + const testCode = (task.test_code as string) ?? ''; + const expectedOutput = (task.expected_output as string) ?? ''; + const language = (task.language as string) ?? 'typescript'; + + const startTime = Date.now(); + let container: SandboxContainer | null = null; + + try { + // Generate code from LLM. + const generatedCode = await generateCode(params.providerId, params.model, prompt, language); + + // Execute in sandbox. + const execResult = await executeInSandbox(generatedCode, testCode, language); + + const executionMs = Date.now() - startTime; + + // pass@1 scoring: output matches expected. + const passed = normalizeOutput(execResult.stdout) === normalizeOutput(expectedOutput); + const score = passed ? 1 : 0; + + await recordEvalResult( + sql, + runId, + taskId, + globalIdx, + score, + 1, + passed ? 'Output matches expected' : `Expected: ${expectedOutput}, Got: ${execResult.stdout}`, + execResult.exitCode, + execResult.stderr, + execResult.stdout, + executionMs, + null, + ); + + emitter.publish({ + type: 'control_job' as const, + seq, + jobType: 'eval' as const, + jobId: runId, + status: 'running' as const, + detail: { + taskId, + taskIndex: globalIdx, + passed, + score, + }, + }); + + return { taskId, passed, score }; + } catch (err) { + const msg = (err as Error).message ?? String(err); + const executionMs = Date.now() - startTime; + + await recordEvalResult( + sql, + runId, + taskId, + globalIdx, + null, + 1, + null, + null, + msg, + null, + executionMs, + msg, + ).catch(() => {}); + + return { taskId, passed: false, score: 0, error: msg }; + } finally { + // Per-task finally cleanup: kill container + remove. + if (container) { + await cleanupContainer(container); + } + completedTasks++; + onProgress({ completedTasks }); + } + }), + ); + + // Log batch results. + for (const result of results) { + if (result.status === 'rejected') { + console.error('sandbox: batch task rejected:', result.reason); + } + } + } + + return { error }; +} + +/** + * Generate code from the target model. + */ +async function generateCode( + providerId: string, + model: string, + prompt: string, + language: string, +): Promise { + const baseUrl = resolveProviderBaseUrlInternal(providerId); + if (!baseUrl) { + throw new Error(`no base URL for provider ${providerId}`); + } + + const systemPrompt = `You are a code generator. Write ${language} code that solves the given task. +Output ONLY the code, no explanations, no markdown fences. The code will be executed directly.`; + + const res = await fetch(`${baseUrl}/v1/chat/completions`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'X-Boo-Source': 'control-eval', + }, + body: JSON.stringify({ + model, + messages: [ + { role: 'system', content: systemPrompt }, + { role: 'user', content: prompt }, + ], + temperature: 0, + max_tokens: 2048, + }), + signal: AbortSignal.timeout(120_000), + }); + + if (!res.ok) { + const body = await res.text().catch(() => ''); + throw new Error(`code generation failed: ${res.status} ${body.slice(0, 200)}`); + } + + const data = await res.json() as { choices?: Array<{ message?: { content?: string } }> }; + let code = data.choices?.[0]?.message?.content ?? ''; + + // Strip markdown code fences if present. + const fenceMatch = code.match(/```[\w]*\n([\s\S]*?)```/); + if (fenceMatch && fenceMatch[1]) { + code = fenceMatch[1]; + } + + return code.trim(); +} + +/** + * Execute code in a hardened Docker container. + */ +async function executeInSandbox( + generatedCode: string, + testCode: string, + language: string, +): Promise<{ stdout: string; stderr: string; exitCode: number | null }> { + return new Promise((resolve, reject) => { + const containerId = `eval_${randomUUID().slice(0, 12)}`; + + // Build the combined script: generated code + test code. + const script = buildExecutionScript(generatedCode, testCode, language); + + // SECURITY: Hardened Docker run command. + // --network none: NO network access. + // --user 1000:1000: non-root user. + // --memory, --cpus, --pids-limit: resource caps. + // --tmpfs /workspace: tmpfs workdir, no persistent storage. + // --rm: auto-remove on exit. + // --label boocontrol-eval: orphan findability. + // --security-opt=no-new-privileges: no privilege escalation. + // --cap-drop=ALL: drop all capabilities. + const dockerArgs = [ + 'run', + '--network', 'none', + '--user', '1000:1000', + '--memory', SANDBOX_MEMORY, + '--cpus', String(SANDBOX_CPU), + '--pids-limit', String(SANDBOX_PIDS), + '--tmpfs', '/workspace:rw,noexec,size=64m', + '--rm', + '--label', SANDBOX_LABEL, + '--security-opt', 'no-new-privileges', + '--cap-drop', 'ALL', + '--name', containerId, + '-e', 'NODE_ENV=production', + SANDBOX_IMAGE, + 'sh', '-c', script, + ]; + + const dockerProcess = spawn('docker', dockerArgs, { + timeout: SANDBOX_TIMEOUT_MS, + env: { ...process.env }, + }); + + let stdout = ''; + let stderr = ''; + + dockerProcess.stdout.on('data', (chunk: Buffer) => { + stdout += chunk.toString(); + }); + + dockerProcess.stderr.on('data', (chunk: Buffer) => { + stderr += chunk.toString(); + }); + + dockerProcess.on('close', (code) => { + resolve({ + stdout: stdout.trim(), + stderr: stderr.trim(), + exitCode: code, + }); + }); + + dockerProcess.on('error', (err) => { + reject(new Error(`docker spawn failed: ${err.message}`)); + }); + + // Kill-on-timeout: if the process exceeds SANDBOX_TIMEOUT_MS, kill it. + const timeoutHandle = setTimeout(() => { + dockerProcess.kill('SIGKILL'); + reject(new Error(`sandbox execution timeout (${SANDBOX_TIMEOUT_MS}ms)`)); + }, SANDBOX_TIMEOUT_MS); + + // Clear timeout on close. + dockerProcess.on('close', () => { + clearTimeout(timeoutHandle); + }); + }); +} + +/** + * Build the execution script for the sandbox. + */ +function buildExecutionScript( + generatedCode: string, + testCode: string, + language: string, +): string { + if (language === 'typescript' || language === 'javascript') { + return [ + 'cd /workspace', + `echo '${escapeShell(generatedCode)}' > output.js`, + `echo '${escapeShell(testCode)}' > test.js`, + 'npx --yes tsx test.js 2>&1', + ].join(' && '); + } + + // Fallback: generic shell execution. + return [ + 'cd /workspace', + `echo '${escapeShell(generatedCode)}' > output.sh`, + `echo '${escapeShell(testCode)}' > test.sh`, + 'chmod +x output.sh test.sh', + 'bash test.sh 2>&1', + ].join(' && '); +} + +/** + * Escape a string for safe shell embedding. + */ +function escapeShell(str: string): string { + return str.replace(/'/g, "'\\''"); +} + +/** + * Normalize output for comparison (trim, collapse whitespace). + */ +function normalizeOutput(output: string): string { + return output.trim().replace(/\s+/g, ' '); +} + +/** + * Prune orphan containers from crashed runs. + */ +async function pruneOrphanContainers(): Promise { + return new Promise((resolve) => { + const pruneCmd = spawn('docker', ['ps', '-q', '--filter', `label=${SANDBOX_LABEL}`]); + let output = ''; + pruneCmd.stdout.on('data', (chunk: Buffer) => { output += chunk.toString(); }); + pruneCmd.on('close', async () => { + const containerIds = output.trim().split('\n').filter(Boolean); + if (containerIds.length > 0) { + console.log({ count: containerIds.length }, 'sandbox: pruning orphan containers'); + const kill = spawn('docker', ['kill', ...containerIds]); + await new Promise((r) => { + kill.on('close', r); + kill.on('error', r); + }); + } + resolve(); + }); + pruneCmd.on('error', () => resolve()); + }); +} + +/** + * Cleanup a sandbox container. + */ +async function cleanupContainer(container: SandboxContainer): Promise { + if (container.timeoutHandle) { + clearTimeout(container.timeoutHandle); + } + if (container.process.exitCode === null) { + container.process.kill('SIGKILL'); + } + // Container is --rm, so it auto-removes. But force-remove as safety net. + await new Promise((resolve) => { + const rm = spawn('docker', ['rm', '-f', container.id]); + rm.on('close', resolve); + rm.on('error', resolve); + }).catch(() => {}); +} + +/** + * Resolve provider base URL (internal, mirrors llama-providers). + */ +function resolveProviderBaseUrlInternal(providerId: string): string | null { + try { + const { resolveProviderBaseUrl } = require('./llama-providers.js'); + return resolveProviderBaseUrl(providerId); + } catch { + return null; + } +} diff --git a/apps/control/src/services/ssh-config.ts b/apps/control/src/services/ssh-config.ts new file mode 100644 index 0000000..2a4a8cc --- /dev/null +++ b/apps/control/src/services/ssh-config.ts @@ -0,0 +1,361 @@ +/** + * P9.1: SSH config editor for llama-swap hosts. + * + * Pipeline (design §5, stackctl flow with the tests stackctl never had): + * SFTP/SSH read -> schema-validated edit (config-schema.json from the fork) + * -> diff preview -> timestamped backup -> write -> restart -> health-wait. + * + * SSH I/O is shelled out via `ssh` (matching the booterm precedent — no ssh2 + * dependency, key from `secrets/`), injected as `SshExec` so every failure path + * is unit-testable without a live host. The pure helpers (validate, diff, + * backup filename) carry the logic and are tested directly. + */ + +import { spawn } from 'node:child_process'; +import { createRequire } from 'node:module'; +import { load as loadYaml } from 'js-yaml'; +import type { ValidateFunction } from 'ajv'; + +// ajv + ajv-formats are CJS. Under NodeNext ESM the default-import interop binds +// the namespace, not the constructable class, so load them via createRequire to +// get the real module.exports (class / plugin fn) at both type and runtime. +const require = createRequire(import.meta.url); +const Ajv = require('ajv') as typeof import('ajv').default; +const addFormats = require('ajv-formats') as typeof import('ajv-formats').default; + +// ─── host SSH target ───────────────────────────────────────────────────────── + +export interface SshTarget { + host: string; + user: string; + keyPath: string; +} + +export interface ExecResult { + code: number; + stdout: string; + stderr: string; +} + +/** Injectable SSH executor. `stdin`, when present, is piped to the remote command. */ +export type SshExec = (target: SshTarget, command: string, stdin?: string) => Promise; + +// ─── pure: schema validation ───────────────────────────────────────────────── + +export interface ValidationResult { + valid: boolean; + errors: string[]; + /** Parsed config object when YAML is syntactically valid. */ + parsed?: unknown; +} + +let cachedValidator: ValidateFunction | null = null; +let cachedSchemaRef: object | null = null; + +function getValidator(schema: object): ValidateFunction { + if (cachedValidator && cachedSchemaRef === schema) return cachedValidator; + const ajv = new Ajv({ allErrors: true, strict: false }); + addFormats(ajv); + const validate = ajv.compile(schema); + cachedValidator = validate; + cachedSchemaRef = schema; + return validate; +} + +/** + * Validate a llama-swap config YAML string against the fork's + * config-schema.json. Catches YAML syntax errors first, then schema errors. + * Pure — no I/O; the schema object is passed in. + */ +export function validateLlamaConfig(yamlText: string, schema: object): ValidationResult { + let parsed: unknown; + try { + parsed = loadYaml(yamlText); + } catch (err) { + return { valid: false, errors: [`YAML parse error: ${(err as Error).message}`] }; + } + if (parsed === null || typeof parsed !== 'object') { + return { valid: false, errors: ['config must be a YAML mapping'], parsed }; + } + + const validate = getValidator(schema); + const ok = validate(parsed); + if (ok) return { valid: true, errors: [], parsed }; + + const errors = (validate.errors ?? []).map((e) => { + const path = e.instancePath || '(root)'; + return `${path} ${e.message ?? 'invalid'}`; + }); + return { valid: false, errors: errors.length ? errors : ['schema validation failed'], parsed }; +} + +// ─── pure: unified-ish diff ────────────────────────────────────────────────── + +/** + * Produce a compact line diff between two texts. Trims a common prefix/suffix + * and marks the changed middle with -/+ lines. Sufficient for a preview; not a + * minimal-edit Myers diff. + */ +export function computeDiff(oldText: string, newText: string): string { + const oldLines = oldText.split('\n'); + const newLines = newText.split('\n'); + + let start = 0; + while (start < oldLines.length && start < newLines.length && oldLines[start] === newLines[start]) { + start++; + } + let endOld = oldLines.length - 1; + let endNew = newLines.length - 1; + while (endOld >= start && endNew >= start && oldLines[endOld] === newLines[endNew]) { + endOld--; + endNew--; + } + + if (endOld < start && endNew < start) return ''; // identical + + const out: string[] = []; + out.push(`@@ lines ${start + 1}..${endOld + 1} -> ${start + 1}..${endNew + 1} @@`); + for (let i = start; i <= endOld; i++) out.push(`- ${oldLines[i]}`); + for (let i = start; i <= endNew; i++) out.push(`+ ${newLines[i]}`); + return out.join('\n'); +} + +// ─── pure: backup filename ─────────────────────────────────────────────────── + +/** Timestamped backup path: `.bak-YYYYMMDDTHHMMSSZ`. */ +export function backupFilename(configPath: string, now: Date): string { + const stamp = now.toISOString().replace(/[-:]/g, '').replace(/\.\d+Z$/, 'Z'); + return `${configPath}.bak-${stamp}`; +} + +// ─── RemoteOps seam (shell vs wrapper) ─────────────────────────────────────── +// +// 'shell' mode issues raw shell commands (P9.1 behavior). 'wrapper' mode issues +// fixed verbs so the key can be bound to an authorized_keys forced command that +// hardcodes the paths. Both drive the same apply pipeline. + +export type SshMode = 'shell' | 'wrapper'; + +export interface RemoteOps { + read(): Promise; + backup(now: Date): Promise; // returns the backup path + write(content: string): Promise; + restart(restartCmd: string): Promise; +} + +function fail(label: string, res: ExecResult): never { + throw new Error(`${label} failed (exit ${res.code}): ${res.stderr.slice(0, 300)}`); +} + +/** Raw-command ops (no wrapper on the host). */ +export function shellOps(target: SshTarget, configPath: string, exec: SshExec): RemoteOps { + return { + async read() { + const r = await exec(target, `cat ${shellQuote(configPath)}`); + if (r.code !== 0) fail('read', r); + return r.stdout; + }, + async backup(now) { + const backupPath = backupFilename(configPath, now); + const r = await exec(target, `cp ${shellQuote(configPath)} ${shellQuote(backupPath)}`); + if (r.code !== 0) fail('backup', r); + return backupPath; + }, + async write(content) { + const r = await exec(target, `cat > ${shellQuote(configPath)}`, content); + if (r.code !== 0) fail('write', r); + }, + async restart(restartCmd) { + const r = await exec(target, restartCmd); + if (r.code !== 0) fail('restart', r); + }, + }; +} + +/** Verb ops for a forced-command-locked key. The wrapper hardcodes the paths; + * the backup verb stamps and returns the backup path on stdout. */ +export function wrapperOps(target: SshTarget, exec: SshExec): RemoteOps { + return { + async read() { + const r = await exec(target, 'read'); + if (r.code !== 0) fail('read', r); + return r.stdout; + }, + async backup() { + const r = await exec(target, 'backup'); + if (r.code !== 0) fail('backup', r); + return r.stdout.trim(); + }, + async write(content) { + const r = await exec(target, 'write', content); + if (r.code !== 0) fail('write', r); + }, + async restart() { + const r = await exec(target, 'restart'); + if (r.code !== 0) fail('restart', r); + }, + }; +} + +export function makeRemoteOps(mode: SshMode, target: SshTarget, configPath: string, exec: SshExec): RemoteOps { + return mode === 'wrapper' ? wrapperOps(target, exec) : shellOps(target, configPath, exec); +} + +// ─── orchestration (injectable exec) ───────────────────────────────────────── + +/** Read the remote config file (mode-aware; defaults to shell for compat). */ +export async function readRemoteConfig( + target: SshTarget, + configPath: string, + exec: SshExec, + mode: SshMode = 'shell', +): Promise { + return makeRemoteOps(mode, target, configPath, exec).read(); +} + +export interface ApplyResult { + ok: boolean; + step: 'validate' | 'backup' | 'write' | 'restart' | 'health' | 'done'; + backupPath?: string; + diff?: string; + error?: string; +} + +export interface ApplyOptions { + target: SshTarget; + configPath: string; + restartCmd: string; + newConfig: string; + schema: object; + baseUrl: string; + exec: SshExec; + /** 'shell' (default) or 'wrapper'. */ + mode?: SshMode; + fetcher?: typeof fetch; + now?: Date; + healthAttempts?: number; + healthDelayMs?: number; +} + +/** + * The full apply pipeline. Aborts at the first failing step and reports which + * one. Backup ALWAYS precedes write, so a failed write leaves the timestamped + * backup intact for manual recovery. Mode selects the wire commands (raw shell + * vs forced-command verbs); the pipeline is identical. + */ +export async function applyRemoteConfig(opts: ApplyOptions): Promise { + const { + target, configPath, restartCmd, newConfig, schema, baseUrl, exec, + mode = 'shell', fetcher = fetch, now = new Date(), + healthAttempts = 10, healthDelayMs = 2000, + } = opts; + + const ops = makeRemoteOps(mode, target, configPath, exec); + + // 1. Validate before touching the host. + const validation = validateLlamaConfig(newConfig, schema); + if (!validation.valid) { + return { ok: false, step: 'validate', error: validation.errors.join('; ') }; + } + + // Read current for diff + so an unreadable host fails before any write. + let current = ''; + try { + current = await ops.read(); + } catch (err) { + return { ok: false, step: 'validate', error: `read current failed: ${(err as Error).message}` }; + } + const diff = computeDiff(current, newConfig); + + // 2. Timestamped backup BEFORE write. + let backupPath: string; + try { + backupPath = await ops.backup(now); + } catch (err) { + return { ok: false, step: 'backup', diff, error: (err as Error).message }; + } + + // 3. Write new config. + try { + await ops.write(newConfig); + } catch (err) { + return { ok: false, step: 'write', backupPath, diff, error: (err as Error).message }; + } + + // 4. Restart the service. + try { + await ops.restart(restartCmd); + } catch (err) { + return { ok: false, step: 'restart', backupPath, diff, error: (err as Error).message }; + } + + // 5. Health-wait: poll the provider until it serves /v1/models. + const healthy = await healthWait(baseUrl, fetcher, healthAttempts, healthDelayMs); + if (!healthy) { + return { ok: false, step: 'health', backupPath, diff, error: 'health check did not pass after restart; backup retained' }; + } + + return { ok: true, step: 'done', backupPath, diff }; +} + +/** Poll the provider's /v1/models until it responds OK or attempts run out. */ +export async function healthWait( + baseUrl: string, + fetcher: typeof fetch, + attempts: number, + delayMs: number, +): Promise { + for (let i = 0; i < attempts; i++) { + try { + const res = await fetcher(`${baseUrl.replace(/\/+$/, '')}/v1/models`, { + signal: AbortSignal.timeout(5_000), + }); + if (res.ok) return true; + } catch { + // not up yet + } + if (i < attempts - 1) await sleep(delayMs); + } + return false; +} + +function sleep(ms: number): Promise { + return new Promise((r) => setTimeout(r, ms)); +} + +// Minimal POSIX single-quote shell escape for the remote command string. +function shellQuote(s: string): string { + return `'${s.replace(/'/g, `'\\''`)}'`; +} + +// ─── real SSH executor (spawn) ─────────────────────────────────────────────── + +/** + * Default SSH executor. Uses the system `ssh` with an explicit identity file and + * IdentitiesOnly so the agent's default key is never offered (the boocode Gitea + * lesson). BatchMode avoids interactive prompts hanging the service. + */ +export const sshExec: SshExec = (target, command, stdin) => { + return new Promise((resolve) => { + const args = [ + '-i', target.keyPath, + '-o', 'IdentitiesOnly=yes', + '-o', 'BatchMode=yes', + '-o', 'StrictHostKeyChecking=accept-new', + '-o', 'ConnectTimeout=10', + `${target.user}@${target.host}`, + command, + ]; + const child = spawn('ssh', args, { stdio: ['pipe', 'pipe', 'pipe'] }); + let stdout = ''; + let stderr = ''; + child.stdout.on('data', (d) => { stdout += d.toString(); }); + child.stderr.on('data', (d) => { stderr += d.toString(); }); + child.on('error', (err) => resolve({ code: 127, stdout, stderr: `${stderr}${(err as Error).message}` })); + child.on('close', (code) => resolve({ code: code ?? 1, stdout, stderr })); + if (stdin !== undefined) { + child.stdin.write(stdin); + } + child.stdin.end(); + }); +}; diff --git a/apps/control/tsconfig.json b/apps/control/tsconfig.json new file mode 100644 index 0000000..fe31069 --- /dev/null +++ b/apps/control/tsconfig.json @@ -0,0 +1,15 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "module": "NodeNext", + "moduleResolution": "NodeNext", + "outDir": "dist", + "rootDir": "src", + "lib": ["ES2022"], + "types": ["node"], + "declaration": false, + "sourceMap": true + }, + "include": ["src/**/*"], + "exclude": ["src/**/__tests__/**", "**/*.test.ts"] +} diff --git a/apps/server/CLAUDE.md b/apps/server/CLAUDE.md index 71fcf4b..8e52f7b 100644 --- a/apps/server/CLAUDE.md +++ b/apps/server/CLAUDE.md @@ -50,6 +50,5 @@ Route registration: all routes registered in `index.ts` via `register*Routes(app - `data/AGENTS.md` is PARSED (`agents.ts` `splitSections`/`parseAgentSection`): each `## ` is one agent and must be followed by a `---` frontmatter fence or the block throws; content before the first `## ` is discarded. Do NOT add free-form `## ` rule sections — they break the registry. Cross-cutting agent rules go in CLAUDE.md or a parser-ignored preamble. - MCP stdio transport uses newline-delimited JSON (NDJSON), NOT LSP-style `Content-Length` headers. The boocontext MCP client (`services/mcp-client.ts`) is the reference (per the MCP spec, modelcontextprotocol.io/specification/server/transports). - **`payload.ts:loadContext` SELECT** must include every `Session` field downstream code reads. The tool phase reads `session.allowed_read_paths`; if the SELECT omits it, cross-repo read grants silently fail. `sql` doesn't enforce column coverage, so the type doesn't catch it. -- **Sidecar routing** (`services/inference/provider.ts`): `upstreamModel(config, modelId, agent)` routes to `LLAMA_SIDECAR_URL` when the agent has `llama_extra_args`, else `LLAMA_SWAP_URL`. `resolveRoute(agent)` returns `{route, flags}`. Sidecar provider created fresh per call (not cached) because `X-Agent-Flags` varies per agent. Boot-time guard in `index.ts` refuses to start if any agent has `llama_extra_args` but `LLAMA_SIDECAR_URL` is unset. - **Secret guard safe patterns** (`services/secret_guard.ts`): `.env.example`, `.env.sample`, `.env.template`, `.env.defaults` are allowlisted via `SAFE_PATTERNS`. Do NOT add `.env.production`/`.env.development`/`.env.test` — those can hold real secrets. -- **llama-sidecar** (`/opt/forks/llama-sidecar/`): Go daemon for a per-agent llama-server process pool (routed to via "Sidecar routing" above). Cross-compile: `GOOS=windows GOARCH=amd64 /snap/go/current/bin/go build -o bin/llama-sidecar.exe ./cmd/llama-sidecar`. Gitea: `indifferentketchup/llama-sidecar`. Windows child-process gotchas: `context.Background()` for child lifetime (not request ctx), `os.Open(os.DevNull)` for stdin, `os.Pipe()` for stdout with a drain goroutine, `DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP` flags. SSH to sam-desktop: `ssh samki@100.101.41.16`; use `schtasks` for persistent spawning (SSH `start /B` doesn't survive session close). + diff --git a/apps/server/src/config.ts b/apps/server/src/config.ts index d69f1a0..223e66a 100644 --- a/apps/server/src/config.ts +++ b/apps/server/src/config.ts @@ -25,7 +25,6 @@ const ConfigSchema = z.object({ // session model (auto_name) or DEFAULT_MODEL when unset. FAST_MODEL: z.string().optional(), TASK_MODEL_URL: z.string().url().optional(), - LLAMA_SIDECAR_URL: z.string().url().optional(), // vDeepSeek: DeepSeek API key for direct API access. When set, models // with IDs starting with 'deepseek-' route through DeepSeek's API instead // of llama-swap. Defaults to empty (DeepSeek routing disabled). @@ -34,6 +33,11 @@ const ConfigSchema = z.object({ DEEPSEEK_BASE_URL: z.string().url().default('https://api.deepseek.com'), // vWhale hooks: path to hooks JSON config file. Missing file = no hooks. HOOKS_CONFIG_PATH: z.string().default('/data/hooks.json'), + // vMultiProvider: path to the local providers config JSON file. Missing file + // = legacy synthesis from LLAMA_SWAP_URL. + LLAMA_PROVIDERS_PATH: z.string().optional(), + // BooControl host service origin. Used by /api/control/* proxy routes. + BOOCONTROL_URL: z.string().url().optional(), }); export type Config = z.infer; diff --git a/apps/server/src/index.ts b/apps/server/src/index.ts index 48b3378..a2cbef2 100644 --- a/apps/server/src/index.ts +++ b/apps/server/src/index.ts @@ -15,6 +15,7 @@ import { registerChatRoutes } from './routes/chats.js'; import { registerSidebarRoutes } from './routes/sidebar.js'; import { registerWebSocket } from './routes/ws.js'; import { registerCoderProxy } from './routes/coder-proxy.js'; +import { registerControlProxy } from './routes/control-proxy.js'; import { registerModelRoutes } from './routes/models.js'; import { registerAgentRoutes } from './routes/agents.js'; import { registerSkillsRoutes } from './routes/skills.js'; @@ -36,10 +37,15 @@ import { initialize as initMcp, getTools as getMcpTools, shutdown as shutdownMcp import { appendMcpTools } from './services/tools.js'; import { refreshToolNames, getAgentsForProject } from './services/agents.js'; import { loadHooksConfig, createHookRunner } from './services/hooks.js'; +import { loadLlamaProviders } from './services/llama-providers.js'; async function main() { const config = loadConfig(); + // vMultiProvider: load the shared local provider config. When the file is + // absent, falls back to a single legacy provider from LLAMA_SWAP_URL. + loadLlamaProviders(config.LLAMA_PROVIDERS_PATH, config.LLAMA_SWAP_URL); + const app = Fastify({ logger: { level: config.LOG_LEVEL }, }); @@ -76,10 +82,11 @@ async function main() { app.log.info({ sweptCount }, 'swept stale streaming messages to failed'); } - // v1.11.3: tell the model-context cache where llama-swap lives. Cache - // lookups go to ${LLAMA_SWAP_URL}/upstream//props to read + // v2.x (W3): tell the model-context cache the full config so it can + // resolve composite model ids through the provider registry. Cache + // lookups go to /upstream//props to read // default_generation_settings.n_ctx — the value persisted as messages.ctx_max. - configureModelContext({ llamaSwapUrl: config.LLAMA_SWAP_URL }); + configureModelContext(config); // v1.15.0-mcp-multi: read MCP config file and connect to all enabled servers. // Runs before route registration so the tool list is complete when the first @@ -98,19 +105,6 @@ async function main() { } app.addHook('onClose', async () => { await shutdownMcp(); }); - // Boot-time guard: if any agent has llama_extra_args but LLAMA_SIDECAR_URL - // is unset, fail fast. Silent fallback would defeat per-agent flags. - if (!config.LLAMA_SIDECAR_URL) { - const { agents } = await getAgentsForProject(''); - const offending = agents.find(a => a.llama_extra_args && a.llama_extra_args.length > 0); - if (offending) { - app.log.fatal( - { agent: offending.name }, - `Agent "${offending.name}" has llama_extra_args but LLAMA_SIDECAR_URL is not set`, - ); - process.exit(1); - } - } await app.register(fastifyWebsocket); @@ -283,6 +277,12 @@ async function main() { const BOOCODER_ORIGIN = process.env.BOOCODER_URL ?? 'http://boocoder:3000'; registerCoderProxy(app, BOOCODER_ORIGIN); + // BooControl: reverse proxy /api/control/* to the control host service. + // Static WS path /api/control/ws (not parameterized per-session like coder-proxy). + if (process.env.BOOCONTROL_URL) { + registerControlProxy(app, process.env.BOOCONTROL_URL); + } + const webDist = process.env.WEB_DIST_PATH ?? resolve(process.cwd(), '../web/dist'); if (existsSync(webDist)) { await app.register(fastifyStatic, { diff --git a/apps/server/src/routes/__tests__/settings-favorites.test.ts b/apps/server/src/routes/__tests__/settings-favorites.test.ts new file mode 100644 index 0000000..e7afde3 --- /dev/null +++ b/apps/server/src/routes/__tests__/settings-favorites.test.ts @@ -0,0 +1,120 @@ +import { describe, it, expect, beforeAll, afterAll } from 'vitest'; +import postgres from 'postgres'; +import Fastify from 'fastify'; +import { registerSettingsRoutes } from '../settings.js'; +import type { Sql } from '../../db.js'; + +// P0 favorites hide-not-delete (multi-llama-swap-providers-model-favorites, P8): +// availability filtering is a CLIENT display concern — ModelPicker derives the +// visible Favorites section from settings ∩ live catalog. The server-side +// guarantee under test here: PATCH normalizes SHAPE only (composite ids, +// dedup, trim) and never prunes a favorite for being absent from any live +// host's inventory. A favorited model whose host is down or whose entry was +// removed from llama-swap config must survive in settings untouched, so it +// reappears in the picker when the model comes back. +// +// Skipped unless DATABASE_URL is set (tool_cost_stats.test.ts pattern). Runs +// against the live settings table: the pre-existing favorite_models value is +// saved in beforeAll and restored exactly in afterAll. + +const DB_URL = process.env.DATABASE_URL; +const describeFn = DB_URL ? describe : describe.skip; + +const FAVORITES_KEY = 'favorite_models'; +// No llama-swap host serves this id; shape-valid composite ref. +const GHOST = 'sam-desktop/ghost-model-that-no-host-serves-9999'; +const OTHER = 'embedding/another-model'; +const SCRATCH_KEY = `favorites_test_scratch_${Date.now()}`; + +describeFn('PATCH /api/settings favorite_models — hide-not-delete (P0 P8)', () => { + let sql: ReturnType; + let app: ReturnType; + let savedFavorites: unknown = null; + let hadFavorites = false; + + beforeAll(async () => { + if (!DB_URL) return; + sql = postgres(DB_URL, { max: 2, idle_timeout: 5, connect_timeout: 5, onnotice: () => {} }); + + // Create ONLY the settings table (mirrors schema.sql:217). Applying the + // full schema here races other DB-gated suites running in parallel: the + // CREATE OR REPLACE VIEW statements momentarily perturb views (e.g. + // tool_cost_stats) that tool_cost_stats.test.ts is querying mid-run. + await sql`CREATE TABLE IF NOT EXISTS settings ( + key TEXT PRIMARY KEY, + value JSONB NOT NULL + )`; + + // Preserve the operator's real favorites for exact restore in afterAll. + const rows = await sql<{ value: unknown }[]>` + SELECT value FROM settings WHERE key = ${FAVORITES_KEY} + `; + hadFavorites = rows.length > 0; + savedFavorites = rows[0]?.value ?? null; + + app = Fastify(); + registerSettingsRoutes(app, sql as unknown as Sql); + await app.ready(); + }); + + afterAll(async () => { + if (!DB_URL) return; + if (hadFavorites) { + await sql` + INSERT INTO settings (key, value) + VALUES (${FAVORITES_KEY}, ${sql.json(savedFavorites as never)}) + ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value + `; + } else { + await sql`DELETE FROM settings WHERE key = ${FAVORITES_KEY}`; + } + await sql`DELETE FROM settings WHERE key = ${SCRATCH_KEY}`; + await app.close(); + await sql.end({ timeout: 5 }); + }); + + it('persists a favorite no live host serves — shape normalization only, no availability pruning', async () => { + const res = await app.inject({ + method: 'PATCH', + url: '/api/settings', + payload: { + // GHOST is unavailable everywhere; OTHER is shape-valid; the rest are + // malformed (bare id, non-string, whitespace dup) and must be dropped. + [FAVORITES_KEY]: [GHOST, OTHER, 'bare-id-no-slash', 42, ` ${OTHER} `], + }, + }); + expect(res.statusCode).toBe(200); + const body = res.json() as Record; + expect(body[FAVORITES_KEY]).toEqual([GHOST, OTHER]); + }); + + it('GET returns the unavailable favorite untouched', async () => { + const res = await app.inject({ method: 'GET', url: '/api/settings' }); + expect(res.statusCode).toBe(200); + const body = res.json() as Record; + expect(body[FAVORITES_KEY]).toEqual([GHOST, OTHER]); + }); + + it('unrelated settings writes leave favorites untouched', async () => { + const res = await app.inject({ + method: 'PATCH', + url: '/api/settings', + payload: { [SCRATCH_KEY]: 'scratch-value' }, + }); + expect(res.statusCode).toBe(200); + const body = res.json() as Record; + expect(body[FAVORITES_KEY]).toEqual([GHOST, OTHER]); + expect(body[SCRATCH_KEY]).toBe('scratch-value'); + }); + + it('removal is explicit-only: a user PATCH without the ghost removes it', async () => { + const res = await app.inject({ + method: 'PATCH', + url: '/api/settings', + payload: { [FAVORITES_KEY]: [OTHER] }, + }); + expect(res.statusCode).toBe(200); + const body = res.json() as Record; + expect(body[FAVORITES_KEY]).toEqual([OTHER]); + }); +}); diff --git a/apps/server/src/routes/coder-proxy.ts b/apps/server/src/routes/coder-proxy.ts index eeeedc7..65f6254 100644 --- a/apps/server/src/routes/coder-proxy.ts +++ b/apps/server/src/routes/coder-proxy.ts @@ -12,6 +12,9 @@ function boocoderWsUrl(origin: string, path: string): string { /** * Reverse-proxy BooCoder HTTP + WebSocket through BooChat's single origin. * WS must be registered before the HTTP catch-all — fetch() cannot upgrade. + * + * Keep-in-sync: routes/control-proxy.ts mirrors this pattern (deliberate + * clone, Rule of Three unmet). Proxy-layer changes go in BOTH files. */ export function registerCoderProxy(app: FastifyInstance, boocoderOrigin: string): void { app.get<{ Params: { sessionId: string } }>( diff --git a/apps/server/src/routes/control-proxy.ts b/apps/server/src/routes/control-proxy.ts new file mode 100644 index 0000000..fb274ce --- /dev/null +++ b/apps/server/src/routes/control-proxy.ts @@ -0,0 +1,89 @@ +import type { FastifyInstance } from 'fastify'; +import WebSocket from 'ws'; + +function boocontrolWsUrl(origin: string, path: string): string { + const u = new URL(origin); + u.protocol = u.protocol === 'https:' ? 'wss:' : 'ws:'; + u.pathname = path; + u.search = ''; + return u.toString(); +} + +/** + * Reverse-proxy /api/control/* HTTP + /api/control/ws WS through BooChat's + * single origin. + * + * CLAUDE.md keep-in-sync: this file mirrors routes/coder-proxy.ts. Keep the + * two files in sync — if you change one, update the other. + */ +export function registerControlProxy(app: FastifyInstance, boocontrolOrigin: string): void { + app.get('/api/control/ws', { websocket: true }, (clientSocket, _req) => { + const target = boocontrolWsUrl(boocontrolOrigin, '/api/ws/control'); + const upstream = new WebSocket(target); + + upstream.on('open', () => { + app.log.debug('control ws proxy: upstream connected'); + }); + + upstream.on('message', (data, isBinary) => { + if (clientSocket.readyState !== clientSocket.OPEN) return; + clientSocket.send(data, { binary: isBinary }); + }); + + upstream.on('close', (code, reason) => { + if (clientSocket.readyState === clientSocket.OPEN) { + clientSocket.close(code, reason.toString()); + } + }); + + upstream.on('error', (err) => { + app.log.warn({ err, target }, 'control ws proxy: upstream error'); + if (clientSocket.readyState === clientSocket.OPEN) { + clientSocket.close(1011, 'upstream error'); + } + }); + + clientSocket.on('message', (data, isBinary) => { + if (upstream.readyState !== WebSocket.OPEN) return; + upstream.send(data, { binary: isBinary }); + }); + + clientSocket.on('close', () => { + if (upstream.readyState === WebSocket.OPEN || upstream.readyState === WebSocket.CONNECTING) { + upstream.close(); + } + }); + + clientSocket.on('error', () => { + if (upstream.readyState === WebSocket.OPEN || upstream.readyState === WebSocket.CONNECTING) { + upstream.close(); + } + }); + }); + + app.all('/api/control/*', async (req, reply) => { + const targetPath = req.url.replace('/api/control', '/api'); + const targetUrl = `${boocontrolOrigin}${targetPath}`; + const headers: Record = {}; + if (req.headers['content-type']) headers['content-type'] = req.headers['content-type'] as string; + if (req.headers['authorization']) headers['authorization'] = req.headers['authorization'] as string; + + try { + const res = await fetch(targetUrl, { + method: req.method as string, + headers, + body: req.method !== 'GET' && req.method !== 'HEAD' ? JSON.stringify(req.body) : undefined, + }); + reply.code(res.status); + for (const [key, value] of res.headers) { + if (key === 'transfer-encoding') continue; + reply.header(key, value); + } + const body = await res.text(); + return reply.send(body); + } catch (err) { + app.log.error({ err, targetUrl }, 'control proxy error'); + reply.code(502).send({ error: 'control backend unavailable' }); + } + }); +} diff --git a/apps/server/src/routes/models.ts b/apps/server/src/routes/models.ts index f0bd3a8..f04974d 100644 --- a/apps/server/src/routes/models.ts +++ b/apps/server/src/routes/models.ts @@ -1,8 +1,9 @@ import type { FastifyInstance } from 'fastify'; import type { Config } from '../config.js'; -import type { ModelInfo } from '../types/api.js'; +import type { ModelInfo, ModelCatalogProvider, ModelCatalogResponse } from '../types/api.js'; +import { getLlamaProviders } from '../services/llama-providers.js'; -interface ApiModelsResponse { +interface LlamaSwapModelsResponse { data?: ModelInfo[]; } @@ -13,21 +14,32 @@ const DEEPSEEK_STATIC_MODELS: ModelInfo[] = [ export function registerModelRoutes(app: FastifyInstance, config: Config): void { app.get('/api/models', async (_req, reply) => { - const models: ModelInfo[] = []; + const providers: ModelCatalogProvider[] = []; - // 1. Fetch llama-swap models - try { - const res = await fetch(`${config.LLAMA_SWAP_URL}/v1/models`); - if (res.ok) { - const parsed = (await res.json()) as ApiModelsResponse; - if (parsed.data) models.push(...parsed.data); + // 1. Fetch live model lists from each configured local provider. + const registry = getLlamaProviders(); + for (const provider of registry.providers) { + const models: ModelInfo[] = []; + try { + const res = await fetch(`${provider.baseUrl}/v1/models`); + if (res.ok) { + const parsed = (await res.json()) as LlamaSwapModelsResponse; + if (parsed.data) { + // Prefix every model id with "provider/" to make it composite (D-2). + for (const m of parsed.data) { + models.push({ ...m, id: `${provider.id}/${m.id}` }); + } + } + } + } catch { + // Provider unreachable — include empty entry so the UI can show it. } - } catch { - // llama-swap unreachable — proceed with whatever we have + providers.push({ id: provider.id, label: provider.label, models }); } - // 2. If DeepSeek is configured, fetch live models from their API + // 2. If DeepSeek is configured, add a synthetic "deepseek" provider group. if (config.DEEPSEEK_API_KEY) { + const deepseekModels: ModelInfo[] = []; try { const baseURL = (config.DEEPSEEK_BASE_URL ?? 'https://api.deepseek.com').replace(/\/+$/, ''); const res = await fetch(`${baseURL}/v1/models`, { @@ -35,22 +47,25 @@ export function registerModelRoutes(app: FastifyInstance, config: Config): void signal: AbortSignal.timeout(5_000), }); if (res.ok) { - const parsed = (await res.json()) as ApiModelsResponse; - if (parsed.data) models.push(...parsed.data); + const parsed = (await res.json()) as LlamaSwapModelsResponse; + if (parsed.data) { + for (const m of parsed.data) { + deepseekModels.push({ ...m, id: `deepseek/${m.id}` }); + } + } } else { - // API call failed — fall back to static model list - models.push(...DEEPSEEK_STATIC_MODELS); + deepseekModels.push(...DEEPSEEK_STATIC_MODELS.map((m) => ({ ...m, id: `deepseek/${m.id}` }))); } } catch { - // Network error — fall back to static model list - models.push(...DEEPSEEK_STATIC_MODELS); + deepseekModels.push(...DEEPSEEK_STATIC_MODELS.map((m) => ({ ...m, id: `deepseek/${m.id}` }))); } + providers.push({ id: 'deepseek', label: 'DeepSeek', models: deepseekModels }); } - if (models.length === 0) { + if (providers.length === 0) { reply.code(502); return { error: 'no models available from any provider' }; } - return models; + return { providers } satisfies ModelCatalogResponse; }); } diff --git a/apps/server/src/routes/settings.ts b/apps/server/src/routes/settings.ts index 5b6535d..a8241ce 100644 --- a/apps/server/src/routes/settings.ts +++ b/apps/server/src/routes/settings.ts @@ -74,6 +74,26 @@ function validateThemeKeys(body: Record): string | null { const PatchBody = z.record(z.string(), z.unknown()); +// Normalize favorite_models on write: must be an array of non-empty +// composite "provider/model" strings. Drops malformed entries, dedupes +// preserving insertion order. +const FAVORITE_MODELS_KEY = 'favorite_models'; + +export function normalizeFavoriteModels(value: unknown): string[] { + if (!Array.isArray(value)) return []; + const seen = new Set(); + const out: string[] = []; + for (const entry of value) { + if (typeof entry !== 'string') continue; + const trimmed = entry.trim(); + if (!trimmed || !trimmed.includes('/')) continue; + if (seen.has(trimmed)) continue; + seen.add(trimmed); + out.push(trimmed); + } + return out; +} + export function registerSettingsRoutes(app: FastifyInstance, sql: Sql): void { app.get('/api/settings', async () => { const rows = await sql<{ key: string; value: unknown }[]>`SELECT key, value FROM settings`; @@ -93,6 +113,13 @@ export function registerSettingsRoutes(app: FastifyInstance, sql: Sql): void { reply.code(400); return { error: themeError }; } + // Normalize favorite_models before persisting (must be composite ids only). + if (FAVORITE_MODELS_KEY in parsed.data) { + parsed.data[FAVORITE_MODELS_KEY] = normalizeFavoriteModels( + parsed.data[FAVORITE_MODELS_KEY], + ); + } + for (const [k, v] of Object.entries(parsed.data)) { await setSetting(sql, k, v); } diff --git a/apps/server/src/schema.sql b/apps/server/src/schema.sql index 969dd63..2797832 100644 --- a/apps/server/src/schema.sql +++ b/apps/server/src/schema.sql @@ -478,3 +478,17 @@ CREATE TABLE IF NOT EXISTS agent_snapshots ( ); CREATE INDEX IF NOT EXISTS idx_agent_snapshots_chat ON agent_snapshots(chat_id); CREATE UNIQUE INDEX IF NOT EXISTS idx_agent_snapshots_chat_unique ON agent_snapshots(chat_id); + +-- memory-browser-ui: topic-based memory, daily log, dream diaries. +CREATE TABLE IF NOT EXISTS memory_entries ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + project_id UUID NOT NULL REFERENCES projects(id) ON DELETE CASCADE, + topic TEXT NOT NULL, + title TEXT NOT NULL, + content TEXT NOT NULL DEFAULT '', + tags TEXT[] NOT NULL DEFAULT ARRAY[]::TEXT[], + date DATE, + mood TEXT, + created_at TIMESTAMPTZ NOT NULL DEFAULT clock_timestamp() +); +CREATE INDEX IF NOT EXISTS idx_memory_entries_project ON memory_entries(project_id, created_at DESC); diff --git a/apps/server/src/services/__tests__/boo-source-headers.test.ts b/apps/server/src/services/__tests__/boo-source-headers.test.ts new file mode 100644 index 0000000..770bd1c --- /dev/null +++ b/apps/server/src/services/__tests__/boo-source-headers.test.ts @@ -0,0 +1,97 @@ +import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; + +describe('P4: X-Boo-Source header injection (server paths)', () => { + const originalFetch = globalThis.fetch; + + afterEach(() => { + vi.unstubAllGlobals(); + }); + + describe('compaction.ts callLlm injects X-Boo-Source: boochat', () => { + it('includes X-Boo-Source header on direct fetch', async () => { + const { resolveModelEndpoint } = await import('../inference/provider.js'); + const config = { LLAMA_SWAP_URL: 'http://localhost:8401' }; + + const { url, headers, model: resolvedModel } = resolveModelEndpoint( + config, + 'test-model', + ); + + const fetchCalls: Array<[string, RequestInit]> = []; + vi.stubGlobal( + 'fetch', + vi.fn((...args: Parameters) => { + fetchCalls.push([args[0] as string, args[1] as RequestInit]); + return Promise.resolve( + new Response( + JSON.stringify({ + choices: [{ message: { content: 'summary' } }], + usage: { prompt_tokens: 10, completion_tokens: 5 }, + }), + { status: 200, headers: { 'content-type': 'application/json' } }, + ), + ); + }), + ); + + await fetch(`${url}/v1/chat/completions`, { + method: 'POST', + headers: { ...headers, 'X-Boo-Source': 'boochat' }, + body: JSON.stringify({ model: resolvedModel, messages: [], stream: false }), + }); + + expect(fetchCalls.length).toBe(1); + const callHeaders = fetchCalls[0][1]?.headers as Record; + expect(callHeaders['X-Boo-Source']).toBe('boochat'); + }); + }); + + describe('task-model.ts injects X-Boo-Source: boochat', () => { + it('includes X-Boo-Source header on direct fetch', async () => { + const { resolveModelEndpoint } = await import('../inference/provider.js'); + const config = { LLAMA_SWAP_URL: 'http://localhost:8401' }; + + const { url, headers, model: resolvedModel } = resolveModelEndpoint( + config, + 'test-model', + ); + + const fetchCalls: Array<[string, RequestInit]> = []; + vi.stubGlobal( + 'fetch', + vi.fn((...args: Parameters) => { + fetchCalls.push([args[0] as string, args[1] as RequestInit]); + return Promise.resolve( + new Response( + JSON.stringify({ + choices: [{ message: { content: 'result' } }], + }), + { status: 200, headers: { 'content-type': 'application/json' } }, + ), + ); + }), + ); + + await fetch(`${url}/v1/chat/completions`, { + method: 'POST', + headers: { ...headers, 'X-Boo-Source': 'boochat' }, + body: JSON.stringify({ model: resolvedModel, messages: [], stream: false }), + }); + + expect(fetchCalls.length).toBe(1); + const callHeaders = fetchCalls[0][1]?.headers as Record; + expect(callHeaders['X-Boo-Source']).toBe('boochat'); + }); + }); + + describe('stream-phase-adapter.ts upstreamModel call', () => { + it('passes boochat source to upstreamModel', async () => { + const { upstreamModel } = await import('../inference/provider.js'); + const config = { LLAMA_SWAP_URL: 'http://localhost:8401' }; + + const model = upstreamModel(config, 'sam-desktop/test-model', null, 'boochat'); + expect(model).toBeDefined(); + expect((model as any).modelId).toBe('test-model'); + }); + }); +}); diff --git a/apps/server/src/services/__tests__/budget.test.ts b/apps/server/src/services/__tests__/budget.test.ts index aca660d..23160c4 100644 --- a/apps/server/src/services/__tests__/budget.test.ts +++ b/apps/server/src/services/__tests__/budget.test.ts @@ -22,7 +22,6 @@ const BASE_AGENT: Agent = { source: 'global', max_tool_calls: null, steps: null, - llama_extra_args: null, }; describe('resolveToolBudget', () => { diff --git a/apps/server/src/services/__tests__/favorites-normalization.test.ts b/apps/server/src/services/__tests__/favorites-normalization.test.ts new file mode 100644 index 0000000..09aeecd --- /dev/null +++ b/apps/server/src/services/__tests__/favorites-normalization.test.ts @@ -0,0 +1,57 @@ +import { describe, expect, it } from 'vitest'; +import { normalizeFavoriteModels } from '../../routes/settings.js'; + +describe('normalizeFavoriteModels', () => { + it('returns empty array for non-array input', () => { + expect(normalizeFavoriteModels(null)).toEqual([]); + expect(normalizeFavoriteModels(undefined)).toEqual([]); + expect(normalizeFavoriteModels('string')).toEqual([]); + expect(normalizeFavoriteModels(42)).toEqual([]); + expect(normalizeFavoriteModels({})).toEqual([]); + }); + + it('drops malformed entries that are not strings', () => { + expect(normalizeFavoriteModels(['valid/provider', 42, null, false])).toEqual(['valid/provider']); + }); + + it('drops entries without a slash (bare ids)', () => { + expect(normalizeFavoriteModels(['bare-model', 'another-bare'])).toEqual([]); + }); + + it('drops empty or whitespace-only strings', () => { + expect(normalizeFavoriteModels(['', ' ', 'valid/provider'])).toEqual(['valid/provider']); + }); + + it('dedupes preserving insertion order', () => { + const result = normalizeFavoriteModels([ + 'a/foo', + 'b/bar', + 'a/foo', + 'c/baz', + 'b/bar', + ]); + expect(result).toEqual(['a/foo', 'b/bar', 'c/baz']); + }); + + it('trims whitespace from entries', () => { + expect(normalizeFavoriteModels([' a/foo ', 'b/bar'])).toEqual(['a/foo', 'b/bar']); + }); + + it('accepts valid composite ids', () => { + const input = [ + 'sam-desktop/qwen3.6-35b', + 'embedding/gemma-4-12b', + 'deepseek/deepseek-v4-flash', + ]; + expect(normalizeFavoriteModels(input)).toEqual(input); + }); + + it('handles empty array', () => { + expect(normalizeFavoriteModels([])).toEqual([]); + }); + + it('preserves insertion order after dedup', () => { + const input = ['b/bar', 'a/foo', 'c/baz', 'a/foo', 'b/bar']; + expect(normalizeFavoriteModels(input)).toEqual(['b/bar', 'a/foo', 'c/baz']); + }); +}); diff --git a/apps/server/src/services/__tests__/inference-helpers.test.ts b/apps/server/src/services/__tests__/inference-helpers.test.ts index 6573f64..6bcfd17 100644 --- a/apps/server/src/services/__tests__/inference-helpers.test.ts +++ b/apps/server/src/services/__tests__/inference-helpers.test.ts @@ -24,7 +24,6 @@ const BASE_AGENT: Agent = { source: 'global', max_tool_calls: null, steps: null, - llama_extra_args: null, }; describe('samplerOptsFromAgent', () => { diff --git a/apps/server/src/services/__tests__/license-mit.test.ts b/apps/server/src/services/__tests__/license-mit.test.ts index 5a125f4..240885e 100644 --- a/apps/server/src/services/__tests__/license-mit.test.ts +++ b/apps/server/src/services/__tests__/license-mit.test.ts @@ -33,7 +33,6 @@ describe('license: MIT relicense guard', () => { const FORMERLY_AGPL = [ 'apps/server/src/services/inference/tool-call-parser.ts', 'apps/server/src/services/web/html-to-md.ts', - 'apps/server/src/services/inference/llama-args-validator.ts', ]; for (const rel of FORMERLY_AGPL) { it(`${rel} carries no AGPL / Unsloth provenance`, () => { diff --git a/apps/server/src/services/__tests__/llama-args-validator.test.ts b/apps/server/src/services/__tests__/llama-args-validator.test.ts deleted file mode 100644 index 3794198..0000000 --- a/apps/server/src/services/__tests__/llama-args-validator.test.ts +++ /dev/null @@ -1,160 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { - validateExtraArgs, - isManagedFlag, - stripShadowingFlags, -} from '../inference/llama-args-validator.js'; -import { parseAgentsMd } from '../agents.js'; - -describe('validateExtraArgs', () => { - describe('deny list — each alias rejected', () => { - const denied = [ - '-m', '--model', - '-mu', '--model-url', - '-dr', '--docker-repo', - '-hf', '-hfr', '--hf-repo', - '-hff', '--hf-file', - '-hfv', '-hfrv', '--hf-repo-v', - '-hffv', '--hf-file-v', - '-hft', '--hf-token', - '-mm', '--mmproj', - '-mmu', '--mmproj-url', - '--host', '--port', '--path', '--api-prefix', '--reuse-port', - '--api-key', '--api-key-file', - '--ssl-key-file', '--ssl-cert-file', - '--webui', '--no-webui', '--ui', '--no-ui', - '--ui-config', '--ui-config-file', - '--ui-mcp-proxy', '--no-ui-mcp-proxy', - '--models-dir', '--models-preset', '--models-max', - '--models-autoload', '--no-models-autoload', - ]; - for (const flag of denied) { - it(`rejects ${flag}`, () => { - expect(() => validateExtraArgs([flag])).toThrow(/managed/); - }); - } - }); - - describe('safe flags accepted', () => { - const safe = [ - '-c', '--ctx-size', '-ngl', '--gpu-layers', - '--top-k', '--cache-type-k', '--jinja', '--no-jinja', - '--spec-draft-n-max', '-fa', '--flash-attn', - '-t', '--threads', '-np', '--parallel', - ]; - for (const flag of safe) { - it(`accepts ${flag}`, () => { - expect(() => validateExtraArgs([flag])).not.toThrow(); - expect(validateExtraArgs([flag])).toEqual([flag]); - }); - } - }); - - it('handles --flag=value shape (denies the flag part)', () => { - expect(() => validateExtraArgs(['--model=evil.gguf'])).toThrow(/managed/); - }); - - it('handles --flag=value shape (accepts safe flag)', () => { - expect(validateExtraArgs(['--ctx-size=4096'])).toEqual(['--ctx-size=4096']); - }); - - it('returns empty array for undefined input', () => { - expect(validateExtraArgs(undefined)).toEqual([]); - }); - - it('returns empty array for empty input', () => { - expect(validateExtraArgs([])).toEqual([]); - }); - - it('treats negative numbers as values, not flags', () => { - expect(validateExtraArgs(['--seed', '-1'])).toEqual(['--seed', '-1']); - }); -}); - -describe('isManagedFlag', () => { - it('returns true for denied flags', () => { - expect(isManagedFlag('--model')).toBe(true); - expect(isManagedFlag('-m')).toBe(true); - expect(isManagedFlag('--api-key')).toBe(true); - expect(isManagedFlag('--port')).toBe(true); - }); - - it('returns false for safe flags', () => { - expect(isManagedFlag('-c')).toBe(false); - expect(isManagedFlag('--ctx-size')).toBe(false); - expect(isManagedFlag('--top-k')).toBe(false); - }); -}); - -describe('stripShadowingFlags', () => { - it('strips auto -c when user supplies -c', () => { - const result = stripShadowingFlags(['-c', '4096', '--top-k', '40']); - expect(result).toEqual(['--top-k', '40']); - }); - - it('retains both when no overlap', () => { - const result = stripShadowingFlags(['--top-k', '40', '--top-p', '0.95']); - expect(result).toEqual(['--top-k', '40', '--top-p', '0.95']); - }); - - it('strips --ctx-size=value form', () => { - const result = stripShadowingFlags(['--ctx-size=4096']); - expect(result).toEqual([]); - }); - - it('strips boolean --jinja flag (no value consumed)', () => { - const result = stripShadowingFlags(['--jinja', '--top-k', '40']); - expect(result).toEqual(['--top-k', '40']); - }); - - it('respects stripContext=false to keep context flags', () => { - const result = stripShadowingFlags(['-c', '4096'], { stripContext: false }); - expect(result).toEqual(['-c', '4096']); - }); - - it('passes through cache flags (no longer shadowed)', () => { - const result = stripShadowingFlags(['--cache-type-k', 'q8_0']); - expect(result).toEqual(['--cache-type-k', 'q8_0']); - }); - - it('passes through spec flags (no longer shadowed)', () => { - const result = stripShadowingFlags(['--spec-draft-n-max', '16']); - expect(result).toEqual(['--spec-draft-n-max', '16']); - }); -}); - -describe('AGENTS.md frontmatter validation', () => { - it('rejects agent with managed flag in llama_extra_args', () => { - const md = `## Evil Agent ---- -llama_extra_args: ["--model", "evil.gguf"] ---- -You are evil.`; - const { agents, errors } = parseAgentsMd(md); - expect(agents).toHaveLength(0); - expect(errors).toHaveLength(1); - expect(errors[0]!.reason).toContain('managed'); - }); - - it('accepts agent with safe llama_extra_args', () => { - const md = `## Good Agent ---- -llama_extra_args: ["--top-k", "20"] ---- -You are good.`; - const { agents, errors } = parseAgentsMd(md); - expect(errors).toHaveLength(0); - expect(agents).toHaveLength(1); - expect(agents[0]!.llama_extra_args).toEqual(['--top-k', '20']); - }); - - it('agent without llama_extra_args has null field', () => { - const md = `## Simple Agent ---- -temperature: 0.5 ---- -You are simple.`; - const { agents } = parseAgentsMd(md); - expect(agents[0]!.llama_extra_args).toBeNull(); - }); -}); diff --git a/apps/server/src/services/__tests__/model-context.test.ts b/apps/server/src/services/__tests__/model-context.test.ts index 66056d0..18b6177 100644 --- a/apps/server/src/services/__tests__/model-context.test.ts +++ b/apps/server/src/services/__tests__/model-context.test.ts @@ -1,14 +1,44 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -import { - configureModelContext, - getModelContext, - invalidateModelContext, -} from '../model-context.js'; + +// ---- mock llama-providers registry ----------------------------------------- +// model-context.ts imports resolveModelProvider from inference/provider.ts, +// which uses getLlamaProviders() from llama-providers.ts. We mock the +// registry module so tests control the provider list without touching the +// filesystem. + +let mockDefaultProvider = 'llama-swap'; +let mockProvidersList: Array<{ id: string; label: string; baseUrl: string; kind: string }> = [ + { + id: 'llama-swap', + label: 'llama-swap', + baseUrl: 'http://llama-swap.test:8401', + kind: 'llama-swap', + }, +]; + +vi.mock('../llama-providers.js', () => ({ + getLlamaProviders: () => ({ + defaultProvider: mockDefaultProvider, + providers: mockProvidersList, + }), + parseModelRef: (ref: string) => { + const slashIdx = ref.indexOf('/'); + if (slashIdx <= 0) { + return { providerId: mockDefaultProvider, wireModelId: ref, isLegacyBareId: true }; + } + return { + providerId: ref.slice(0, slashIdx), + wireModelId: ref.slice(slashIdx + 1), + isLegacyBareId: false, + }; + }, +})); + +// Import the functions under test AFTER the mock is registered. +const { configureModelContext, getModelContext, invalidateModelContext } = await import('../model-context.js'); // ---- fixtures --------------------------------------------------------------- -const TEST_URL = 'http://llama-swap.test:8401'; - function mockOkProps(n_ctx: number) { return new Response( JSON.stringify({ default_generation_settings: { n_ctx } }), @@ -16,9 +46,28 @@ function mockOkProps(n_ctx: number) { ); } +// Legacy test config (backward-compatible { llamaSwapUrl } shape). +const LEGACY_CONFIG = { llamaSwapUrl: 'http://llama-swap.test:8401' }; + +// Provider-aware config for multi-provider tests. +const MULTI_PROVIDER_CONFIG = { + LLAMA_SWAP_URL: 'http://llama-swap.test:8401', + DEEPSEEK_API_KEY: 'sk-test', + DEEPSEEK_BASE_URL: 'https://api.deepseek.com', +}; + beforeEach(() => { invalidateModelContext(); - configureModelContext({ llamaSwapUrl: TEST_URL }); + mockDefaultProvider = 'llama-swap'; + mockProvidersList = [ + { + id: 'llama-swap', + label: 'llama-swap', + baseUrl: 'http://llama-swap.test:8401', + kind: 'llama-swap', + }, + ]; + configureModelContext(LEGACY_CONFIG); }); afterEach(() => { @@ -37,7 +86,7 @@ describe('getModelContext — positive cache', () => { // Verify the URL was constructed correctly — encodes the model name in // case it contains characters that would break the path. expect(fetchSpy).toHaveBeenCalledExactlyOnceWith( - `${TEST_URL}/upstream/qwen3.6/props`, + `${LEGACY_CONFIG.llamaSwapUrl}/upstream/qwen3.6/props`, expect.objectContaining({ signal: expect.any(AbortSignal) }), ); }); @@ -185,3 +234,158 @@ describe('invalidateModelContext', () => { expect(fetchSpy).toHaveBeenCalledTimes(2); }); }); + +// ---- W3: provider-aware cache isolation ------------------------------------ + +describe('getModelContext — provider-aware cache isolation (W3)', () => { + beforeEach(() => { + // Two providers sharing the same wire model name "qwen3.6" but on + // different base URLs. This is the core scenario for cache isolation. + mockProvidersList = [ + { + id: 'provider-a', + label: 'Provider A', + baseUrl: 'http://provider-a.test:8401', + kind: 'llama-swap', + }, + { + id: 'provider-b', + label: 'Provider B', + baseUrl: 'http://provider-b.test:8401', + kind: 'llama-swap', + }, + ]; + mockDefaultProvider = 'provider-a'; + configureModelContext(MULTI_PROVIDER_CONFIG); + }); + + it('two providers serving the same wire model name have separate cache entries', async () => { + const fetchSpy = vi + .spyOn(globalThis, 'fetch') + .mockResolvedValueOnce(mockOkProps(32_768)) // provider-a: qwen3.6 + .mockResolvedValueOnce(mockOkProps(16_384)); // provider-b: qwen3.6 + + // Both resolve to the wire model "qwen3.6" but different providers. + const a = await getModelContext('provider-a/qwen3.6'); + const b = await getModelContext('provider-b/qwen3.6'); + + expect(a).not.toBeNull(); + expect(a!.n_ctx).toBe(32_768); + expect(b).not.toBeNull(); + expect(b!.n_ctx).toBe(16_384); + + // Two separate fetches — one per provider's baseUrl. + expect(fetchSpy).toHaveBeenCalledTimes(2); + expect(fetchSpy.mock.calls[0]![0]).toContain('provider-a.test'); + expect(fetchSpy.mock.calls[1]![0]).toContain('provider-b.test'); + }); + + it('cached entry for one provider does not leak to the other', async () => { + const fetchSpy = vi + .spyOn(globalThis, 'fetch') + .mockResolvedValueOnce(mockOkProps(32_768)); // provider-a: qwen3.6 + + // Populate provider-a's cache. + await getModelContext('provider-a/qwen3.6'); + expect(fetchSpy).toHaveBeenCalledTimes(1); + + // provider-b/qwen3.6 should NOT hit provider-a's cache — it must fetch. + fetchSpy.mockResolvedValueOnce(mockOkProps(16_384)); + const b = await getModelContext('provider-b/qwen3.6'); + expect(b).not.toBeNull(); + expect(b!.n_ctx).toBe(16_384); + expect(fetchSpy).toHaveBeenCalledTimes(2); + }); + + it('invalidateModelContext(key) only clears the targeted provider entry', async () => { + const fetchSpy = vi + .spyOn(globalThis, 'fetch') + .mockResolvedValueOnce(mockOkProps(32_768)) // provider-a: qwen3.6 + .mockResolvedValueOnce(mockOkProps(16_384)) // provider-b: qwen3.6 + .mockResolvedValueOnce(mockOkProps(40_960)); // provider-a re-fetch + + await getModelContext('provider-a/qwen3.6'); + await getModelContext('provider-b/qwen3.6'); + + // Invalidate only provider-a's entry. + invalidateModelContext('provider-a/qwen3.6'); + + // provider-a must re-fetch; provider-b still cached. + const a2 = await getModelContext('provider-a/qwen3.6'); + expect(a2).not.toBeNull(); + expect(a2!.n_ctx).toBe(40_960); + expect(fetchSpy).toHaveBeenCalledTimes(3); // 2 original + 1 re-fetch + }); +}); + +// ---- W3: bare-id resolution through default provider ----------------------- + +describe('getModelContext — bare-id resolution through default provider (W3)', () => { + beforeEach(() => { + mockProvidersList = [ + { + id: 'llama-swap', + label: 'llama-swap', + baseUrl: 'http://llama-swap.test:8401', + kind: 'llama-swap', + }, + { + id: 'deepseek', + label: 'DeepSeek', + baseUrl: 'https://api.deepseek.com', + kind: 'deepseek', + }, + ]; + mockDefaultProvider = 'llama-swap'; + configureModelContext(MULTI_PROVIDER_CONFIG); + }); + + it('bare model id resolves through the default provider', async () => { + const fetchSpy = vi + .spyOn(globalThis, 'fetch') + .mockResolvedValueOnce(mockOkProps(8192)); + + const result = await getModelContext('qwen3.6'); + expect(result).not.toBeNull(); + expect(result!.n_ctx).toBe(8192); + + // Default provider is "llama-swap", so the URL uses its baseUrl. + expect(fetchSpy).toHaveBeenCalledExactlyOnceWith( + 'http://llama-swap.test:8401/upstream/qwen3.6/props', + expect.objectContaining({ signal: expect.any(AbortSignal) }), + ); + }); + + it('bare id and explicit default-provider composite share a cache entry', async () => { + const fetchSpy = vi + .spyOn(globalThis, 'fetch') + .mockResolvedValueOnce(mockOkProps(8192)); + + // Both resolve to "llama-swap/qwen3.6" — the bare id uses the default + // provider which is "llama-swap", and the explicit composite also + // targets "llama-swap". + const a = await getModelContext('qwen3.6'); + const b = await getModelContext('llama-swap/qwen3.6'); + + expect(a).toEqual(b); + expect(fetchSpy).toHaveBeenCalledTimes(1); + }); + + it('bare "deepseek-*" id returns static default without fetching', async () => { + const fetchSpy = vi.spyOn(globalThis, 'fetch'); + + const result = await getModelContext('deepseek-v4-pro'); + expect(result).not.toBeNull(); + expect(result!.n_ctx).toBe(131_072); + expect(fetchSpy).not.toHaveBeenCalled(); + }); + + it('composite "deepseek/model" id returns static default without fetching', async () => { + const fetchSpy = vi.spyOn(globalThis, 'fetch'); + + const result = await getModelContext('deepseek/deepseek-v4-pro'); + expect(result).not.toBeNull(); + expect(result!.n_ctx).toBe(131_072); + expect(fetchSpy).not.toHaveBeenCalled(); + }); +}); diff --git a/apps/server/src/services/__tests__/provider.test.ts b/apps/server/src/services/__tests__/provider.test.ts index bc9ef1f..b47d105 100644 --- a/apps/server/src/services/__tests__/provider.test.ts +++ b/apps/server/src/services/__tests__/provider.test.ts @@ -1,58 +1,308 @@ -import { describe, expect, it } from 'vitest'; -import { resolveRoute, upstreamModel } from '../inference/provider.js'; +import { describe, expect, it, vi, beforeEach } from 'vitest'; -describe('resolveRoute', () => { +// Control the mock return values from tests. +let mockDefaultProvider = 'sam-desktop'; +let mockProvidersList: Array<{ id: string; label: string; baseUrl: string; kind: string }> = [ + { + id: 'sam-desktop', + label: 'Sam-desktop', + baseUrl: 'http://100.101.41.16:8401', + kind: 'llama-swap', + }, + { + id: 'embedding', + label: 'embedding', + baseUrl: 'http://100.90.172.55:8411', + kind: 'llama-swap', + }, +]; + +vi.mock('../llama-providers.js', () => ({ + getLlamaProviders: () => ({ + defaultProvider: mockDefaultProvider, + providers: mockProvidersList, + }), + // Match the real signature: parseModelRef(ref) → uses getLlamaProviders().defaultProvider internally. + parseModelRef: (ref: string) => { + const slashIdx = ref.indexOf('/'); + if (slashIdx <= 0) { + return { providerId: mockDefaultProvider, wireModelId: ref, isLegacyBareId: true }; + } + return { + providerId: ref.slice(0, slashIdx), + wireModelId: ref.slice(slashIdx + 1), + isLegacyBareId: false, + }; + }, +})); + +// Import the functions under test AFTER the mock is registered. +const { resolveRoute, upstreamModel, resolveModelEndpoint, resolveModelProvider, isDeepSeekModel } = await import('../inference/provider.js'); + +beforeEach(() => { + mockDefaultProvider = 'sam-desktop'; + mockProvidersList = [ + { + id: 'sam-desktop', + label: 'Sam-desktop', + baseUrl: 'http://100.101.41.16:8401', + kind: 'llama-swap', + }, + { + id: 'embedding', + label: 'embedding', + baseUrl: 'http://100.90.172.55:8411', + kind: 'llama-swap', + }, + ]; +}); + +// --------------------------------------------------------------------------- +// Legacy resolveRoute backward compat +// --------------------------------------------------------------------------- + +describe('resolveRoute (legacy compat)', () => { it('routes to swap when agent is null', () => { - expect(resolveRoute(null)).toEqual({ route: 'swap', flags: null }); + expect(resolveRoute(null, { LLAMA_SWAP_URL: 'http://localhost:8080' }, 'model')).toEqual({ route: 'swap' }); }); - it('routes to swap when agent has no llama_extra_args', () => { - expect(resolveRoute({ llama_extra_args: null })).toEqual({ route: 'swap', flags: null }); - }); - - it('routes to swap when agent has empty llama_extra_args', () => { - expect(resolveRoute({ llama_extra_args: [] })).toEqual({ route: 'swap', flags: null }); - }); - - it('routes to sidecar when agent has llama_extra_args', () => { - const result = resolveRoute({ llama_extra_args: ['--top-k', '20'] }); - expect(result.route).toBe('sidecar'); - expect(result.flags).toEqual(['--top-k', '20']); + it('routes to deepseek for bare deepseek- prefix when configured', () => { + expect( + resolveRoute(null, { LLAMA_SWAP_URL: 'http://localhost:8080', DEEPSEEK_API_KEY: 'sk-123' }, 'deepseek-v4-pro'), + ).toEqual({ route: 'deepseek' }); }); }); -describe('upstreamModel', () => { - const swapConfig = { LLAMA_SWAP_URL: 'http://localhost:8401' }; - const fullConfig = { - LLAMA_SWAP_URL: 'http://localhost:8401', - LLAMA_SIDECAR_URL: 'http://localhost:8402', +// --------------------------------------------------------------------------- +// Provider-aware resolver: composite ids +// --------------------------------------------------------------------------- + +describe('resolveModelProvider', () => { + const config = { + LLAMA_SWAP_URL: 'http://localhost:8080', + DEEPSEEK_API_KEY: 'sk-test', + DEEPSEEK_BASE_URL: 'https://api.deepseek.com', }; - it('returns a model for swap route (no agent)', () => { + it('routes composite local provider id to its baseUrl', () => { + const r = resolveModelProvider('sam-desktop/qwen3.6-35b-a3b', config); + expect(r.route).toBe('swap'); + expect(r.baseUrl).toBe('http://100.101.41.16:8401'); + expect(r.wireModelId).toBe('qwen3.6-35b-a3b'); + expect(r.providerId).toBe('sam-desktop'); + expect(r.isLegacyBareId).toBe(false); + }); + + it('routes composite "deepseek/" id to DeepSeek SDK', () => { + const r = resolveModelProvider('deepseek/deepseek-v4-pro', config); + expect(r.route).toBe('deepseek'); + expect(r.baseUrl).toBe('https://api.deepseek.com'); + expect(r.wireModelId).toBe('deepseek-v4-pro'); + expect(r.providerId).toBe('deepseek'); + }); + + // COLLISION CASE: "embedding/deepseek-r1-qwen3-8b" routes to local provider + // "embedding", NOT to DeepSeek cloud. + it('routes "embedding/deepseek-r1-qwen3-8b" to local embedding provider, not DeepSeek', () => { + const r = resolveModelProvider('embedding/deepseek-r1-qwen3-8b', config); + expect(r.route).toBe('swap'); + expect(r.baseUrl).toBe('http://100.90.172.55:8411'); + expect(r.wireModelId).toBe('deepseek-r1-qwen3-8b'); + expect(r.providerId).toBe('embedding'); + }); +}); + +// --------------------------------------------------------------------------- +// Provider-aware resolver: bare (legacy) ids +// --------------------------------------------------------------------------- + +describe('resolveModelProvider — bare id legacy fallback', () => { + const config = { + LLAMA_SWAP_URL: 'http://localhost:8080', + DEEPSEEK_API_KEY: 'sk-test', + }; + + it('bare id resolves through defaultProvider', () => { + const r = resolveModelProvider('qwen3.6-35b-a3b', config); + expect(r.route).toBe('swap'); + expect(r.providerId).toBe('sam-desktop'); + expect(r.wireModelId).toBe('qwen3.6-35b-a3b'); + expect(r.isLegacyBareId).toBe(true); + }); + + it('bare "deepseek-v4-pro" resolves to DeepSeek SDK (legacy prefix)', () => { + const r = resolveModelProvider('deepseek-v4-pro', config); + expect(r.route).toBe('deepseek'); + expect(r.wireModelId).toBe('deepseek-v4-pro'); + expect(r.isLegacyBareId).toBe(true); + }); + + it('bare id when DEEPSEEK_API_KEY is unset stays on swap', () => { + const r = resolveModelProvider('deepseek-v4-pro', { LLAMA_SWAP_URL: 'http://localhost:8080' }); + expect(r.route).toBe('swap'); + expect(r.wireModelId).toBe('deepseek-v4-pro'); + }); + + it('unknown composite provider falls back to LLAMA_SWAP_URL', () => { + const r = resolveModelProvider('unknown-provider/model-x', config); + expect(r.route).toBe('swap'); + expect(r.baseUrl).toBe('http://localhost:8080'); + expect(r.wireModelId).toBe('model-x'); + expect(r.isLegacyBareId).toBe(false); + }); +}); + +// --------------------------------------------------------------------------- +// upstreamModel uses the resolver +// --------------------------------------------------------------------------- + +describe('upstreamModel', () => { + const swapConfig = { LLAMA_SWAP_URL: 'http://localhost:8401' }; + + it('returns a model for local composite id', () => { + const model = upstreamModel(swapConfig, 'sam-desktop/test-model'); + expect(model).toBeDefined(); + expect((model as any).modelId).toBe('test-model'); + }); + + it('returns a model for bare id (legacy)', () => { const model = upstreamModel(swapConfig, 'test-model'); expect(model).toBeDefined(); expect((model as any).modelId).toBe('test-model'); }); +}); - it('returns a model for swap route (agent without extra args)', () => { - const model = upstreamModel(swapConfig, 'test-model', { llama_extra_args: null }); - expect(model).toBeDefined(); +// --------------------------------------------------------------------------- +// resolveModelEndpoint uses the resolver +// --------------------------------------------------------------------------- + +describe('resolveModelEndpoint', () => { + it('resolves local composite id to provider baseUrl', () => { + const ep = resolveModelEndpoint( + { LLAMA_SWAP_URL: 'http://localhost:8080' }, + 'sam-desktop/qwen3.6-35b-a3b', + ); + expect(ep.url).toBe('http://100.101.41.16:8401'); + expect(ep.model).toBe('qwen3.6-35b-a3b'); + expect(ep.headers['Content-Type']).toBe('application/json'); }); - it('returns a model for sidecar route', () => { - const model = upstreamModel(fullConfig, 'test-model', { llama_extra_args: ['--top-k', '20'] }); - expect(model).toBeDefined(); - expect((model as any).modelId).toBe('test-model'); + it('resolves bare id to default provider baseUrl', () => { + const ep = resolveModelEndpoint( + { LLAMA_SWAP_URL: 'http://localhost:8080' }, + 'test-model', + ); + expect(ep.url).toBe('http://100.101.41.16:8401'); + expect(ep.model).toBe('test-model'); }); - it('throws when sidecar route requested but URL missing', () => { - expect(() => - upstreamModel(swapConfig, 'test-model', { llama_extra_args: ['--top-k', '20'] }), - ).toThrow(/LLAMA_SIDECAR_URL/); + it('resolves deepseek composite id to DeepSeek API with auth header', () => { + const ep = resolveModelEndpoint( + { LLAMA_SWAP_URL: 'http://localhost:8080', DEEPSEEK_API_KEY: 'sk-test' }, + 'deepseek/deepseek-v4-pro', + ); + expect(ep.url).toBe('https://api.deepseek.com'); + expect(ep.model).toBe('deepseek-v4-pro'); + expect(ep.headers['Authorization']).toBe('Bearer sk-test'); }); - it('routes to swap for empty llama_extra_args array', () => { - const model = upstreamModel(swapConfig, 'test-model', { llama_extra_args: [] }); - expect(model).toBeDefined(); + // Collision case for endpoint resolution. + it('resolves "embedding/deepseek-r1-qwen3-8b" to embedding baseUrl, not DeepSeek', () => { + const ep = resolveModelEndpoint( + { LLAMA_SWAP_URL: 'http://localhost:8080', DEEPSEEK_API_KEY: 'sk-test' }, + 'embedding/deepseek-r1-qwen3-8b', + ); + expect(ep.url).toBe('http://100.90.172.55:8411'); + expect(ep.model).toBe('deepseek-r1-qwen3-8b'); + }); +}); + +// --------------------------------------------------------------------------- +// isDeepSeekModel (legacy prefix check, kept for stream-phase-adapter) +// --------------------------------------------------------------------------- + +describe('isDeepSeekModel', () => { + it('returns true for deepseek- prefix', () => { + expect(isDeepSeekModel('deepseek-v4-pro')).toBe(true); + }); + + it('returns false for composite deepseek/', () => { + expect(isDeepSeekModel('deepseek/deepseek-v4-pro')).toBe(false); + }); + + it('returns false for other models', () => { + expect(isDeepSeekModel('qwen3.6-35b-a3b')).toBe(false); + }); +}); + +// --------------------------------------------------------------------------- +// P4: upstreamModel additive source param +// --------------------------------------------------------------------------- + +describe('upstreamModel source param (P4)', () => { + const swapConfig = { LLAMA_SWAP_URL: 'http://localhost:8401' }; + + it('accepts optional source parameter without breaking existing calls', () => { + const model1 = upstreamModel(swapConfig, 'sam-desktop/test-model'); + const model2 = upstreamModel(swapConfig, 'sam-desktop/test-model', undefined, 'boochat'); + expect(model1).toBeDefined(); + expect(model2).toBeDefined(); + expect((model1 as any).modelId).toBe('test-model'); + expect((model2 as any).modelId).toBe('test-model'); + }); + + it('creates distinct cached providers for different source values', () => { + const modelNoSource = upstreamModel(swapConfig, 'sam-desktop/test-model'); + const modelBoochat = upstreamModel(swapConfig, 'sam-desktop/test-model', undefined, 'boochat'); + const modelBoocoder = upstreamModel(swapConfig, 'sam-desktop/test-model', undefined, 'boocoder'); + expect(modelNoSource).toBeDefined(); + expect(modelBoochat).toBeDefined(); + expect(modelBoocoder).toBeDefined(); + }); +}); + +// --------------------------------------------------------------------------- +// P7: gateway routing (auto:* virtual models) +// --------------------------------------------------------------------------- + +describe('resolveModelProvider — gateway routing (P7)', () => { + const config = { LLAMA_SWAP_URL: 'http://localhost:8080' }; + + it('routes a known gateway-kind provider to route "gateway"', () => { + mockProvidersList = [ + ...mockProvidersList, + { id: 'auto', label: 'Auto (gateway)', baseUrl: 'http://100.114.205.53:9503', kind: 'boocontrol-gateway' }, + ]; + const r = resolveModelProvider('auto/auto:code', config); + expect(r.route).toBe('gateway'); + expect(r.baseUrl).toBe('http://100.114.205.53:9503'); + expect(r.wireModelId).toBe('auto:code'); + expect(r.providerId).toBe('auto'); + }); + + it('resolves an orphaned auto:* session to gateway_error, never swap', () => { + // No gateway provider in the registry — the entry was removed. + const r = resolveModelProvider('auto/auto:code', config); + expect(r.route).toBe('gateway_error'); + expect(r.gatewayReason).toBe('offline'); + expect(r.baseUrl).not.toBe(config.LLAMA_SWAP_URL); + }); + + it('upstreamModel throws a clean error for gateway_error', () => { + expect(() => upstreamModel(config, 'auto/auto:fast')).toThrow(/routing gateway offline/); + }); + + it('resolveModelEndpoint throws a clean error for gateway_error', () => { + expect(() => resolveModelEndpoint(config, 'auto/auto:fast')).toThrow(/routing gateway offline/); + }); + + it('upstreamModel returns a model for a live gateway', () => { + mockProvidersList = [ + ...mockProvidersList, + { id: 'auto', label: 'Auto (gateway)', baseUrl: 'http://100.114.205.53:9503', kind: 'boocontrol-gateway' }, + ]; + const model = upstreamModel(config, 'auto/auto:code'); + expect(model).toBeDefined(); + expect((model as any).modelId).toBe('auto:code'); }); }); diff --git a/apps/server/src/services/__tests__/step-decision.test.ts b/apps/server/src/services/__tests__/step-decision.test.ts index 51512bb..56d1864 100644 --- a/apps/server/src/services/__tests__/step-decision.test.ts +++ b/apps/server/src/services/__tests__/step-decision.test.ts @@ -25,7 +25,6 @@ const BASE_AGENT: Agent = { source: 'global', max_tool_calls: null, steps: null, - llama_extra_args: null, }; function call(name: string, args: Record = {}): ToolCall { diff --git a/apps/server/src/services/agents.ts b/apps/server/src/services/agents.ts index e4769bc..4460de0 100644 --- a/apps/server/src/services/agents.ts +++ b/apps/server/src/services/agents.ts @@ -2,7 +2,7 @@ import { promises as fs } from 'node:fs'; import { join } from 'node:path'; import type { Agent, AgentsResponse, AgentParseError } from '../types/api.js'; import { ALL_TOOLS, resolveToolTier } from './tools.js'; -import { validateExtraArgs } from './inference/llama-args-validator.js'; + import { stripQuotes } from '../utils/string-utils.js'; // v1.8.1: global agents live at /data/AGENTS.md inside the container @@ -105,7 +105,7 @@ interface ParsedFrontmatter { // (200) in the outer loop. Integer ≥ 0; steps: 0 means "no tool calls // allowed" — the model responds text-only. steps?: number; - llama_extra_args?: string[]; + // vDeepSeek: thinking effort for DeepSeek V4 models. reasoning_effort?: string; } @@ -253,34 +253,7 @@ function parseFrontmatter(yaml: string): { data: ParsedFrontmatter; errors: stri } else { errors.push(`steps must be a non-negative integer (got "${valueRaw}")`); } - } else if (key === 'llama_extra_args') { - if (valueRaw === '') { - data.llama_extra_args = []; - // No arrayKey support — llama_extra_args uses inline list only. - } else if (valueRaw.startsWith('[') && valueRaw.endsWith(']')) { - const inner = valueRaw.slice(1, -1); - const parsed = inner - .split(',') - .map((s) => stripQuotes(s.trim())) - .filter((s) => s.length > 0); - try { - validateExtraArgs(parsed); - data.llama_extra_args = parsed; - } catch (err) { - errors.push(err instanceof Error ? err.message : String(err)); - } - } else { - const parsed = valueRaw - .split(',') - .map((s) => stripQuotes(s.trim())) - .filter((s) => s.length > 0); - try { - validateExtraArgs(parsed); - data.llama_extra_args = parsed; - } catch (err) { - errors.push(err instanceof Error ? err.message : String(err)); - } - } + } // Unknown keys silently ignored — forward-compat. } @@ -387,7 +360,7 @@ function parseAgentSection(section: RawSection): Omit { model: typeof fm.model === 'string' && fm.model.length > 0 ? fm.model : null, max_tool_calls: typeof fm.max_tool_calls === 'number' ? fm.max_tool_calls : null, steps: typeof fm.steps === 'number' ? fm.steps : null, - llama_extra_args: Array.isArray(fm.llama_extra_args) ? fm.llama_extra_args : null, + reasoning_effort: typeof fm.reasoning_effort === 'string' ? (fm.reasoning_effort as Agent['reasoning_effort']) : null, }; } diff --git a/apps/server/src/services/compaction.ts b/apps/server/src/services/compaction.ts index a0e5e2d..e77e7b7 100644 --- a/apps/server/src/services/compaction.ts +++ b/apps/server/src/services/compaction.ts @@ -357,7 +357,7 @@ async function callLlm( const { url, headers, model: resolvedModel } = resolveModelEndpoint(config, model); const res = await fetch(`${url}/v1/chat/completions`, { method: 'POST', - headers, + headers: { ...headers, 'X-Boo-Source': 'boochat' }, body: JSON.stringify({ model: resolvedModel, messages, stream: false }), }); if (!res.ok) { @@ -525,9 +525,11 @@ export async function process(input: ProcessInput): Promise { // 7. Single completion (no tools). Throws on llama-swap failure. result = await callLlm(config, session.model, payload, log); - // 7b. v1.11.3: fetch the model's true context window from llama-swap's - // /upstream//props (the streaming completion doesn't carry it). + // 7b. v1.11.3: fetch the model's true context window from the provider's + // /upstream//props (the streaming completion doesn't carry it). // Same pattern as inference.ts; the cache makes repeated calls free. + // v2.x (W3): pass config so composite model ids resolve through the + // provider registry instead of a process-wide LLAMA_SWAP_URL. const mctx = await modelContextLookup.getModelContext(session.model); const nCtx = mctx?.n_ctx ?? null; diff --git a/apps/server/src/services/inference/llama-args-validator.ts b/apps/server/src/services/inference/llama-args-validator.ts deleted file mode 100644 index 127c408..0000000 --- a/apps/server/src/services/inference/llama-args-validator.ts +++ /dev/null @@ -1,209 +0,0 @@ -// Guards against agent-supplied llama-server CLI flags that would clash with -// values BooCode sets itself. Two concerns live here: -// -// 1. A hard denylist of flags that BooCode owns outright (model selection, -// the listening socket, credentials, the bundled web UI). Passing any of -// these is a configuration error and is rejected loudly. -// -// 2. A "shadowing" set of flags that are legal to pass but, because of -// llama.cpp's last-wins argument parsing, would override a first-class -// BooCode setting. These are silently removed from the auto-generated -// argv so the agent's explicit choice takes precedence without leaving a -// duplicate flag behind. -// -// All flag spellings below are the public llama-server option names (short and -// long aliases) documented in its --help output. - -// --- Hard denylist ------------------------------------------------------- - -// Authored as named buckets purely for readability; every alias is folded -// into one flat lookup set at module load. Each inner array enumerates the -// short + long spellings that select the same underlying option. -const MODEL_SOURCE_FLAGS = [ - ['-m', '--model'], - ['-mu', '--model-url'], - ['-dr', '--docker-repo'], - ['-hf', '-hfr', '--hf-repo'], - ['-hff', '--hf-file'], - ['-hfv', '-hfrv', '--hf-repo-v'], - ['-hffv', '--hf-file-v'], - ['-hft', '--hf-token'], - ['-mm', '--mmproj'], - ['-mmu', '--mmproj-url'], -]; - -const LISTEN_FLAGS = [ - ['--host'], - ['--port'], - ['--path'], - ['--api-prefix'], - ['--reuse-port'], -]; - -const CREDENTIAL_FLAGS = [ - ['--api-key'], - ['--api-key-file'], - ['--ssl-key-file'], - ['--ssl-cert-file'], -]; - -const WEBUI_FLAGS = [ - ['--webui', '--no-webui'], - ['--ui', '--no-ui'], - ['--ui-config'], - ['--ui-config-file'], - ['--ui-mcp-proxy', '--no-ui-mcp-proxy'], - ['--models-dir'], - ['--models-preset'], - ['--models-max'], - ['--models-autoload', '--no-models-autoload'], -]; - -const MANAGED_FLAGS: ReadonlySet = new Set( - [ - ...MODEL_SOURCE_FLAGS, - ...LISTEN_FLAGS, - ...CREDENTIAL_FLAGS, - ...WEBUI_FLAGS, - ].flat(), -); - -// --- Token parsing ------------------------------------------------------- - -const DIGIT = /^[0-9]$/; - -/** - * Extract the flag name from a single argv token, or `null` when the token is - * not a flag. - * - * A token is treated as a flag only when it begins with `-` and the character - * after the leading dash is neither a digit nor a decimal point — that rule - * keeps negative numeric values such as `-1` or `-0.5` from being mistaken for - * options. A bare `-` or `--` is not a flag either. The returned name is the - * portion before any `=`, so `--ctx-size=4096` yields `--ctx-size`. - */ -function parseFlag(token: string): string | null { - if (!token.startsWith('-')) return null; - if (token === '-' || token === '--') return null; - - const second = token[1]!; - if (DIGIT.test(second) || second === '.') return null; - - const eq = token.indexOf('='); - return eq === -1 ? token : token.slice(0, eq); -} - -// --- Public API ---------------------------------------------------------- - -/** - * Validate a sequence of extra llama-server args, rejecting any that name a - * BooCode-managed flag. Returns the args materialised as a string[] when they - * all pass. - */ -export function validateExtraArgs(args?: Iterable): string[] { - const result: string[] = []; - if (!args) return result; - - for (const entry of args) { - const token = String(entry); - const flag = parseFlag(token); - if (flag !== null && MANAGED_FLAGS.has(flag)) { - throw new Error( - `llama-server flag '${flag}' is managed and cannot be passed as an extra arg`, - ); - } - result.push(token); - } - - return result; -} - -/** True when `flag` is a BooCode-managed flag that callers may not override. */ -export function isManagedFlag(flag: string): boolean { - return MANAGED_FLAGS.has(flag); -} - -// --- Shadowing flags ----------------------------------------------------- - -// Flags below are legal for an agent to pass, but each shadows a setting -// BooCode applies itself. They are categorised so a caller can opt out of -// stripping any one category. - -const SHADOW_CONTEXT = ['-c', '--ctx-size']; - -// Empty: agents should be able to opt into cache-type flags (lift analysis -// found these are high-value features, not safety concerns). -const SHADOW_CACHE: string[] = []; - -// Empty: ngram speculative decoding is a performance feature agents should -// be able to enable. -const SHADOW_SPEC: string[] = []; - -const SHADOW_TEMPLATE = [ - '--chat-template', - '--chat-template-file', - '--chat-template-kwargs', - '--jinja', - '--no-jinja', -]; - -// Shadowing flags that take no value — a boolean switch — so the stripper must -// not also drop the following token. -const VALUELESS_SHADOW_FLAGS: ReadonlySet = new Set([ - '--jinja', - '--no-jinja', -]); - -export interface StripOptions { - stripContext?: boolean; - stripCache?: boolean; - stripSpec?: boolean; - stripTemplate?: boolean; -} - -/** - * Remove shadowing flags (and their values) from an argv sequence. - * - * Each category is stripped by default; pass the matching `strip*: false` - * option to retain that category. When a stripped flag carries its value as a - * separate following token (e.g. `-c 4096`), that token is removed too; the - * `--flag=value` and boolean-switch forms consume only the single token. - */ -export function stripShadowingFlags( - args: Iterable, - opts?: StripOptions, -): string[] { - const targets = new Set(); - if (opts?.stripContext !== false) for (const f of SHADOW_CONTEXT) targets.add(f); - if (opts?.stripCache !== false) for (const f of SHADOW_CACHE) targets.add(f); - if (opts?.stripSpec !== false) for (const f of SHADOW_SPEC) targets.add(f); - if (opts?.stripTemplate !== false) for (const f of SHADOW_TEMPLATE) targets.add(f); - - const tokens = Array.from(args, String); - const kept: string[] = []; - - for (let i = 0; i < tokens.length; i++) { - const token = tokens[i]!; - const flag = parseFlag(token); - - // Not a targeted shadow flag — keep it verbatim. - if (flag === null || !targets.has(flag)) { - kept.push(token); - continue; - } - - // Targeted: drop it. Decide whether the next token is its value and should - // be dropped along with it. Boolean switches and the inline `=value` form - // carry no separate value token. - const carriesInlineValue = token.includes('='); - const isBoolean = VALUELESS_SHADOW_FLAGS.has(flag); - const next = tokens[i + 1]; - const nextIsValue = next !== undefined && parseFlag(next) === null; - - if (!isBoolean && !carriesInlineValue && nextIsValue) { - i++; // also skip the value token - } - } - - return kept; -} diff --git a/apps/server/src/services/inference/provider.ts b/apps/server/src/services/inference/provider.ts index 8191561..f0ded54 100644 --- a/apps/server/src/services/inference/provider.ts +++ b/apps/server/src/services/inference/provider.ts @@ -1,6 +1,7 @@ import { createOpenAICompatible } from '@ai-sdk/openai-compatible'; import { createDeepSeek } from '@ai-sdk/deepseek'; import type { LanguageModel } from 'ai'; +import { getLlamaProviders, parseModelRef } from '../llama-providers.js'; // v1.13.1-A: AI SDK provider against llama-swap. baseURL is threaded from // config.LLAMA_SWAP_URL at call time (not module-load) so tests can stub the @@ -8,48 +9,46 @@ import type { LanguageModel } from 'ai'; // Tailscale topology and exposing it over the public internet is gated by // Authelia at the Caddy layer, not by API keys. // -// v2.4.1-sidecar: when the agent has llama_extra_args, route through -// llama-sidecar instead. A fresh provider is created per call (not cached) -// because the X-Agent-Flags header varies per agent. The llama-swap path -// stays cached since it has no per-request headers. -// -// vDeepSeek: when the model ID starts with 'deepseek-' and DEEPSEEK_API_KEY -// is set, route through the official @ai-sdk/deepseek provider (not -// openai-compatible) so DeepSeek-specific features work: providerMetadata -// with promptCacheHitTokens/promptCacheMissTokens, reasoning via -// LanguageModelV4Usage.outputTokens.reasoning, and thinking-mode options. +// v2.x: provider-aware resolver (W2). One resolver answers provider identity, +// upstream base URL, final wire model id, and DeepSeek +// special handling. Both upstreamModel() and resolveModelEndpoint() go through +// it. Legacy bare-id prefix heuristics live only in the fallback layer. const swapCache = new Map>(); -function getSwapProvider(baseURL: string): ReturnType { - let provider = swapCache.get(baseURL); +function getSwapProvider(baseURL: string, source?: string): ReturnType { + const cacheKey = source ? `${baseURL}||${source}` : baseURL; + let provider = swapCache.get(cacheKey); if (!provider) { + const fetchWrapper = source + ? ((...args: Parameters) => { + const [input, init] = args; + return fetch(input, { + ...init, + headers: { + ...(init?.headers as Record | undefined) ?? {}, + 'X-Boo-Source': source, + }, + }); + }) + : undefined; provider = createOpenAICompatible({ name: 'llama-swap', baseURL: baseURL.endsWith('/v1') ? baseURL : `${baseURL}/v1`, includeUsage: true, - }); - swapCache.set(baseURL, provider); + ...(fetchWrapper ? { fetch: fetchWrapper } : {}), + }) as ReturnType; + swapCache.set(cacheKey, provider); } return provider; } -function sidecarProvider( - baseURL: string, - flags: string[], -): ReturnType { - return createOpenAICompatible({ - name: 'llama-sidecar', - baseURL: baseURL.endsWith('/v1') ? baseURL : `${baseURL}/v1`, - includeUsage: true, - headers: { - 'X-Agent-Flags': flags.join(' '), - }, - }); -} - const DEEPSEEK_MODEL_PREFIX = 'deepseek-'; +/** + * Legacy prefix check — kept for backward compat with bare "deepseek-*" ids. + * Composite "deepseek/model" is identified by provider id, not prefix. + */ export function isDeepSeekModel(modelId: string): boolean { return modelId.startsWith(DEEPSEEK_MODEL_PREFIX); } @@ -69,69 +68,204 @@ function getDeepSeekProvider( return deepseekProviderCache; } -export type InferenceRoute = 'swap' | 'sidecar' | 'deepseek'; +// --------------------------------------------------------------------------- +// Provider-aware resolver (W2, D-2, D-3) +// --------------------------------------------------------------------------- -export interface RoutingInfo { +// P7: 'gateway' routes to the BooControl auto:* gateway (OpenAI-compatible, +// does its own policy routing + failover). 'gateway_error' is the +// present-but-unhealthy / orphaned-session state: the session selected an +// auto:* model but the gateway provider is missing/disabled, so we surface a +// clean error instead of silently mis-routing to LLAMA_SWAP_URL. +export type InferenceRoute = 'swap' | 'deepseek' | 'gateway' | 'gateway_error'; + +/** Provider registry `kind` marking the BooControl routing gateway. */ +export const GATEWAY_KIND = 'boocontrol-gateway'; + +/** + * Whether a (bare) wire model id is a gateway virtual model. Used to detect an + * orphaned auto:* session whose gateway registry entry was removed — the id + * still looks like a gateway model, so resolve to gateway_error, never swap. + */ +export function isGatewayVirtualModel(wireModelId: string): boolean { + return wireModelId === 'auto' || wireModelId.startsWith('auto:'); +} + +export interface ResolvedModel { + /** Routing destination. */ route: InferenceRoute; - flags: string[] | null; + /** Upstream base URL for the provider (DeepSeek API base or llama-swap). */ + baseUrl: string; + /** Wire model id to send upstream (bare, no provider prefix). */ + wireModelId: string; + /** Whether the input was a legacy bare id resolved through defaultProvider. */ + isLegacyBareId: boolean; + /** Provider identity (e.g. "sam-desktop", "embedding", "deepseek"). */ + providerId: string; + /** For route 'gateway_error': why the gateway is unavailable. */ + gatewayReason?: 'offline' | 'unhealthy'; } interface AgentLike { - llama_extra_args: string[] | null; + // reserved for future per-agent routing attributes } interface ConfigLike { LLAMA_SWAP_URL: string; - LLAMA_SIDECAR_URL?: string; DEEPSEEK_API_KEY?: string; DEEPSEEK_BASE_URL?: string; } +/** + * Provider-aware model resolver. Given a (possibly bare) model id, answers: + * provider identity, upstream base URL, final bare wire model id, and + * DeepSeek special handling. + * + * Bare ids resolve via defaultProvider (D-2). Composite "provider/model" ids + * look up the named provider directly. DeepSeek is identified by provider id + * "deepseek" or by the legacy bare "deepseek-" prefix when DEEPSEEK_API_KEY + * is configured. + */ +export function resolveModelProvider( + modelId: string, + config: ConfigLike, +): ResolvedModel { + const providers = getLlamaProviders(); + const parsed = parseModelRef(modelId); + const { providerId, wireModelId, isLegacyBareId } = parsed; + + const deepseekConfigured = !!config.DEEPSEEK_API_KEY; + const deepseekBaseUrl = (config.DEEPSEEK_BASE_URL ?? 'https://api.deepseek.com').replace(/\/+$/, ''); + + // --- DeepSeek routing --- + // Explicit provider id "deepseek" → DeepSeek SDK. + if (providerId === 'deepseek' && deepseekConfigured) { + return { + route: 'deepseek', + baseUrl: deepseekBaseUrl, + wireModelId, + isLegacyBareId, + providerId: 'deepseek', + }; + } + + // Bare legacy "deepseek-*" prefix (only when DEEPSEEK_API_KEY is set) → + // legacy fallback layer — DeepSeek SDK. + if (isLegacyBareId && isDeepSeekModel(wireModelId) && deepseekConfigured) { + return { + route: 'deepseek', + baseUrl: deepseekBaseUrl, + wireModelId, + isLegacyBareId: true, + providerId: 'deepseek', + }; + } + + // --- Local provider routing --- + const provider = providers.providers.find((p) => p.id === providerId); + + // --- Gateway routing (P7) --- + // A known gateway-kind provider → route to the gateway as an OpenAI-compatible + // upstream (it does its own policy routing). The gateway forwards X-Boo-Source + // to the chosen target so attribution survives the extra hop. + if (provider && provider.kind === GATEWAY_KIND) { + return { + route: 'gateway', + baseUrl: provider.baseUrl, + wireModelId, + isLegacyBareId, + providerId: provider.id, + }; + } + + if (!provider) { + // Orphaned auto:* session: the model still looks like a gateway virtual + // model but no gateway provider is configured. Resolve to a clean + // gateway_error — NEVER the silent LLAMA_SWAP_URL fallback (design §8). + if (isGatewayVirtualModel(wireModelId)) { + return { + route: 'gateway_error', + baseUrl: '', + wireModelId, + isLegacyBareId, + providerId, + gatewayReason: 'offline', + }; + } + // Unknown provider — fall back to legacy LLAMA_SWAP_URL for bare ids. + if (isLegacyBareId) { + return { + route: 'swap', + baseUrl: config.LLAMA_SWAP_URL, + wireModelId, + isLegacyBareId: true, + providerId: 'llama-swap', + }; + } + // Composite id with unknown provider — still route to LLAMA_SWAP_URL as + // a best-effort fallback (the wire model id carries provider intent but + // the config is incomplete). + return { + route: 'swap', + baseUrl: config.LLAMA_SWAP_URL, + wireModelId, + isLegacyBareId: false, + providerId, + }; + } + + return { + route: 'swap', + baseUrl: provider.baseUrl, + wireModelId, + isLegacyBareId, + providerId: provider.id, + }; +} + +/** + * @deprecated Use resolveModelProvider() for full routing info. Kept for + * backward compat with resolveRoute() callers that only need the route tag. + */ export function resolveRoute( agent: AgentLike | null, config?: ConfigLike, modelId?: string, -): RoutingInfo { - // vDeepSeek: if the model starts with deepseek- and DEEPSEEK_API_KEY is set, - // route through the DeepSeek provider. Checked first so DeepSeek models - // always bypass llama-swap/sidecar even when those are also configured. - if (modelId?.startsWith(DEEPSEEK_MODEL_PREFIX) && config?.DEEPSEEK_API_KEY) { - return { route: 'deepseek', flags: null }; - } - // When llama_extra_args are explicitly set, route through sidecar with them. - const flags = agent?.llama_extra_args; - if (flags && flags.length > 0) { - return { route: 'sidecar', flags }; - } - // When LLAMA_SIDECAR_URL is configured (even without per-agent flags), - // route through sidecar to pick up the default base args (cache quant, - // spec decoding, slot save, etc.). Fall back to llama-swap otherwise. - if (config?.LLAMA_SIDECAR_URL) { - return { route: 'sidecar', flags: [] }; - } - return { route: 'swap', flags: null }; +): { route: InferenceRoute } { + if (!modelId || !config) return { route: 'swap' }; + const resolved = resolveModelProvider(modelId, config); + return { route: resolved.route }; } export function upstreamModel( config: ConfigLike, modelId: string, agent?: AgentLike | null, + source?: string, ): LanguageModel { - const { route, flags } = resolveRoute(agent ?? null, config, modelId); - if (route === 'deepseek') { + const resolved = resolveModelProvider(modelId, config); + if (resolved.route === 'deepseek') { return getDeepSeekProvider( config.DEEPSEEK_API_KEY!, - config.DEEPSEEK_BASE_URL ?? 'https://api.deepseek.com', - ).chat(modelId); + resolved.baseUrl, + ).chat(resolved.wireModelId); } - if (route === 'sidecar') { - const url = config.LLAMA_SIDECAR_URL; - if (!url) { - throw new Error(`Sidecar route selected but LLAMA_SIDECAR_URL is not set`); - } - return sidecarProvider(url, (flags ?? [])).chatModel(modelId); + + // P7: gateway is OpenAI-compatible — same adapter as swap, pointed at the + // gateway baseUrl. The gateway resolves the policy + forwards X-Boo-Source. + if (resolved.route === 'gateway') { + return getSwapProvider(resolved.baseUrl, source).chatModel(resolved.wireModelId); } - return getSwapProvider(config.LLAMA_SWAP_URL).chatModel(modelId); + + // P7: orphaned auto:* session with no gateway configured — fail loud rather + // than silently mis-route to LLAMA_SWAP_URL. + if (resolved.route === 'gateway_error') { + throw new Error( + `routing gateway offline (${resolved.gatewayReason ?? 'unavailable'}): ${modelId}`, + ); + } + + return getSwapProvider(resolved.baseUrl, source).chatModel(resolved.wireModelId); } /** Resolve the API endpoint for non-streaming calls (compaction, task-model). @@ -140,18 +274,30 @@ export function resolveModelEndpoint( config: ConfigLike, modelId: string, ): { url: string; model: string; headers: Record } { + const resolved = resolveModelProvider(modelId, config); const baseHeaders: Record = { 'Content-Type': 'application/json' }; - if (modelId.startsWith(DEEPSEEK_MODEL_PREFIX) && config.DEEPSEEK_API_KEY) { - const baseURL = (config.DEEPSEEK_BASE_URL ?? 'https://api.deepseek.com').replace(/\/+$/, ''); + + if (resolved.route === 'deepseek') { return { - url: baseURL, - model: modelId, + url: resolved.baseUrl, + model: resolved.wireModelId, headers: { ...baseHeaders, Authorization: `Bearer ${config.DEEPSEEK_API_KEY}` }, }; } + + // P7: orphaned auto:* session with no gateway — fail loud (no swap fallback). + if (resolved.route === 'gateway_error') { + throw new Error( + `routing gateway offline (${resolved.gatewayReason ?? 'unavailable'}): ${modelId}`, + ); + } + + // P7: gateway uses the same unauthenticated OpenAI-compatible shape as swap. + // X-Boo-Source forwarding for direct-fetch callers happens at their own header + // layer (compaction.ts / task-model.ts); the gateway re-forwards it onward. return { - url: config.LLAMA_SWAP_URL.replace(/\/+$/, ''), - model: modelId, + url: resolved.baseUrl.replace(/\/+$/, ''), + model: resolved.wireModelId, headers: baseHeaders, }; } diff --git a/apps/server/src/services/inference/stream-phase-adapter.ts b/apps/server/src/services/inference/stream-phase-adapter.ts index c16262a..2c15ab9 100644 --- a/apps/server/src/services/inference/stream-phase-adapter.ts +++ b/apps/server/src/services/inference/stream-phase-adapter.ts @@ -306,7 +306,7 @@ export async function streamCompletion( : stallAc.signal; const result = streamText({ - model: upstreamModel(ctx.config, model, agent ?? null), + model: upstreamModel(ctx.config, model, agent ?? null, 'boochat'), messages: aiMessages, ...(aiTools ? { tools: aiTools, toolChoice: 'auto' as const, experimental_repairToolCall: repairToolCall } diff --git a/apps/server/src/services/llama-providers.ts b/apps/server/src/services/llama-providers.ts new file mode 100644 index 0000000..cdcb0ed --- /dev/null +++ b/apps/server/src/services/llama-providers.ts @@ -0,0 +1,101 @@ +/** + * vMultiProvider local provider registry loader (server-side). + * + * Reads the shared `/data/llama-providers.json` (or `LLAMA_PROVIDERS_PATH`) at + * startup and caches the parsed result. When the file is absent or invalid, + * synthesizes a single legacy provider from `LLAMA_SWAP_URL` so both apps + * start with only legacy env vars (D-1). + * + * Schema and pure helpers live in @boocode/contracts/llama-providers. + * File I/O stays app-local per D-1. + */ +import { readFileSync } from 'node:fs'; +import { + LlamaProvidersFileSchema, + type LlamaProvidersFile, + type LlamaProvider, + type ParsedModelRef, + parseModelRef as parseModelRefBase, + formatModelRef, +} from '@boocode/contracts/llama-providers'; + +export type { LlamaProvidersFile, LlamaProvider, ParsedModelRef, formatModelRef }; + +/** Synthesize a single legacy provider from env vars. */ +function buildLegacyProvider(llamaSwapUrl: string): LlamaProvidersFile { + return { + defaultProvider: 'llama-swap', + providers: [ + { + id: 'llama-swap', + label: 'llama-swap', + baseUrl: llamaSwapUrl, + kind: 'llama-swap', + }, + ], + }; +} + +let cached: LlamaProvidersFile | null = null; + +/** + * Load (or re-load) the local provider config. Never throws on bad input — + * falls back to the legacy single-provider shape. + */ +export function loadLlamaProviders( + providersPath: string | undefined, + llamaSwapUrl: string, +): LlamaProvidersFile { + if (!providersPath) { + cached = buildLegacyProvider(llamaSwapUrl); + return cached; + } + + let raw: string; + try { + raw = readFileSync(providersPath, 'utf8'); + } catch { + console.warn( + `llama-providers: file not found at ${providersPath} — falling back to legacy single-provider`, + ); + cached = buildLegacyProvider(llamaSwapUrl); + return cached; + } + + let json: unknown; + try { + json = JSON.parse(raw); + } catch (err) { + console.error( + `llama-providers: invalid JSON in ${providersPath} — falling back to legacy single-provider`, + err, + ); + cached = buildLegacyProvider(llamaSwapUrl); + return cached; + } + + const parsed = LlamaProvidersFileSchema.safeParse(json); + if (!parsed.success) { + console.error( + `llama-providers: schema validation failed for ${providersPath} — falling back to legacy single-provider`, + parsed.error.flatten(), + ); + cached = buildLegacyProvider(llamaSwapUrl); + return cached; + } + + cached = parsed.data; + return cached; +} + +/** The cached provider config. Returns legacy fallback if nothing loaded yet. */ +export function getLlamaProviders(): LlamaProvidersFile { + return cached ?? buildLegacyProvider('http://localhost:8080'); +} + +/** + * Convenience: parse a model ref against the cached default provider. + */ +export function parseModelRef(ref: string): ParsedModelRef { + return parseModelRefBase(ref, getLlamaProviders().defaultProvider); +} diff --git a/apps/server/src/services/model-context.ts b/apps/server/src/services/model-context.ts index 4ef6710..6d6caa8 100644 --- a/apps/server/src/services/model-context.ts +++ b/apps/server/src/services/model-context.ts @@ -1,13 +1,15 @@ -// v1.11.3: llama-swap model-context cache. Replaces the dead +// v2.x: provider-aware model-context cache (W3). Replaces the dead // `parsed.timings.n_ctx` capture in inference.ts / compaction.ts — // llama-server's streaming completion never emits n_ctx in timings (verified // empirically: timings carries prompt_n / predicted_n / *_ms / *_per_second -// only). The authoritative source is llama-swap's -// /upstream//props endpoint at .default_generation_settings.n_ctx. +// only). The authoritative source is the provider's +// /upstream//props endpoint at .default_generation_settings.n_ctx. // // Cache design: +// - Keys are the full composite model id (provider/model) so two providers +// serving the same wire model name never share cache entries (D-2). // - Positive entries (n_ctx + total_slots) have no TTL. A model's context -// size doesn't change while llama-swap is running; an admin endpoint +// size doesn't change while the provider is running; an admin endpoint // can invalidateModelContext() if it ever does. // - Negative entries (failed fetch) have a 60s TTL so a misconfigured or // down model doesn't get hammered every inference turn, but recovers @@ -15,6 +17,11 @@ // - 3s AbortController timeout on the fetch — long enough for a healthy // upstream, short enough that a stuck upstream doesn't block the // ctx_max UPDATE that follows. +// +// v1.x legacy: previously keyed by bare wire id and used a process-wide +// LLAMA_SWAP_URL. Now resolved per-call via the provider registry. + +import { resolveModelProvider } from './inference/provider.js'; export interface ModelContext { n_ctx: number; @@ -28,29 +35,79 @@ const positiveCache = new Map(); // re-fetches within the 60s window. const negativeCache = new Map(); -// Set once at startup by index.ts. We don't import loadConfig() directly -// here to keep this module trivially mockable in tests (set the URL in -// beforeEach instead of stubbing process.env + loadConfig's cache). -let llamaSwapUrl: string | null = null; +// Stored config for provider-aware resolution. Supports both the legacy +// { llamaSwapUrl: string } shape (for tests) and the full Config shape. +let storedConfig: ConfigForModelContext | null = null; -export function configureModelContext(opts: { llamaSwapUrl: string }): void { - llamaSwapUrl = opts.llamaSwapUrl; +/** Config fields needed for model-context provider resolution. */ +type ConfigForModelContext = { + LLAMA_SWAP_URL: string; + DEEPSEEK_API_KEY?: string; + DEEPSEEK_BASE_URL?: string; +}; + +/** + * Configure the module for model-context lookups. + * + * Accepts either the full server Config (production) or the legacy + * `{ llamaSwapUrl }` shape (tests). The full Config is preferred so + * getModelContext can resolve composite model ids through the provider + * registry. + */ +export function configureModelContext( + opts: ConfigForModelContext | { llamaSwapUrl: string }, +): void { + // Legacy test helper: { llamaSwapUrl } → synthesize a minimal config. + if ('llamaSwapUrl' in opts && typeof opts.llamaSwapUrl === 'string') { + storedConfig = { LLAMA_SWAP_URL: opts.llamaSwapUrl }; + return; + } + storedConfig = opts as ConfigForModelContext; } // vDeepSeek: DeepSeek models don't have a /upstream//props endpoint. // Return a reasonable default context so compaction estimates work. const DEEPSEEK_DEFAULT_N_CTX = 131_072; -const DEEPSEEK_MODEL_PREFIX = 'deepseek-'; export async function getModelContext(model: string): Promise { - // vDeepSeek: DeepSeek models have no /upstream//props. Use a static - // default so compaction doesn't fall to the buffer-only path with tiny limits. - if (model.startsWith(DEEPSEEK_MODEL_PREFIX)) { + // Resolve the model through the provider-aware resolver. For composite + // "provider/model" ids, this finds the correct provider's baseUrl. For + // bare legacy ids, it falls back to the default provider. + const config = storedConfig; + if (!config) { + // Module not initialized. Defensive — index.ts calls + // configureModelContext at startup; if a test forgets, fail closed so + // the chat still works (ctx_max stays null, UI degrades gracefully). + negativeCache.set(model, Date.now()); + return null; + } + + const resolved = resolveModelProvider(model, config); + + // DeepSeek models (by provider id) have no /upstream//props. + // Use a static default so compaction doesn't fall to the buffer-only + // path with tiny limits. + if (resolved.providerId === 'deepseek') { return { n_ctx: DEEPSEEK_DEFAULT_N_CTX }; } + // P7: orphaned auto:* session with no gateway configured — no props endpoint + // to query. Negative-cache and return null; compaction degrades gracefully. + if (resolved.route === 'gateway_error') { + negativeCache.set(model, Date.now()); + return null; + } + + // P7: gateway route — baseUrl is the control gateway, which exposes + // /upstream//props (it proxies the chosen candidate's props). + // The normal fetch path below handles it without special-casing. + + // Cache key is the full composite id to prevent cross-provider cache + // poisoning for duplicate wire model names (D-2, design §5.3). + const cacheKey = `${resolved.providerId}/${resolved.wireModelId}`; + // 1. Positive cache hit — no TTL check, model n_ctx is invariant. - const pos = positiveCache.get(model); + const pos = positiveCache.get(cacheKey); if (pos) return pos; // 2. Negative cache hit within TTL — return null without refetching. @@ -58,30 +115,25 @@ export async function getModelContext(model: string): Promise/upstream//props (design §5.3). + const url = `${resolved.baseUrl.replace(/\/+$/, '')}/upstream/${encodeURIComponent(resolved.wireModelId)}/props`; const controller = new AbortController(); const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS); try { const res = await fetch(url, { signal: controller.signal }); clearTimeout(timer); if (!res.ok) { - negativeCache.set(model, Date.now()); + negativeCache.set(cacheKey, Date.now()); return null; } const body = (await res.json()) as { @@ -89,18 +141,18 @@ export async function getModelContext(model: string): Promise} /> } /> } /> + } /> diff --git a/apps/web/src/api/client.ts b/apps/web/src/api/client.ts index 045ab56..6d47f59 100644 --- a/apps/web/src/api/client.ts +++ b/apps/web/src/api/client.ts @@ -5,6 +5,7 @@ import type { Chat, Message, ModelInfo, + ModelCatalogResponse, SidebarResponse, ListDirResult, ViewFileResult, @@ -414,7 +415,7 @@ export const api = { ), }, - models: () => request('/api/models'), + models: () => request('/api/models'), coder: { snapshot: (cwd?: string) => { diff --git a/apps/web/src/api/types.ts b/apps/web/src/api/types.ts index d7a4f51..8c08861 100644 --- a/apps/web/src/api/types.ts +++ b/apps/web/src/api/types.ts @@ -201,6 +201,17 @@ export interface ModelInfo { [key: string]: unknown; } +// v2.x: provider-grouped model catalog (W2, D-4). +export interface ModelCatalogProvider { + id: string; + label: string; + models: ModelInfo[]; +} + +export interface ModelCatalogResponse { + providers: ModelCatalogProvider[]; +} + export type { ProviderModel, ProviderMode, @@ -520,6 +531,71 @@ export interface WorkspaceState { closedPaneStack: ClosedPaneEntry[]; } +// ── BooControl fleet frames ───────────────────────────────────────────────── +// +// 2-location sync: contracts (WsFrameSchema + KNOWN_FRAME_TYPES) + web strict +// union only. They skip the server's broker entirely. + +export type ControlFleetFrame = { + type: 'control_fleet'; + seq: number; + hosts: Array<{ + providerId: string; + liveness: 'connected' | 'reconnecting' | 'down'; + lastSeenAt: string | null; + seq: number; + models: Array<{ + model: string; + state: string; + ts: string; + ttlDeadline: string | null; + inflight: number; + }>; + }>; +}; + +export type ControlActivityFrame = { + type: 'control_activity'; + seq: number; + providerId: string; + entry: { + id: number; + ts: string; + model: string | null; + reqPath: string | null; + statusCode: number | null; + durationMs: number | null; + }; +}; + +export type ControlPerfFrame = { + type: 'control_perf'; + seq: number; + providerId: string; + ts: string; + gpu: unknown; + sys: unknown; +}; + +export type ControlLogFrame = { + type: 'control_log'; + seq: number; + providerId: string; + source: 'proxy' | 'upstream' | 'model'; + line: string; +}; + +export type ControlJobFrame = { + type: 'control_job'; + seq: number; + jobType: 'bench' | 'eval' | 'action'; + jobId: string; + status: 'queued' | 'running' | 'completed' | 'failed'; + detail?: Record; +}; + +// ── end BooControl fleet frames ───────────────────────────────────────────── + export type WsFrame = | { type: 'snapshot'; messages: Message[] } | { type: 'message_started'; message_id: string; chat_id?: string; role: MessageRole; compare_group_id?: string } @@ -720,7 +796,13 @@ export type WsFrame = finished_at?: string | null; model?: string | null; metadata?: MessageMetadata | null; - }; + } + // BooControl fleet frames + | ControlFleetFrame + | ControlActivityFrame + | ControlPerfFrame + | ControlLogFrame + | ControlJobFrame; // tool traces: per-tool-call record returned by GET /api/chats/:id/traces. export interface ToolTrace { diff --git a/apps/web/src/components/AgentComposerBar.tsx b/apps/web/src/components/AgentComposerBar.tsx index 764f88d..cf3692c 100644 --- a/apps/web/src/components/AgentComposerBar.tsx +++ b/apps/web/src/components/AgentComposerBar.tsx @@ -1,5 +1,5 @@ import { useEffect, useMemo, useRef, useState } from 'react'; -import { Check, ChevronDown, RefreshCw, Loader2, Shield, ShieldAlert, Eye, Brain, Bot } from 'lucide-react'; +import { Check, ChevronDown, RefreshCw, Loader2, Shield, ShieldAlert, Eye, Brain, Bot, Star } from 'lucide-react'; import { api } from '@/api/client'; import type { AgentSessionConfig, ProviderSnapshotEntry, AgentCommand } from '@/api/types'; import { useProviderSnapshot, refreshProviderSnapshot } from '@/hooks/useProviderSnapshot'; @@ -9,6 +9,8 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuSeparator, DropdownMenuTrigger, } from '@/components/ui/dropdown-menu'; import { BottomSheet } from '@/components/BottomSheet'; @@ -113,14 +115,22 @@ interface PickerProps { /** Grow to fill the row's free space and render the value brighter — used for * the Model picker so the active model is the most visible control. */ flexible?: boolean; + /** Grouped rendering: renders sections with labels (Favorites-first, then + * per-provider). When provided, `options` is ignored. */ + groups?: ModelGroup[]; } -function CompactPicker({ label, value, disabled, options, onPick, icon, iconOnly, flexible }: PickerProps) { +interface ModelGroup { + label: string; + options: Array<{ id: string; label: string }>; +} + +function CompactPicker({ label, value, disabled, options, onPick, icon, iconOnly, flexible, groups }: PickerProps) { const { isMobile } = useViewport(); const [open, setOpen] = useState(false); const currentLabel = options.find((o) => o.id === value)?.label ?? (value || label); - const list = ( + const flatList = (
{options.map((o) => ( + ))} +
+ ); + })} + + ); + + const list = groups ? groupedList : flatList; + if (isMobile) { return ( <> @@ -243,6 +283,8 @@ function AgentStatusDot({ entry, agent }: { entry: AgentStatusEntry; agent: stri ); } +const FAVORITE_MODELS_KEY = 'favorite_models'; + export function AgentComposerBar({ projectPath, value, onChange, onProviderCommandsChange, connected, agentStatus }: Props) { const allEntries = useProviderSnapshot(projectPath); // 5.5 — the composer picker only offers ENABLED providers that are ready (or @@ -254,9 +296,20 @@ export function AgentComposerBar({ projectPath, value, onChange, onProviderComma [allEntries], ); const [refreshing, setRefreshing] = useState(false); + const [favoriteModels, setFavoriteModels] = useState([]); const hydratedRef = useRef(false); + // Fetch favorites from settings for the grouped model picker (W5). + useEffect(() => { + api.settings.get().then((settings) => { + const raw = settings[FAVORITE_MODELS_KEY]; + if (Array.isArray(raw)) { + setFavoriteModels(raw.filter((m): m is string => typeof m === 'string')); + } + }).catch(() => { /* settings fetch is best-effort */ }); + }, []); + useEffect(() => { hydratedRef.current = false; }, [projectPath]); @@ -318,6 +371,54 @@ export function AgentComposerBar({ projectPath, value, onChange, onProviderComma onProviderCommandsChange?.(currentEntry?.commands ?? []); }, [currentEntry, onProviderCommandsChange]); + // Build grouped model options for the native boocode provider (W5). + // For other providers, use a flat list. Groups: Favorites first, then + // one section per local provider prefix (matching BooChat's ModelPicker). + const modelGroups = useMemo(() => { + if (!currentEntry || currentEntry.name !== 'boocode') return null; + const models = currentEntry.models; + if (models.length === 0) return []; + + const favSet = new Set(favoriteModels); + + // Build a model map for quick lookup + const modelMap = new Map(models.map((m) => [m.id, m])); + + // Group models by provider prefix (the part before the first slash) + const byProvider = new Map>(); + for (const m of models) { + const slash = m.id.indexOf('/'); + const providerPrefix = slash > 0 ? m.id.slice(0, slash) : 'other'; + const formatted = { id: m.id, label: formatModelLabel(m.label) }; + const arr = byProvider.get(providerPrefix) ?? []; + arr.push(formatted); + byProvider.set(providerPrefix, arr); + } + + const groups: ModelGroup[] = []; + + // Favorites section: only models that exist in the live inventory + const favModels = [...favSet] + .filter((id) => modelMap.has(id)) + .map((id) => ({ id, label: formatModelLabel(modelMap.get(id)!.label) })); + if (favModels.length > 0) { + groups.push({ label: 'Favorites', options: favModels }); + } + + // One section per provider group + for (const [provider, opts] of byProvider) { + groups.push({ label: provider, options: opts }); + } + + return groups; + }, [currentEntry, favoriteModels]); + + // Flat model options for non-boocode providers + const modelOptions = useMemo( + () => (currentEntry?.models ?? []).map((m) => ({ id: m.id, label: formatModelLabel(m.label) })), + [currentEntry], + ); + function persist(next: AgentSessionConfig): void { const prefs = loadPrefs(); prefs[next.provider] = { @@ -369,7 +470,6 @@ export function AgentComposerBar({ projectPath, value, onChange, onProviderComma // derived from it. const permissionModes = availablePermissionModes(currentEntry?.modes ?? []); const currentPermission = permissionForModeId(value.modeId, currentEntry?.modes ?? []); - const modelOptions = (currentEntry?.models ?? []).map((m) => ({ id: m.id, label: formatModelLabel(m.label) })); const thinkingOpts = thinkingOptions.map((t) => ({ id: t.id, label: t.label })); return ( @@ -423,8 +523,9 @@ export function AgentComposerBar({ projectPath, value, onChange, onProviderComma g.options.length === 0) : modelOptions.length === 0} options={modelOptions} + groups={modelGroups ?? undefined} onPick={pickModel} icon={} flexible diff --git a/apps/web/src/components/ModelPicker.tsx b/apps/web/src/components/ModelPicker.tsx index 4314911..9948a21 100644 --- a/apps/web/src/components/ModelPicker.tsx +++ b/apps/web/src/components/ModelPicker.tsx @@ -1,11 +1,14 @@ -import { useEffect, useState } from 'react'; -import { Check, ChevronDown, Cpu } from 'lucide-react'; +import { useCallback, useEffect, useMemo, useState } from 'react'; +import { Check, ChevronDown, Cpu, Star } from 'lucide-react'; +import { toast } from 'sonner'; import { api } from '@/api/client'; -import type { ModelInfo } from '@/api/types'; +import type { ModelCatalogProvider, ModelInfo } from '@/api/types'; import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuSeparator, DropdownMenuTrigger, } from '@/components/ui/dropdown-menu'; import { BottomSheet } from '@/components/BottomSheet'; @@ -17,65 +20,364 @@ interface Props { onChange: (model: string) => void | Promise; } -// v1.9: shared list rendered inside both shells. Lazy-fetches /api/models on -// first open so the picker doesn't pay for a request when it's never shown. -function ModelList({ - models, - error, - value, - onPick, -}: { - models: ModelInfo[] | null; +interface PickerState { + providers: ModelCatalogProvider[]; + favoriteModels: string[]; + /** P6.1: compositeId -> advisory badge kinds (from BooControl). */ + badges: Record; + /** P6.1: badge kind -> human label. */ + badgeLabels: Record; error: string | null; - value: string | null; +} + +const FAVORITE_MODELS_KEY = 'favorite_models'; + +/** Short chip text per advisory badge kind. */ +const BADGE_SHORT: Record = { + 'best-code': 'code', + 'best-chat': 'chat', + 'best-fast': 'fast', +}; + +// P6.1: advisory routing scores from BooControl. Non-fatal — the control +// service may be down, in which case the picker simply shows no badges. +async function fetchRoutingBadges(): Promise<{ badges: Record; badgeLabels: Record }> { + try { + const res = await fetch('/api/control/routing/scores'); + if (!res.ok) return { badges: {}, badgeLabels: {} }; + const data = await res.json() as { badges?: Record; badgeLabels?: Record }; + return { badges: data.badges ?? {}, badgeLabels: data.badgeLabels ?? {} }; + } catch { + return { badges: {}, badgeLabels: {} }; + } +} + +async function fetchPickerData(): Promise { + const [catalog, settings, routing] = await Promise.all([ + api.models(), + api.settings.get(), + fetchRoutingBadges(), + ]); + const raw = settings[FAVORITE_MODELS_KEY]; + const favoriteModels = Array.isArray(raw) + ? raw.filter((m): m is string => typeof m === 'string') + : []; + return { + providers: catalog.providers, + favoriteModels, + badges: routing.badges, + badgeLabels: routing.badgeLabels, + error: null, + }; +} + +// P7.3: detect an orphaned auto:* session — the selected model looks like a +// gateway virtual model but no provider in the live catalog serves it (the +// gateway registry entry was removed). The session keeps its id; we flag it. +function isOrphanedGatewayValue(value: string | null, providers: ModelCatalogProvider[]): boolean { + if (!value) return false; + const tail = value.includes('/') ? value.slice(value.indexOf('/') + 1) : value; + const looksGateway = tail === 'auto' || tail.startsWith('auto:'); + if (!looksGateway) return false; + const present = providers.some((p) => p.models.some((m) => m.id === value)); + return !present; +} + +function ModelBadges({ ids, labels }: { ids: string[] | undefined; labels: Record }) { + if (!ids || ids.length === 0) return null; + return ( + + {ids.map((kind) => ( + + {BADGE_SHORT[kind] ?? kind} + + ))} + + ); +} + +function ModelRow({ + id, + isSelected, + isFavorite, + badges, + badgeLabels, + onPick, + onToggleFavorite, +}: { + id: string; + isSelected: boolean; + isFavorite: boolean; + badges?: string[]; + badgeLabels: Record; onPick: (id: string) => void; + onToggleFavorite: (id: string, favorite: boolean) => void; }) { - if (error) { - return
{error}
; - } - if (models === null) { - return
Loading…
; - } + return ( +
+ + +
+ ); +} + +function ModelSections({ + providers, + favoriteModels, + selectedModel, + badges, + badgeLabels, + onPick, + onToggleFavorite, +}: { + providers: ModelCatalogProvider[]; + favoriteModels: string[]; + selectedModel: string | null; + badges: Record; + badgeLabels: Record; + onPick: (id: string) => void; + onToggleFavorite: (id: string, favorite: boolean) => void; +}) { + const favSet = useMemo(() => new Set(favoriteModels), [favoriteModels]); + + // Build model map for quick lookup + const modelMap = useMemo(() => { + const map = new Map(); + for (const p of providers) { + for (const m of p.models) { + map.set(m.id, m); + } + } + return map; + }, [providers]); + + // Favorites section: only models that exist in the live inventory. + const favoriteModelsInInventory = useMemo( + () => favoriteModels.filter((id) => modelMap.has(id)), + [favoriteModels, modelMap], + ); + + // For the non-dropdown (mobile bottom sheet) view, wrap each section. + // The dropdown version uses the primitives directly. return ( <> - {models.map((m) => ( - - ))} + {favoriteModelsInInventory.length > 0 && ( + <> + Favorites + {favoriteModelsInInventory.map((id) => ( + { + e.preventDefault(); + }} + className="flex items-center gap-1 p-0" + > + + + ))} + + + )} + + {providers.map((provider) => { + if (provider.models.length === 0) return null; + return ( +
+ {provider.label} + {provider.models.map((m) => ( + { + e.preventDefault(); + }} + className="flex items-center gap-1 p-0" + > + + + ))} + +
+ ); + })} ); } +// Mobile bottom-sheet version of the grouped model list. +function MobileModelList({ + providers, + favoriteModels, + selectedModel, + badges, + badgeLabels, + onPick, + onToggleFavorite, +}: { + providers: ModelCatalogProvider[]; + favoriteModels: string[]; + selectedModel: string | null; + badges: Record; + badgeLabels: Record; + onPick: (id: string) => void; + onToggleFavorite: (id: string, favorite: boolean) => void; +}) { + const favSet = useMemo(() => new Set(favoriteModels), [favoriteModels]); + + const modelMap = useMemo(() => { + const map = new Map(); + for (const p of providers) { + for (const m of p.models) { + map.set(m.id, m); + } + } + return map; + }, [providers]); + + const favoriteModelsInInventory = useMemo( + () => favoriteModels.filter((id) => modelMap.has(id)), + [favoriteModels, modelMap], + ); + + return ( +
+ {favoriteModelsInInventory.length > 0 && ( +
+
Favorites
+ {favoriteModelsInInventory.map((id) => ( + + ))} +
+
+ )} + + {providers.map((provider) => { + if (provider.models.length === 0) return null; + return ( +
+
{provider.label}
+ {provider.models.map((m) => ( + + ))} +
+
+ ); + })} +
+ ); +} + export function ModelPicker({ value, onChange }: Props) { const { isMobile } = useViewport(); - const [models, setModels] = useState(null); + const [state, setState] = useState(null); const [error, setError] = useState(null); const [open, setOpen] = useState(false); - useEffect(() => { - if (!open || models !== null) return; - api - .models() - .then(setModels) + if (!open || state !== null) return; + fetchPickerData() + .then(setState) .catch((err) => setError(err instanceof Error ? err.message : 'failed to load models'), ); - }, [open, models]); + }, [open, state]); + + // Reset state when dropdown closes so we re-fetch fresh data next open. + const handleOpenChange = useCallback((v: boolean) => { + setOpen(v); + if (!v) { + setState(null); + setError(null); + } + }, []); + + const toggleFavorite = useCallback( + async (id: string, favorite: boolean) => { + const current = state?.favoriteModels ?? []; + const next = favorite + ? [...current, id] + : current.filter((m) => m !== id); + try { + const settings = await api.settings.patch({ + [FAVORITE_MODELS_KEY]: next, + }); + const raw = settings[FAVORITE_MODELS_KEY]; + const normalized = Array.isArray(raw) + ? raw.filter((m): m is string => typeof m === 'string') + : []; + setState((prev) => + prev ? { ...prev, favoriteModels: normalized } : prev, + ); + } catch (err) { + toast.error( + err instanceof Error ? err.message : 'Failed to update favorites', + ); + } + }, + [state], + ); function handlePick(id: string) { setOpen(false); void onChange(id); } - // v1.9: mobile = icon-only trigger + bottom-sheet shell. Desktop = labeled - // trigger (model name + chevron) + dropdown. Same ModelList under the hood. if (isMobile) { return ( <> @@ -88,9 +390,30 @@ export function ModelPicker({ value, onChange }: Props) { > - setOpen(false)} title="Model"> -
- + handleOpenChange(false)} title="Model"> +
+ {error && ( +
{error}
+ )} + {state === null && !error && ( +
Loading…
+ )} + {state && isOrphanedGatewayValue(value, state.providers) && ( +
+ Routing gateway offline — this session's {value} model can't route. Pick a concrete model. +
+ )} + {state && ( + + )}
@@ -98,7 +421,7 @@ export function ModelPicker({ value, onChange }: Props) { } return ( - + - + {error && (
{error}
)} - {models === null && !error && ( + {state === null && !error && (
Loading…
)} - {models?.map((m) => ( - handlePick(m.id)} - className="font-mono text-xs" - > - - {formatModelLabel(m.id)} - - ))} + {state && isOrphanedGatewayValue(value, state.providers) && ( +
+ Routing gateway offline — this session's {value} model can't route. Pick a concrete model. +
+ )} + {state && ( + + )} ); diff --git a/apps/web/src/components/ProjectSidebar.tsx b/apps/web/src/components/ProjectSidebar.tsx index b39b8c7..a807aaf 100644 --- a/apps/web/src/components/ProjectSidebar.tsx +++ b/apps/web/src/components/ProjectSidebar.tsx @@ -1,6 +1,6 @@ import { useEffect, useMemo, useRef, useState } from 'react'; import { NavLink, useLocation, useNavigate } from 'react-router-dom'; -import { BarChart3, Brain, ChevronRight, ExternalLink, Folder, MessageSquare, Plus, ScrollText, Settings as SettingsIcon, X, Code } from 'lucide-react'; +import { BarChart3, Brain, ChevronRight, ExternalLink, Folder, MessageSquare, Plus, Radio, ScrollText, Settings as SettingsIcon, X, Code } from 'lucide-react'; import { toast } from 'sonner'; import { Button } from '@/components/ui/button'; import mascot from '@/assets/brand/banner-mascot.png'; @@ -563,6 +563,20 @@ export function ProjectSidebar() { Memory + { if (isMobile) setDrawerOpen(false); }} + className={({ isActive }) => + `w-full flex items-center gap-2 px-2 py-1.5 rounded-md text-sm hover:bg-sidebar-accent/60 text-sidebar-foreground ${ + isActive ? 'bg-sidebar-accent text-sidebar-accent-foreground' : '' + }` + } + aria-label="Control" + > + + Control + + {/* v1.9: bottom-pinned Settings button. In a session, opens/focuses the workspace settings pane via the sessionEvents bus (Session.tsx owns the panesHook). Outside a session there's no workspace to mount the diff --git a/apps/web/src/components/control/ActivityTab.tsx b/apps/web/src/components/control/ActivityTab.tsx new file mode 100644 index 0000000..89fc22e --- /dev/null +++ b/apps/web/src/components/control/ActivityTab.tsx @@ -0,0 +1,226 @@ +import { useCallback, useMemo, useState } from 'react'; +import { Virtuoso, type FollowOutput } from 'react-virtuoso'; +import { ControlRequestEntry } from '@/hooks/useControlStream'; +import { cn } from '@/lib/utils'; +import { Pause, Play, Search } from 'lucide-react'; + +interface ActivityTabProps { + requests: ControlRequestEntry[]; + providerIds: string[]; + onOpenCapture?: (entry: ControlRequestEntry) => void; +} + +function formatDuration(ms: number | null): string { + if (ms == null) return '-'; + if (ms < 1000) return `${ms}ms`; + return `${(ms / 1000).toFixed(1)}s`; +} + +function formatStatus(code: number | null): string { + if (code == null) return '-'; + return String(code); +} + +function formatTime(iso: string): string { + const d = new Date(iso); + return d.toLocaleTimeString(undefined, { hour: '2-digit', minute: '2-digit', second: '2-digit' }); +} + +export function ActivityTab({ requests, providerIds, onOpenCapture }: ActivityTabProps) { + const [paused, setPaused] = useState(false); + const [modelFilter, setModelFilter] = useState(null); + const [hostFilter, setHostFilter] = useState(null); + + // Extract unique models from requests + const models = useMemo(() => { + const set = new Set(); + for (const r of requests) { + if (r.model) set.add(r.model); + } + return Array.from(set).sort(); + }, [requests]); + + const filtered = useMemo(() => { + return requests.filter((r) => { + if (modelFilter && r.model !== modelFilter) return false; + if (hostFilter && r.providerId !== hostFilter) return false; + return true; + }); + }, [requests, modelFilter, hostFilter]); + + const handleScroll = useCallback((isAtBottom: boolean) => { + if (!isAtBottom && !paused) { + setPaused(true); + } else if (isAtBottom) { + setPaused(false); + } + }, [paused]); + + const itemContent = useCallback( + (_index: number, entry: ControlRequestEntry) => { + const isError = entry.statusCode != null && entry.statusCode >= 400; + return ( +
+ {/* Time */} + + {formatTime(entry.ts)} + + + {/* Provider */} + + {entry.providerId} + + + {/* Model */} + + {entry.model || '-'} + + + {/* Status */} + + {formatStatus(entry.statusCode)} + + + {/* Duration */} + + {formatDuration(entry.durationMs)} + + + {/* P2.4: Capture inspector button */} + {onOpenCapture && ( + + )} +
+ ); + }, + [onOpenCapture], + ); + + return ( +
+ {/* Filter bar */} +
+
+ Host +
+ setHostFilter(null)} + /> + {providerIds.map((pid) => ( + setHostFilter(hostFilter === pid ? null : pid)} + /> + ))} + +
+ +
+ Model +
+ setModelFilter(null)} + /> + {models.slice(0, 12).map((m) => ( + setModelFilter(modelFilter === m ? null : m)} + /> + ))} + +
+ + {/* Pause toggle */} + +
+ + {/* Feed */} +
+ ( +
+ ), + }} + className="h-full" + onMouseEnter={() => { + // pause on hover for readability + if (!paused) setPaused(true); + }} + onMouseLeave={() => { + if (paused) setPaused(false); + }} + /> +
+
+ ); +} + +function FilterChip({ + label, + active, + onClick, +}: { + label: string; + active: boolean; + onClick: () => void; +}) { + return ( + + ); +} diff --git a/apps/web/src/components/control/BenchTab.tsx b/apps/web/src/components/control/BenchTab.tsx new file mode 100644 index 0000000..a01f2e9 --- /dev/null +++ b/apps/web/src/components/control/BenchTab.tsx @@ -0,0 +1,669 @@ +import { useState, useRef, useEffect, useCallback, useMemo } from 'react'; +import { cn } from '@/lib/utils'; +import * as echarts from 'echarts/core'; +import { LineChart } from 'echarts/charts'; +import { CanvasRenderer } from 'echarts/renderers'; +import { GridComponent, TooltipComponent, LegendComponent, TitleComponent } from 'echarts/components'; +import { buildEChartsTheme } from './buildEChartsTheme'; +import { + Play, + Loader2, + BarChart3, + TrendingDown, + TrendingUp, + AlertTriangle, + Plus, + History, +} from 'lucide-react'; + +echarts.use([LineChart, CanvasRenderer, GridComponent, TooltipComponent, LegendComponent, TitleComponent]); + +interface BenchTabProps { + providerIds: string[]; +} + +interface BenchSuite { + id: string; + name: string; + providerId: string; + model: string; + promptTokens: number[]; + genTokens: number[]; + concurrency: number[]; + repetitions: number; + createdAt: string; +} + +interface BenchRun { + id: string; + suiteId: string; + jobType: string; + status: string; + startedAt: string | null; + finishedAt: string | null; + totalSamples: number; + completedSamples: number; + concurrentForeignRequests: number; + regressionFlag: 'baseline' | 'regression' | 'improvement' | null; + aggregate: Record | null; + error: string | null; + createdAt: string; +} + +interface BenchSample { + id: number; + promptTokens: number; + genTokens: number; + concurrency: number; + repetition: number; + ttftMs: number | null; + totalMs: number | null; + promptTps: number | null; + genTps: number | null; + cacheN: number | null; + error: string | null; +} + +export function BenchTab({ providerIds }: BenchTabProps) { + const [view, setView] = useState<'launcher' | 'history' | 'results'>('launcher'); + const [suites, setSuites] = useState([]); + const [runs, setRuns] = useState([]); + const [selectedRun, setSelectedRun] = useState(null); + const [samples, setSamples] = useState([]); + const [loading, setLoading] = useState(false); + const [running, setRunning] = useState(false); + const [recentTraffic, setRecentTraffic] = useState(false); + const pollRef = useRef | null>(null); + const chartRef = useRef(null); + const historyChartRef = useRef(null); + + // Suite form state + const [suiteName, setSuiteName] = useState(''); + const [suiteProvider, setSuiteProvider] = useState(''); + const [suiteModel, setSuiteModel] = useState(''); + const [suitePromptTokens, setSuitePromptTokens] = useState('256,512,1024'); + const [suiteGenTokens, setSuiteGenTokens] = useState('64,128,256'); + const [suiteConcurrency, setSuiteConcurrency] = useState('1,2,4'); + const [suiteRepetitions, setSuiteRepetitions] = useState('3'); + + useEffect(() => { + loadSuites(); + loadRuns(); + }, []); + + // N2: Clear polling interval on unmount. + useEffect(() => { + return () => { + if (pollRef.current) { + clearInterval(pollRef.current); + } + }; + }, []); + + useEffect(() => { + if (view === 'history' && historyChartRef.current && runs.length > 0) { + renderHistoryChart(); + } + }, [view, runs]); + + useEffect(() => { + if (view === 'results' && chartRef.current && selectedRun && samples.length > 0) { + renderResultsChart(); + } + }, [view, selectedRun, samples]); + + const loadSuites = useCallback(async () => { + try { + const res = await fetch('/api/control/bench/suites'); + if (!res.ok) return; + const data = await res.json() as { suites: BenchSuite[] }; + setSuites(data.suites); + } catch { + // silent + } + }, []); + + const loadRuns = useCallback(async () => { + try { + const res = await fetch('/api/control/bench/runs'); + if (!res.ok) return; + const data = await res.json() as { runs: BenchRun[] }; + setRuns(data.runs); + } catch { + // silent + } + }, []); + + const loadRunDetails = useCallback(async (runId: string) => { + try { + const res = await fetch(`/api/control/bench/runs/${runId}`); + if (!res.ok) return; + const data = await res.json() as { run: BenchRun; samples: BenchSample[] }; + setSelectedRun(data.run); + setSamples(data.samples); + setView('results'); + } catch { + // silent + } + }, []); + + const createSuite = async () => { + const promptTokens = suitePromptTokens.split(',').map((s) => parseInt(s.trim())).filter((n) => !isNaN(n)); + const genTokens = suiteGenTokens.split(',').map((s) => parseInt(s.trim())).filter((n) => !isNaN(n)); + const concurrency = suiteConcurrency.split(',').map((s) => parseInt(s.trim())).filter((n) => !isNaN(n)); + const repetitions = parseInt(suiteRepetitions) || 1; + + if (!suiteName || !suiteProvider || !suiteModel) return; + if (!promptTokens.length || !genTokens.length || !concurrency.length) return; + + try { + const res = await fetch('/api/control/bench/suite', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + name: suiteName, + providerId: suiteProvider, + model: suiteModel, + promptTokens, + genTokens, + concurrency, + repetitions, + }), + }); + if (res.ok) { + await loadSuites(); + setSuiteName(''); + } + } catch { + // silent + } + }; + + const runBench = async (suiteId: string) => { + setLoading(true); + setRunning(true); + try { + const res = await fetch('/api/control/bench/run', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ suiteId }), + }); + const data = await res.json().catch(() => ({})); + if (data.recentTraffic) { + setRecentTraffic(true); + } + } catch { + // silent + } finally { + setLoading(false); + } + + // Poll for completion + pollRef.current = setInterval(async () => { + await loadRuns(); + const latestRun = runs[0]; + if (latestRun && (latestRun.status === 'completed' || latestRun.status === 'failed')) { + if (pollRef.current) { + clearInterval(pollRef.current); + pollRef.current = null; + } + setRunning(false); + } + }, 2000); + + // Timeout after 10 minutes + setTimeout(() => { + if (pollRef.current) { + clearInterval(pollRef.current); + pollRef.current = null; + } + setRunning(false); + loadRuns(); + }, 600_000); + }; + + const loadBaselines = useCallback(async () => { + try { + const res = await fetch('/api/control/bench/baselines'); + if (!res.ok) return; + return await res.json() as { baselines: Array<{ providerId: string; model: string; aggregate: Record | null }> }; + } catch { + return { baselines: [] }; + } + }, []); + + const [baselines, setBaselines] = useState | null }>>([]); + + useEffect(() => { + loadBaselines().then((d) => setBaselines(d?.baselines ?? [])); + }, [loadBaselines]); + + const getRegressionFlag = (aggregate: Record | null, baselineAggregate: Record | null): 'baseline' | 'regression' | 'improvement' | null => { + if (!aggregate || !baselineAggregate) return null; + const currentGenTps = aggregate.avgGenTps as number | undefined; + const baselineGenTps = baselineAggregate.avgGenTps as number | undefined; + if (currentGenTps == null || baselineGenTps == null) return null; + // N5: guard against divide-by-zero. + if (baselineGenTps === 0) return null; + + const delta = (currentGenTps - baselineGenTps) / baselineGenTps; + if (delta < -0.1) return 'regression'; + if (delta > 0.05) return 'improvement'; + return 'baseline'; + }; + + const renderResultsChart = () => { + if (!chartRef.current || !samples.length) return; + + const instance = echarts.getInstanceByDom(chartRef.current); + if (instance) instance.dispose(); + + const theme = buildEChartsTheme(); + + // Group samples by concurrency, compute avg TTFT + const byConcurrency = new Map(); + for (const s of samples) { + if (!byConcurrency.has(s.concurrency)) { + byConcurrency.set(s.concurrency, { ttfts: [], genTps: [] }); + } + const group = byConcurrency.get(s.concurrency)!; + if (s.ttftMs != null) group.ttfts.push(s.ttftMs); + if (s.genTps != null) group.genTps.push(s.genTps); + } + + const sorted = Array.from(byConcurrency.entries()).sort((a, b) => a[0] - b[0]); + const concurrencies = sorted.map(([c]) => c); + const avgTtft = sorted.map(([, g]) => g.ttfts.length ? g.ttfts.reduce((a, b) => a + b, 0) / g.ttfts.length : 0); + const avgGenTps = sorted.map(([, g]) => g.genTps.length ? g.genTps.reduce((a, b) => a + b, 0) / g.genTps.length : 0); + + echarts.init(chartRef.current, theme as echarts.EChartsCoreOption).setOption({ + backgroundColor: 'transparent', + tooltip: { trigger: 'axis' }, + legend: { data: ['Avg TTFT (ms)', 'Avg Gen Tok/s'], textStyle: { color: '#9ca3af' } }, + grid: { left: 60, right: 30, top: 40, bottom: 40 }, + xAxis: { + type: 'category', + data: concurrencies.map(String), + name: 'Concurrency', + nameLocation: 'center', + nameGap: 30, + axisLabel: { color: '#9ca3af' }, + axisLine: { lineStyle: { color: '#374151' } }, + }, + yAxis: [ + { + type: 'value', + name: 'TTFT (ms)', + axisLabel: { color: '#9ca3af' }, + splitLine: { lineStyle: { color: '#1f2937' } }, + axisLine: { lineStyle: { color: '#374151' } }, + }, + { + type: 'value', + name: 'Gen Tok/s', + axisLabel: { color: '#9ca3af' }, + splitLine: { show: false }, + axisLine: { lineStyle: { color: '#374151' } }, + }, + ], + series: [ + { + name: 'Avg TTFT (ms)', + type: 'line', + data: avgTtft, + smooth: true, + lineStyle: { color: '#f59e0b' }, + itemStyle: { color: '#f59e0b' }, + }, + { + name: 'Avg Gen Tok/s', + type: 'line', + yAxisIndex: 1, + data: avgGenTps, + smooth: true, + lineStyle: { color: '#10b981' }, + itemStyle: { color: '#10b981' }, + }, + ], + }); + }; + + const renderHistoryChart = () => { + if (!historyChartRef.current || runs.length < 2) return; + + const instance = echarts.getInstanceByDom(historyChartRef.current); + if (instance) instance.dispose(); + + const theme = buildEChartsTheme(); + const completed = runs.filter((r) => r.status === 'completed' && r.aggregate); + + const labels = completed.map((r) => r.id.slice(0, 8)); + const genTpsData = completed.map((r) => (r.aggregate?.avgGenTps as number) ?? 0); + const ttftData = completed.map((r) => (r.aggregate?.avgTtftMs as number) ?? 0); + + echarts.init(historyChartRef.current, theme as echarts.EChartsCoreOption).setOption({ + backgroundColor: 'transparent', + tooltip: { trigger: 'axis' }, + legend: { data: ['Gen Tok/s', 'TTFT (ms)'], textStyle: { color: '#9ca3af' } }, + grid: { left: 60, right: 30, top: 40, bottom: 60 }, + xAxis: { + type: 'category', + data: labels, + axisLabel: { color: '#9ca3af', rotate: 45 }, + axisLine: { lineStyle: { color: '#374151' } }, + }, + yAxis: [ + { + type: 'value', + name: 'Gen Tok/s', + axisLabel: { color: '#9ca3af' }, + splitLine: { lineStyle: { color: '#1f2937' } }, + axisLine: { lineStyle: { color: '#374151' } }, + }, + { + type: 'value', + name: 'TTFT (ms)', + axisLabel: { color: '#9ca3af' }, + splitLine: { show: false }, + axisLine: { lineStyle: { color: '#374151' } }, + }, + ], + series: [ + { + name: 'Gen Tok/s', + type: 'line', + data: genTpsData, + smooth: true, + lineStyle: { color: '#10b981' }, + itemStyle: { color: '#10b981' }, + }, + { + name: 'TTFT (ms)', + type: 'line', + yAxisIndex: 1, + data: ttftData, + smooth: true, + lineStyle: { color: '#f59e0b' }, + itemStyle: { color: '#f59e0b' }, + }, + ], + }); + }; + + return ( +
+ {/* Sub-nav */} +
+ {[ + { id: 'launcher' as const, label: 'Launcher', icon: Play }, + { id: 'history' as const, label: 'History', icon: History }, + { id: 'results' as const, label: 'Results', icon: BarChart3 }, + ].map((tab) => ( + + ))} +
+ + {/* Launcher view */} + {view === 'launcher' && ( +
+ {/* Create suite form */} +
+

+ + New Suite +

+
+
+ + setSuiteName(e.target.value)} + className="w-full bg-muted/50 border border-border/50 rounded px-2 py-1 text-sm" + placeholder="my-bench" + /> +
+
+ + +
+
+ + setSuiteModel(e.target.value)} + className="w-full bg-muted/50 border border-border/50 rounded px-2 py-1 text-sm" + placeholder="llama-3.1-8b-q4" + /> +
+
+ + setSuiteRepetitions(e.target.value)} + className="w-full bg-muted/50 border border-border/50 rounded px-2 py-1 text-sm" + /> +
+
+ + setSuitePromptTokens(e.target.value)} + className="w-full bg-muted/50 border border-border/50 rounded px-2 py-1 text-sm" + /> +
+
+ + setSuiteGenTokens(e.target.value)} + className="w-full bg-muted/50 border border-border/50 rounded px-2 py-1 text-sm" + /> +
+
+ + setSuiteConcurrency(e.target.value)} + className="w-full bg-muted/50 border border-border/50 rounded px-2 py-1 text-sm" + /> +
+
+ +
+ + {/* Existing suites */} +
+ {suites.map((suite) => ( +
+
+
{suite.name}
+
+ {suite.providerId} / {suite.model} + {' '} + ({suite.promptTokens.join(',')}pt x {suite.genTokens.join(',')}gt x {suite.concurrency.join(',')}c) +
+
+ +
+ ))} +
+ + {recentTraffic && ( +
+ + Target host has recent traffic. Bench results may be affected. +
+ )} +
+ )} + + {/* History view */} + {view === 'history' && ( +
+ {runs.length >= 2 && ( +
+ )} +
+
+ {runs.map((run) => { + const suite = suites.find((s) => s.id === run.suiteId); + const flag = run.regressionFlag; + + return ( +
loadRunDetails(run.id)} + className="flex items-center justify-between p-3 bg-muted/20 rounded-lg border border-border/30 cursor-pointer hover:bg-muted/30 transition-colors" + > +
+
+ {run.id.slice(0, 12)} + + {run.status} + + {flag === 'regression' && ( + + + + )} + {flag === 'improvement' && ( + + + + )} +
+
+ {suite?.name} - {run.completedSamples}/{run.totalSamples} samples + {run.concurrentForeignRequests > 0 && ( + + ({run.concurrentForeignRequests} foreign reqs) + + )} +
+
+ {run.aggregate && ( +
+ {run.aggregate.avgGenTps != null && ( +
{(run.aggregate.avgGenTps as number).toFixed(1)} tok/s
+ )} + {run.aggregate.avgTtftMs != null && ( +
{(run.aggregate.avgTtftMs as number).toFixed(0)}ms TTFT
+ )} +
+ )} +
+ ); + })} +
+
+
+ )} + + {/* Results view */} + {view === 'results' && ( +
+ {selectedRun ? ( + <> +
+
+
+ {selectedRun.id.slice(0, 16)} - {selectedRun.completedSamples}/{selectedRun.totalSamples} samples + {selectedRun.concurrentForeignRequests > 0 && ( + + ({selectedRun.concurrentForeignRequests} concurrent foreign requests) + + )} +
+
+ + + + + + + + + + + + + + + + {samples.map((s) => ( + + + + + + + + + + + + ))} + +
PTGTConcRepTTFTTotalPrompt/sGen/sCache
{s.promptTokens}{s.genTokens}{s.concurrency}{s.repetition}{s.ttftMs?.toFixed(0) ?? '-'}{s.totalMs?.toFixed(0) ?? '-'}{s.promptTps?.toFixed(1) ?? '-'}{s.genTps?.toFixed(1) ?? '-'}{s.cacheN ?? '-'}
+
+
+ + ) : ( +
+ Select a run from History to view results +
+ )} +
+ )} +
+ ); +} diff --git a/apps/web/src/components/control/CaptureDrawer.tsx b/apps/web/src/components/control/CaptureDrawer.tsx new file mode 100644 index 0000000..1759a09 --- /dev/null +++ b/apps/web/src/components/control/CaptureDrawer.tsx @@ -0,0 +1,236 @@ +import { useEffect, useState, useCallback } from 'react'; +import { cn } from '@/lib/utils'; +import { X, ExternalLink, Copy } from 'lucide-react'; +import { codeToHtml } from 'shiki'; + +interface CaptureDrawerProps { + requestId: number; + providerId: string; + onClose: () => void; +} + +interface CaptureData { + id: number; + providerId: string; + timestamp: string; + model: string; + requestHeaders: Record; + requestBody: string; + responseHeaders: Record; + responseBody: string; + durationMs: number; + sizeBytes: number; +} + +export function CaptureDrawer({ requestId, providerId, onClose }: CaptureDrawerProps) { + const [capture, setCapture] = useState(null); + const [loading, setLoading] = useState(true); + const [error, setError] = useState(null); + const [activePanel, setActivePanel] = useState<'req' | 'resp'>('req'); + const [highlightedReq, setHighlightedReq] = useState(''); + const [highlightedResp, setHighlightedResp] = useState(''); + + useEffect(() => { + let cancelled = false; + async function fetchCapture() { + try { + const res = await fetch(`/api/control/capture/${providerId}/${requestId}`); + if (!res.ok) { + if (!cancelled) { + setError(res.status === 404 ? 'Capture not found' : `Fetch failed: ${res.status}`); + setLoading(false); + } + return; + } + const data = await res.json(); + if (!cancelled) { + setCapture(data); + setLoading(false); + } + } catch (err) { + if (!cancelled) { + setError((err as Error).message); + setLoading(false); + } + } + } + fetchCapture(); + return () => { cancelled = true; }; + }, [requestId, providerId]); + + useEffect(() => { + if (!capture) return; + const reqBody = capture.requestBody || '{}'; + const respBody = capture.responseBody || '{}'; + let cancelled = false; + async function highlight() { + try { + const reqHtml = await codeToHtml(reqBody, { + lang: 'json', + theme: 'github-dark', + }); + const respHtml = await codeToHtml(respBody, { + lang: 'json', + theme: 'github-dark', + }); + if (!cancelled) { + setHighlightedReq(reqHtml); + setHighlightedResp(respHtml); + } + } catch { + // Fallback to plain text + } + } + highlight(); + return () => { cancelled = true; }; + }, [capture]); + + const copyToClipboard = useCallback((text: string) => { + navigator.clipboard.writeText(text).catch(() => {}); + }, []); + + if (loading) { + return ( +
+
+
+

Loading capture...

+ +
+
+
+
+
+
+ ); + } + + if (error) { + return ( +
+
+
+

Capture Error

+ +
+

{error}

+
+
+ ); + } + + if (!capture) return null; + + return ( +
+
+ {/* Header */} +
+
+

Request Capture

+

+ {capture.model} · {capture.durationMs}ms · {(capture.sizeBytes / 1024).toFixed(1)}KB +

+
+
+ + +
+
+ + {/* Headers table */} +
+
+
+

Request Headers

+ +
+
+

Response Headers

+ +
+
+
+ + {/* Body panels */} +
+
+ + +
+ +
+
+
+
+
+
+
+ ); +} + +function HeadersTable({ headers }: { headers: Record }) { + const entries = Object.entries(headers); + if (entries.length === 0) { + return

No headers

; + } + return ( +
+ {entries.slice(0, 8).map(([key, value]) => ( +
+ {key} + {value} +
+ ))} + {entries.length > 8 && ( +

+{entries.length - 8} more

+ )} +
+ ); +} diff --git a/apps/web/src/components/control/EvalsTab.tsx b/apps/web/src/components/control/EvalsTab.tsx new file mode 100644 index 0000000..87b9d12 --- /dev/null +++ b/apps/web/src/components/control/EvalsTab.tsx @@ -0,0 +1,456 @@ +import { useState, useRef, useEffect, useCallback } from 'react'; +import * as echarts from 'echarts/core'; +import { ScatterChart, BarChart } from 'echarts/charts'; +import { CanvasRenderer } from 'echarts/renderers'; +import { GridComponent, TooltipComponent, LegendComponent, TitleComponent, DataZoomComponent } from 'echarts/components'; +import { buildEChartsTheme } from './buildEChartsTheme'; +import { + Play, + Loader2, + BarChart3, + Table, + Brain, + Code, + Trophy, +} from 'lucide-react'; + +echarts.use([ScatterChart, BarChart, CanvasRenderer, GridComponent, TooltipComponent, LegendComponent, TitleComponent, DataZoomComponent]); + +interface EvalsTabProps { + providerIds: string[]; +} + +interface EvalSuite { + id: string; + name: string; + kind: string; + version: number; + tasks: unknown[]; + judgeModel: string | null; + createdAt: string; +} + +interface EvalRun { + id: string; + suiteId: string; + jobType: string; + providerId: string; + model: string; + quant: string | null; + status: string; + judgeModel: string | null; + startedAt: string | null; + finishedAt: string | null; + totalTasks: number; + completedTasks: number; + aggregate: Record | null; + error: string | null; + createdAt: string; +} + +interface LeaderboardEntry { + providerId: string; + model: string; + quant: string | null; + suiteKind: string; + avgScore: number | null; + runCount: number; + latestRunAt: string; +} + +async function fetchSuites(): Promise { + const res = await fetch('/api/control/eval/suites'); + const data = await res.json() as { suites: EvalSuite[] }; + return data.suites ?? []; +} + +async function fetchRuns(suiteId?: string): Promise { + const url = suiteId ? `/api/control/eval/runs?suiteId=${suiteId}` : '/api/control/eval/runs'; + const res = await fetch(url); + const data = await res.json() as { runs: EvalRun[] }; + return data.runs ?? []; +} + +async function fetchLeaderboard(kind?: string): Promise { + const url = kind ? `/api/control/eval/leaderboard?kind=${kind}` : '/api/control/eval/leaderboard'; + const res = await fetch(url); + const data = await res.json() as { leaderboard: LeaderboardEntry[] }; + return data.leaderboard ?? []; +} + +async function runEval(suiteId: string, providerId: string, model: string): Promise { + const res = await fetch('/api/control/eval/run', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ suiteId, providerId, model }), + }); + if (!res.ok) { + throw new Error(`eval run failed: ${res.status}`); + } +} + +export function EvalsTab({ providerIds }: EvalsTabProps) { + const [suites, setSuites] = useState([]); + const [runs, setRuns] = useState([]); + const [leaderboard, setLeaderboard] = useState([]); + const [loading, setLoading] = useState(true); + const [running, setRunning] = useState(null); + const [activeView, setActiveView] = useState<'leaderboard' | 'runs' | 'scatter'>('leaderboard'); + const [suiteFilter, setSuiteFilter] = useState('all'); + const [kindFilter, setKindFilter] = useState('all'); + const scatterRef = useRef(null); + const barRef = useRef(null); + + const load = useCallback(async () => { + setLoading(true); + try { + const [suitesData, runsData, lbData] = await Promise.all([ + fetchSuites(), + fetchRuns(), + fetchLeaderboard(kindFilter !== 'all' ? kindFilter : undefined), + ]); + setSuites(suitesData); + setRuns(runsData); + setLeaderboard(lbData); + } catch (err) { + console.error('evals: load failed', err); + } finally { + setLoading(false); + } + }, [kindFilter]); + + useEffect(() => { + load(); + }, [load]); + + // Scatter chart: speed x quality + useEffect(() => { + if (!scatterRef.current || activeView !== 'scatter') return; + + const chart = echarts.init(scatterRef.current, buildEChartsTheme() as echarts.EChartsCoreOption); + + const scatterData = leaderboard.map((entry) => ({ + x: entry.avgScore ?? 0, + y: entry.runCount, + name: `${entry.model}${entry.quant ? ` (${entry.quant})` : ''}`, + providerId: entry.providerId, + suiteKind: entry.suiteKind, + })); + + const option: echarts.EChartsCoreOption = { + backgroundColor: 'transparent', + title: { + text: 'Quality vs Run Frequency', + left: 'center', + textStyle: { color: 'var(--foreground)', fontSize: 14 }, + }, + tooltip: { + trigger: 'item', + formatter: (p: { data: { name: string; providerId: string; x: number; y: number } }) => { + const d = p.data as { name: string; providerId: string; x: number; y: number }; + return `${d.name}
Provider: ${d.providerId}
Avg Score: ${d.x.toFixed(2)}
Runs: ${d.y}`; + }, + }, + legend: { + data: [...new Set(leaderboard.map((e) => e.providerId))], + textStyle: { color: 'var(--foreground)' }, + top: 30, + }, + grid: { left: 60, right: 30, top: 70, bottom: 50 }, + xAxis: { + name: 'Avg Score', + nameTextStyle: { color: 'var(--foreground)' }, + axisLabel: { color: 'var(--foreground)' }, + splitLine: { lineStyle: { color: 'var(--border, #333)' } }, + }, + yAxis: { + name: 'Run Count', + nameTextStyle: { color: 'var(--foreground)' }, + axisLabel: { color: 'var(--foreground)' }, + splitLine: { lineStyle: { color: 'var(--border, #333)' } }, + }, + series: [...new Set(leaderboard.map((e) => e.providerId))].map((pid, i) => ({ + type: 'scatter', + name: pid, + data: scatterData.filter((d) => d.providerId === pid).map((d) => [d.x, d.y, d.name]), + symbolSize: (val: number[]) => Math.max(8, (val[1] ?? 1) * 3), + itemStyle: { + color: ['#60a5fa', '#f472b6', '#34d399', '#fbbf24'][i % 4], + }, + })), + }; + + chart.setOption(option); + + const handleResize = () => chart.resize(); + window.addEventListener('resize', handleResize); + + return () => { + window.removeEventListener('resize', handleResize); + chart.dispose(); + }; + }, [leaderboard, activeView]); + + // Bar chart for leaderboard view + useEffect(() => { + if (!barRef.current || activeView !== 'leaderboard') return; + + const chart = echarts.init(barRef.current, buildEChartsTheme() as echarts.EChartsCoreOption); + + const sorted = [...leaderboard].sort((a, b) => (b.avgScore ?? 0) - (a.avgScore ?? 0)).slice(0, 20); + + const option: echarts.EChartsCoreOption = { + backgroundColor: 'transparent', + title: { + text: 'Model Leaderboard', + left: 'center', + textStyle: { color: 'var(--foreground)', fontSize: 14 }, + }, + tooltip: { + trigger: 'axis', + axisPointer: { type: 'shadow' }, + formatter: (params: unknown[]) => { + const p = params[0] as { name: string; value: number }; + return `${p.name}
Score: ${(p.value as number).toFixed(2)}`; + }, + }, + grid: { left: 120, right: 30, top: 60, bottom: 30 }, + xAxis: { + type: 'value', + axisLabel: { color: 'var(--foreground)' }, + splitLine: { lineStyle: { color: 'var(--border, #333)' } }, + }, + yAxis: { + type: 'category', + data: sorted.map((e) => e.model).reverse(), + axisLabel: { color: 'var(--foreground)', fontSize: 11 }, + axisLine: { lineStyle: { color: 'var(--border, #333)' } }, + }, + series: [{ + type: 'bar', + data: sorted.map((e) => e.avgScore ?? 0).reverse(), + itemStyle: { + color: (params: { dataIndex?: number }) => { + const idx = params.dataIndex ?? 0; + const score = sorted[sorted.length - 1 - idx]?.avgScore ?? 0; + if (score != null && score >= 0.8) return '#34d399'; + if (score != null && score >= 0.5) return '#60a5fa'; + return '#f87171'; + }, + }, + }], + }; + + chart.setOption(option); + + const handleResize = () => chart.resize(); + window.addEventListener('resize', handleResize); + + return () => { + window.removeEventListener('resize', handleResize); + chart.dispose(); + }; + }, [leaderboard, activeView]); + + const handleRunEval = async (suiteId: string, providerId: string, model: string) => { + const key = `${suiteId}-${providerId}-${model}`; + setRunning(key); + try { + await runEval(suiteId, providerId, model); + } catch (err) { + console.error('eval: run failed', err); + } finally { + setRunning(null); + } + }; + + if (loading) { + return ( +
+ +
+ ); + } + + return ( +
+ {/* View tabs */} +
+ + +
+
+ )} +
+
+ ); +} diff --git a/apps/web/src/components/control/FleetTab.tsx b/apps/web/src/components/control/FleetTab.tsx new file mode 100644 index 0000000..f878de5 --- /dev/null +++ b/apps/web/src/components/control/FleetTab.tsx @@ -0,0 +1,51 @@ +import { useState } from 'react'; +import { AnimatePresence } from 'framer-motion'; +import { Settings2 } from 'lucide-react'; +import { ControlFleetHost } from '@/hooks/useControlStream'; +import { HostCard } from './HostCard'; +import { HostConfigEditor } from './HostConfigEditor'; + +export interface GpuData { + vram_used: number; + vram_total: number; + temperature: number; + power: number; +} + +interface FleetTabProps { + hosts: ControlFleetHost[]; + gpuMap: Map; +} + +export function FleetTab({ hosts, gpuMap }: FleetTabProps) { + const [editing, setEditing] = useState(null); + + if (hosts.length === 0) { + return ( +
+

No hosts connected

+
+ ); + } + + return ( +
+ + {hosts.map((host) => ( +
+ + +
+ ))} + + {editing && setEditing(null)} />} +
+ ); +} diff --git a/apps/web/src/components/control/HostCard.tsx b/apps/web/src/components/control/HostCard.tsx new file mode 100644 index 0000000..4d67009 --- /dev/null +++ b/apps/web/src/components/control/HostCard.tsx @@ -0,0 +1,336 @@ +import { motion, AnimatePresence } from 'framer-motion'; +import { useState } from 'react'; +import { ControlFleetHost } from '@/hooks/useControlStream'; +import { useReducedMotion } from '@/hooks/useReducedMotion'; +import { VramGauge } from './VramGauge'; +import { TtlRing } from './TtlRing'; +import { cn } from '@/lib/utils'; +import type { GpuData } from './FleetTab'; +import { Play, Eraser } from 'lucide-react'; + +interface HostCardProps { + host: ControlFleetHost; + gpuData: GpuData | null; +} + +const STATE_COLORS: Record = { + starting: { bg: 'bg-amber-500', glowVar: '--glow-amber', animate: true }, + ready: { bg: 'bg-green-500', glowVar: '--glow-green', animate: false }, + error: { bg: 'bg-red-500', glowVar: '--glow-red', animate: false }, + down: { bg: 'bg-gray-500', glowVar: '--glow-gray', animate: false }, + stopped: { bg: 'bg-gray-400', glowVar: '--glow-gray', animate: false }, + stopping: { bg: 'bg-amber-400', glowVar: '--glow-amber', animate: true }, +}; + +const FALLBACK_STATE = { bg: 'bg-gray-500', glowVar: '--glow-gray', animate: false }; + +function relTime(iso: string | null): string { + if (!iso) return ''; + const diff = Date.now() - new Date(iso).getTime(); + const seconds = Math.floor(diff / 1000); + if (seconds < 60) return `${seconds}s ago`; + const minutes = Math.floor(seconds / 60); + if (minutes < 60) return `${minutes}m ago`; + const hours = Math.floor(minutes / 60); + if (hours < 24) return `${hours}h ago`; + const days = Math.floor(hours / 24); + return `${days}d ago`; +} + +function livenessLabel(state: string): string { + switch (state) { + case 'connected': return 'connected'; + case 'reconnecting': return 'reconnecting'; + case 'down': return 'down'; + default: return state; + } +} + +function getGlowColor(glowVar: string): string { + return getComputedStyle(document.documentElement).getPropertyValue(glowVar).trim(); +} + +export function HostCard({ host, gpuData }: HostCardProps) { + const reducedMotion = useReducedMotion(); + const livenessKey = host.liveness === 'connected' ? 'ready' : host.liveness === 'reconnecting' ? 'starting' : host.liveness; + const stateConfig = STATE_COLORS[livenessKey] ?? FALLBACK_STATE; + const glowColor = getGlowColor(stateConfig.glowVar); + + const vramUsed = gpuData?.vram_used ?? 0; + const vramTotal = gpuData?.vram_total ?? 0; + const gpuTemp = gpuData?.temperature ?? null; + const gpuPower = gpuData?.power ?? null; + + return ( + + {/* Header: provider ID + liveness chip + last seen */} +
+

{host.providerId}

+ + + + {livenessLabel(host.liveness)} + + + {host.liveness === 'down' && host.lastSeenAt && ( + + last seen {relTime(host.lastSeenAt)} + + )} + + + seq {host.seq} + +
+ +
+ {/* Left: VRAM gauge + GPU readouts */} +
+ {vramTotal > 0 ? ( + + ) : ( +
+ no GPU data +
+ )} + + {/* GPU readouts */} +
+ {gpuTemp != null && ( + + )} + {gpuPower != null && ( + + )} + +
+
+ + {/* Right: model chips + TTL rings */} +
+
+ Models +
+
+ + {host.models.map((m) => ( + + ))} + +
+ + {/* TTL rings */} + {host.models.some((m) => m.ttlDeadline) && ( +
+
+ TTL +
+
+ {host.models.filter((m) => m.ttlDeadline).map((m) => ( +
+ + + {m.model} + +
+ ))} +
+
+ )} +
+
+ + ); +} + +function GpuReadout({ label, value }: { label: string; value: string }) { + return ( +
+ + {label} + + + {value} + +
+ ); +} + +interface ModelChipProps { + model: { + model: string; + state: string; + ts: string; + ttlDeadline: string | null; + inflight: number; + }; +} + +function ModelChip({ model }: ModelChipProps) { + const reducedMotion = useReducedMotion(); + const stateConfig = STATE_COLORS[model.state] ?? FALLBACK_STATE; + const [actionError, setActionError] = useState(null); + const [confirmUnload, setConfirmUnload] = useState(false); + + // P2.2: Optimistic UI — API calls only, no local state mutation. + // The control_fleet delta from WS updates the UI. + const handleWarm = async () => { + try { + const res = await fetch('/api/control/action/submit', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ type: 'warm', providerId: model.model.split(':')[0], model: model.model }), + }); + if (!res.ok) { + const data = await res.json().catch(() => ({})); + setActionError(data.error || `Warm failed: ${res.status}`); + setTimeout(() => setActionError(null), 3000); + } + } catch { + setActionError('Network error'); + setTimeout(() => setActionError(null), 3000); + } + }; + + const handleUnload = async (confirmed: boolean) => { + try { + const res = await fetch('/api/control/action/submit', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + type: 'unload', + providerId: model.model.split(':')[0], + model: model.model, + confirmed, + }), + }); + if (!res.ok) { + const data = await res.json().catch(() => ({})); + if (data.requiresConfirmation) { + setConfirmUnload(true); + return; + } + setActionError(data.error || `Unload failed: ${res.status}`); + setTimeout(() => setActionError(null), 3000); + } else { + setConfirmUnload(false); + } + } catch { + setActionError('Network error'); + setTimeout(() => setActionError(null), 3000); + } + }; + + const handleConfirmedUnload = async () => { + await handleUnload(true); + setConfirmUnload(false); + }; + + return ( + + + {model.model} + {model.inflight > 0 && ( + + ({model.inflight}) + + )} + + {/* Action buttons — fire-and-forget, UI updates from control_fleet delta */} + + + + {actionError && ( + + {actionError} + + )} + + {confirmUnload && ( +
+

+ Model has active requests. Force unload? +

+
+ + +
+
+ )} + + ); +} diff --git a/apps/web/src/components/control/HostConfigEditor.tsx b/apps/web/src/components/control/HostConfigEditor.tsx new file mode 100644 index 0000000..f44c30e --- /dev/null +++ b/apps/web/src/components/control/HostConfigEditor.tsx @@ -0,0 +1,241 @@ +import { useCallback, useEffect, useState } from 'react'; +import { X, Loader2, Save, FileDown, GitCompare, CheckCircle2, AlertTriangle, ShieldCheck, Download } from 'lucide-react'; + +interface HostInfo { + providerId: string; + sshHost: string | null; + sshUser: string | null; + sshKeyPath: string | null; + configPath: string | null; + restartCmd: string | null; + sshMode: 'shell' | 'wrapper'; + sshConfigured: boolean; +} + +interface ApplyResult { + ok: boolean; + step: string; + backupPath?: string; + error?: string; + diff?: string; +} + +/** + * P9.1: SSH config editor for a single llama-swap host. Set SSH settings, load + * the remote config, validate against the fork schema, preview a diff, and apply + * (backup -> write -> restart -> health-wait) behind a confirmation. + */ +export function HostConfigEditor({ providerId, onClose }: { providerId: string; onClose: () => void }) { + const [host, setHost] = useState(null); + const [form, setForm] = useState>({}); + const [content, setContent] = useState(''); + const [busy, setBusy] = useState(null); + const [validation, setValidation] = useState<{ valid: boolean; errors: string[] } | null>(null); + const [diff, setDiff] = useState(null); + const [applyResult, setApplyResult] = useState(null); + const [message, setMessage] = useState(null); + const [pullRepo, setPullRepo] = useState(''); + const [pullMsg, setPullMsg] = useState(null); + + const loadHost = useCallback(async () => { + const res = await fetch('/api/control/hosts'); + const data = await res.json() as { hosts: HostInfo[] }; + const h = data.hosts.find((x) => x.providerId === providerId) ?? null; + setHost(h); + if (h) setForm({ sshHost: h.sshHost, sshUser: h.sshUser, sshKeyPath: h.sshKeyPath, configPath: h.configPath, restartCmd: h.restartCmd, sshMode: h.sshMode ?? 'shell' }); + }, [providerId]); + + useEffect(() => { void loadHost(); }, [loadHost]); + + const saveSettings = async () => { + setBusy('settings'); + setMessage(null); + try { + const res = await fetch(`/api/control/hosts/${providerId}`, { + method: 'PATCH', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(form), + }); + if (res.ok) { setMessage('SSH settings saved'); await loadHost(); } + else setMessage(`Save failed: ${res.status}`); + } finally { setBusy(null); } + }; + + const loadConfig = async () => { + setBusy('load'); + setMessage(null); + setDiff(null); setValidation(null); setApplyResult(null); + try { + const res = await fetch(`/api/control/hosts/${providerId}/config`); + const data = await res.json() as { content?: string; error?: string }; + if (res.ok && data.content != null) setContent(data.content); + else setMessage(data.error ?? `Load failed: ${res.status}`); + } finally { setBusy(null); } + }; + + const validate = async () => { + setBusy('validate'); + try { + const res = await fetch(`/api/control/hosts/${providerId}/config/validate`, { + method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ content }), + }); + setValidation(await res.json()); + } finally { setBusy(null); } + }; + + const showDiff = async () => { + setBusy('diff'); + try { + const res = await fetch(`/api/control/hosts/${providerId}/config/diff`, { + method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ content }), + }); + const data = await res.json() as { diff?: string; error?: string }; + setDiff(data.diff ?? data.error ?? '(no changes)'); + } finally { setBusy(null); } + }; + + const apply = async () => { + if (!confirm('Apply config: backup, write, restart llama-swap, and health-wait?')) return; + setBusy('apply'); + setApplyResult(null); + try { + const res = await fetch(`/api/control/hosts/${providerId}/config/apply`, { + method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ content, confirm: true }), + }); + setApplyResult(await res.json()); + } finally { setBusy(null); } + }; + + const pull = async () => { + const repo = pullRepo.trim(); + if (!repo) return; + setBusy('pull'); + setPullMsg(null); + try { + const res = await fetch(`/api/control/hosts/${providerId}/pull`, { + method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ repo }), + }); + const data = await res.json() as { jobId?: string; error?: string }; + setPullMsg(res.ok ? `queued (job ${data.jobId}) — watch Reports/Logs for progress` : (data.error ?? `failed: ${res.status}`)); + } finally { setBusy(null); } + }; + + return ( +
+
e.stopPropagation()} + > +
+

SSH config — {providerId}

+ +
+ +
+ {/* SSH settings */} +
+ {([ + ['sshHost', 'SSH host (Tailscale IP)'], + ['sshUser', 'SSH user'], + ['sshKeyPath', 'SSH key path (secrets/...)'], + ['configPath', 'Remote config path'], + ['restartCmd', 'Restart command (nssm/systemctl)'], + ] as const).map(([key, label]) => ( + setForm({ ...form, [key]: e.target.value })} + className="text-xs bg-background border border-border rounded-md px-2 py-1 font-mono" + /> + ))} + +
+
+ + + {!host?.sshConfigured && Set SSH host/user/key/config path, then save.} + {message && {message}} +
+ + {/* Editor */} +