circuschief 0.5.0 → 0.7.0

package/packages/server/src/db/ProjectDefaultsRepository.js

@@ -12,6 +12,7 @@ const UPSERT_FIELD_MAP = [
   { key: 'gitMode', column: 'git_mode' },
   { key: 'gitBranch', column: 'git_branch' },
   { key: 'model', column: 'model' },
+  { key: 'providerId', column: 'provider_id' },
   { key: 'effortLevel', column: 'effort_level' },
 ];
 
@@ -47,6 +48,7 @@ export class ProjectDefaultsRepository extends BaseRepository {
       gitMode: row.git_mode || null,
       gitBranch: row.git_branch || null,
       model: row.model || null,
+      providerId: row.provider_id || null,
       effortLevel: row.effort_level || null,
       createdAt: row.created_at,
       updatedAt: row.updated_at,
@@ -72,47 +74,53 @@ export class ProjectDefaultsRepository extends BaseRepository {
    * @param {Object} data - Defaults data (all fields optional)
    * @returns {Object} Updated defaults object
    */
+  #insertDefaults(projectId, data) {
+    const id = databaseManager.generateId();
+    const now = Date.now();
+
+    this.db
+      .prepare(
+        `INSERT INTO project_session_defaults
+         (id, project_id, mode, thinking_enabled, start_immediately, git_mode, git_branch, model, provider_id, effort_level, created_at, updated_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        id,
+        projectId,
+        data.mode || null,
+        data.thinkingEnabled !== undefined ? (data.thinkingEnabled ? 1 : 0) : null,
+        data.startImmediately !== undefined ? (data.startImmediately ? 1 : 0) : null,
+        data.gitMode || null,
+        data.gitBranch || null,
+        data.model || null,
+        data.providerId || null,
+        data.effortLevel || null,
+        now,
+        now
+      );
+  }
+
+  #updateDefaults(projectId, data) {
+    const { updates, values } = buildUpdateFields(data);
+
+    if (updates.length > 0) {
+      updates.push('updated_at = ?');
+      values.push(Date.now());
+      values.push(projectId);
+
+      this.db
+        .prepare(`UPDATE project_session_defaults SET ${updates.join(', ')} WHERE project_id = ?`)
+        .run(...values);
+    }
+  }
+
   upsert(projectId, data) {
-    // Get existing defaults if any
     const existing = this.getByProjectId(projectId);
 
     if (!existing) {
-      // Create new defaults record
-      const id = databaseManager.generateId();
-      const now = Date.now();
-
-      this.db
-        .prepare(
-          `INSERT INTO project_session_defaults
-           (id, project_id, mode, thinking_enabled, start_immediately, git_mode, git_branch, model, effort_level, created_at, updated_at)
-           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
-        )
-        .run(
-          id,
-          projectId,
-          data.mode || null,
-          data.thinkingEnabled !== undefined ? (data.thinkingEnabled ? 1 : 0) : null,
-          data.startImmediately !== undefined ? (data.startImmediately ? 1 : 0) : null,
-          data.gitMode || null,
-          data.gitBranch || null,
-          data.model || null,
-          data.effortLevel || null,
-          now,
-          now
-        );
+      this.#insertDefaults(projectId, data);
     } else {
-      // Update existing defaults
-      const { updates, values } = buildUpdateFields(data);
-
-      if (updates.length > 0) {
-        updates.push('updated_at = ?');
-        values.push(Date.now());
-        values.push(projectId);
-
-        this.db
-          .prepare(`UPDATE project_session_defaults SET ${updates.join(', ')} WHERE project_id = ?`)
-          .run(...values);
-      }
+      this.#updateDefaults(projectId, data);
     }
 
     return this.getByProjectId(projectId);
@@ -137,7 +145,8 @@ export class ProjectDefaultsRepository extends BaseRepository {
       .prepare(
         `UPDATE project_session_defaults
          SET mode = NULL, thinking_enabled = NULL, start_immediately = NULL,
-             git_mode = NULL, git_branch = NULL, model = NULL, effort_level = NULL, updated_at = ?
+             git_mode = NULL, git_branch = NULL, model = NULL, provider_id = NULL,
+             effort_level = NULL, updated_at = ?
          WHERE project_id = ?`
       )
       .run(Date.now(), projectId);
@@ -167,6 +176,7 @@ export class ProjectDefaultsRepository extends BaseRepository {
       gitMode: null,
       gitBranch: null,
       model: null,
+      providerId: null,
       effortLevel: null,
     };
   }

package/packages/server/src/db/ProviderRepository.js

@@ -2,6 +2,22 @@ import { BaseRepository } from './BaseRepository.js';
 import { databaseManager } from './DatabaseManager.js';
 import { encrypt, decrypt } from '../services/encryption.js';
 
+/**
+ * Valid values for `providers.kind`. Maps 1:1 to an agent adapter:
+ *   - 'anthropic' → 'claude-code'
+ *   - 'openai'    → 'codex'
+ */
+export const PROVIDER_KINDS = Object.freeze(['anthropic', 'openai']);
+
+/**
+ * Mapping from provider kind to the agent adapter that should drive sessions
+ * backed by that provider.
+ */
+export const AGENT_TYPE_BY_KIND = Object.freeze({
+  anthropic: 'claude-code',
+  openai: 'codex',
+});
+
 /**
  * Provider repository class (replaces ModelProviderRepository).
  *
@@ -11,6 +27,8 @@ import { encrypt, decrypt } from '../services/encryption.js';
  * - No auto-sync logic (#syncDefaultModels removed)
  * - Auth tokens are encrypted at rest (AES-256-GCM via encryption service)
  * - `getProviderByModelId` includes models (needed for buildProviderEnv)
+ * - Providers carry a `kind` (`'anthropic'` | `'openai'`) that selects the
+ *   agent adapter and env-var convention. `kind` is **immutable** after create.
  */
 export class ProviderRepository extends BaseRepository {
   constructor() {
@@ -27,6 +45,7 @@ export class ProviderRepository extends BaseRepository {
       apiTimeoutMs: row.api_timeout_ms,
       additionalEnvVars: row.additional_env_vars ? JSON.parse(row.additional_env_vars) : null,
       isBuiltIn: row.is_built_in === 1,
+      kind: row.kind || 'anthropic',
       createdAt: row.created_at,
       updatedAt: row.updated_at,
     };
@@ -64,12 +83,20 @@ export class ProviderRepository extends BaseRepository {
       authToken = null,
       apiTimeoutMs = null,
       additionalEnvVars = null,
+      kind = 'anthropic',
     } = data;
 
+    // Application-layer validation: give a clear error ahead of the DB CHECK.
+    if (!PROVIDER_KINDS.includes(kind)) {
+      throw new Error(
+        `Invalid provider kind "${kind}". Must be one of: ${PROVIDER_KINDS.join(', ')}.`
+      );
+    }
+
     this.db
       .prepare(
-        `INSERT INTO providers (id, name, base_url, auth_token, api_timeout_ms, additional_env_vars, created_at, updated_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
+        `INSERT INTO providers (id, name, base_url, auth_token, api_timeout_ms, additional_env_vars, kind, created_at, updated_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
       )
       .run(
         id,
@@ -78,6 +105,7 @@ export class ProviderRepository extends BaseRepository {
         encrypt(authToken),
         apiTimeoutMs,
         additionalEnvVars ? JSON.stringify(additionalEnvVars) : null,
+        kind,
         now,
         now
       );
@@ -115,6 +143,15 @@ export class ProviderRepository extends BaseRepository {
    * @returns {Object} Updated provider (with models array)
    */
   update(id, data) {
+    // `kind` is immutable after create. Existing models + env wiring depend on it,
+    // so changing it in place would silently corrupt sessions already attached to
+    // this provider.
+    if (data && Object.prototype.hasOwnProperty.call(data, 'kind')) {
+      throw new Error(
+        "Provider kind is immutable after create. Delete and recreate the provider to change kind."
+      );
+    }
+
     const updates = [];
     const values = [];
 
@@ -279,12 +316,15 @@ export class ProviderRepository extends BaseRepository {
       return null;
     }
 
-    // Find which provider owns this model ID
+    // Prefer custom providers over built-ins for duplicate model IDs. This
+    // preserves user-managed OpenAI providers (alternate base URLs, keys, or
+    // env vars) even when official OpenAI models are also seeded built-ins.
     const row = this.db
       .prepare(
         `SELECT p.id FROM providers p
          JOIN provider_models pm ON p.id = pm.provider_id
-         WHERE pm.model_id = ?`
+         WHERE pm.model_id = ?
+         ORDER BY p.is_built_in ASC, p.name ASC`
       )
       .get(modelId);
 
@@ -297,11 +337,27 @@ export class ProviderRepository extends BaseRepository {
     const provider = this.getById(row.id);
     if (!provider) return null;
 
-    // Built-in Anthropic provider falls through to SDK defaults
-    if (provider.isBuiltIn) {
+    // Built-in **Anthropic** provider falls through to SDK defaults (keeps
+    // historical behavior of letting @anthropic-ai/claude-agent-sdk pick its
+    // own env). Built-in OpenAI (or any future non-Anthropic built-in) still
+    // needs its env vars to flow, so we return the provider object.
+    if (provider.isBuiltIn && provider.kind === 'anthropic') {
       return null;
     }
 
     return provider;
   }
+
+  /**
+   * Resolve a provider's agent type from its id.
+   * @param {string|null|undefined} providerId
+   * @returns {string|null} 'claude-code' for anthropic-kind, 'codex' for openai-kind,
+   *   or null if the provider is unknown.
+   */
+  getAgentTypeForProvider(providerId) {
+    if (!providerId) return null;
+    const provider = this.getById(providerId);
+    if (!provider) return null;
+    return AGENT_TYPE_BY_KIND[provider.kind] || null;
+  }
 }

package/packages/server/src/db/SessionRepository.js

@@ -1,6 +1,6 @@
 import { BaseRepository } from './BaseRepository.js';
 import { databaseManager } from './DatabaseManager.js';
-import { messages, conversations } from './index.js';
+import { messages, conversations, modelProviders } from './index.js';
 import {
   ACTIVITY_FIELDS_SQL,
   mapTokenUsage,
@@ -9,6 +9,26 @@ import {
   buildUpdateClauses,
 } from './session-helpers.js';
 
+const DEFAULT_AGENT_TYPE = 'claude-code';
+
+/**
+ * Resolve the agent type ('claude-code' or 'codex') from a model ID by looking
+ * up which provider owns the model. This is the same logic as
+ * sessionProvider.resolveAgentTypeFromModel but inlined here to avoid a
+ * circular dependency:
+ *   database.js (index) → SessionRepository → sessionProvider → database.js
+ * @param {string|null} modelId
+ * @returns {'claude-code'|'codex'}
+ */
+function resolveAgentTypeFromModel(modelId) {
+  if (!modelId) return DEFAULT_AGENT_TYPE;
+  const provider = modelProviders.getProviderByModelId(modelId);
+  if (!provider) return DEFAULT_AGENT_TYPE;
+  // ProviderRepository.getAgentTypeForProvider maps kind → agent adapter
+  const agentType = modelProviders.getAgentTypeForProvider(provider.id);
+  return agentType || DEFAULT_AGENT_TYPE;
+}
+
 /**
  * Session repository class
  */
@@ -25,6 +45,7 @@ export class SessionRepository extends BaseRepository {
       status: row.status,
       mode: row.mode,
       model: row.model,
+      providerId: row.provider_id || null,
       thinkingEnabled: Boolean(row.thinking_enabled),
       archived: Boolean(row.archived),
       starred: Boolean(row.starred),
@@ -42,6 +63,8 @@ export class SessionRepository extends BaseRepository {
       effortLevel: row.effort_level || null,
       autoSendPendingPrompt: Boolean(row.auto_send_pending_prompt),
       slashCommands: row.slash_commands || null,
+      // Agent runtime driving this session (fallback to 'claude-code' for legacy rows).
+      agentType: row.agent_type || DEFAULT_AGENT_TYPE,
       ...mapTokenUsage(row),
       ...mapScheduling(row),
       // Kanban fields
@@ -49,7 +72,7 @@ export class SessionRepository extends BaseRepository {
       laneTriggerDepth: row.lane_trigger_depth || 0,
       createdAt: row.created_at,
       updatedAt: row.updated_at,
-      lastActivityAt: row.last_activity_at || row.updated_at || row.created_at,
+      lastActivityAt: row.last_activity_at ?? null,
       activeTimeMs: row.active_time_ms || 0,
     };
   }
@@ -62,18 +85,39 @@ export class SessionRepository extends BaseRepository {
     return this.map(row);
   }
 
-  /** Create a new session with optional config (mode, thinkingEnabled, gitBranch, parentSessionId, status, model, effortLevel) */
+  /** Create a new session with optional config (mode, thinkingEnabled, gitBranch, parentSessionId, status, model, providerId, effortLevel, agentType) */
   create(projectId, name, prompt, options = {}) {
     const config = parseCreateConfig(options, Array.prototype.slice.call(arguments, 4));
 
+    // Resolve agentType: explicit override → model-based derivation → fallback
+    const agentType =
+      config.agentType
+      ?? (config.model ? resolveAgentTypeFromModel(config.model) : null)
+      ?? DEFAULT_AGENT_TYPE;
+
     const id = databaseManager.generateId();
     const now = Date.now();
     this.db
       .prepare(
-        `INSERT INTO sessions (id, project_id, name, status, mode, thinking_enabled, git_branch, parent_session_id, model, effort_level, created_at, updated_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+        `INSERT INTO sessions (id, project_id, name, status, mode, thinking_enabled, git_branch, parent_session_id, model, provider_id, effort_level, agent_type, created_at, updated_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
       )
-      .run(id, projectId, name, config.status, config.mode, config.thinkingEnabled ? 1 : 0, config.gitBranch, config.parentSessionId, config.model, config.effortLevel, now, now);
+      .run(
+        id,
+        projectId,
+        name,
+        config.status,
+        config.mode,
+        config.thinkingEnabled ? 1 : 0,
+        config.gitBranch,
+        config.parentSessionId,
+        config.model,
+        config.providerId,
+        config.effortLevel,
+        agentType,
+        now,
+        now
+      );
 
     // Create initial conversation
     const conversation = conversations.create(id, 'Initial', true);
@@ -103,6 +147,7 @@ export class SessionRepository extends BaseRepository {
 
     sql += ` ORDER BY
       starred DESC,
+      COALESCE(last_activity_at, updated_at, created_at) DESC,
       updated_at DESC,
       created_at DESC,
       rowid DESC`;
@@ -141,7 +186,7 @@ export class SessionRepository extends BaseRepository {
         `SELECT s.*, p.name as project_name, p.working_directory as project_working_directory, ${ACTIVITY_FIELDS_SQL}
          FROM sessions s JOIN projects p ON s.project_id = p.id
          WHERE s.status IN ('starting', 'running', 'waiting') AND s.archived = 0
-         ORDER BY s.starred DESC, s.updated_at DESC, s.created_at DESC, s.rowid DESC`
+         ORDER BY s.starred DESC, COALESCE(last_activity_at, s.updated_at, s.created_at) DESC, s.updated_at DESC, s.created_at DESC, s.rowid DESC`
       )
       .all();
     return rows.map(row => ({
@@ -157,7 +202,7 @@ export class SessionRepository extends BaseRepository {
       .prepare(
         `SELECT s.*, ${ACTIVITY_FIELDS_SQL} FROM sessions s
          WHERE parent_session_id = ?
-         ORDER BY updated_at DESC, created_at DESC, rowid DESC`
+         ORDER BY COALESCE(last_activity_at, updated_at, created_at) DESC, updated_at DESC, created_at DESC, rowid DESC`
       )
       .all(parentSessionId);
     return this.mapAll(rows);
@@ -213,6 +258,18 @@ export class SessionRepository extends BaseRepository {
     return this.getById(id);
   }
 
+  /**
+   * Touch a session to update its updated_at timestamp without changing other fields.
+   * This is used to mark a session as recently active (e.g., when a message is added).
+   * @param {string} id - Session ID
+   * @returns {Object|null} The updated session or null if not found
+   */
+  touch(id) {
+    const now = Date.now();
+    this.db.prepare('UPDATE sessions SET updated_at = ? WHERE id = ?').run(now, id);
+    return this.getById(id);
+  }
+
   /** Duplicate a session with a new ID and reset state (does NOT handle git or conversation setup) */
   duplicate(sourceSessionId, { name } = {}) {
     const source = this.getById(sourceSessionId);
@@ -227,10 +284,10 @@ export class SessionRepository extends BaseRepository {
     // Insert new session with same settings but new ID and status
     this.db
       .prepare(
-        `INSERT INTO sessions (id, project_id, name, status, mode, thinking_enabled, git_branch, model, effort_level, context_window,
-                               input_tokens, output_tokens, cache_read_input_tokens, cache_creation_input_tokens,
+        `INSERT INTO sessions (id, project_id, name, status, mode, thinking_enabled, git_branch, model, provider_id, effort_level, agent_type, context_window,
+                               input_tokens, output_tokens, thinking_tokens, cache_read_input_tokens, cache_creation_input_tokens,
                                web_search_requests, cost_usd, created_at, updated_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
       )
       .run(
         id,
@@ -241,10 +298,13 @@ export class SessionRepository extends BaseRepository {
         source.thinkingEnabled ? 1 : 0,
         source.gitBranch,  // Copy branch name (NOT worktree path)
         source.model,
+        source.providerId,
         source.effortLevel,
+        source.agentType || DEFAULT_AGENT_TYPE,
         source.contextWindow,
         source.inputTokens,
         source.outputTokens,
+        source.thinkingTokens,
         source.cacheReadInputTokens,
         source.cacheCreationInputTokens,
         source.webSearchRequests,
@@ -261,7 +321,7 @@ export class SessionRepository extends BaseRepository {
     const rows = this.db
       .prepare(
         `SELECT s.*, ${ACTIVITY_FIELDS_SQL} FROM sessions s
-         WHERE pr_url IS NOT NULL ORDER BY updated_at DESC, created_at DESC, rowid DESC`
+         WHERE pr_url IS NOT NULL ORDER BY COALESCE(last_activity_at, updated_at, created_at) DESC, updated_at DESC, created_at DESC, rowid DESC`
       )
       .all();
     return this.mapAll(rows);
@@ -270,11 +330,11 @@ export class SessionRepository extends BaseRepository {
   updateUsage(id, usage) {
     this.db
       .prepare(
-        `UPDATE sessions SET input_tokens = ?, output_tokens = ?, cache_read_input_tokens = ?,
+        `UPDATE sessions SET input_tokens = ?, output_tokens = ?, thinking_tokens = ?, cache_read_input_tokens = ?,
           cache_creation_input_tokens = ?, web_search_requests = ?, context_window = ?, updated_at = ?
         WHERE id = ?`
       )
-      .run(usage.inputTokens, usage.outputTokens, usage.cacheReadInputTokens,
+      .run(usage.inputTokens, usage.outputTokens, usage.thinkingTokens || 0, usage.cacheReadInputTokens,
         usage.cacheCreationInputTokens, usage.webSearchRequests, usage.contextWindow, Date.now(), id);
     return this.getById(id);
   }

package/packages/server/src/db/SettingsRepository.js

@@ -5,6 +5,13 @@ const TOKEN_WEIGHTS_KEY = 'token_cost_weights';
 const SUMMARY_SETTINGS_KEY = 'summary_settings';
 const GENERAL_SETTINGS_KEY = 'general_settings';
 
+const DEFAULT_SUMMARY_SETTINGS = Object.freeze({
+  disableSessionSummaries: false,
+  sessionTitlePrompt: '',
+  summaryModel: '',
+  summaryProviderId: null,
+});
+
 /**
  * Settings repository for managing application-wide settings
  */
@@ -114,22 +121,13 @@ export class SettingsRepository {
   getSummarySettings() {
     const value = this.get(SUMMARY_SETTINGS_KEY);
     if (!value) {
-      return {
-        disableSessionSummaries: false,
-        sessionTitlePrompt: '',
-      };
+      return { ...DEFAULT_SUMMARY_SETTINGS };
     }
     try {
       const parsed = JSON.parse(value);
-      return {
-        disableSessionSummaries: parsed.disableSessionSummaries || false,
-        sessionTitlePrompt: parsed.sessionTitlePrompt || '',
-      };
+      return normalizeStoredSummarySettings(parsed);
     } catch {
-      return {
-        disableSessionSummaries: false,
-        sessionTitlePrompt: '',
-      };
+      return { ...DEFAULT_SUMMARY_SETTINGS };
     }
   }
 
@@ -138,11 +136,22 @@ export class SettingsRepository {
    * @param {Object} settings - Summary settings
    * @param {boolean} settings.disableSessionSummaries - Disable session summaries
    * @param {string} settings.sessionTitlePrompt - Custom session title prompt
+   * @param {string} [settings.summaryModel] - Summary model id; empty string means auto
+   * @param {string|null} [settings.summaryProviderId] - Provider id owning summaryModel
    */
   setSummarySettings(settings) {
+    const summaryModel = String(settings.summaryModel || '');
+    const summaryProviderId = typeof settings.summaryProviderId === 'string'
+      ? settings.summaryProviderId
+      : null;
+    if (summaryModel && !summaryProviderId) {
+      throw new Error('summaryProviderId is required when summaryModel is set');
+    }
     const validated = {
       disableSessionSummaries: Boolean(settings.disableSessionSummaries),
       sessionTitlePrompt: String(settings.sessionTitlePrompt || ''),
+      summaryModel,
+      summaryProviderId: summaryModel ? summaryProviderId : null,
     };
     this.set(SUMMARY_SETTINGS_KEY, JSON.stringify(validated));
     return validated;
@@ -154,10 +163,7 @@ export class SettingsRepository {
    */
   resetSummarySettings() {
     this.delete(SUMMARY_SETTINGS_KEY);
-    return {
-      disableSessionSummaries: false,
-      sessionTitlePrompt: '',
-    };
+    return { ...DEFAULT_SUMMARY_SETTINGS };
   }
 
   // General Settings
@@ -209,3 +215,25 @@ export class SettingsRepository {
     };
   }
 }
+
+function normalizeStoredSummarySettings(parsed) {
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    return { ...DEFAULT_SUMMARY_SETTINGS };
+  }
+
+  const summaryModel = typeof parsed.summaryModel === 'string' ? parsed.summaryModel : '';
+  const summaryProviderId = typeof parsed.summaryProviderId === 'string' && parsed.summaryProviderId
+    ? parsed.summaryProviderId
+    : null;
+
+  if (summaryModel && !summaryProviderId) {
+    return { ...DEFAULT_SUMMARY_SETTINGS };
+  }
+
+  return {
+    disableSessionSummaries: Boolean(parsed.disableSessionSummaries),
+    sessionTitlePrompt: typeof parsed.sessionTitlePrompt === 'string' ? parsed.sessionTitlePrompt : '',
+    summaryModel,
+    summaryProviderId: summaryModel ? summaryProviderId : null,
+  };
+}

package/packages/server/src/db/conversation-helpers.js

@@ -22,6 +22,7 @@ export function mapConversationRow(row) {
     // Token usage fields
     inputTokens: row.input_tokens || 0,
     outputTokens: row.output_tokens || 0,
+    thinkingTokens: row.thinking_tokens || 0,
     cacheReadInputTokens: row.cache_read_input_tokens || 0,
     cacheCreationInputTokens: row.cache_creation_input_tokens || 0,
     webSearchRequests: row.web_search_requests || 0,

package/packages/server/src/db/migrations/conversationsMigrations.js

@@ -113,6 +113,10 @@ export const conversationsMigrations = [
     name: 'conversations-add-output_tokens',
     up(db) { addColumnIfMissing(db, TABLE_CONVERSATIONS, 'output_tokens', COL_INTEGER_DEFAULT_0); },
   },
+  {
+    name: 'conversations-add-thinking_tokens',
+    up(db) { addColumnIfMissing(db, TABLE_CONVERSATIONS, 'thinking_tokens', COL_INTEGER_DEFAULT_0); },
+  },
   {
     name: 'conversations-add-cache_read_input_tokens',
     up(db) { addColumnIfMissing(db, TABLE_CONVERSATIONS, 'cache_read_input_tokens', COL_INTEGER_DEFAULT_0); },

package/packages/server/src/db/migrations/index.js

@@ -114,6 +114,7 @@ export const allMigrations = validateMigrations([
   c.get('conversations-add-claude_session_id'),
   c.get('conversations-add-input_tokens'),
   c.get('conversations-add-output_tokens'),
+  c.get('conversations-add-thinking_tokens'),
   c.get('conversations-add-cache_read_input_tokens'),
   c.get('conversations-add-cache_creation_input_tokens'),
   c.get('conversations-add-web_search_requests'),
@@ -123,6 +124,7 @@ export const allMigrations = validateMigrations([
   // --- Sessions token usage ---
   s.get('sessions-add-input_tokens'),
   s.get('sessions-add-output_tokens'),
+  s.get('sessions-add-thinking_tokens'),
   s.get('sessions-add-cache_read_input_tokens'),
   s.get('sessions-add-cache_creation_input_tokens'),
   s.get('sessions-add-web_search_requests'),
@@ -168,7 +170,9 @@ export const allMigrations = validateMigrations([
 
   // --- Providers + provider_models tables + seed ---
   m.get('providers-create-tables'),
+  m.get('providers-add-kind'),
   m.get('providers-seed-built-in'),
+  m.get('providers-seed-built-in-openai'),
 
   // --- Sessions provider_id (from providers FK) ---
   s.get('sessions-add-provider_id-from-providers'),

package/packages/server/src/db/migrations/miscMigrations.js

@@ -4,12 +4,13 @@
  * Each export is an array of { name, up(db) } migration objects.
  */
 import { randomUUID } from 'node:crypto';
+import { OPENAI_MODELS } from '../../../../shared/src/index.js';
 import { addColumnIfMissing, tableExists } from './migrationUtils.js';
 
 /**
  * Seed the built-in Anthropic provider if it doesn't exist.
  */
-function seedBuiltInProvider(db) {
+function seedBuiltInAnthropicProvider(db) {
   const providerId = 'anthropic-default';
 
   const existing = db
@@ -43,6 +44,35 @@ function seedBuiltInProvider(db) {
   }
 }
 
+/**
+ * Seed the built-in OpenAI/Codex provider if it doesn't exist.
+ */
+function seedBuiltInOpenAIProvider(db) {
+  const providerId = 'openai-default';
+  const now = Date.now();
+
+  db.prepare(
+    `INSERT OR IGNORE INTO providers (
+       id, name, base_url, auth_token, kind, is_built_in, created_at, updated_at
+     )
+     VALUES (?, ?, NULL, NULL, 'openai', 1, ?, ?)`
+  ).run(providerId, 'OpenAI (Official)', now, now);
+
+  const insertModel = db.prepare(
+    `INSERT OR IGNORE INTO provider_models (id, provider_id, model_id, display_name, description, tier, created_at)
+     VALUES (?, ?, ?, ?, ?, 'custom', ?)`
+  );
+
+  for (const model of OPENAI_MODELS) {
+    insertModel.run(model.seedId, providerId, model.id, model.name, model.description, now);
+  }
+}
+
+function seedBuiltInProviders(db) {
+  seedBuiltInAnthropicProvider(db);
+  seedBuiltInOpenAIProvider(db);
+}
+
 /**
  * Update built-in models to 4.6 versions.
  */
@@ -217,6 +247,7 @@ export const miscMigrations = [
           api_timeout_ms INTEGER,
           additional_env_vars TEXT,
           is_built_in INTEGER NOT NULL DEFAULT 0,
+          kind TEXT NOT NULL DEFAULT 'anthropic' CHECK(kind IN ('anthropic','openai')),
           created_at INTEGER NOT NULL DEFAULT (unixepoch() * 1000),
           updated_at INTEGER NOT NULL DEFAULT (unixepoch() * 1000)
         );
@@ -235,10 +266,29 @@ export const miscMigrations = [
     },
   },
 
-  // --- Seed built-in provider ---
+  // --- Add `kind` column to providers (for DBs that predate the CREATE TABLE change) ---
+  {
+    name: 'providers-add-kind',
+    up(db) {
+      addColumnIfMissing(
+        db,
+        'providers',
+        'kind',
+        "TEXT NOT NULL DEFAULT 'anthropic' CHECK(kind IN ('anthropic','openai'))"
+      );
+    },
+  },
+
+  // --- Seed built-in providers ---
   {
     name: 'providers-seed-built-in',
-    up(db) { seedBuiltInProvider(db); },
+    up(db) { seedBuiltInProviders(db); },
+  },
+
+  // --- Seed built-in OpenAI provider for DBs that already ran the original seed ---
+  {
+    name: 'providers-seed-built-in-openai',
+    up(db) { seedBuiltInOpenAIProvider(db); },
   },
 
   // --- Update built-in models to 4.6 ---