@assistkick/create 1.10.0 → 1.11.0

package/templates/assistkick-product-system/packages/backend/src/routes/skills.ts

@@ -0,0 +1,95 @@
+/**
+ * Skills routes — lists available skills from project workspace.
+ * GET /api/projects/:id/skills — scans .claude/skills/ directory
+ */
+
+import { Router } from 'express';
+import { join } from 'node:path';
+import { readdir, readFile } from 'node:fs/promises';
+import { existsSync } from 'node:fs';
+import type { ProjectWorkspaceService } from '../services/project_workspace_service.js';
+
+interface SkillRoutesDeps {
+  workspaceService: ProjectWorkspaceService;
+  log: (tag: string, ...args: unknown[]) => void;
+}
+
+export interface SkillInfo {
+  name: string;
+  description: string;
+  folderName: string;
+}
+
+/**
+ * Parse a SKILL.md file to extract name and description.
+ * Looks for a # heading for name and the first non-empty, non-heading line
+ * after for description.
+ */
+export const parseSkillMd = (content: string): { name: string; description: string } => {
+  const lines = content.split('\n');
+  let name = '';
+  let description = '';
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!name && trimmed.startsWith('# ')) {
+      name = trimmed.slice(2).trim();
+    } else if (name && !description && trimmed && !trimmed.startsWith('#')) {
+      description = trimmed;
+    }
+    if (name && description) break;
+  }
+
+  return { name, description };
+};
+
+export const createSkillRoutes = ({ workspaceService, log }: SkillRoutesDeps): Router => {
+  const router: Router = Router({ mergeParams: true });
+
+  router.get('/', async (req, res) => {
+    const { id } = req.params;
+    log('SKILLS', `GET /api/projects/${id}/skills`);
+
+    try {
+      const wsPath = workspaceService.getWorkspacePath(id);
+      const skillsDir = join(wsPath, '.claude', 'skills');
+
+      if (!existsSync(skillsDir)) {
+        res.json({ skills: [] });
+        return;
+      }
+
+      const entries = await readdir(skillsDir, { withFileTypes: true });
+      const skills: SkillInfo[] = [];
+
+      for (const entry of entries) {
+        if (!entry.isDirectory()) continue;
+
+        const skillMdPath = join(skillsDir, entry.name, 'SKILL.md');
+        let name = entry.name;
+        let description = '';
+
+        if (existsSync(skillMdPath)) {
+          try {
+            const content = await readFile(skillMdPath, 'utf-8');
+            const parsed = parseSkillMd(content);
+            if (parsed.name) name = parsed.name;
+            description = parsed.description;
+          } catch {
+            // Use folder name as fallback
+          }
+        }
+
+        skills.push({ name, description, folderName: entry.name });
+      }
+
+      res.json({ skills });
+    } catch (err: unknown) {
+      const message = err instanceof Error ? err.message : String(err);
+      log('SKILLS', `Failed to list skills: ${message}`);
+      res.status(500).json({ error: `Failed to list skills: ${message}` });
+    }
+  });
+
+  return router;
+};

package/templates/assistkick-product-system/packages/backend/src/routes/terminal.ts

@@ -43,7 +43,7 @@ export const createTerminalRoutes = ({ ptyManager, log }: TerminalRoutesDeps): R
 
   // POST /api/terminal/sessions
   router.post('/sessions', async (req, res) => {
-    const { projectId, projectName } = req.body;
+    const { projectId, projectName, sessionType } = req.body;
 
     if (!projectId || typeof projectId !== 'string') {
       res.status(400).json({ error: 'projectId is required' });
@@ -54,8 +54,9 @@ export const createTerminalRoutes = ({ ptyManager, log }: TerminalRoutesDeps): R
       return;
     }
 
-    const session = await ptyManager.createSession(projectId.trim(), projectName.trim(), 80, 24);
-    log('TERMINAL', `Created session "${session.name}" for project ${projectId}`);
+    const type = sessionType === 'terminal' ? 'terminal' as const : 'claude' as const;
+    const session = await ptyManager.createSession(projectId.trim(), projectName.trim(), 80, 24, type);
+    log('TERMINAL', `Created ${type} session "${session.name}" for project ${projectId}`);
     res.status(201).json({ session });
   });
 
@@ -93,7 +94,7 @@ export const createTerminalRoutes = ({ ptyManager, log }: TerminalRoutesDeps): R
         log('TERMINAL', `Uploaded image: ${filePath} (${body.length} bytes)`);
         res.json({ path: filePath });
       } catch (err: any) {
-        log('TERMINAL', `Image upload failed: ${err.message}`);
+        log('TERMINAL', `Image upload failed:`, err.stack || err.message);
         res.status(500).json({ error: 'Failed to save image' });
       }
     },

package/templates/assistkick-product-system/packages/backend/src/routes/users.ts

@@ -37,7 +37,7 @@ export const createUserRoutes = ({ userManagementService, log }: UserRoutesDeps)
       const userList = await userManagementService.listUsers();
       res.json({ users: userList });
     } catch (err: any) {
-      log('USERS', `List users failed: ${err.message}`);
+      log('USERS', `List users failed:`, err.stack || err.message);
       res.status(500).json({ error: 'Failed to list users' });
     }
   });
@@ -52,7 +52,7 @@ export const createUserRoutes = ({ userManagementService, log }: UserRoutesDeps)
       await userManagementService.deleteUser(id, user.id);
       res.json({ message: 'User deleted' });
     } catch (err: any) {
-      log('USERS', `Delete user failed: ${err.message}`);
+      log('USERS', `Delete user failed:`, err.stack || err.message);
       if (err.message === 'Cannot delete your own account') {
         return res.status(400).json({ error: err.message });
       }
@@ -71,7 +71,7 @@ export const createUserRoutes = ({ userManagementService, log }: UserRoutesDeps)
       const invitationList = await userManagementService.listInvitations();
       res.json({ invitations: invitationList });
     } catch (err: any) {
-      log('USERS', `List invitations failed: ${err.message}`);
+      log('USERS', `List invitations failed:`, err.stack || err.message);
       res.status(500).json({ error: 'Failed to list invitations' });
     }
   });
@@ -85,7 +85,7 @@ export const createUserRoutes = ({ userManagementService, log }: UserRoutesDeps)
       await userManagementService.deleteInvitation(id);
       res.json({ message: 'Invitation deleted' });
     } catch (err: any) {
-      log('USERS', `Delete invitation failed: ${err.message}`);
+      log('USERS', `Delete invitation failed:`, err.stack || err.message);
       if (err.message === 'Invitation not found') {
         return res.status(404).json({ error: err.message });
       }

package/templates/assistkick-product-system/packages/backend/src/routes/video.ts

@@ -65,7 +65,7 @@ export const createVideoRoutes = ({ ttsService, bundleService, videoRenderServic
 
       res.json(result);
     } catch (err: any) {
-      log('VIDEO', `TTS generation failed: ${err.message}`);
+      log('VIDEO', `TTS generation failed:`, err.stack || err.message);
       res.status(500).json({ error: err.message });
     }
   });
@@ -77,7 +77,7 @@ export const createVideoRoutes = ({ ttsService, bundleService, videoRenderServic
       const compositions = bundleService.listCompositions();
       res.json({ compositions });
     } catch (err: any) {
-      log('VIDEO', `Failed to list compositions: ${err.message}`);
+      log('VIDEO', `Failed to list compositions:`, err.stack || err.message);
       res.status(500).json({ error: 'Failed to list compositions' });
     }
   });
@@ -95,7 +95,7 @@ export const createVideoRoutes = ({ ttsService, bundleService, videoRenderServic
       const status = await bundleService.buildBundle();
       res.json(status);
     } catch (err: any) {
-      log('VIDEO', `Bundle rebuild failed: ${err.message}`);
+      log('VIDEO', `Bundle rebuild failed:`, err.stack || err.message);
       res.status(500).json({ error: 'Bundle rebuild failed' });
     }
   });
@@ -114,7 +114,7 @@ export const createVideoRoutes = ({ ttsService, bundleService, videoRenderServic
       const renders = await videoRenderService.listRenders(projectId);
       res.json({ renders });
     } catch (err: any) {
-      log('VIDEO', `Failed to list renders: ${err.message}`);
+      log('VIDEO', `Failed to list renders:`, err.stack || err.message);
       res.status(500).json({ error: 'Failed to list renders' });
     }
   });
@@ -151,7 +151,7 @@ export const createVideoRoutes = ({ ttsService, bundleService, videoRenderServic
 
       res.json(status);
     } catch (err: any) {
-      log('VIDEO', `Render start failed: ${err.message}`);
+      log('VIDEO', `Render start failed:`, err.stack || err.message);
       res.status(500).json({ error: err.message });
     }
   });
@@ -169,7 +169,7 @@ export const createVideoRoutes = ({ ttsService, bundleService, videoRenderServic
       }
       res.json(status);
     } catch (err: any) {
-      log('VIDEO', `Failed to get render status: ${err.message}`);
+      log('VIDEO', `Failed to get render status:`, err.stack || err.message);
       res.status(500).json({ error: err.message });
     }
   });
@@ -187,7 +187,7 @@ export const createVideoRoutes = ({ ttsService, bundleService, videoRenderServic
       }
       res.json({ ok: true });
     } catch (err: any) {
-      log('VIDEO', `Failed to delete render: ${err.message}`);
+      log('VIDEO', `Failed to delete render:`, err.stack || err.message);
       res.status(500).json({ error: err.message });
     }
   });
@@ -205,7 +205,7 @@ export const createVideoRoutes = ({ ttsService, bundleService, videoRenderServic
       }
       res.sendFile(filePath);
     } catch (err: any) {
-      log('VIDEO', `Failed to serve render file: ${err.message}`);
+      log('VIDEO', `Failed to serve render file:`, err.stack || err.message);
       res.status(500).json({ error: err.message });
     }
   });

package/templates/assistkick-product-system/packages/backend/src/routes/workflow_groups.ts

@@ -27,7 +27,7 @@ export const createWorkflowGroupRoutes = ({ workflowGroupService, log }: Workflo
       const groups = await workflowGroupService.list(projectId);
       res.json({ groups });
     } catch (err: any) {
-      log('WORKFLOW_GROUPS', `List groups failed: ${err.message}`);
+      log('WORKFLOW_GROUPS', `List groups failed:`, err.stack || err.message);
       res.status(500).json({ error: 'Failed to list workflow groups' });
     }
   });
@@ -45,7 +45,7 @@ export const createWorkflowGroupRoutes = ({ workflowGroupService, log }: Workflo
       }
       res.json({ group });
     } catch (err: any) {
-      log('WORKFLOW_GROUPS', `Get group failed: ${err.message}`);
+      log('WORKFLOW_GROUPS', `Get group failed:`, err.stack || err.message);
       res.status(500).json({ error: 'Failed to get workflow group' });
     }
   });
@@ -73,7 +73,7 @@ export const createWorkflowGroupRoutes = ({ workflowGroupService, log }: Workflo
       });
       res.status(201).json({ group });
     } catch (err: any) {
-      log('WORKFLOW_GROUPS', `Create group failed: ${err.message}`);
+      log('WORKFLOW_GROUPS', `Create group failed:`, err.stack || err.message);
       res.status(500).json({ error: 'Failed to create workflow group' });
     }
   });
@@ -88,7 +88,7 @@ export const createWorkflowGroupRoutes = ({ workflowGroupService, log }: Workflo
       const group = await workflowGroupService.update(id, { name, graphData });
       res.json({ group });
     } catch (err: any) {
-      log('WORKFLOW_GROUPS', `Update group failed: ${err.message}`);
+      log('WORKFLOW_GROUPS', `Update group failed:`, err.stack || err.message);
       if (err.message === 'Workflow group not found') {
         res.status(404).json({ error: err.message });
         return;
@@ -106,7 +106,7 @@ export const createWorkflowGroupRoutes = ({ workflowGroupService, log }: Workflo
       await workflowGroupService.delete(id);
       res.json({ success: true });
     } catch (err: any) {
-      log('WORKFLOW_GROUPS', `Delete group failed: ${err.message}`);
+      log('WORKFLOW_GROUPS', `Delete group failed:`, err.stack || err.message);
       if (err.message === 'Workflow group not found') {
         res.status(404).json({ error: err.message });
         return;

package/templates/assistkick-product-system/packages/backend/src/routes/workflows.ts

@@ -30,7 +30,7 @@ export const createWorkflowRoutes = ({ workflowService, log }: WorkflowRoutesDep
       const workflowList = await workflowService.list(projectId, featureType, triggerColumn);
       res.json({ workflows: workflowList });
     } catch (err: any) {
-      log('WORKFLOWS', `List workflows failed: ${err.message}`);
+      log('WORKFLOWS', `List workflows failed:`, err.stack || err.message);
       res.status(500).json({ error: 'Failed to list workflows' });
     }
   });
@@ -48,7 +48,7 @@ export const createWorkflowRoutes = ({ workflowService, log }: WorkflowRoutesDep
       }
       res.json({ workflow });
     } catch (err: any) {
-      log('WORKFLOWS', `Get workflow failed: ${err.message}`);
+      log('WORKFLOWS', `Get workflow failed:`, err.stack || err.message);
       res.status(500).json({ error: 'Failed to get workflow' });
     }
   });
@@ -79,7 +79,7 @@ export const createWorkflowRoutes = ({ workflowService, log }: WorkflowRoutesDep
       });
       res.status(201).json({ workflow });
     } catch (err: any) {
-      log('WORKFLOWS', `Create workflow failed: ${err.message}`);
+      log('WORKFLOWS', `Create workflow failed:`, err.stack || err.message);
       res.status(500).json({ error: 'Failed to create workflow' });
     }
   });
@@ -105,7 +105,7 @@ export const createWorkflowRoutes = ({ workflowService, log }: WorkflowRoutesDep
       });
       res.json({ workflow });
     } catch (err: any) {
-      log('WORKFLOWS', `Update workflow failed: ${err.message}`);
+      log('WORKFLOWS', `Update workflow failed:`, err.stack || err.message);
       if (err.message === 'Workflow not found') {
         res.status(404).json({ error: err.message });
         return;
@@ -123,7 +123,7 @@ export const createWorkflowRoutes = ({ workflowService, log }: WorkflowRoutesDep
       await workflowService.delete(id);
       res.json({ success: true });
     } catch (err: any) {
-      log('WORKFLOWS', `Delete workflow failed: ${err.message}`);
+      log('WORKFLOWS', `Delete workflow failed:`, err.stack || err.message);
       if (err.message === 'Workflow not found') {
         res.status(404).json({ error: err.message });
         return;
@@ -145,7 +145,7 @@ export const createWorkflowRoutes = ({ workflowService, log }: WorkflowRoutesDep
       const workflow = await workflowService.setDefault(id);
       res.json({ workflow });
     } catch (err: any) {
-      log('WORKFLOWS', `Set default workflow failed: ${err.message}`);
+      log('WORKFLOWS', `Set default workflow failed:`, err.stack || err.message);
       if (err.message === 'Workflow not found') {
         res.status(404).json({ error: err.message });
         return;

package/templates/assistkick-product-system/packages/backend/src/server.ts

@@ -16,13 +16,17 @@ import { fileURLToPath } from 'node:url';
 import { existsSync } from 'node:fs';
 import { WebSocketServer } from 'ws';
 import * as pty from 'node-pty';
-import { initServices, log, githubAppService, sshKeyService, workspaceService, workflowEngine, orchestrator, workflowService as initWorkflowService, workflowGroupService as initWorkflowGroupService, bundleService, ttsService, videoRenderService } from './services/init.js';
+import { initServices, log, logError, paths, githubAppService, sshKeyService, workspaceService, workflowEngine, orchestrator, workflowService as initWorkflowService, workflowGroupService as initWorkflowGroupService, bundleService, ttsService, videoRenderService } from './services/init.js';
 import { AuthService } from './services/auth_service.js';
 import { EmailService } from './services/email_service.js';
 import { PasswordResetService } from './services/password_reset_service.js';
 import { InvitationService } from './services/invitation_service.js';
 import { PtySessionManager } from './services/pty_session_manager.js';
 import { TerminalWsHandler } from './services/terminal_ws_handler.js';
+import { ChatCliBridge } from './services/chat_cli_bridge.js';
+import { ChatWsHandler } from './services/chat_ws_handler.js';
+import { PermissionService } from './services/permission_service.js';
+import { createChatPermissionRoutes } from './routes/chat_permission.js';
 import { UserManagementService } from './services/user_management_service.js';
 import { ProjectService } from './services/project_service.js';
 import { AuthMiddleware } from './middleware/auth_middleware.js';
@@ -31,6 +35,7 @@ import { createUserRoutes } from './routes/users.js';
 import { createProjectRoutes } from './routes/projects.js';
 import { createTerminalRoutes } from './routes/terminal.js';
 import { getDb } from '@assistkick/shared/lib/db.js';
+import { sql } from 'drizzle-orm';
 import graphRoutes from './routes/graph.js';
 import kanbanRoutes from './routes/kanban.js';
 import { createWorkflowExecutionRoutes } from './routes/pipeline.js';
@@ -38,10 +43,20 @@ import coherenceRoutes from './routes/coherence.js';
 import { createGitRoutes } from './routes/git.js';
 import { createFileRoutes } from './routes/files.js';
 import { AgentService } from './services/agent_service.js';
-import { createAgentRoutes } from './routes/agents.js';
+import { createAgentRoutes, createSkillListRoutes } from './routes/agents.js';
 import { createWorkflowRoutes } from './routes/workflows.js';
 import { createWorkflowGroupRoutes } from './routes/workflow_groups.js';
 import { createVideoRoutes } from './routes/video.js';
+import { ChatSessionService } from './services/chat_session_service.js';
+import { ChatMessageRepository } from './services/chat_message_repository.js';
+import { TitleGeneratorService } from './services/title_generator_service.js';
+import { createChatSessionRoutes } from './routes/chat_sessions.js';
+import { createChatUploadRoutes } from './routes/chat_upload.js';
+import { createChatFilesRoutes } from './routes/chat_files.js';
+import { createSkillRoutes } from './routes/skills.js';
+import { DevCommandDetector } from './services/dev_command_detector.js';
+import { PreviewServerManager } from './services/preview_server_manager.js';
+import { createPreviewApiRoutes, createPreviewProxyMiddleware } from './routes/preview.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const DEFAULT_PORT = parseInt(process.env.PORT || '3000', 10);
@@ -68,7 +83,7 @@ initServices(args.verbose);
 const app: Express = express();
 
 app.use(cors());
-app.use(express.json());
+app.use(express.json({ limit: '10mb' }));
 app.use(cookieParser());
 
 // Request/response logging
@@ -90,7 +105,7 @@ const authService = new AuthService({ jwtSecret, isProduction });
 const resendApiKey = process.env.RESEND_API_KEY || '';
 const appBaseUrl = process.env.APP_BASE_URL || 'https://assistkick.localhost';
 const emailFromAddress = process.env.EMAIL_FROM || 'noreply@example.com';
-const emailService = new EmailService({ apiKey: resendApiKey, fromAddress: emailFromAddress });
+const emailService = new EmailService({ apiKey: resendApiKey, fromAddress: emailFromAddress, log });
 const passwordResetService = new PasswordResetService({ getDb, emailService, authService, appBaseUrl, log });
 const invitationService = new InvitationService({ getDb, emailService, authService, appBaseUrl, log });
 const authRoutes = createAuthRoutes({ getDb, authService, passwordResetService, invitationService, log });
@@ -106,7 +121,7 @@ app.use('/api/users', authMiddleware.requireAuth, userRoutes);
 
 // Project management routes (authenticated)
 const projectService = new ProjectService({ getDb, log });
-const projectRoutes = createProjectRoutes({ projectService, log });
+const projectRoutes = createProjectRoutes({ projectService, workspaceService, log });
 app.use('/api/projects', authMiddleware.requireAuth, projectRoutes);
 
 // Git repository routes (nested under /api/projects/:id/git)
@@ -117,22 +132,20 @@ app.use('/api/projects/:id/git', authMiddleware.requireAuth, gitRoutes);
 const fileRoutes = createFileRoutes({ workspaceService, log });
 app.use('/api/projects/:id/files', authMiddleware.requireAuth, fileRoutes);
 
+// Skills routes (nested under /api/projects/:id/skills)
+const skillRoutes = createSkillRoutes({ workspaceService, log });
+app.use('/api/projects/:id/skills', authMiddleware.requireAuth, skillRoutes);
+
 // Agent management routes (authenticated)
 const SKILLS_DIR = join(__dirname, '..', '..', '..', '..', '.claude', 'skills');
-const agentService = new AgentService({
-  getDb,
-  log,
-  skillPaths: {
-    developer: join(SKILLS_DIR, 'assistkick-developer', 'SKILL.md'),
-    reviewer: join(SKILLS_DIR, 'assistkick-code-reviewer', 'SKILL.md'),
-    debugger: join(SKILLS_DIR, 'assistkick-debugger', 'SKILL.md'),
-    videoScriptWriter: join(SKILLS_DIR, 'video-script-writer', 'SKILL.md'),
-    videoCompositionAgent: join(SKILLS_DIR, 'video-composition-agent', 'SKILL.md'),
-  },
-});
+const agentService = new AgentService({ getDb, log, skillsDir: SKILLS_DIR });
 const agentRoutes = createAgentRoutes({ agentService, log });
 app.use('/api/agents', authMiddleware.requireAuth, agentRoutes);
 
+// Skills listing route (authenticated) — scans skills directory on disk
+const skillListRoutes = createSkillListRoutes({ agentService, log });
+app.use('/api/skills', authMiddleware.requireAuth, skillListRoutes);
+
 // Workflow management routes (authenticated)
 const workflowRoutes = createWorkflowRoutes({ workflowService: initWorkflowService, log });
 app.use('/api/workflows', authMiddleware.requireAuth, workflowRoutes);
@@ -145,16 +158,61 @@ app.use('/api/workflow-groups', authMiddleware.requireAuth, workflowGroupRoutes)
 const videoRoutes = createVideoRoutes({ ttsService, bundleService, videoRenderService, log });
 app.use('/api/video', authMiddleware.requireAuth, videoRoutes);
 
-// Ensure default project exists and assign orphan nodes on startup
-projectService.ensureDefaultAndAssignOrphans().catch((err: any) => {
-  log('STARTUP', `Failed to ensure default project: ${err.message}`);
-});
+// Wait for DB connection to be ready before running startup tasks.
+// Turso cold-starts can cause the first query to fail if fired immediately.
+const waitForDb = async (maxRetries = 5, delayMs = 500): Promise<void> => {
+  for (let i = 0; i < maxRetries; i++) {
+    try {
+      const db = getDb();
+      await db.select({ one: sql`1` }).from(sql`sqlite_master`).limit(1);
+      return;
+    } catch (err: any) {
+      if (i < maxRetries - 1) {
+        log('STARTUP', `DB not ready, retrying in ${delayMs}ms (${i + 1}/${maxRetries}):`, err.message);
+        await new Promise(r => setTimeout(r, delayMs));
+      }
+    }
+  }
+  log('STARTUP', 'DB warmup failed after retries — startup tasks may fail');
+};
 
-// Sync default agent prompts with latest SKILL.md + template code
-agentService.syncDefaults().catch((err: any) => {
-  log('STARTUP', `Failed to sync default agents: ${err.message}`);
+waitForDb().then(async () => {
+  try {
+    await projectService.ensureDefaultAndAssignOrphans();
+  } catch (err: any) {
+    logError('STARTUP', 'Failed to ensure default project', err);
+  }
+}).catch((err: any) => {
+  logError('STARTUP', 'Startup tasks failed', err);
 });
 
+// Chat v2 session management routes (authenticated)
+const chatSessionService = new ChatSessionService({ getDb, log });
+const chatMessageRepository = new ChatMessageRepository({ getDb, log });
+const chatSessionRoutes = createChatSessionRoutes({ chatSessionService, chatMessageRepository, log });
+app.use('/api/chat-sessions', authMiddleware.requireAuth, chatSessionRoutes);
+
+// Chat v2 file upload routes (authenticated) — base64 file upload for chat attachments
+// Uses a larger body size limit since files are base64-encoded in JSON
+const chatUploadRoutes = createChatUploadRoutes({ workspaceService, log });
+app.use('/api/chat-upload', authMiddleware.requireAuth, express.json({ limit: '15mb' }), chatUploadRoutes);
+
+// Chat v2 file serve routes (authenticated) — serves uploaded chat attachment files with caching
+const chatFilesRoutes = createChatFilesRoutes({ workspaceService, log });
+app.use('/api/chat-files', authMiddleware.requireAuth, chatFilesRoutes);
+
+// Preview server manager — manages dev server lifecycle
+const devCommandDetector = new DevCommandDetector({ log });
+const previewManager = new PreviewServerManager({ devCommandDetector, log });
+
+// Preview API routes (authenticated)
+const previewApiRoutes = createPreviewApiRoutes({ previewManager, workspaceService, projectService, log });
+app.use('/api/preview', authMiddleware.requireAuth, previewApiRoutes);
+
+// Preview proxy middleware — must be before SPA fallback so /apps/* is intercepted
+const previewProxy = createPreviewProxyMiddleware({ previewManager, authMiddleware, log });
+app.use(previewProxy);
+
 // PTY session manager — initialized early so terminal REST routes can reference it
 // Resolve project root: from packages/backend/src → assistkick-product-system → repo root
 const PROJECT_ROOT = join(__dirname, '..', '..', '..', '..');
@@ -196,16 +254,37 @@ if (existsSync(FRONTEND_DIST)) {
 const server = createServer(app);
 
 // Set up WebSocket for terminal
-const wss = new WebSocketServer({ noServer: true });
-const terminalHandler = new TerminalWsHandler({ wss, authService, ptyManager, log });
+const terminalWss = new WebSocketServer({ noServer: true });
+const terminalHandler = new TerminalWsHandler({ wss: terminalWss, authService, ptyManager, log });
+
+// Set up WebSocket for Chat v2 streaming with permission management
+const chatWss = new WebSocketServer({ noServer: true });
+const chatCliBridge = new ChatCliBridge({ workspacesDir: paths.workspacesDir, log });
+const permissionService = new PermissionService({ getDb, log });
+const titleGeneratorService = new TitleGeneratorService({ log });
+const chatHandler = new ChatWsHandler({ wss: chatWss, authService, chatCliBridge, permissionService, chatMessageRepository, chatSessionService, titleGeneratorService, log });
+
+// Chat permission routes — used by MCP permission server (no auth — internal only)
+const chatPermissionRoutes = createChatPermissionRoutes({ permissionService, log });
+app.use('/api/chat/permission', chatPermissionRoutes);
 
 server.on('upgrade', (req, socket, head) => {
-  terminalHandler.handleUpgrade(req, socket, head);
+  const url = new URL(req.url || '', 'http://localhost');
+  if (url.pathname === '/api/chat') {
+    chatHandler.handleUpgrade(req, socket, head);
+  } else if (url.pathname.startsWith('/apps/')) {
+    // Let http-proxy-middleware handle WebSocket upgrades for preview apps (HMR)
+    // The proxy middleware registers its own upgrade handler on the server
+  } else {
+    terminalHandler.handleUpgrade(req, socket, head);
+  }
 });
 
-// Clean up PTY sessions on server shutdown
+// Clean up PTY sessions and chat CLI processes on server shutdown
 process.on('SIGTERM', () => {
+  previewManager.stopAll();
   ptyManager.destroyAllPty();
+  chatCliBridge.killAll();
   server.close();
 });
 
@@ -213,6 +292,7 @@ server.listen(args.port, () => {
   log('SERVER', `API server running at http://localhost:${args.port}`);
   log('SERVER', `Verbose mode: ${args.verbose ? 'ON' : 'OFF'}`);
   log('SERVER', `WebSocket terminal endpoint: ws://localhost:${args.port}/api/terminal`);
+  log('SERVER', `WebSocket chat endpoint: ws://localhost:${args.port}/api/chat`);
   if (existsSync(FRONTEND_DIST)) {
     log('SERVER', `Serving frontend from ${FRONTEND_DIST}`);
   } else {