circuschief 0.2.1 → 0.3.0

package/package.json

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

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

@@ -4,6 +4,21 @@ import * as gitService from '../services/gitService.js';
 
 const router = Router();
 
+// GET /api/git/detect-worktree-path?directory=/path/to/repo
+router.get('/detect-worktree-path', async (req, res) => {
+  const { directory } = req.query;
+  if (!directory) {
+    return res.status(400).json({ error: 'directory query parameter is required' });
+  }
+
+  try {
+    const result = await gitService.detectWorktreePath(directory);
+    res.json(result);
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
 // GET /api/projects/:id/git/status - Check if git repo, get branches
 router.get('/projects/:id/status', async (req, res) => {
   const project = projects.getById(req.params.id);

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

@@ -0,0 +1,96 @@
+import { Router } from 'express';
+import { projects, commandButtons } from '../database.js';
+import { CreateCommandButtonRequest, UpdateCommandButtonRequest } from '../../../shared/src/contracts/commandButtons.js';
+
+// Error message constants
+const ERR_PROJECT_NOT_FOUND = 'Project not found';
+const ERR_BUTTON_NOT_FOUND = 'Command button not found';
+
+const router = Router({ mergeParams: true });
+
+// GET /api/projects/:id/command-buttons - List all command buttons for project
+router.get('/', (req, res) => {
+  const project = projects.getById(req.params.id);
+  if (!project) {
+    return res.status(404).json({ error: ERR_PROJECT_NOT_FOUND });
+  }
+
+  const buttons = commandButtons.getByProjectId(req.params.id);
+  res.json(buttons);
+});
+
+// POST /api/projects/:id/command-buttons - Create new command button
+router.post('/', (req, res) => {
+  const project = projects.getById(req.params.id);
+  if (!project) {
+    return res.status(404).json({ error: ERR_PROJECT_NOT_FOUND });
+  }
+
+  const result = CreateCommandButtonRequest.safeParse(req.body);
+  if (!result.success) {
+    return res.status(400).json({ error: result.error.issues[0].message });
+  }
+
+  const button = commandButtons.create({
+    projectId: req.params.id,
+    label: result.data.label,
+    command: result.data.command,
+    sortOrder: result.data.sortOrder,
+    showOnList: result.data.showOnList,
+  });
+
+  res.status(201).json(button);
+});
+
+// GET /api/projects/:id/command-buttons/:buttonId - Get single button
+router.get('/:buttonId', (req, res) => {
+  const project = projects.getById(req.params.id);
+  if (!project) {
+    return res.status(404).json({ error: ERR_PROJECT_NOT_FOUND });
+  }
+
+  const button = commandButtons.getById(req.params.buttonId);
+  if (!button) {
+    return res.status(404).json({ error: ERR_BUTTON_NOT_FOUND });
+  }
+  res.json(button);
+});
+
+// PATCH /api/projects/:id/command-buttons/:buttonId - Update button
+router.patch('/:buttonId', (req, res) => {
+  const project = projects.getById(req.params.id);
+  if (!project) {
+    return res.status(404).json({ error: ERR_PROJECT_NOT_FOUND });
+  }
+
+  const button = commandButtons.getById(req.params.buttonId);
+  if (!button) {
+    return res.status(404).json({ error: ERR_BUTTON_NOT_FOUND });
+  }
+
+  const result = UpdateCommandButtonRequest.safeParse(req.body);
+  if (!result.success) {
+    return res.status(400).json({ error: result.error.issues[0].message });
+  }
+
+  const updated = commandButtons.update(req.params.buttonId, result.data);
+  res.json(updated);
+});
+
+// DELETE /api/projects/:id/command-buttons/:buttonId - Delete button
+router.delete('/:buttonId', (req, res) => {
+  const project = projects.getById(req.params.id);
+  if (!project) {
+    return res.status(404).json({ error: ERR_PROJECT_NOT_FOUND });
+  }
+
+  const button = commandButtons.getById(req.params.buttonId);
+  if (!button) {
+    return res.status(404).json({ error: ERR_BUTTON_NOT_FOUND });
+  }
+
+  commandButtons.delete(req.params.buttonId);
+  res.status(204).send();
+});
+
+export default router;

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

@@ -220,6 +220,52 @@ export function buildSchedulingUpdate(config, initialStatus) {
   return update;
 }
 
+/**
+ * Resolve working directory and optional worktree for a new session.
+ * Inherits the parent's worktree when applicable.
+ * @param {object} params
+ * @returns {Promise<{ workingDirectory: string, gitWorktree: string|null }>}
+ */
+async function resolveSessionWorkingDirectory({ session, config, project }) {
+  const parentSession = config.parentSessionId ? sessions.getById(config.parentSessionId) : null;
+  if (parentSession?.gitWorktree) {
+    return {
+      workingDirectory: parentSession.gitWorktree,
+      gitWorktree: parentSession.gitWorktree,
+    };
+  }
+
+  const gitSetup = await setupGitForSession({
+    projectDir: project.workingDirectory,
+    gitMode: config.gitMode || null,
+    gitBranch: config.gitBranch || null,
+    sessionId: session.id,
+    worktreeBasePath: project.worktreePath || null,
+  });
+  return { workingDirectory: gitSetup.workingDirectory, gitWorktree: gitSetup.gitWorktree };
+}
+
+/**
+ * Start a session immediately via sessionManager, recording failures on the session.
+ */
+async function startSessionImmediately({ session, config, project, workingDirectory, sessionAttachments }) {
+  const resolved = await slashCommandService.resolvePromptSkillOrCommand(
+    workingDirectory, config.prompt, project.systemPrompt
+  );
+  const finalPrompt = resolved ? resolved.userMessage : config.prompt;
+  const finalSystemPrompt = resolved ? resolved.systemPrompt : project.systemPrompt;
+
+  const { runSession } = await import('../services/sessionManager.js');
+  runSession(session.id, finalPrompt, workingDirectory, {
+    systemPrompt: finalSystemPrompt,
+    fileAttachments: sessionAttachments,
+    model: config.model,
+  }).catch((error) => {
+    console.error('Session error:', error);
+    sessions.update(session.id, { status: 'error', error: error.message });
+  });
+}
+
 /**
  * Handle git setup, session start, broadcasts, and hooks after session creation.
  * @param {object} params
@@ -231,25 +277,9 @@ export function buildSchedulingUpdate(config, initialStatus) {
  * @returns {Promise<{ updatedSession: object }>}
  */
 export async function setupAndStartSession({ session, config, project, projectId, files }) {
-  let workingDirectory;
-  let gitWorktree = null;
-
-  // If this is a child session and the parent has a worktree, inherit it
-  // (mirrors templateTriggerService behavior)
-  const parentSession = config.parentSessionId ? sessions.getById(config.parentSessionId) : null;
-  if (parentSession?.gitWorktree) {
-    workingDirectory = parentSession.gitWorktree;
-    gitWorktree = parentSession.gitWorktree;
-  } else {
-    const gitSetup = await setupGitForSession({
-      projectDir: project.workingDirectory,
-      gitMode: config.gitMode || null,
-      gitBranch: config.gitBranch || null,
-      sessionId: session.id,
-    });
-    workingDirectory = gitSetup.workingDirectory;
-    gitWorktree = gitSetup.gitWorktree;
-  }
+  const { workingDirectory, gitWorktree } = await resolveSessionWorkingDirectory({
+    session, config, project,
+  });
 
   if (gitWorktree) {
     sessions.update(session.id, { gitWorktree });
@@ -259,20 +289,8 @@ export async function setupAndStartSession({ session, config, project, projectId
 
   const isScheduled = config.scheduledAt && config.scheduledAt > Date.now();
   if (config.startImmediately && !isScheduled) {
-    const resolved = await slashCommandService.resolvePromptSkillOrCommand(
-      workingDirectory, config.prompt, project.systemPrompt
-    );
-    const finalPrompt = resolved ? resolved.userMessage : config.prompt;
-    const finalSystemPrompt = resolved ? resolved.systemPrompt : project.systemPrompt;
-
-    const { runSession } = await import('../services/sessionManager.js');
-    runSession(session.id, finalPrompt, workingDirectory, {
-      systemPrompt: finalSystemPrompt,
-      fileAttachments: sessionAttachments,
-      model: config.model,
-    }).catch((error) => {
-      console.error('Session error:', error);
-      sessions.update(session.id, { status: 'error', error: error.message });
+    await startSessionImmediately({
+      session, config, project, workingDirectory, sessionAttachments,
     });
   }
 

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

@@ -1,11 +1,11 @@
 import { Router } from 'express';
-import { projects, sessions, sessionTemplates, commandButtons, projectDefaults, commandRuns } from '../database.js';
+import { projects, sessions, sessionTemplates, projectDefaults, commandRuns } from '../database.js';
 import { commandRunner } from '../services/commandRunner.js';
 import { CreateProjectRequest, UpdateProjectRequest, ProjectSessionDefaultsRequest } from '../../../shared/src/contracts/projects.js';
 import { ProjectDefaultsRepository } from '../db/ProjectDefaultsRepository.js';
 import { CreateSessionTemplateRequest } from '../../../shared/src/contracts/templates.js';
-import { CreateCommandButtonRequest, UpdateCommandButtonRequest } from '../../../shared/src/contracts/commandButtons.js';
 import { broadcastToProject } from '../websocket.js';
+import projectCommandButtonsRouter from './projects-commandButtons.js';
 import { WS_MESSAGE_TYPES } from '../../../shared/src/index.js';
 import { handleUploadError, uploadMiddleware } from '../middleware/upload.js';
 import {
@@ -18,10 +18,37 @@ import {
   setupAndStartSession,
 } from './projects-session-helpers.js';
 import { validateGitSettings, buildRunsBySession } from './projects-helpers.js';
+import { access, constants } from 'fs/promises';
+import { dirname, isAbsolute } from 'path';
 
 // Error message constants
 const ERR_PROJECT_NOT_FOUND = 'Project not found';
 
+/**
+ * Validate a worktree path value.
+ * Returns null if valid, or an error message string if invalid.
+ * @param {string|null|undefined} worktreePath
+ * @returns {Promise<string|null>}
+ */
+export async function validateWorktreePath(worktreePath) {
+  if (worktreePath === null || worktreePath === undefined || worktreePath === '') {
+    return null; // null/empty is valid (means use default)
+  }
+
+  if (!isAbsolute(worktreePath)) {
+    return 'Worktree path must be an absolute path';
+  }
+
+  const parent = dirname(worktreePath);
+  try {
+    await access(parent, constants.W_OK);
+  } catch {
+    return `Parent directory does not exist or is not writable: ${parent}`;
+  }
+
+  return null; // valid
+}
+
 const router = Router();
 
 // GET /api/projects - List all projects
@@ -31,16 +58,23 @@ router.get('/', (_req, res) => {
 });
 
 // POST /api/projects - Create project
-router.post('/', (req, res) => {
+router.post('/', async (req, res) => {
   const result = CreateProjectRequest.safeParse(req.body);
   if (!result.success) {
     return res.status(400).json({ error: result.error.issues[0].message });
   }
 
-  const { name, workingDirectory, systemPrompt, onSessionCreated, onSessionDeleted } = result.data;
+  const { name, workingDirectory, systemPrompt, onSessionCreated, onSessionDeleted, worktreePath } = result.data;
+
+  const pathError = await validateWorktreePath(worktreePath);
+  if (pathError) {
+    return res.status(400).json({ error: pathError });
+  }
+
   const project = projects.create(name, workingDirectory, systemPrompt || null, {
     onSessionCreated: onSessionCreated || null,
     onSessionDeleted: onSessionDeleted || null,
+    worktreePath: worktreePath || null,
   });
   res.status(201).json(project);
 });
@@ -55,7 +89,7 @@ router.get('/:id', (req, res) => {
 });
 
 // PUT /api/projects/:id - Update project
-router.put('/:id', (req, res) => {
+router.put('/:id', async (req, res) => {
   const project = projects.getById(req.params.id);
   if (!project) {
     return res.status(404).json({ error: ERR_PROJECT_NOT_FOUND });
@@ -66,6 +100,13 @@ router.put('/:id', (req, res) => {
     return res.status(400).json({ error: result.error.issues[0].message });
   }
 
+  if (result.data.worktreePath !== undefined) {
+    const pathError = await validateWorktreePath(result.data.worktreePath);
+    if (pathError) {
+      return res.status(400).json({ error: pathError });
+    }
+  }
+
   const updated = projects.update(req.params.id, result.data);
   res.json(updated);
 });
@@ -183,24 +224,13 @@ async function validateAndPrepareSessionConfig(reqBody, reqFiles, projectId, pro
   return { config, nextTemplateId };
 }
 
-// POST /api/projects/:id/sessions - Create session
-// Supports both JSON and multipart/form-data (for file attachments)
-router.post('/:id/sessions', uploadMiddleware('files', 10), handleUploadError, async (req, res) => {
-  const project = projects.getById(req.params.id);
-  if (!project) {
-    return res.status(404).json({ error: ERR_PROJECT_NOT_FOUND });
-  }
-
-  const prepared = await validateAndPrepareSessionConfig(req.body, req.files, req.params.id, project);
-  if (prepared.error) {
-    return res.status(prepared.status).json({ error: prepared.error });
-  }
-
-  const { config, nextTemplateId } = prepared;
-  const initialStatus = determineInitialStatus(config);
-
+/**
+ * Create the session row and apply any post-create updates.
+ * Returns the created session (already persisted in DB).
+ */
+function createSessionRow(projectId, config, nextTemplateId, initialStatus) {
   const sessionName = config.name || generateInitialName(config.prompt);
-  const session = sessions.create(req.params.id, sessionName, config.prompt, {
+  const session = sessions.create(projectId, sessionName, config.prompt, {
     mode: config.mode,
     thinkingEnabled: config.thinkingEnabled,
     gitBranch: config.gitBranch,
@@ -210,7 +240,6 @@ router.post('/:id/sessions', uploadMiddleware('files', 10), handleUploadError, a
     effortLevel: config.effortLevel,
   });
 
-  // Apply optional post-create updates (next template + scheduling) in one pass
   const postCreateUpdate = {
     ...(nextTemplateId ? { nextTemplateId } : {}),
     ...buildSchedulingUpdate(config, initialStatus),
@@ -218,24 +247,68 @@ router.post('/:id/sessions', uploadMiddleware('files', 10), handleUploadError, a
   if (Object.keys(postCreateUpdate).length > 0) {
     sessions.update(session.id, postCreateUpdate);
   }
+  return session;
+}
 
-  // Setup git environment, start session, and broadcast
+/**
+ * Run setupAndStartSession and translate any failure into an error response,
+ * marking the session as errored and broadcasting the update.
+ */
+async function startSessionOrFail(req, res, { session, config, project }) {
   try {
     const { updatedSession } = await setupAndStartSession({
       session, config, project, projectId: req.params.id, files: config.files,
     });
-    res.status(201).json(updatedSession);
+    return res.status(201).json(updatedSession);
   } catch (error) {
     console.error('Git setup error:', error);
     const updatedSession = sessions.update(session.id, { status: 'error', error: error.message });
-
     broadcastToProject(req.params.id, WS_MESSAGE_TYPES.SESSION_UPDATED, {
       projectId: req.params.id,
       sessionId: session.id,
       session: updatedSession,
     });
+    return res.status(500).json({ error: `Git setup failed: ${error.message}` });
+  }
+}
 
-    res.status(500).json({ error: `Git setup failed: ${error.message}` });
+// POST /api/projects/:id/sessions - Create session
+// Supports both JSON and multipart/form-data (for file attachments)
+router.post('/:id/sessions', uploadMiddleware('files', 10), handleUploadError, async (req, res) => {
+  // Outer try/catch so any synchronous or asynchronous throw produces an HTTP
+  // response rather than leaving the socket hanging (which manifests as
+  // "socket hang up" on the client side). Without this, an unhandled rejection
+  // from validation, DB repositories, or template resolution could cause the
+  // intermittent flake observed in file-attachments.test.js.
+  let session = null;
+  try {
+    const project = projects.getById(req.params.id);
+    if (!project) {
+      return res.status(404).json({ error: ERR_PROJECT_NOT_FOUND });
+    }
+
+    const prepared = await validateAndPrepareSessionConfig(req.body, req.files, req.params.id, project);
+    if (prepared.error) {
+      return res.status(prepared.status).json({ error: prepared.error });
+    }
+
+    const { config, nextTemplateId } = prepared;
+    const initialStatus = determineInitialStatus(config);
+    session = createSessionRow(req.params.id, config, nextTemplateId, initialStatus);
+    return await startSessionOrFail(req, res, { session, config, project });
+  } catch (error) {
+    console.error('Session creation error:', error);
+
+    // If the session row was already created, mark it as errored so it isn't left dangling.
+    if (session && session.id) {
+      try {
+        sessions.update(session.id, { status: 'error', error: error.message });
+      } catch (updateError) {
+        console.error('Failed to mark session as errored:', updateError);
+      }
+    }
+
+    return res.status(500).json({ error: error.message || 'Internal server error' });
   }
 });
 
@@ -269,90 +342,8 @@ router.post('/:id/templates', (req, res) => {
   res.status(201).json(template);
 });
 
-// GET /api/projects/:id/command-buttons - List all command buttons for project
-router.get('/:id/command-buttons', (req, res) => {
-  const project = projects.getById(req.params.id);
-  if (!project) {
-    return res.status(404).json({ error: ERR_PROJECT_NOT_FOUND });
-  }
-
-  const buttons = commandButtons.getByProjectId(req.params.id);
-  res.json(buttons);
-});
-
-// POST /api/projects/:id/command-buttons - Create new command button
-router.post('/:id/command-buttons', (req, res) => {
-  const project = projects.getById(req.params.id);
-  if (!project) {
-    return res.status(404).json({ error: ERR_PROJECT_NOT_FOUND });
-  }
-
-  const result = CreateCommandButtonRequest.safeParse(req.body);
-  if (!result.success) {
-    return res.status(400).json({ error: result.error.issues[0].message });
-  }
-
-  const button = commandButtons.create({
-    projectId: req.params.id,
-    label: result.data.label,
-    command: result.data.command,
-    sortOrder: result.data.sortOrder,
-    showOnList: result.data.showOnList,
-  });
-
-  res.status(201).json(button);
-});
-
-// GET /api/projects/:id/command-buttons/:buttonId - Get single button
-router.get('/:id/command-buttons/:buttonId', (req, res) => {
-  const project = projects.getById(req.params.id);
-  if (!project) {
-    return res.status(404).json({ error: ERR_PROJECT_NOT_FOUND });
-  }
-
-  const button = commandButtons.getById(req.params.buttonId);
-  if (!button) {
-    return res.status(404).json({ error: 'Command button not found' });
-  }
-  res.json(button);
-});
-
-// PATCH /api/projects/:id/command-buttons/:buttonId - Update button
-router.patch('/:id/command-buttons/:buttonId', (req, res) => {
-  const project = projects.getById(req.params.id);
-  if (!project) {
-    return res.status(404).json({ error: ERR_PROJECT_NOT_FOUND });
-  }
-
-  const button = commandButtons.getById(req.params.buttonId);
-  if (!button) {
-    return res.status(404).json({ error: 'Command button not found' });
-  }
-
-  const result = UpdateCommandButtonRequest.safeParse(req.body);
-  if (!result.success) {
-    return res.status(400).json({ error: result.error.issues[0].message });
-  }
-
-  const updated = commandButtons.update(req.params.buttonId, result.data);
-  res.json(updated);
-});
-
-// DELETE /api/projects/:id/command-buttons/:buttonId - Delete button
-router.delete('/:id/command-buttons/:buttonId', (req, res) => {
-  const project = projects.getById(req.params.id);
-  if (!project) {
-    return res.status(404).json({ error: ERR_PROJECT_NOT_FOUND });
-  }
-
-  const button = commandButtons.getById(req.params.buttonId);
-  if (!button) {
-    return res.status(404).json({ error: 'Command button not found' });
-  }
-
-  commandButtons.delete(req.params.buttonId);
-  res.status(204).send();
-});
+// Command button routes are mounted as a sub-router
+router.use('/:id/command-buttons', projectCommandButtonsRouter);
 
 // GET /api/projects/:id/session-defaults - Get session defaults for project
 router.get('/:id/session-defaults', (req, res) => {

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

@@ -19,8 +19,9 @@ router.post('/:id/archive', requireSessionAndProject, async (req, res) => {
   const updated = sessions.update(req.params.id, { archived: true });
 
   // Execute project cleanup command if cleanup requested and project has one configured
+  // Only run for worktree sessions - branch-mode sessions have nothing to clean up
   // Skip for child sessions - they share parent's resources and shouldn't trigger teardown
-  if (cleanup && req.project?.onSessionDeleted && !req.session_.parentSessionId) {
+  if (cleanup && req.project?.onSessionDeleted && req.session_.gitWorktree && !req.session_.parentSessionId) {
     executeHookAsync(req.project.onSessionDeleted, req.workingDirectory, {
       sessionId: req.session_.id,
       projectId: req.project.id,

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

@@ -175,8 +175,9 @@ router.delete('/:id', requireSessionAndProject, async (req, res) => {
   }
 
   // Execute on_session_deleted hook if configured (non-blocking)
+  // Only run for worktree sessions - branch-mode sessions have nothing to clean up
   // Skip for child sessions - they share parent's resources and shouldn't trigger teardown
-  if (req.project?.onSessionDeleted && !req.session_.parentSessionId) {
+  if (req.project?.onSessionDeleted && req.session_.gitWorktree && !req.session_.parentSessionId) {
     executeHookAsync(req.project.onSessionDeleted, req.workingDirectory, {
       sessionId: req.session_.id,
       projectId: req.project.id,

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

@@ -115,6 +115,8 @@ const FIELD_DEFINITIONS = [
   { field: 'autoSendPendingPrompt', transform: Boolean },
   { field: 'providerId', validate: validateProviderId },
   { field: 'prUrl', validate: validatePrUrl },
+  // Git fields
+  { field: 'gitWorktree' },
   // Scheduling fields
   { field: 'scheduledAt' },
   { field: 'autoRescheduleEnabled', transform: Boolean },

package/packages/server/src/config.js

@@ -0,0 +1,6 @@
+import { homedir } from 'os';
+import { join } from 'path';
+
+export function getDefaultDbPath() {
+  return join(homedir(), '.circuschief', 'circuschief.db');
+}

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

@@ -19,7 +19,7 @@ export class DatabaseManager {
    * @param {string} dbPath - Path to database file (use ':memory:' for in-memory)
    * @returns {Database.Database}
    */
-  init(dbPath = 'circuschief.db') {
+  init(dbPath) {
     this.#db = new Database(dbPath);
 
     // Enable WAL mode and foreign keys

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

@@ -19,7 +19,10 @@ export class ProjectRepository extends BaseRepository {
       onSessionDeleted: row.on_session_deleted,
       prPollInterval: row.pr_poll_interval,
       repoUrl: row.repo_url,
+      worktreePath: row.worktree_path,
       kanbanEnabled: row.kanban_enabled === undefined ? true : Boolean(row.kanban_enabled),
+      sessionCount: row.session_count ?? 0,
+      lastActivityAt: row.last_activity_at ?? null,
       createdAt: row.created_at,
       updatedAt: row.updated_at,
     };
@@ -34,11 +37,12 @@ export class ProjectRepository extends BaseRepository {
       prPollInterval = 60000,
       repoUrl = null,
       kanbanEnabled = true,
+      worktreePath = null,
     } = options;
     this.db
       .prepare(
-        `INSERT INTO projects (id, name, working_directory, system_prompt, on_session_created, on_session_deleted, pr_poll_interval, repo_url, kanban_enabled, created_at, updated_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+        `INSERT INTO projects (id, name, working_directory, system_prompt, on_session_created, on_session_deleted, pr_poll_interval, repo_url, kanban_enabled, worktree_path, created_at, updated_at)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
       )
       .run(
         id,
@@ -50,6 +54,7 @@ export class ProjectRepository extends BaseRepository {
         prPollInterval,
         repoUrl,
         kanbanEnabled ? 1 : 0,
+        worktreePath,
         now,
         now
       );
@@ -57,7 +62,15 @@ export class ProjectRepository extends BaseRepository {
   }
 
   getAll() {
-    const rows = this.db.prepare('SELECT * FROM projects ORDER BY updated_at DESC').all();
+    const rows = this.db.prepare(`
+      SELECT p.*,
+        COUNT(CASE WHEN s.archived = 0 THEN s.id END) as session_count,
+        MAX(s.updated_at) as last_activity_at
+      FROM projects p
+      LEFT JOIN sessions s ON s.project_id = p.id
+      GROUP BY p.id
+      ORDER BY p.updated_at DESC
+    `).all();
     return this.mapAll(rows);
   }
 
@@ -73,6 +86,7 @@ export class ProjectRepository extends BaseRepository {
     onSessionDeleted: { column: 'on_session_deleted' },
     prPollInterval: { column: 'pr_poll_interval' },
     repoUrl: { column: 'repo_url' },
+    worktreePath: { column: 'worktree_path' },
     kanbanEnabled: { column: 'kanban_enabled', transform: (v) => v ? 1 : 0 },
   };
 

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

@@ -65,6 +65,7 @@ export const allMigrations = validateMigrations([
   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 ---
@@ -196,4 +197,10 @@ export const allMigrations = validateMigrations([
 
   // --- 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'),
 ]);