mixdog 0.7.18 → 0.8.1

package/setup/config-merge.mjs

@@ -1,246 +0,0 @@
-/**
- * Setup UI config merge helpers (importable without starting setup-server).
- */
-import { applyDefaults as applyChannelsDefaults } from '../src/channels/lib/config.mjs';
-import {
-  SECRET_ACCOUNTS,
-  saveSecret,
-  deleteSecret,
-  hasStoredSecret,
-  getDiscordToken,
-  getWebhookAuthtoken,
-  getSearchApiKey,
-  getAgentApiKey,
-  diagnoseDiscordTokenValue,
-  AGENT_PROVIDER_ENV,
-} from '../src/shared/config.mjs';
-
-const SUPPORTED_PROVIDERS = [
-  'anthropic-oauth', 'openai-oauth', 'openai-api', 'gemini-api', 'xai-api', 'grok-oauth',
-  'tavily', 'firecrawl', 'exa',
-];
-
-function envSecretPresent(account) {
-  const key = 'MIXDOG_' + String(account || '').replace(/[.\s]+/g, '_').toUpperCase();
-  if (process.env[key]) return true;
-  const agentMatch = String(account || '').match(/^agent\.([^.]+)\.apiKey$/);
-  if (agentMatch) {
-    const std = AGENT_PROVIDER_ENV[agentMatch[1]];
-    if (std && process.env[std]) return true;
-  }
-  return false;
-}
-
-function getSecretByAccount(account) {
-  if (account === SECRET_ACCOUNTS.discordToken) return getDiscordToken();
-  if (account === SECRET_ACCOUNTS.webhookAuth) return getWebhookAuthtoken();
-  const searchMatch = String(account || '').match(/^search\.([^.]+)\.apiKey$/);
-  if (searchMatch) return getSearchApiKey(searchMatch[1]);
-  const agentMatch = String(account || '').match(/^agent\.([^.]+)\.apiKey$/);
-  if (agentMatch) return getAgentApiKey(agentMatch[1]);
-  return null;
-}
-
-function keychainSecretPresent(account) {
-  if (hasStoredSecret(account)) return true;
-  if (envSecretPresent(account)) return false;
-  return !!getSecretByAccount(account);
-}
-
-function saveSecretChecked(account, rawValue, label) {
-  const value = typeof rawValue === 'string' ? rawValue.trim() : '';
-  if (!value) {
-    return { attempted: false, stored: keychainSecretPresent(account), env: envSecretPresent(account), inputLength: 0 };
-  }
-  saveSecret(account, value);
-  const stored = keychainSecretPresent(account);
-  if (!stored && !envSecretPresent(account)) {
-    throw new Error(`${label}: keychain write completed but secret is not readable`);
-  }
-  return { attempted: true, stored, env: envSecretPresent(account), inputLength: value.length };
-}
-
-function deleteSecretIfCurrentValue(account, value) {
-  if (!value) return false;
-  try {
-    if (getSecretByAccount(account) !== value) return false;
-    deleteSecret(account);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function saveDiscordTokenChecked(rawValue, config) {
-  const value = typeof rawValue === 'string' ? rawValue.trim() : '';
-  if (!value) {
-    return { attempted: false, stored: keychainSecretPresent(SECRET_ACCOUNTS.discordToken), env: envSecretPresent(SECRET_ACCOUNTS.discordToken), inputLength: 0 };
-  }
-  const problem = diagnoseDiscordTokenValue(value, config || {});
-  if (problem) {
-    const removed = deleteSecretIfCurrentValue(SECRET_ACCOUNTS.discordToken, value);
-    throw new Error(`channels.discord.token: ${problem}${removed ? ' Removed the invalid saved value.' : ''}`);
-  }
-  return saveSecretChecked(SECRET_ACCOUNTS.discordToken, value, 'channels.discord.token');
-}
-
-// Shallow merge that preserves keys the incoming payload omits. BOTH sides are
-// normalized to plain objects first so a stray array/string (on either side)
-// can never spread into numeric keys (e.g. ['x'] -> {0:'x'}).
-const plainObject = (o) => (o && typeof o === 'object' && !Array.isArray(o)) ? o : {};
-export const mergeKept = (existing, incoming) => ({ ...plainObject(existing), ...plainObject(incoming) });
-
-/** schedules/<name>/config.json — partial UI/skill saves must keep unmanaged keys (cron, timezone, secret, …). */
-export function mergeEndpointConfig(existing, incoming) {
-  return mergeKept(existing, incoming);
-}
-
-/** webhooks/<name>/config.json — merge then pin dispatch role invariant. */
-export function mergeWebhookEndpointConfig(existing, incoming) {
-  const merged = mergeEndpointConfig(existing, incoming);
-  merged.role = 'webhook-handler';
-  return merged;
-}
-
-export function mergeAgentConfig(existing, data, secretReport = {}) {
-  // Shallow copy of existing preserves unmanaged top-level keys; providers
-  // deep-merge per-key (partial save must not wipe other providers).
-  const config = { ...existing };
-  config.providers = { ...(config.providers || {}) };
-  if (data.providers) {
-    for (const [name, val] of Object.entries(data.providers)) {
-      if (!val || typeof val !== 'object') continue;
-      config.providers[name] = { ...(config.providers[name] || {}) };
-      for (const [k, v] of Object.entries(val)) {
-        if (v === undefined) continue;
-        if (k === 'apiKey') {
-          secretReport[`agent.${name}.apiKey`] = saveSecretChecked(SECRET_ACCOUNTS.agentApiKey(name), v, `agent.${name}.apiKey`);
-          continue;
-        }
-        config.providers[name][k] = v;
-      }
-    }
-  }
-  if (data.bridge && typeof data.bridge === 'object') {
-    config.bridge = { ...(config.bridge || {}), ...data.bridge };
-  }
-  return config;
-}
-
-export function mergeMemoryConfig(existing, incoming, secretReport = {}) {
-  // Field-wise partial updates + deep-merge providers (same preserve rules as agent).
-  const config = { ...existing };
-  if (incoming.enabled !== undefined) config.enabled = incoming.enabled;
-  if (incoming.cycle1) {
-    if (!config.cycle1) config.cycle1 = {};
-    if (incoming.cycle1.interval !== undefined) config.cycle1.interval = incoming.cycle1.interval;
-    if (incoming.cycle1.timeout !== undefined) config.cycle1.timeout = incoming.cycle1.timeout;
-    if (incoming.cycle1.batchSize !== undefined) config.cycle1.batchSize = incoming.cycle1.batchSize;
-  }
-  if (incoming.cycle2) {
-    if (!config.cycle2) config.cycle2 = {};
-    if (incoming.cycle2.interval !== undefined) config.cycle2.interval = incoming.cycle2.interval;
-  }
-  if (incoming.user) {
-    if (!config.user) config.user = { name: '', title: '' };
-    if (incoming.user.name !== undefined) config.user.name = incoming.user.name;
-    if (incoming.user.title !== undefined) config.user.title = incoming.user.title;
-  }
-  if (incoming.providers) {
-    config.providers = { ...(config.providers || {}) };
-    for (const [name, val] of Object.entries(incoming.providers)) {
-      if (!val || typeof val !== 'object') continue;
-      config.providers[name] = { ...(config.providers[name] || {}) };
-      for (const [k, v] of Object.entries(val)) {
-        if (v === undefined) continue;
-        if (k === 'apiKey') {
-          secretReport[`memory.${name}.apiKey`] = saveSecretChecked(SECRET_ACCOUNTS.agentApiKey(name), v, `memory.${name}.apiKey`);
-          continue;
-        }
-        config.providers[name][k] = v;
-      }
-    }
-  }
-  return config;
-}
-
-export function mergeSearchConfig(existing, data, secretReport = {}) {
-  // Partial field updates; models shallow-merge; modelOptions replaces per-family
-  // entries intentionally so the UI can clear a family's overrides.
-  const config = { ...existing };
-  if (!config.rawSearch) config.rawSearch = {};
-  if (!config.rawSearch.credentials) config.rawSearch.credentials = {};
-  if (data.provider !== undefined && SUPPORTED_PROVIDERS.includes(data.provider)) {
-    config.provider = data.provider;
-  }
-  if (data.maxResults !== undefined) config.rawSearch.maxResults = data.maxResults;
-  if (data.requestTimeoutMs !== undefined) config.requestTimeoutMs = data.requestTimeoutMs;
-  if (data.crawl !== undefined) config.crawl = data.crawl;
-  if (data.models !== undefined && typeof data.models === 'object') {
-    config.models = { ...(config.models || {}), ...data.models };
-  }
-  if (data.modelOptions !== undefined && typeof data.modelOptions === 'object') {
-    config.modelOptions = { ...(config.modelOptions || {}) };
-    for (const [fam, opts] of Object.entries(data.modelOptions)) {
-      if (opts && typeof opts === 'object' && Object.keys(opts).length > 0) {
-        config.modelOptions[fam] = { ...opts };
-      } else {
-        delete config.modelOptions[fam];
-      }
-    }
-  }
-  for (const [id, key] of Object.entries(data.searchProviders || {})) {
-    if (!config.rawSearch.credentials[id]) config.rawSearch.credentials[id] = {};
-    secretReport[`search.${id}.apiKey`] = saveSecretChecked(SECRET_ACCOUNTS.searchApiKey(id), key, `search.${id}.apiKey`);
-    delete config.rawSearch.credentials[id].apiKey;
-  }
-  return config;
-}
-
-export function mergeConfig(existing, data, secretReport = {}) {
-  const config = { ...existing };
-
-  config.backend = 'discord';
-
-  if (data.discord) {
-    config.discord = { ...config.discord };
-    if (Object.prototype.hasOwnProperty.call(data.discord, 'token')) {
-      const tokenConfig = {
-        ...config,
-        discord: { ...(config.discord || {}), ...data.discord },
-        channelsConfig: data.channelsConfig || config.channelsConfig,
-        mainChannel: data.mainChannel || config.mainChannel,
-      };
-      secretReport['channels.discord.token'] = saveDiscordTokenChecked(data.discord.token, tokenConfig);
-      delete config.discord.token;
-    }
-    if (data.discord.applicationId) config.discord.applicationId = data.discord.applicationId;
-  }
-
-  if (data.channelsConfig && Object.keys(data.channelsConfig).length > 0) {
-    // Intentional full replace: deleting a channel in the UI must remove its row;
-    // shallow merge would leave stale channel entries on disk.
-    config.channelsConfig = data.channelsConfig;
-  }
-  if (data.mainChannel) config.mainChannel = data.mainChannel;
-  if (data.access) config.access = mergeKept(config.access, data.access);
-  if (data.voice) config.voice = mergeKept(config.voice, data.voice);
-  if (data.schedules) config.schedules = mergeKept(config.schedules, data.schedules);
-  if (data.webhook) {
-    const { authtoken, ...webhookRest } = data.webhook;
-    if (Object.prototype.hasOwnProperty.call(data.webhook, 'authtoken')) {
-      secretReport['channels.webhook.authtoken'] = saveSecretChecked(SECRET_ACCOUNTS.webhookAuth, authtoken, 'channels.webhook.authtoken');
-    }
-    // Strip any plaintext authtoken from the on-disk webhook BEFORE merging so
-    // the secret is never re-persisted to config JSON (keychain-only invariant
-    // that the prior full-replace path enforced implicitly).
-    const { authtoken: _existingAuth, ...existingWebhook } = config.webhook || {};
-    config.webhook = mergeKept(existingWebhook, webhookRest);
-  }
-  if (data.quiet) {
-    config.quiet = applyChannelsDefaults({ ...config, quiet: mergeKept(config.quiet, data.quiet) }).quiet;
-  }
-
-  return config;
-}
-