From 076379bfc1395390fc50663918bfe925f2ac450d Mon Sep 17 00:00:00 2001 From: William Valentin Date: Mon, 23 Feb 2026 17:11:02 -0800 Subject: [PATCH] refactor(config): generate paas profile from default overlay --- config/paas.yaml | 131 +++++++++++++++++++++++---- config/profiles/paas.overlay.yaml | 25 +++++ docs/deployment/PAAS.md | 14 ++- package.json | 4 +- scripts/generate-config-profiles.mjs | 98 ++++++++++++++++++++ src/config/profileTemplates.test.ts | 15 +++ 6 files changed, 268 insertions(+), 19 deletions(-) create mode 100644 config/profiles/paas.overlay.yaml create mode 100644 scripts/generate-config-profiles.mjs create mode 100644 src/config/profileTemplates.test.ts diff --git a/config/paas.yaml b/config/paas.yaml index 506327a..8e6d5de 100644 --- a/config/paas.yaml +++ b/config/paas.yaml @@ -1,35 +1,134 @@ -# Flynn PaaS-friendly configuration template +# Flynn generated profile +# Profile: paas # -# Intended for: Fly.io / Railway / Render (or any platform that provides PORT). -# - Binds the gateway on all interfaces (required for container/PaaS routing). -# - Relies on `${ENV_VAR}` expansion so secrets stay in platform env vars. +# This file is auto-generated from: +# - config/default.yaml +# - config/profiles/paas.overlay.yaml # -# For a full example with more options, see: config/default.yaml - +# Do not edit this file directly. +# Regenerate with: pnpm config:profiles:generate +telegram: + bot_token: ${FLYNN_TELEGRAM_TOKEN} + allowed_chat_ids: [] server: + tailscale: + serve: false localhost: false - port: 18800 # Overridden by PORT env var when set. - + port: 18800 + max_request_body_bytes: 1048576 + ws_rate_limit: + enabled: true + capacity: 30 + refill_per_sec: 15 + max_violations: 8 + violation_window_ms: 10000 + queue: + mode: collect + cap: 50 + overflow: drop_old + debounce_ms: 0 + summarize_overflow: true + overrides: + channels: {} + sessions: {} + nodes: + enabled: false + allowed_roles: + - companion + feature_gates: {} + location: + enabled: false + push: + enabled: false + webchat_push: + enabled: false + max_subscriptions: 5000 + discovery: + enabled: false + service_name: flynn-gateway + service_type: _flynn._tcp + txt: {} models: - fast: - provider: anthropic - model: claude-haiku-4-5-20251001 - api_key: ${ANTHROPIC_API_KEY} default: provider: anthropic model: claude-sonnet-4-20250514 + auth_mode: api_key + api_key: ${ANTHROPIC_API_KEY} + fast: + provider: anthropic + model: claude-haiku-4-5-20251001 api_key: ${ANTHROPIC_API_KEY} complex: provider: anthropic model: claude-opus-4-6-20250715 api_key: ${ANTHROPIC_API_KEY} - -# Recommended safe defaults for internet-exposed deployments. + local: + provider: ollama + model: glm-4.7-flash + fallback_chain: + - local + local_providers: + ollama: + provider: ollama + model: glm-4.7-flash + endpoint: http://localhost:11434 + llamacpp: + provider: llamacpp + model: gpt-oss-20b + endpoint: http://localhost:8080 +hooks: + confirm: + - shell.* + - process.start + - process.kill + - browser.* + - message.send + - cron.create + - cron.delete + - file.write + - file.patch + log: + - web.* + - file.read + silent: + - notify +agents: + sensitive_mode: confirm_without_elevation +memory: + enabled: true + auto_extract: true + embedding: + enabled: true + provider: ollama + model: nomic-embed-text + endpoint: http://localhost:11434 + chunk_size: 512 + chunk_overlap: 50 + top_k: 5 + hybrid_weight: 0.7 +automation: + heartbeat: + enabled: true + interval: 5m + notify_cooldown: 30m + checks: + - gateway + - model + - channels + - memory + - disk + - process_memory + - backup + - provider_errors + failure_threshold: 2 + disk_threshold_mb: 100 + process_memory_threshold_mb: 1500 + backup_failure_threshold: 1 + provider_error_rate_threshold: 0.5 + provider_error_min_calls: 5 pairing: enabled: true - tools: profile: messaging - sandbox: enabled: true diff --git a/config/profiles/paas.overlay.yaml b/config/profiles/paas.overlay.yaml new file mode 100644 index 0000000..fbc6772 --- /dev/null +++ b/config/profiles/paas.overlay.yaml @@ -0,0 +1,25 @@ +# PaaS profile overlay. +# This file contains only overrides from config/default.yaml. + +models: + fast: + provider: anthropic + model: claude-haiku-4-5-20251001 + api_key: ${ANTHROPIC_API_KEY} + default: + provider: anthropic + model: claude-sonnet-4-20250514 + api_key: ${ANTHROPIC_API_KEY} + complex: + provider: anthropic + model: claude-opus-4-6-20250715 + api_key: ${ANTHROPIC_API_KEY} + +pairing: + enabled: true + +tools: + profile: messaging + +sandbox: + enabled: true diff --git a/docs/deployment/PAAS.md b/docs/deployment/PAAS.md index a40a5dc..4a01bae 100644 --- a/docs/deployment/PAAS.md +++ b/docs/deployment/PAAS.md @@ -7,7 +7,18 @@ Key requirements: - Bind on all interfaces: set `server.localhost: false`. - Use the platform port: Flynn supports `PORT` env override (it overrides `server.port`). -This repo includes a PaaS-friendly config template at `config/paas.yaml`. +This repo includes a PaaS-friendly config profile at `config/profiles/paas.overlay.yaml`. + +`config/paas.yaml` is generated from: +- `config/default.yaml` (canonical base) +- `config/profiles/paas.overlay.yaml` (PaaS overrides only) + +Regenerate/check with: + +```bash +pnpm config:profiles:generate +pnpm config:profiles:check +``` ## Fly.io @@ -53,4 +64,3 @@ Checklist: - Ensure your config binds externally (`server.localhost: false`) or use the baked-in `config/paas.yaml`. Optional blueprint: `deploy/render/render.yaml` - diff --git a/package.json b/package.json index 487e816..97cbb10 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,9 @@ "test": "vitest", "test:run": "vitest run", "lint": "eslint src/", - "typecheck": "tsc --noEmit" + "typecheck": "tsc --noEmit", + "config:profiles:generate": "node scripts/generate-config-profiles.mjs", + "config:profiles:check": "node scripts/generate-config-profiles.mjs --check" }, "keywords": [ "ai", diff --git a/scripts/generate-config-profiles.mjs b/scripts/generate-config-profiles.mjs new file mode 100644 index 0000000..aa8cd36 --- /dev/null +++ b/scripts/generate-config-profiles.mjs @@ -0,0 +1,98 @@ +#!/usr/bin/env node + +import { readFileSync, writeFileSync } from 'node:fs'; +import { resolve } from 'node:path'; +import { parse, stringify } from 'yaml'; + +const root = resolve(import.meta.dirname, '..'); +const basePath = resolve(root, 'config/default.yaml'); + +const profiles = [ + { + name: 'paas', + overlayPath: resolve(root, 'config/profiles/paas.overlay.yaml'), + outputPath: resolve(root, 'config/paas.yaml'), + }, +]; + +const checkOnly = process.argv.includes('--check'); + +function isObject(value) { + return Boolean(value) && typeof value === 'object' && !Array.isArray(value); +} + +function deepMerge(base, overlay) { + if (!isObject(base) || !isObject(overlay)) { + return overlay; + } + + const result = { ...base }; + for (const [key, value] of Object.entries(overlay)) { + if (isObject(value) && isObject(result[key])) { + result[key] = deepMerge(result[key], value); + continue; + } + result[key] = value; + } + return result; +} + +function sortObjectKeys(value) { + if (Array.isArray(value)) { + return value.map(sortObjectKeys); + } + if (!isObject(value)) { + return value; + } + const sorted = {}; + for (const key of Object.keys(value).sort()) { + sorted[key] = sortObjectKeys(value[key]); + } + return sorted; +} + +function stableStringify(value) { + return JSON.stringify(sortObjectKeys(value)); +} + +function buildHeader(profile) { + return [ + '# Flynn generated profile', + `# Profile: ${profile.name}`, + '#', + '# This file is auto-generated from:', + '# - config/default.yaml', + `# - config/profiles/${profile.name}.overlay.yaml`, + '#', + '# Do not edit this file directly.', + '# Regenerate with: pnpm config:profiles:generate', + '', + ].join('\n'); +} + +const baseConfig = parse(readFileSync(basePath, 'utf-8')); + +let hasDrift = false; +for (const profile of profiles) { + const overlayConfig = parse(readFileSync(profile.overlayPath, 'utf-8')); + const merged = deepMerge(baseConfig, overlayConfig); + const nextContent = buildHeader(profile) + stringify(merged, { + lineWidth: 0, + }); + + if (checkOnly) { + const existing = parse(readFileSync(profile.outputPath, 'utf-8')); + if (stableStringify(existing) !== stableStringify(merged)) { + console.error(`[drift] config/${profile.name}.yaml is out of date`); + hasDrift = true; + } + continue; + } + + writeFileSync(profile.outputPath, nextContent, 'utf-8'); + console.log(`[ok] generated config/${profile.name}.yaml`); +} + +if (checkOnly && hasDrift) { + process.exit(1); +} diff --git a/src/config/profileTemplates.test.ts b/src/config/profileTemplates.test.ts new file mode 100644 index 0000000..b9f3798 --- /dev/null +++ b/src/config/profileTemplates.test.ts @@ -0,0 +1,15 @@ +import { readFileSync } from 'fs'; +import { parse } from 'yaml'; +import { describe, expect, it } from 'vitest'; +import { deepMerge } from './loader.js'; + +describe('config profile templates', () => { + it('keeps config/paas.yaml in sync with default + paas overlay', () => { + const base = parse(readFileSync('config/default.yaml', 'utf-8')) as Record; + const overlay = parse(readFileSync('config/profiles/paas.overlay.yaml', 'utf-8')) as Record; + const generated = parse(readFileSync('config/paas.yaml', 'utf-8')) as Record; + const expected = deepMerge(base, overlay); + + expect(generated).toEqual(expected); + }); +});