circuschief 0.6.0 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "circuschief",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Local-first web UI for managing Claude Code sessions",
   "type": "module",
   "bin": {

package/packages/server/src/api/projects-session-helpers.js

@@ -44,6 +44,26 @@ export function resolveDefault(explicit, projectDefault, systemDefault) {
   return systemDefault;
 }
 
+/**
+ * Normalize provider IDs from JSON or multipart request fields.
+ * @param {*} value - Raw providerId value
+ * @returns {string|null|undefined}
+ */
+export function normalizeProviderId(value) {
+  if (value === undefined) return undefined;
+  if (value === null || value === '') return null;
+  if (typeof value !== 'string') {
+    throw new TypeError('providerId must be a string or null');
+  }
+  return value;
+}
+
+function resolveProviderDefault(explicit, projectDefault, systemDefault) {
+  if (explicit !== undefined) return explicit;
+  if (projectDefault !== undefined && projectDefault !== null) return projectDefault;
+  return systemDefault ?? null;
+}
+
 /**
  * Resolve thinkingEnabled with special boolean handling.
  * @param {object} body - Request body
@@ -114,11 +134,16 @@ export function prepareSessionConfig(body, projectDefs, systemDefaults) {
     effortLevel = null;
   }
 
+  const explicitProviderId = normalizeProviderId(body.providerId);
+  const projectProviderId = normalizeProviderId(projectDefs?.providerId);
+  const systemProviderId = normalizeProviderId(systemDefaults.providerId);
+
   return {
     prompt: body.prompt,
     name: body.name,
     mode: resolveDefault(body.mode, projectDefs?.mode, systemDefaults.mode),
     model: resolveDefault(body.model, projectDefs?.model, systemDefaults.model || null),
+    providerId: resolveProviderDefault(explicitProviderId, projectProviderId, systemProviderId),
     effortLevel,
     gitBranch: resolveDefault(body.gitBranch, projectDefs?.gitBranch, null),
     gitMode: resolveDefault(body.gitMode, projectDefs?.gitMode, null),

package/packages/server/src/api/projects.js

@@ -243,6 +243,7 @@ function createSessionRow(projectId, config, nextTemplateId, initialStatus) {
     parentSessionId: config.parentSessionId,
     status: initialStatus,
     model: config.model,
+    providerId: config.providerId,
     effortLevel: config.effortLevel,
     agentType: config.agentType,
   });

package/packages/server/src/api/sessions-draft.js

@@ -57,6 +57,7 @@ router.post('/:id/start', requireSession, async (req, res) => {
     const updatedSession = await startDraft(req.session_, {
       prompt: req.body.prompt,
       model: req.body.model,
+      providerId: req.body.providerId,
     });
 
     res.json({ success: true, session: updatedSession });

package/packages/server/src/api/settings.js

@@ -1,8 +1,9 @@
 import { Router } from 'express';
-import { settings } from '../db/index.js';
+import { modelProviders, settings } from '../db/index.js';
 import { DEFAULT_SESSION_TITLE_PROMPT } from '../services/summaryService.js';
 
 const router = Router();
+const SUPPORTED_SUMMARY_PROVIDER_KINDS = new Set(['anthropic', 'openai']);
 
 /**
  * GET /api/settings/token-weights
@@ -93,19 +94,42 @@ router.get('/summary', (req, res) => {
  */
 router.put('/summary', (req, res) => {
   try {
-    const { disableSessionSummaries, sessionTitlePrompt } = req.body;
+    const body = req.body || {};
+    const {
+      disableSessionSummaries,
+      sessionTitlePrompt,
+      summaryModel,
+      summaryProviderId,
+    } = body;
 
     // Validate that all required fields are present
     if (typeof disableSessionSummaries !== 'boolean' ||
-        typeof sessionTitlePrompt !== 'string') {
+        typeof sessionTitlePrompt !== 'string' ||
+        !Object.prototype.hasOwnProperty.call(body, 'summaryModel') ||
+        !Object.prototype.hasOwnProperty.call(body, 'summaryProviderId')) {
       return res.status(400).json({
-        error: 'Invalid summary settings. disableSessionSummaries must be a boolean, sessionTitlePrompt must be a string'
+        error: 'Invalid summary settings. disableSessionSummaries must be a boolean, sessionTitlePrompt must be a string, summaryModel must be present, and summaryProviderId must be present'
       });
     }
 
+    if (typeof summaryModel !== 'string') {
+      return res.status(400).json({ error: 'summaryModel must be a string' });
+    }
+
+    if (summaryProviderId !== null && typeof summaryProviderId !== 'string') {
+      return res.status(400).json({ error: 'summaryProviderId must be a string or null' });
+    }
+
+    const validationError = validateSummaryModelSelection(summaryModel, summaryProviderId);
+    if (validationError) {
+      return res.status(400).json({ error: validationError });
+    }
+
     const updatedSettings = settings.setSummarySettings({
       disableSessionSummaries,
       sessionTitlePrompt,
+      summaryModel,
+      summaryProviderId,
     });
 
     // Include the default prompt for UI display/editing
@@ -119,6 +143,30 @@ router.put('/summary', (req, res) => {
   }
 });
 
+function validateSummaryModelSelection(summaryModel, summaryProviderId) {
+  if (!summaryModel) {
+    if (summaryProviderId !== null) {
+      return 'summaryProviderId must be null when summaryModel is empty';
+    }
+    return null;
+  }
+
+  if (!summaryProviderId) {
+    return 'summaryProviderId is required when summaryModel is set';
+  }
+
+  const provider = modelProviders.getById(summaryProviderId);
+  if (!provider) return `Unknown summary provider: ${summaryProviderId}`;
+  if (!SUPPORTED_SUMMARY_PROVIDER_KINDS.has(provider.kind || 'anthropic')) {
+    return `Unsupported summary provider kind: ${provider.kind}`;
+  }
+  const ownsModel = provider.models?.some((model) => model.modelId === summaryModel);
+  if (!ownsModel) {
+    return `Provider ${summaryProviderId} does not own summary model ${summaryModel}`;
+  }
+  return null;
+}
+
 /**
  * DELETE /api/settings/summary
  * Reset summary settings to defaults

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

@@ -237,6 +237,7 @@ export class ConversationRepository extends BaseRepository {
    * @param {Object} usage - Usage data
    * @param {number} usage.inputTokens
    * @param {number} usage.outputTokens
+   * @param {number} usage.thinkingTokens
    * @param {number} usage.cacheReadInputTokens
    * @param {number} usage.cacheCreationInputTokens
    * @param {number} usage.webSearchRequests
@@ -255,6 +256,7 @@ export class ConversationRepository extends BaseRepository {
         `UPDATE conversations SET
           input_tokens = ?,
           output_tokens = ?,
+          thinking_tokens = ?,
           cache_read_input_tokens = ?,
           cache_creation_input_tokens = ?,
           web_search_requests = ?,
@@ -265,6 +267,7 @@ export class ConversationRepository extends BaseRepository {
       .run(
         usage.inputTokens,
         usage.outputTokens,
+        usage.thinkingTokens || 0,
         usage.cacheReadInputTokens,
         usage.cacheCreationInputTokens,
         usage.webSearchRequests,
@@ -290,9 +293,12 @@ export class ConversationRepository extends BaseRepository {
       const now = Date.now();
 
       this.db
-        .prepare(
-          `INSERT INTO conversations (id, session_id, name, summary, is_active, created_at, updated_at)
-           VALUES (?, ?, ?, ?, ?, ?, ?)`
+      .prepare(
+          `INSERT INTO conversations (id, session_id, name, summary, is_active,
+                                      input_tokens, output_tokens, thinking_tokens,
+                                      cache_read_input_tokens, cache_creation_input_tokens,
+                                      web_search_requests, context_window, created_at, updated_at)
+           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
         )
         .run(
           id,
@@ -300,6 +306,13 @@ export class ConversationRepository extends BaseRepository {
           conv.name,
           conv.summary,
           conv.isActive ? 1 : 0,
+          conv.inputTokens,
+          conv.outputTokens,
+          conv.thinkingTokens,
+          conv.cacheReadInputTokens,
+          conv.cacheCreationInputTokens,
+          conv.webSearchRequests,
+          conv.contextWindow,
           now,
           now
         );

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/SessionRepository.js

@@ -45,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),
@@ -84,7 +85,7 @@ export class SessionRepository extends BaseRepository {
     return this.map(row);
   }
 
-  /** Create a new session with optional config (mode, thinkingEnabled, gitBranch, parentSessionId, status, model, effortLevel, agentType) */
+  /** 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));
 
@@ -98,8 +99,8 @@ export class SessionRepository extends BaseRepository {
     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, agent_type, 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,
@@ -111,6 +112,7 @@ export class SessionRepository extends BaseRepository {
         config.gitBranch,
         config.parentSessionId,
         config.model,
+        config.providerId,
         config.effortLevel,
         agentType,
         now,
@@ -282,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, agent_type, 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,
@@ -296,11 +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,
@@ -326,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'),

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

@@ -32,6 +32,7 @@ const SESSIONS_BASE_COLUMNS = `
     parent_session_id TEXT REFERENCES sessions(id) ON DELETE SET NULL,
     input_tokens INTEGER DEFAULT 0,
     output_tokens INTEGER DEFAULT 0,
+    thinking_tokens INTEGER DEFAULT 0,
     cache_read_input_tokens INTEGER DEFAULT 0,
     cache_creation_input_tokens INTEGER DEFAULT 0,
     web_search_requests INTEGER DEFAULT 0,
@@ -59,7 +60,7 @@ const SESSIONS_ALL_COLUMNS = [
   'id', 'project_id', 'name', 'status', 'mode', 'thinking_enabled',
   'git_branch', 'git_worktree', 'pr_url', 'error', 'effort_level',
   'cost_usd', 'claude_session_id', 'model', 'next_template_id',
-  'parent_session_id', 'input_tokens', 'output_tokens',
+  'parent_session_id', 'input_tokens', 'output_tokens', 'thinking_tokens',
   'cache_read_input_tokens', 'cache_creation_input_tokens',
   'web_search_requests', 'context_window', 'archived', 'starred',
   'manually_named', 'scheduled_at', 'reschedule_delay_minutes',
@@ -211,6 +212,10 @@ export const sessionsMigrations = [
     name: 'sessions-add-output_tokens',
     up(db) { addColumnIfMissing(db, TABLE_SESSIONS, 'output_tokens', COL_INTEGER_DEFAULT_0); },
   },
+  {
+    name: 'sessions-add-thinking_tokens',
+    up(db) { addColumnIfMissing(db, TABLE_SESSIONS, 'thinking_tokens', COL_INTEGER_DEFAULT_0); },
+  },
   {
     name: 'sessions-add-cache_read_input_tokens',
     up(db) { addColumnIfMissing(db, TABLE_SESSIONS, 'cache_read_input_tokens', COL_INTEGER_DEFAULT_0); },

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

@@ -24,6 +24,7 @@ export function mapTokenUsage(row) {
   return {
     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,
@@ -58,6 +59,7 @@ const CONFIG_DEFAULTS = {
   parentSessionId: null,
   status: 'starting',
   model: null,
+  providerId: null,
   effortLevel: null,
   // Agent runtime for the session: 'claude-code' (default) or 'codex'.
   // Defaults to null so SessionRepository.create() can resolve it from the model.
@@ -100,6 +102,7 @@ export const DIRECT_FIELD_MAP = {
   costUsd: 'cost_usd',
   claudeSessionId: 'claude_session_id',
   model: 'model',
+  providerId: 'provider_id',
   nextTemplateId: 'next_template_id',
   parentSessionId: 'parent_session_id',
   scheduledAt: 'scheduled_at',

package/packages/server/src/schema.sql

@@ -48,6 +48,13 @@ CREATE TABLE IF NOT EXISTS sessions (
   claude_session_id TEXT,
   next_template_id TEXT REFERENCES session_templates(id) ON DELETE SET NULL,
   parent_session_id TEXT REFERENCES sessions(id) ON DELETE SET NULL,
+  input_tokens INTEGER DEFAULT 0,
+  output_tokens INTEGER DEFAULT 0,
+  thinking_tokens INTEGER DEFAULT 0,
+  cache_read_input_tokens INTEGER DEFAULT 0,
+  cache_creation_input_tokens INTEGER DEFAULT 0,
+  web_search_requests INTEGER DEFAULT 0,
+  context_window INTEGER DEFAULT 200000,
   created_at INTEGER NOT NULL DEFAULT (unixepoch() * 1000),
   updated_at INTEGER NOT NULL DEFAULT (unixepoch() * 1000)
 );
@@ -64,6 +71,7 @@ CREATE TABLE IF NOT EXISTS conversations (
   -- Token usage fields (per-conversation tracking)
   input_tokens INTEGER DEFAULT 0,
   output_tokens INTEGER DEFAULT 0,
+  thinking_tokens INTEGER DEFAULT 0,
   cache_read_input_tokens INTEGER DEFAULT 0,
   cache_creation_input_tokens INTEGER DEFAULT 0,
   web_search_requests INTEGER DEFAULT 0,

package/packages/server/src/services/agentCallLogger.js

@@ -20,7 +20,7 @@ export class AgentCallLogger {
     const callId = nanoid();
 
     // Build metadata object - only include keys with defined values
-    const metadata = {};
+    const metadata = { ...(meta.metadata || {}) };
     if (meta.effortLevel !== undefined && meta.effortLevel !== null) {
       metadata.effortLevel = meta.effortLevel;
     }