circuschief 0.6.0 → 0.8.0

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

@@ -12,7 +12,6 @@ export { SessionTemplateRepository } from './SessionTemplateRepository.js';
 export { MessageRepository } from './MessageRepository.js';
 export { ConversationRepository } from './ConversationRepository.js';
 export { CanvasItemRepository } from './CanvasItemRepository.js';
-export { SessionNoteRepository } from './SessionNoteRepository.js';
 export { TodoRepository } from './TodoRepository.js';
 export { WorkLogRepository } from './WorkLogRepository.js';
 export { SessionSummaryRepository } from './SessionSummaryRepository.js';
@@ -35,7 +34,6 @@ import { ProjectDefaultsRepository } from './ProjectDefaultsRepository.js';
 import { MessageRepository } from './MessageRepository.js';
 import { ConversationRepository } from './ConversationRepository.js';
 import { CanvasItemRepository } from './CanvasItemRepository.js';
-import { SessionNoteRepository } from './SessionNoteRepository.js';
 import { TodoRepository } from './TodoRepository.js';
 import { WorkLogRepository } from './WorkLogRepository.js';
 import { SessionSummaryRepository } from './SessionSummaryRepository.js';
@@ -56,7 +54,6 @@ export const projectDefaults = new ProjectDefaultsRepository();
 export const messages = new MessageRepository();
 export const conversations = new ConversationRepository();
 export const canvasItems = new CanvasItemRepository();
-export const sessionNotes = new SessionNoteRepository();
 export const todos = new TodoRepository();
 export const workLogs = new WorkLogRepository();
 export const sessionSummaries = new SessionSummaryRepository();

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

@@ -1,208 +1,44 @@
 /**
- * Central registry of all database migrations in execution order.
+ * Repair sessions whose parent link was lost during schema consolidation.
  *
- * Each migration is idempotent (checks before acting), so the exact ordering
- * only matters where there are hard dependencies (e.g. a table must exist
- * before a column references it via FK).
- *
- * The ordering below mirrors the original #runMigrations() top-to-bottom flow
- * as closely as possible.
+ * Child sessions inherit their root session's worktree. When parent_session_id
+ * is missing, the final UUID segment of git_worktree can identify the owning
+ * root session. Only repair rows where that UUID belongs to another session in
+ * the same project.
  */
-import { sessionsMigrations } from './sessionsMigrations.js';
-import { projectsMigrations } from './projectsMigrations.js';
-import { conversationsMigrations } from './conversationsMigrations.js';
-import { canvasItemsMigrations } from './canvasItemsMigrations.js';
-import { miscMigrations } from './miscMigrations.js';
-import { kanbanMigrations } from './kanbanMigrations.js';
-
-/**
- * Build a lookup map from a migrations array keyed by migration name.
- * @param {Array<{name: string, up: Function}>} migrations
- * @returns {Map<string, {name: string, up: Function}>}
- */
-function toLookup(migrations) {
-  const map = new Map();
-  for (const m of migrations) {
-    map.set(m.name, m);
-  }
-  return map;
-}
-
-const s = toLookup(sessionsMigrations);
-const p = toLookup(projectsMigrations);
-const c = toLookup(conversationsMigrations);
-const ci = toLookup(canvasItemsMigrations);
-const m = toLookup(miscMigrations);
-const k = toLookup(kanbanMigrations);
+export const repairMissingSessionParentsFromWorktree = {
+  name: 'repair-missing-session-parents-from-worktree',
+  up(db) {
+    db.prepare(`
+      UPDATE sessions
+      SET parent_session_id = (
+        SELECT parent.id
+        FROM sessions AS parent
+        WHERE parent.id = substr(sessions.git_worktree, length(sessions.git_worktree) - 35, 36)
+          AND parent.project_id = sessions.project_id
+          AND parent.id <> sessions.id
+      )
+      WHERE parent_session_id IS NULL
+        AND git_worktree IS NOT NULL
+        AND EXISTS (
+          SELECT 1
+          FROM sessions AS parent
+          WHERE parent.id = substr(sessions.git_worktree, length(sessions.git_worktree) - 35, 36)
+            AND parent.project_id = sessions.project_id
+            AND parent.id <> sessions.id
+        )
+    `).run();
+  },
+};
 
 /**
- * Flat, ordered list of every migration, matching the original execution order
- * from DatabaseManager.#runMigrations().
+ * Post-baseline database migrations.
+ *
+ * Pre-release migration history was consolidated into schema.sql. Future
+ * shipped schema changes should be added here as explicit migrations.
  *
  * @type {Array<{name: string, up: (db: import('better-sqlite3').Database) => void}>}
  */
-// Validate that all migrations are properly defined
-function validateMigrations(migrationsArray) {
-  for (const migration of migrationsArray) {
-    if (!migration || typeof migration.up !== 'function') {
-      const name = migration?.name || 'unknown';
-      throw new Error(`Migration "${name}" is undefined or missing an up() function`);
-    }
-  }
-  return migrationsArray;
-}
-
-export const allMigrations = validateMigrations([
-  // --- Sessions initial columns ---
-  s.get('sessions-add-cost_usd'),
-  s.get('sessions-add-claude_session_id'),
-  s.get('sessions-add-model'),
-  s.get('sessions-add-provider_id-early'),
-  s.get('sessions-add-effort_level'),
-
-  // --- Projects columns ---
-  p.get('projects-add-system_prompt'),
-  p.get('projects-add-on_session_created'),
-  p.get('projects-add-on_session_deleted'),
-  p.get('projects-add-repo_url'),
-  p.get('projects-add-worktree_path'),
-  p.get('projects-drop-summary-columns'),
-
-  // --- Sessions scheduling columns ---
-  s.get('sessions-add-scheduled_at'),
-  s.get('sessions-add-reschedule_delay_minutes'),
-  s.get('sessions-add-auto_reschedule_enabled'),
-  s.get('sessions-add-reschedule_on_token_limit'),
-  s.get('sessions-add-reschedule_on_service_error'),
-  s.get('sessions-add-max_reschedule_count'),
-  s.get('sessions-add-max_total_tokens'),
-  s.get('sessions-add-reschedule_count'),
-  s.get('sessions-add-reschedule_at_token_count'),
-
-  // --- Sessions status constraint migration (table recreation) ---
-  s.get('sessions-migrate-status-constraint'),
-
-  // --- Session summaries PR columns ---
-  c.get('session_summaries-add-pr_merged'),
-  c.get('session_summaries-add-pr_state'),
-  c.get('session_summaries-add-has_merge_conflicts'),
-  c.get('session_summaries-add-ci_status'),
-  c.get('session_summaries-add-ci_failures'),
-  c.get('session_summaries-add-last_summarized_message_id'),
-
-  // --- Sessions template chaining ---
-  s.get('sessions-add-next_template_id'),
-  s.get('sessions-add-parent_session_id'),
-  s.get('sessions-template-chaining-indexes'),
-
-  // --- Message attachments ---
-  c.get('message_attachments-add-file_path'),
-
-  // --- Conversation messages: conversation_id ---
-  c.get('conversation_messages-add-conversation_id'),
-
-  // --- Migrate existing sessions to conversations ---
-  c.get('conversations-migrate-existing-sessions'),
-
-  // --- Canvas items ---
-  ci.get('canvas_items-migrate-type-constraint'),
-  ci.get('canvas_items-add-deleted_at'),
-  ci.get('canvas_items-drop-label'),
-  ci.get('canvas_items-add-updated_at'),
-
-  // --- Conversations: claude_session_id + token usage ---
-  c.get('conversations-add-claude_session_id'),
-  c.get('conversations-add-input_tokens'),
-  c.get('conversations-add-output_tokens'),
-  c.get('conversations-add-cache_read_input_tokens'),
-  c.get('conversations-add-cache_creation_input_tokens'),
-  c.get('conversations-add-web_search_requests'),
-  c.get('conversations-add-context_window'),
-  c.get('conversations-add-model'),
-
-  // --- Sessions token usage ---
-  s.get('sessions-add-input_tokens'),
-  s.get('sessions-add-output_tokens'),
-  s.get('sessions-add-cache_read_input_tokens'),
-  s.get('sessions-add-cache_creation_input_tokens'),
-  s.get('sessions-add-web_search_requests'),
-  s.get('sessions-add-context_window'),
-
-  // --- Sessions archived / starred / manually_named ---
-  s.get('sessions-add-archived'),
-  s.get('sessions-add-starred'),
-  s.get('sessions-add-manually_named'),
-
-  // --- Project session defaults table ---
-  p.get('project_session_defaults-create-table'),
-
-  // --- Command buttons ---
-  m.get('command_buttons-add-show_on_list'),
-
-  // --- Session todos ---
-  c.get('session_todos-add-conversation_id'),
-
-  // --- Conversation branching ---
-  c.get('conversations-add-parent_conversation_id'),
-  c.get('conversations-add-branch_from_message_id'),
-
-  // --- Sessions pending prompt / slash commands / pending model / auto send ---
-  s.get('sessions-add-pending_prompt'),
-  s.get('sessions-add-slash_commands'),
-  s.get('sessions-add-pending_model'),
-  s.get('sessions-add-auto_send_pending_prompt'),
-
-  // --- Session templates ---
-  m.get('session_templates-add-model'),
-  m.get('session_templates-add-mode'),
-  m.get('session_templates-add-effort_level'),
-
-  // --- Conversation messages model ---
-  c.get('conversation_messages-add-model'),
-
-  // --- App settings table ---
-  m.get('app_settings-create-table'),
-
-  // --- Legacy model_providers cleanup ---
-  m.get('model_providers-cleanup-legacy'),
-
-  // --- 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'),
-
-  // --- Project session defaults provider_id / effort_level ---
-  p.get('project_session_defaults-add-provider_id'),
-  p.get('project_session_defaults-add-effort_level'),
-
-  // --- Update built-in models ---
-  m.get('providers-update-built-in-models'),
-
-  // --- Sessions agent_type ---
-  s.get('sessions-add-agent_type'),
-
-  // --- Agent call logs table ---
-  m.get('agent_call_logs-create-table'),
-
-  // --- Kanban feature ---
-  k.get('projects-add-kanban_enabled'),
-  k.get('kanban-create-tables'),
-  k.get('sessions-add-target_lane_id'),
-  k.get('sessions-add-lane_trigger_depth'),
-  k.get('session_templates-add-target_lane_id'),
-  k.get('kanban_lanes-add-on_enter_prompt'),
-  k.get('kanban_lanes-add-agent-settings'),
-
-  // --- Seed default global quick responses ---
-  m.get('quick_responses-seed-defaults'),
-
-  // --- Seed default global session templates ---
-  m.get('session_templates-seed-defaults'),
-
-  // --- Update built-in Opus model to 4.7 ---
-  m.get('providers-update-built-in-opus-4-7'),
-]);
+export const allMigrations = [
+  repairMissingSessionParentsFromWorktree,
+];

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

@@ -0,0 +1,137 @@
+import { randomUUID } from 'node:crypto';
+import { OPENAI_MODELS } from '../../../shared/src/index.js';
+
+export const BUILT_IN_ANTHROPIC_PROVIDER = {
+  id: 'anthropic-default',
+  name: 'Anthropic (Official)',
+  kind: 'anthropic',
+};
+
+export const BUILT_IN_OPENAI_PROVIDER = {
+  id: 'openai-default',
+  name: 'OpenAI (Official)',
+  kind: 'openai',
+};
+
+export const BUILT_IN_ANTHROPIC_MODELS = [
+  { id: 'anthropic-haiku', providerId: BUILT_IN_ANTHROPIC_PROVIDER.id, modelId: 'claude-haiku-4-5-20251001', displayName: 'Haiku 4.5', description: 'Fast & lightweight', tier: 'haiku' },
+  { id: 'anthropic-sonnet', providerId: BUILT_IN_ANTHROPIC_PROVIDER.id, modelId: 'claude-sonnet-4-6', displayName: 'Sonnet 4.6', description: 'Balanced', tier: 'sonnet' },
+  { id: 'anthropic-opus', providerId: BUILT_IN_ANTHROPIC_PROVIDER.id, modelId: 'claude-opus-4-6', displayName: 'Opus 4.6', description: 'Previous generation', tier: 'opus' },
+  { id: 'anthropic-opus-4-7', providerId: BUILT_IN_ANTHROPIC_PROVIDER.id, modelId: 'claude-opus-4-7', displayName: 'Opus 4.7', description: 'Most capable (default)', tier: 'opus' },
+];
+
+export const BUILT_IN_OPENAI_MODELS = OPENAI_MODELS.map((model) => ({
+  id: model.seedId,
+  providerId: BUILT_IN_OPENAI_PROVIDER.id,
+  modelId: model.id,
+  displayName: model.name,
+  description: model.description,
+  tier: 'custom',
+}));
+
+export const DEFAULT_QUICK_RESPONSES = [
+  { label: 'Put a plan on the canvas', content: 'Put a plan on the canvas to get this done', autoSubmit: false, sortOrder: 0 },
+  { label: 'Yes', content: 'Yes', autoSubmit: true, sortOrder: 1 },
+  { label: 'Review the plan', content: `Review the plan on the canvas. Are there any issues that you can find? Is test coverage specified explicitly enough? Does the current code match the assumptions in the plan?\n\nList the issues that you find and then update the plan on the canvas to address any issues that you find. Don't talk about issues with the original plan in the plan itself. Just tell me what the issues are, and update the plan so that the plan doesn't have the issues.`, autoSubmit: true, sortOrder: 2 },
+  { label: 'Implement the plan on the canvas', content: 'Implement the plan on the canvas', autoSubmit: true, sortOrder: 3 },
+  { label: 'Create / Update PR', content: `Ensure all relevant changes are committed and pushed. Then look at the session's summary and create a draft PR if no PR already exists.`, autoSubmit: true, sortOrder: 4 },
+  { label: 'Review PR', content: 'Look at the PR related to the root session. Review the PR. Are there any issues? Are best practices adhered to? Does the PR accomplish the goal? Are all changes covered by tests?', autoSubmit: true, sortOrder: 5 },
+  { label: 'Add tests', content: 'Inspect the changes on our branch. For each change, ensure we have tests that assert the change is working in the expected way. Implement the tests.', autoSubmit: true, sortOrder: 6 },
+  { label: 'Merge in main', content: 'Merge in the latest main branch', autoSubmit: true, sortOrder: 7 },
+  { label: 'Add tests to the plan', content: 'Call out specific test cases in the plan, we should have an assertion for each change called for in the plan', autoSubmit: true, sortOrder: 8 },
+  { label: 'Tests are failing', content: 'Tests are failing. Look at the canvas for details', autoSubmit: true, sortOrder: 9 },
+  { label: 'Continue', content: 'Continue', autoSubmit: true, sortOrder: 10 },
+];
+
+export const DEFAULT_SESSION_TEMPLATE_PROMPTS = {
+  REVIEW: `Review the plan on the canvas. If there's more than one plan then review the most recently updated plan. if there are no plans on the canvas then look for the most recently updated plan on the root session canvas.
+
+Make sure there are tests explicitly called out for all changes. Make sure that all context necessary to hand off the task is included in the plan.
+
+Are there any gaps in the plan? Is test coverage spelled out explicitly? Does the code match the assumptions in the plan?
+
+Update the plan according to your review recommendations.`,
+  IMPLEMENT: `Implement the plan on the canvas. If there's more than one plan on the canvas then use the most recently updated plan. If you don't see a plan on the canvas then look at the parent session's canvas.`,
+  PR: `Ensure all relevant changes are committed and pushed. Then determine the session's goals. You can typically find details about the goals of the session by looking at the most recently modified markdown documents on the root session's canvas - these are typically plans that were implemented during the session. You can also look at the root session's summary, but don't trigger a new summary to be created if the summary is missing.
+
+Create a draft pr and ensure all changes are committed and pushed.`,
+};
+
+export const DEFAULT_SESSION_TEMPLATES = [
+  { name: 'Review the plan', prompt: DEFAULT_SESSION_TEMPLATE_PROMPTS.REVIEW },
+  { name: 'Implement the plan on the canvas', prompt: DEFAULT_SESSION_TEMPLATE_PROMPTS.IMPLEMENT },
+  { name: 'Create/update PR', prompt: DEFAULT_SESSION_TEMPLATE_PROMPTS.PR },
+];
+
+function seedBuiltInProviders(db) {
+  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, ?, 1, ?, ?)`
+  ).run(BUILT_IN_ANTHROPIC_PROVIDER.id, BUILT_IN_ANTHROPIC_PROVIDER.name, BUILT_IN_ANTHROPIC_PROVIDER.kind, now, 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, ?, 1, ?, ?)`
+  ).run(BUILT_IN_OPENAI_PROVIDER.id, BUILT_IN_OPENAI_PROVIDER.name, BUILT_IN_OPENAI_PROVIDER.kind, now, now);
+
+  const insertModel = db.prepare(
+    `INSERT OR IGNORE INTO provider_models (
+       id, provider_id, model_id, display_name, description, tier, created_at
+     )
+     VALUES (?, ?, ?, ?, ?, ?, ?)`
+  );
+
+  for (const model of [...BUILT_IN_ANTHROPIC_MODELS, ...BUILT_IN_OPENAI_MODELS]) {
+    insertModel.run(model.id, model.providerId, model.modelId, model.displayName, model.description, model.tier, now);
+  }
+}
+
+function seedDefaultQuickResponses(db) {
+  const count = db.prepare('SELECT COUNT(*) AS cnt FROM quick_responses').get().cnt;
+  if (count > 0) return;
+
+  const now = Date.now();
+  const stmt = db.prepare(
+    `INSERT INTO quick_responses (
+       id, project_id, label, content, auto_submit, category, sort_order, created_at, updated_at
+     )
+     VALUES (?, NULL, ?, ?, ?, NULL, ?, ?, ?)`
+  );
+
+  for (const item of DEFAULT_QUICK_RESPONSES) {
+    stmt.run(randomUUID(), item.label, item.content, item.autoSubmit ? 1 : 0, item.sortOrder, now, now);
+  }
+}
+
+function seedDefaultSessionTemplates(db) {
+  const count = db.prepare(
+    'SELECT COUNT(*) AS cnt FROM session_templates WHERE project_id IS NULL'
+  ).get().cnt;
+  if (count > 0) return;
+
+  const now = Date.now();
+  const stmt = db.prepare(`
+    INSERT INTO session_templates (
+      id, project_id, name, prompt,
+      next_template_id, thinking_enabled,
+      git_branch, git_mode, model, mode, effort_level, target_lane_id,
+      created_at, updated_at
+    ) VALUES (?, NULL, ?, ?, NULL, 1, NULL, NULL, NULL, 'yolo', NULL, NULL, ?, ?)
+  `);
+
+  for (const item of DEFAULT_SESSION_TEMPLATES) {
+    stmt.run(randomUUID(), item.name, item.prompt, now, now);
+  }
+}
+
+export function seedBaselineData(db) {
+  seedBuiltInProviders(db);
+  seedDefaultQuickResponses(db);
+  seedDefaultSessionTemplates(db);
+}

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

@@ -3,6 +3,8 @@
  * config parsing, and update-clause builders.
  */
 
+import { DEFAULT_RESCHEDULE_DELAY_MINUTES } from '../../../shared/src/index.js';
+
 /** Reusable SQL fragment for computed activity fields on sessions */
 export const ACTIVITY_FIELDS_SQL = `
   (SELECT MAX(cm.timestamp) FROM conversation_messages cm WHERE cm.session_id = s.id) AS last_activity_at,
@@ -24,6 +26,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,
@@ -39,7 +42,7 @@ export function mapTokenUsage(row) {
 export function mapScheduling(row) {
   return {
     scheduledAt: row.scheduled_at || null,
-    rescheduleDelayMinutes: row.reschedule_delay_minutes || 15,
+    rescheduleDelayMinutes: row.reschedule_delay_minutes || DEFAULT_RESCHEDULE_DELAY_MINUTES,
     autoRescheduleEnabled: Boolean(row.auto_reschedule_enabled),
     rescheduleOnTokenLimit: Boolean(row.reschedule_on_token_limit),
     rescheduleOnServiceError: Boolean(row.reschedule_on_service_error),
@@ -52,12 +55,13 @@ export function mapScheduling(row) {
 
 /** Default values for session-create config fields */
 const CONFIG_DEFAULTS = {
-  mode: 'standard',
-  thinkingEnabled: false,
+  mode: 'yolo',
+  thinkingEnabled: true,
   gitBranch: null,
   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 +104,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',
@@ -122,6 +127,7 @@ export const BOOLEAN_FIELD_MAP = {
   archived: 'archived',
   starred: 'starred',
   manuallyNamed: 'manually_named',
+  prUrlAutoLinkDisabled: 'pr_url_auto_link_disabled',
   autoRescheduleEnabled: 'auto_reschedule_enabled',
   rescheduleOnTokenLimit: 'reschedule_on_token_limit',
   rescheduleOnServiceError: 'reschedule_on_service_error',