circuschief 0.8.0 → 1.1.0

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

@@ -1,9 +1,11 @@
 import { Router } from 'express';
-import { sessions, sessionTemplates, modelProviders } from '../database.js';
+import { sessions, sessionTemplates, modelProviders, sessionSummaries } from '../database.js';
 import { broadcastToSession, broadcastToProject } from '../websocket.js';
 import { WS_MESSAGE_TYPES } from '../../../shared/src/index.js';
 import * as summaryService from '../services/summaryService.js';
 import { setSessionNameFromPr } from '../services/prUrlService.js';
+import { checkSessionCiStatusNow } from '../services/prStatusService.js';
+import { broadcastSummaryUpdate } from '../services/summaryBroadcast.js';
 import { requireSession } from '../middleware/sessionLookup.js';
 
 const router = Router();
@@ -195,6 +197,30 @@ function broadcastSessionUpdate(sessionId, projectId, updated, updateData) {
   });
 }
 
+/**
+ * Reset all PR state fields in the session summary when the PR URL changes or is cleared.
+ * This ensures stale PR state (e.g., "merged") doesn't persist for a different PR
+ * and doesn't block summary regeneration.
+ * @param {string} sessionId
+ * @param {string|null} projectId - For broadcasting to project subscribers
+ */
+function resetPrStateForSession(sessionId, projectId) {
+  const existingSummary = sessionSummaries.getBySessionId(sessionId);
+  if (!existingSummary) return;
+
+  sessionSummaries.upsert(sessionId, {
+    prState: null,
+    prMerged: false,
+    hasMergeConflicts: false,
+    ciStatus: null,
+    ciFailures: [],
+  });
+
+  // Broadcast the reset to both session and project subscribers
+  const updatedSummary = sessionSummaries.getBySessionId(sessionId);
+  broadcastSummaryUpdate(sessionId, projectId, updatedSummary);
+}
+
 // PATCH /api/sessions/:id - Update session settings
 router.patch('/:id', requireSession, (req, res) => {
   const { updateData, error } = buildUpdateData(req.body);
@@ -209,6 +235,15 @@ router.patch('/:id', requireSession, (req, res) => {
 
   const updated = sessions.update(req.params.id, updateData);
 
+  // Reset PR state when URL changes to a different PR or is cleared
+  const previousPrUrl = req.session_.prUrl;
+  const prUrlProvided = Object.prototype.hasOwnProperty.call(updateData, 'prUrl');
+  const prUrlChanged = prUrlProvided && previousPrUrl && previousPrUrl !== updateData.prUrl;
+
+  if (prUrlChanged) {
+    resetPrStateForSession(req.params.id, req.session_.projectId);
+  }
+
   // Propagate PR URL to parent session if set (not when clearing)
   if (updateData.prUrl) {
     summaryService.propagatePrUrlToParent(req.params.id, updateData.prUrl);
@@ -218,6 +253,11 @@ router.patch('/:id', requireSession, (req, res) => {
     setSessionNameFromPr(req.params.id, updateData.prUrl).catch(err => {
       console.error(`[Sessions API] Failed to set session name from PR:`, err);
     });
+
+    // Trigger immediate PR status check for the new/changed URL
+    checkSessionCiStatusNow(req.params.id).catch(err => {
+      console.error(`[Sessions API] Failed to check PR status after URL change:`, err);
+    });
   }
 
   broadcastSessionUpdate(req.params.id, req.session_.projectId, updated, updateData);

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

@@ -5,10 +5,11 @@ import { normalizeCommitAttributionOverride } from '../../../shared/src/contract
 
 /**
  * Valid values for `providers.kind`. Maps 1:1 to an agent adapter:
- *   - 'anthropic' → 'claude-code'
+ *   - 'anthropic' ��� 'claude-code'
  *   - 'openai'    → 'codex'
+ *   - 'google'    → 'gemini'
  */
-export const PROVIDER_KINDS = Object.freeze(['anthropic', 'openai']);
+export const PROVIDER_KINDS = Object.freeze(['anthropic', 'openai', 'google']);
 
 /**
  * Mapping from provider kind to the agent adapter that should drive sessions
@@ -17,6 +18,7 @@ export const PROVIDER_KINDS = Object.freeze(['anthropic', 'openai']);
 export const AGENT_TYPE_BY_KIND = Object.freeze({
   anthropic: 'claude-code',
   openai: 'codex',
+  google: 'gemini',
 });
 
 const BUILT_IN_MUTABLE_FIELDS = Object.freeze(['commitAttributionOverride']);

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

@@ -74,6 +74,7 @@ export class SessionRepository extends BaseRepository {
       createdAt: row.created_at,
       updatedAt: row.updated_at,
       lastActivityAt: row.last_activity_at ?? null,
+      lastMessageAt: row.last_message_at ?? null,
       activeTimeMs: row.active_time_ms || 0,
     };
   }
@@ -147,7 +148,6 @@ 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,

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

@@ -23,6 +23,10 @@ export class SessionTemplateRepository extends BaseRepository {
       mode: row.mode || null,
       effortLevel: row.effort_level ?? null,
       targetLaneId: row.target_lane_id || null,
+      showInQuickResponses: Boolean(row.show_in_quick_responses),
+      quickResponseAutoSubmit: Boolean(row.quick_response_auto_submit),
+      quickResponseSortOrder: row.quick_response_sort_order ?? 0,
+      legacyQuickResponseId: row.legacy_quick_response_id || null,
       createdAt: row.created_at,
       updatedAt: row.updated_at,
     };
@@ -51,13 +55,22 @@ export class SessionTemplateRepository extends BaseRepository {
     return value ? 1 : 0;
   }
 
+  static #normalizeBoolean(value) {
+    return value ? 1 : 0;
+  }
+
   create(data) {
     const id = databaseManager.generateId();
     const now = Date.now();
     this.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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+        `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,
+          show_in_quick_responses, quick_response_auto_submit,
+          quick_response_sort_order, legacy_quick_response_id,
+          created_at, updated_at
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
       )
       .run(
         id,
@@ -72,6 +85,10 @@ export class SessionTemplateRepository extends BaseRepository {
         data.mode !== undefined && data.mode !== null ? data.mode : null,
         data.effortLevel ?? null,
         data.targetLaneId || null,
+        SessionTemplateRepository.#normalizeBoolean(data.showInQuickResponses),
+        SessionTemplateRepository.#normalizeBoolean(data.quickResponseAutoSubmit),
+        data.quickResponseSortOrder ?? 0,
+        data.legacyQuickResponseId || null,
         now,
         now
       );
@@ -93,6 +110,10 @@ export class SessionTemplateRepository extends BaseRepository {
     mode: { column: 'mode', transform: (v) => v },
     effortLevel: { column: 'effort_level', transform: (v) => v },
     targetLaneId: { column: 'target_lane_id', transform: (v) => v },
+    showInQuickResponses: { column: 'show_in_quick_responses', transform: (v) => v ? 1 : 0 },
+    quickResponseAutoSubmit: { column: 'quick_response_auto_submit', transform: (v) => v ? 1 : 0 },
+    quickResponseSortOrder: { column: 'quick_response_sort_order', transform: (v) => v },
+    legacyQuickResponseId: { column: 'legacy_quick_response_id', transform: (v) => v || null },
   };
 
   /**

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

@@ -0,0 +1,109 @@
+/**
+ * Migrations for the canvas_items table.
+ * Each export is an array of { name, up(db) } migration objects.
+ */
+import { addColumnIfMissing, getColumns, getTableSql } from './migrationUtils.js';
+
+/**
+ * Migrate canvas_items table to include 'code' in type CHECK constraint.
+ * SQLite doesn't support ALTER TABLE to modify constraints, so we recreate the table.
+ */
+function migrateCanvasItemsTypeConstraint(db) {
+  const tableSql = getTableSql(db, 'canvas_items');
+
+  // If schema already includes 'code', no migration needed
+  if (tableSql?.includes("'code'")) {
+    return;
+  }
+
+  db.exec(`
+    CREATE TABLE canvas_items_new (
+      id TEXT PRIMARY KEY,
+      session_id TEXT REFERENCES sessions(id) ON DELETE CASCADE,
+      type TEXT NOT NULL CHECK (type IN ('image', 'markdown', 'text', 'json', 'pdf', 'code')),
+      content TEXT,
+      data TEXT,
+      mime_type TEXT,
+      filename TEXT,
+      label TEXT,
+      width INTEGER,
+      height INTEGER,
+      created_at INTEGER NOT NULL DEFAULT (unixepoch() * 1000)
+    );
+
+    INSERT INTO canvas_items_new SELECT * FROM canvas_items;
+
+    DROP TABLE canvas_items;
+
+    ALTER TABLE canvas_items_new RENAME TO canvas_items;
+
+    CREATE INDEX IF NOT EXISTS idx_canvas_session ON canvas_items(session_id);
+  `);
+}
+
+/**
+ * Migrate canvas_items table to drop label column.
+ */
+function migrateCanvasItemsDropLabel(db) {
+  const columns = getColumns(db, 'canvas_items');
+
+  // If label column doesn't exist, migration already done
+  if (!columns.includes('label')) {
+    return;
+  }
+
+  db.exec(`
+    CREATE TABLE canvas_items_new (
+      id TEXT PRIMARY KEY,
+      session_id TEXT REFERENCES sessions(id) ON DELETE CASCADE,
+      type TEXT NOT NULL CHECK (type IN ('image', 'markdown', 'text', 'json', 'pdf', 'code')),
+      content TEXT,
+      data TEXT,
+      mime_type TEXT,
+      filename TEXT,
+      width INTEGER,
+      height INTEGER,
+      deleted_at INTEGER,
+      created_at INTEGER NOT NULL DEFAULT (unixepoch() * 1000)
+    );
+
+    INSERT INTO canvas_items_new (id, session_id, type, content, data, mime_type, filename, width, height, deleted_at, created_at)
+    SELECT id, session_id, type, content, data, mime_type, filename, width, height, deleted_at, created_at FROM canvas_items;
+
+    DROP TABLE canvas_items;
+
+    ALTER TABLE canvas_items_new RENAME TO canvas_items;
+
+    CREATE INDEX IF NOT EXISTS idx_canvas_session ON canvas_items(session_id);
+    CREATE INDEX IF NOT EXISTS idx_canvas_deleted ON canvas_items(deleted_at);
+  `);
+}
+
+/** @type {Array<{name: string, up: (db: import('better-sqlite3').Database) => void}>} */
+export const canvasItemsMigrations = [
+  {
+    name: 'canvas_items-migrate-type-constraint',
+    up(db) { migrateCanvasItemsTypeConstraint(db); },
+  },
+  {
+    name: 'canvas_items-add-deleted_at',
+    up(db) {
+      addColumnIfMissing(db, 'canvas_items', 'deleted_at', 'INTEGER');
+      db.exec('CREATE INDEX IF NOT EXISTS idx_canvas_deleted ON canvas_items(deleted_at)');
+    },
+  },
+  {
+    name: 'canvas_items-drop-label',
+    up(db) { migrateCanvasItemsDropLabel(db); },
+  },
+  {
+    name: 'canvas_items-add-updated_at',
+    up(db) {
+      const columns = getColumns(db, 'canvas_items');
+      if (!columns.includes('updated_at')) {
+        db.exec('ALTER TABLE canvas_items ADD COLUMN updated_at INTEGER');
+        db.exec('UPDATE canvas_items SET updated_at = created_at WHERE updated_at IS NULL');
+      }
+    },
+  },
+];

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

@@ -0,0 +1,187 @@
+/**
+ * Migrations for the conversations, conversation_messages, and message_attachments tables.
+ * Each export is an array of { name, up(db) } migration objects.
+ */
+import crypto from 'crypto';
+import { addColumnIfMissing, getColumns } from './migrationUtils.js';
+
+// Table name constants for migrations
+const TABLE_CONVERSATIONS = 'conversations';
+
+// Column type constants
+const COL_INTEGER_DEFAULT_0 = 'INTEGER DEFAULT 0';
+
+/**
+ * Create default conversations for existing sessions that don't have any
+ * and associate orphaned messages with the default conversation.
+ */
+function migrateExistingSessionsToConversations(db) {
+  const sessionsWithoutConversations = db
+    .prepare(
+      `
+      SELECT DISTINCT s.id FROM sessions s
+      LEFT JOIN conversations c ON c.session_id = s.id
+      WHERE c.id IS NULL
+      AND EXISTS (SELECT 1 FROM conversation_messages m WHERE m.session_id = s.id)
+    `
+    )
+    .all();
+
+  for (const session of sessionsWithoutConversations) {
+    const convId = crypto.randomUUID();
+    const now = Date.now();
+
+    db.prepare(
+      `INSERT INTO conversations (id, session_id, name, is_active, created_at, updated_at)
+       VALUES (?, ?, ?, 1, ?, ?)`
+    ).run(convId, session.id, 'Initial', now, now);
+
+    db.prepare(
+      `UPDATE conversation_messages SET conversation_id = ? WHERE session_id = ? AND conversation_id IS NULL`
+    ).run(convId, session.id);
+  }
+}
+
+/** @type {Array<{name: string, up: (db: import('better-sqlite3').Database) => void}>} */
+export const conversationsMigrations = [
+  // --- Session summaries PR columns ---
+  {
+    name: 'session_summaries-add-pr_merged',
+    up(db) { addColumnIfMissing(db, 'session_summaries', 'pr_merged', 'INTEGER'); },
+  },
+  {
+    name: 'session_summaries-add-pr_state',
+    up(db) { addColumnIfMissing(db, 'session_summaries', 'pr_state', 'TEXT'); },
+  },
+  {
+    name: 'session_summaries-add-has_merge_conflicts',
+    up(db) { addColumnIfMissing(db, 'session_summaries', 'has_merge_conflicts', 'INTEGER'); },
+  },
+  {
+    name: 'session_summaries-add-ci_status',
+    up(db) { addColumnIfMissing(db, 'session_summaries', 'ci_status', 'TEXT'); },
+  },
+  {
+    name: 'session_summaries-add-ci_failures',
+    up(db) { addColumnIfMissing(db, 'session_summaries', 'ci_failures', 'TEXT'); },
+  },
+  {
+    name: 'session_summaries-add-last_summarized_message_id',
+    up(db) { addColumnIfMissing(db, 'session_summaries', 'last_summarized_message_id', 'TEXT'); },
+  },
+
+  // --- Message attachments ---
+  {
+    name: 'message_attachments-add-file_path',
+    up(db) { addColumnIfMissing(db, 'message_attachments', 'file_path', 'TEXT'); },
+  },
+
+  // --- Conversation messages: conversation_id ---
+  {
+    name: 'conversation_messages-add-conversation_id',
+    up(db) {
+      const columns = getColumns(db, 'conversation_messages');
+      if (!columns.includes('conversation_id')) {
+        db.exec(
+          'ALTER TABLE conversation_messages ADD COLUMN conversation_id TEXT REFERENCES conversations(id) ON DELETE CASCADE'
+        );
+        db.exec(
+          'CREATE INDEX IF NOT EXISTS idx_messages_conversation ON conversation_messages(conversation_id)'
+        );
+      }
+    },
+  },
+
+  // --- Migrate existing sessions to conversations ---
+  {
+    name: 'conversations-migrate-existing-sessions',
+    up(db) { migrateExistingSessionsToConversations(db); },
+  },
+
+  // --- Conversations: claude_session_id ---
+  {
+    name: 'conversations-add-claude_session_id',
+    up(db) { addColumnIfMissing(db, TABLE_CONVERSATIONS, 'claude_session_id', 'TEXT'); },
+  },
+
+  // --- Conversations token usage ---
+  {
+    name: 'conversations-add-input_tokens',
+    up(db) { addColumnIfMissing(db, TABLE_CONVERSATIONS, 'input_tokens', COL_INTEGER_DEFAULT_0); },
+  },
+  {
+    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); },
+  },
+  {
+    name: 'conversations-add-cache_creation_input_tokens',
+    up(db) { addColumnIfMissing(db, TABLE_CONVERSATIONS, 'cache_creation_input_tokens', COL_INTEGER_DEFAULT_0); },
+  },
+  {
+    name: 'conversations-add-web_search_requests',
+    up(db) { addColumnIfMissing(db, TABLE_CONVERSATIONS, 'web_search_requests', COL_INTEGER_DEFAULT_0); },
+  },
+  {
+    name: 'conversations-add-context_window',
+    up(db) { addColumnIfMissing(db, TABLE_CONVERSATIONS, 'context_window', 'INTEGER DEFAULT 200000'); },
+  },
+  {
+    name: 'conversations-add-model',
+    up(db) { addColumnIfMissing(db, TABLE_CONVERSATIONS, 'model', 'TEXT'); },
+  },
+
+  // --- Conversation branching ---
+  {
+    name: 'conversations-add-parent_conversation_id',
+    up(db) {
+      const columns = getColumns(db, TABLE_CONVERSATIONS);
+      if (!columns.includes('parent_conversation_id')) {
+        db.exec(
+          'ALTER TABLE conversations ADD COLUMN parent_conversation_id TEXT REFERENCES conversations(id) ON DELETE SET NULL'
+        );
+        db.exec(
+          'CREATE INDEX IF NOT EXISTS idx_conversations_parent ON conversations(parent_conversation_id)'
+        );
+      }
+    },
+  },
+  {
+    name: 'conversations-add-branch_from_message_id',
+    up(db) {
+      addColumnIfMissing(
+        db, TABLE_CONVERSATIONS, 'branch_from_message_id',
+        'TEXT REFERENCES conversation_messages(id) ON DELETE SET NULL'
+      );
+    },
+  },
+
+  // --- Session todos: conversation_id ---
+  {
+    name: 'session_todos-add-conversation_id',
+    up(db) {
+      const columns = getColumns(db, 'session_todos');
+      if (!columns.includes('conversation_id')) {
+        db.exec(
+          'ALTER TABLE session_todos ADD COLUMN conversation_id TEXT REFERENCES conversations(id) ON DELETE CASCADE'
+        );
+        db.exec(
+          'CREATE INDEX IF NOT EXISTS idx_todos_conversation ON session_todos(conversation_id)'
+        );
+      }
+    },
+  },
+
+  // --- Conversation messages: model ---
+  {
+    name: 'conversation_messages-add-model',
+    up(db) { addColumnIfMissing(db, 'conversation_messages', 'model', 'TEXT'); },
+  },
+];