@yeaft/webchat-agent 0.1.411 → 0.1.413

package/unify/llm/router.js

@@ -0,0 +1,148 @@
+/**
+ * router.js — AdapterRouter: routes LLM calls to the correct provider adapter
+ *
+ * Given a providers array from config.json:
+ *   [{ name, baseUrl, apiKey, protocol?, models[] }, ...]
+ *
+ * The router resolves model → provider, lazy-creates the right adapter
+ * (AnthropicAdapter or ChatCompletionsAdapter based on protocol), caches it,
+ * and forwards stream()/call() to the resolved adapter.
+ *
+ * protocol defaults to "openai" (Chat Completions API).
+ * Set protocol: "anthropic" only for direct Anthropic API connections.
+ */
+
+import { LLMAdapter } from './adapter.js';
+
+/**
+ * AdapterRouter — Implements LLMAdapter, routes by model → provider.
+ */
+export class AdapterRouter extends LLMAdapter {
+  /** @type {Map<string, object>} modelId → provider config */
+  #modelToProvider;
+
+  /** @type {Map<string, LLMAdapter>} providerName → cached adapter */
+  #adapterCache;
+
+  /** @type {object[]} raw providers array */
+  #providers;
+
+  /**
+   * @param {{ providers: object[], config?: object }} params
+   * @param {object[]} params.providers — Array of { name, baseUrl, apiKey, protocol?, models[] }
+   */
+  constructor({ providers }) {
+    super();
+    this.#providers = providers;
+    this.#modelToProvider = new Map();
+    this.#adapterCache = new Map();
+
+    // Build model → provider index
+    // First provider wins if model appears in multiple providers
+    for (const provider of providers) {
+      if (!Array.isArray(provider.models)) continue;
+      for (const modelId of provider.models) {
+        if (!this.#modelToProvider.has(modelId)) {
+          this.#modelToProvider.set(modelId, provider);
+        }
+      }
+    }
+  }
+
+  /**
+   * Resolve a model ID to its provider's adapter (lazy-created, cached).
+   *
+   * @param {string} modelId
+   * @returns {Promise<LLMAdapter>}
+   */
+  async #resolveAdapter(modelId) {
+    const provider = this.#modelToProvider.get(modelId);
+    if (!provider) {
+      throw new Error(
+        `Model "${modelId}" not found in any provider. ` +
+        `Available models: ${[...this.#modelToProvider.keys()].join(', ') || '(none)'}. ` +
+        `Check your config.json providers[].models arrays.`
+      );
+    }
+
+    // Check cache
+    const cached = this.#adapterCache.get(provider.name);
+    if (cached) return cached;
+
+    // Create adapter based on protocol
+    const protocol = provider.protocol || 'openai';
+    let adapter;
+
+    if (protocol === 'anthropic') {
+      const { AnthropicAdapter } = await import('./anthropic.js');
+      adapter = new AnthropicAdapter({
+        apiKey: provider.apiKey,
+        baseUrl: provider.baseUrl,
+      });
+    } else {
+      // Default: openai (Chat Completions API) — covers proxy, OpenAI, DeepSeek, Gemini, etc.
+      const { ChatCompletionsAdapter } = await import('./chat-completions.js');
+      adapter = new ChatCompletionsAdapter({
+        apiKey: provider.apiKey,
+        baseUrl: provider.baseUrl,
+      });
+    }
+
+    this.#adapterCache.set(provider.name, adapter);
+    return adapter;
+  }
+
+  /**
+   * Stream a model response — routes to the correct provider adapter.
+   *
+   * @param {import('./adapter.js').StreamParams} params
+   * @returns {AsyncGenerator<import('./adapter.js').StreamEvent>}
+   */
+  async *stream(params) {
+    const adapter = await this.#resolveAdapter(params.model);
+    yield* adapter.stream(params);
+  }
+
+  /**
+   * Make a single model call — routes to the correct provider adapter.
+   *
+   * @param {import('./adapter.js').CallParams} params
+   * @returns {Promise<{ text: string, usage: { inputTokens: number, outputTokens: number } }>}
+   */
+  async call(params) {
+    const adapter = await this.#resolveAdapter(params.model);
+    return adapter.call(params);
+  }
+
+  /**
+   * Get the provider config for a given model.
+   *
+   * @param {string} modelId
+   * @returns {object|null} — Provider config or null
+   */
+  getProviderForModel(modelId) {
+    return this.#modelToProvider.get(modelId) || null;
+  }
+
+  /**
+   * List all available models across all providers.
+   *
+   * @returns {{ modelId: string, providerName: string }[]}
+   */
+  listAvailableModels() {
+    const result = [];
+    for (const [modelId, provider] of this.#modelToProvider) {
+      result.push({ modelId, providerName: provider.name });
+    }
+    return result;
+  }
+
+  /**
+   * Get the raw providers config.
+   *
+   * @returns {object[]}
+   */
+  get providers() {
+    return this.#providers;
+  }
+}

package/unify/models.js

@@ -14,8 +14,9 @@
 
 /**
  * @typedef {Object} ModelInfo
- * @property {'anthropic' | 'chat-completions'} adapter — Which adapter to use
- * @property {string} baseUrl — API endpoint base URL
+ * @property {'anthropic' | 'openai' | 'deepseek' | 'google'} provider — Which provider this model belongs to
+ * @property {'anthropic' | 'chat-completions'} adapter — Which wire protocol to use
+ * @property {string} baseUrl — Official API endpoint base URL
  * @property {number} contextWindow — Max context tokens
  * @property {number} maxOutputTokens — Max output tokens
  * @property {string} displayName — Human-readable model name
@@ -25,6 +26,7 @@
 export const MODEL_REGISTRY = new Map([
   // ── Anthropic ──────────────────────────────────────────────────
   ['claude-sonnet-4-20250514', {
+    provider: 'anthropic',
     adapter: 'anthropic',
     baseUrl: 'https://api.anthropic.com',
     contextWindow: 200000,
@@ -32,6 +34,7 @@ export const MODEL_REGISTRY = new Map([
     displayName: 'Claude Sonnet 4',
   }],
   ['claude-opus-4-20250514', {
+    provider: 'anthropic',
     adapter: 'anthropic',
     baseUrl: 'https://api.anthropic.com',
     contextWindow: 200000,
@@ -39,6 +42,7 @@ export const MODEL_REGISTRY = new Map([
     displayName: 'Claude Opus 4',
   }],
   ['claude-haiku-3-20250414', {
+    provider: 'anthropic',
     adapter: 'anthropic',
     baseUrl: 'https://api.anthropic.com',
     contextWindow: 200000,
@@ -48,6 +52,7 @@ export const MODEL_REGISTRY = new Map([
 
   // ── OpenAI ─────────────────────────────────────────────────────
   ['gpt-5', {
+    provider: 'openai',
     adapter: 'chat-completions',
     baseUrl: 'https://api.openai.com/v1',
     contextWindow: 256000,
@@ -55,6 +60,7 @@ export const MODEL_REGISTRY = new Map([
     displayName: 'GPT-5',
   }],
   ['gpt-5.4', {
+    provider: 'openai',
     adapter: 'chat-completions',
     baseUrl: 'https://api.openai.com/v1',
     contextWindow: 272000,
@@ -62,6 +68,7 @@ export const MODEL_REGISTRY = new Map([
     displayName: 'GPT-5.4',
   }],
   ['gpt-4.1', {
+    provider: 'openai',
     adapter: 'chat-completions',
     baseUrl: 'https://api.openai.com/v1',
     contextWindow: 1047576,
@@ -69,6 +76,7 @@ export const MODEL_REGISTRY = new Map([
     displayName: 'GPT-4.1',
   }],
   ['gpt-4.1-mini', {
+    provider: 'openai',
     adapter: 'chat-completions',
     baseUrl: 'https://api.openai.com/v1',
     contextWindow: 1047576,
@@ -76,6 +84,7 @@ export const MODEL_REGISTRY = new Map([
     displayName: 'GPT-4.1 Mini',
   }],
   ['gpt-4.1-nano', {
+    provider: 'openai',
     adapter: 'chat-completions',
     baseUrl: 'https://api.openai.com/v1',
     contextWindow: 1047576,
@@ -83,6 +92,7 @@ export const MODEL_REGISTRY = new Map([
     displayName: 'GPT-4.1 Nano',
   }],
   ['o3', {
+    provider: 'openai',
     adapter: 'chat-completions',
     baseUrl: 'https://api.openai.com/v1',
     contextWindow: 200000,
@@ -90,6 +100,7 @@ export const MODEL_REGISTRY = new Map([
     displayName: 'o3',
   }],
   ['o4-mini', {
+    provider: 'openai',
     adapter: 'chat-completions',
     baseUrl: 'https://api.openai.com/v1',
     contextWindow: 200000,
@@ -99,6 +110,7 @@ export const MODEL_REGISTRY = new Map([
 
   // ── DeepSeek ───────────────────────────────────────────────────
   ['deepseek-chat', {
+    provider: 'deepseek',
     adapter: 'chat-completions',
     baseUrl: 'https://api.deepseek.com',
     contextWindow: 131072,
@@ -106,6 +118,7 @@ export const MODEL_REGISTRY = new Map([
     displayName: 'DeepSeek Chat',
   }],
   ['deepseek-reasoner', {
+    provider: 'deepseek',
     adapter: 'chat-completions',
     baseUrl: 'https://api.deepseek.com',
     contextWindow: 131072,
@@ -115,6 +128,7 @@ export const MODEL_REGISTRY = new Map([
 
   // ── Google (via OpenAI-compatible API) ─────────────────────────
   ['gemini-2.5-pro', {
+    provider: 'google',
     adapter: 'chat-completions',
     baseUrl: 'https://generativelanguage.googleapis.com/v1beta/openai',
     contextWindow: 1048576,
@@ -122,6 +136,7 @@ export const MODEL_REGISTRY = new Map([
     displayName: 'Gemini 2.5 Pro',
   }],
   ['gemini-2.5-flash', {
+    provider: 'google',
     adapter: 'chat-completions',
     baseUrl: 'https://generativelanguage.googleapis.com/v1beta/openai',
     contextWindow: 1048576,
@@ -165,3 +180,32 @@ export function listModels() {
 export function isKnownModel(modelName) {
   return MODEL_REGISTRY.has(modelName);
 }
+
+/**
+ * Get the provider name for a model.
+ *
+ * @param {string} modelName
+ * @returns {string|null} — Provider name ('anthropic', 'openai', 'deepseek', 'google') or null
+ */
+export function getProviderForModel(modelName) {
+  const info = MODEL_REGISTRY.get(modelName);
+  return info ? info.provider : null;
+}
+
+/**
+ * Parse a model reference in "providerName/modelId" format.
+ *
+ * @param {string} ref — e.g. "my-proxy/claude-sonnet-4-20250514" or "claude-sonnet-4-20250514"
+ * @returns {{ providerName: string|null, modelId: string }}
+ */
+export function parseModelRef(ref) {
+  if (!ref) return { providerName: null, modelId: '' };
+  const slashIdx = ref.indexOf('/');
+  if (slashIdx === -1) {
+    return { providerName: null, modelId: ref };
+  }
+  return {
+    providerName: ref.slice(0, slashIdx),
+    modelId: ref.slice(slashIdx + 1),
+  };
+}

package/unify/session.js

@@ -13,7 +13,7 @@
  * a fully wired Session ready for queries.
  */
 
-import { initYeaftDir } from './init.js';
+import { initYeaftDir, DEFAULT_YEAFT_DIR } from './init.js';
 import { loadConfig, loadMCPConfig } from './config.js';
 import { createTrace } from './debug-trace.js';
 import { createLLMAdapter } from './llm/adapter.js';
@@ -46,6 +46,7 @@ import exitWorktree from './tools/exit-worktree.js';
 /**
  * @typedef {Object} Session
  * @property {Engine} engine — The wired engine, ready for .query()
+ * @property {import('./llm/adapter.js').LLMAdapter} adapter — The LLM adapter
  * @property {object} config — Resolved configuration
  * @property {ConversationStore} conversationStore — Conversation persistence
  * @property {MemoryStore} memoryStore — Memory persistence
@@ -80,18 +81,21 @@ export async function loadSession(options = {}) {
     configOverrides = {},
   } = options;
 
-  // ─── 1. Load config (determines yeaftDir) ──────────────
+  // ─── 1. Determine yeaftDir + ensure directory structure ──
+  //        Must happen BEFORE loadConfig so that first-run
+  //        generates a default config.json that loadConfig can read.
   const overrides = { ...configOverrides };
   if (dir) overrides.dir = dir;
   if (model) overrides.model = model;
   if (language) overrides.language = language;
   if (debug !== undefined) overrides.debug = debug;
 
-  const config = loadConfig(overrides);
-  const yeaftDir = config.dir;
-
-  // ─── 2. Ensure directory structure ─────────────────────
+  const yeaftDir = overrides.dir || process.env.YEAFT_DIR || DEFAULT_YEAFT_DIR;
   initYeaftDir(yeaftDir);
+  overrides.dir = yeaftDir;
+
+  // ─── 2. Load config ───────────────────────────────────
+  const config = loadConfig(overrides);
 
   // ─── 3. Create debug trace ─────────────────────────────
   const trace = createTrace({
@@ -177,6 +181,7 @@ export async function loadSession(options = {}) {
 
   return {
     engine,
+    adapter,
     config,
     conversationStore,
     memoryStore,

package/unify/stop-hooks.js

@@ -23,6 +23,7 @@ import { checkDreamGate, incrementQueryCount, dream } from './memory/dream.js';
  *   memoryStore: import('./memory/store.js').MemoryStore,
  *   adapter: object,
  *   config: object,
+ *   primaryModel?: string,
  *   messages?: object[],
  *   taskId?: string,
  *   workerId?: string,
@@ -38,11 +39,15 @@ export async function runStopHooks(context) {
     memoryStore,
     adapter,
     config,
+    primaryModel,
     messages = [],
     taskId,
     trace,
   } = context;
 
+  // Model name for persisted messages: use primaryModel if provided, else config.model
+  const persistModel = primaryModel || config?.model;
+
   const result = {
     messagesPersisted: 0,
     consolidated: false,
@@ -65,7 +70,7 @@ export async function runStopHooks(context) {
             role: msg.role,
             content: typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content),
             mode,
-            model: config.model,
+            model: persistModel,
           });
           result.messagesPersisted++;
         }