claude-ws 0.4.9 → 0.5.1-beta.1

package/locales/de.json

@@ -617,6 +617,7 @@
     "cancelled": "Abgebrochen",
     "detachToFloating": "In schwebendes Fenster abtrennen",
     "maximizeToPanel": "Als Panel maximieren",
+    "sendError": "Senden fehlgeschlagen",
     "clearConversation": "Unterhaltung löschen",
     "clearConversationConfirm": "Sind Sie sicher, dass Sie alle Nachrichten löschen möchten? Dies kann nicht rückgängig gemacht werden.",
     "compactConversation": "Unterhaltung komprimieren",
@@ -787,6 +788,18 @@
     "description": "Die gesuchte Seite existiert nicht.",
     "goHome": "Zurück zur Startseite"
   },
+  "butler": {
+    "disabled": "Butler deaktiviert",
+    "status_idle": "Butler inaktiv",
+    "status_initializing": "Butler startet...",
+    "status_running": "Butler aktiv",
+    "status_reasoning": "Butler denkt nach...",
+    "status_shutting_down": "Butler wird gestoppt...",
+    "enable": "Butler aktivieren",
+    "disable": "Butler deaktivieren",
+    "openProject": "Butler-Projekt öffnen",
+    "startTask": "Butler Task"
+  },
   "globalError": {
     "title": "Etwas ist schiefgelaufen!",
     "fallbackMessage": "Ein unerwarteter Fehler ist aufgetreten",

package/locales/en.json

@@ -619,6 +619,7 @@
     "cancelled": "Cancelled",
     "detachToFloating": "Detach to floating window",
     "maximizeToPanel": "Maximize to panel",
+    "sendError": "Failed to send",
     "clearConversation": "Clear Conversation",
     "clearConversationConfirm": "Are you sure you want to clear all messages? This cannot be undone.",
     "compactConversation": "Compact Conversation",
@@ -792,6 +793,25 @@
     "description": "The page you're looking for doesn't exist.",
     "goHome": "Go back home"
   },
+  "butler": {
+    "disabled": "Butler disabled",
+    "status_idle": "Butler idle",
+    "status_initializing": "Butler starting...",
+    "status_running": "Butler active",
+    "status_reasoning": "Butler thinking...",
+    "status_shutting_down": "Butler stopping...",
+    "enable": "Enable Butler",
+    "disable": "Disable Butler",
+    "openProject": "Open Butler Project",
+    "notifications": "Notifications",
+    "noNotifications": "No notifications",
+    "clearAll": "Clear all",
+    "justNow": "just now",
+    "minutesAgo": "{m}m ago",
+    "hoursAgo": "{h}h ago",
+    "daysAgo": "{d}d ago",
+    "startTask": "Butler Task"
+  },
   "globalError": {
     "title": "Something went wrong!",
     "fallbackMessage": "An unexpected error occurred",

package/locales/es.json

@@ -617,6 +617,7 @@
     "cancelled": "Cancelado",
     "detachToFloating": "Desacoplar a ventana flotante",
     "maximizeToPanel": "Maximizar al panel",
+    "sendError": "Error al enviar",
     "clearConversation": "Limpiar Conversación",
     "clearConversationConfirm": "¿Está seguro de que desea borrar todos los mensajes? Esta acción no se puede deshacer.",
     "compactConversation": "Compactar Conversación",
@@ -787,6 +788,18 @@
     "description": "La página que busca no existe.",
     "goHome": "Volver al inicio"
   },
+  "butler": {
+    "disabled": "Butler desactivado",
+    "status_idle": "Butler inactivo",
+    "status_initializing": "Butler iniciando...",
+    "status_running": "Butler activo",
+    "status_reasoning": "Butler pensando...",
+    "status_shutting_down": "Butler deteniéndose...",
+    "enable": "Activar Butler",
+    "disable": "Desactivar Butler",
+    "openProject": "Abrir proyecto Butler",
+    "startTask": "Butler Task"
+  },
   "globalError": {
     "title": "¡Algo salió mal!",
     "fallbackMessage": "Ocurrió un error inesperado",

package/locales/fr.json

@@ -617,6 +617,7 @@
     "cancelled": "Annulé",
     "detachToFloating": "Détacher en fenêtre flottante",
     "maximizeToPanel": "Maximiser en panneau",
+    "sendError": "Échec de l'envoi",
     "clearConversation": "Effacer la conversation",
     "clearConversationConfirm": "Êtes-vous sûr de vouloir effacer tous les messages ? Cette action est irréversible.",
     "compactConversation": "Compacter la conversation",
@@ -787,6 +788,18 @@
     "description": "La page que vous recherchez n'existe pas.",
     "goHome": "Retourner à l'accueil"
   },
+  "butler": {
+    "disabled": "Butler désactivé",
+    "status_idle": "Butler inactif",
+    "status_initializing": "Butler en démarrage...",
+    "status_running": "Butler actif",
+    "status_reasoning": "Butler en réflexion...",
+    "status_shutting_down": "Butler en arrêt...",
+    "enable": "Activer Butler",
+    "disable": "Désactiver Butler",
+    "openProject": "Ouvrir le projet Butler",
+    "startTask": "Butler Task"
+  },
   "globalError": {
     "title": "Quelque chose s'est mal passé !",
     "fallbackMessage": "Une erreur inattendue s'est produite",

package/locales/ja.json

@@ -617,6 +617,7 @@
     "cancelled": "キャンセルされました",
     "detachToFloating": "フローティングウィンドウにデタッチ",
     "maximizeToPanel": "パネルに最大化",
+    "sendError": "送信に失敗しました",
     "clearConversation": "会話をクリア",
     "clearConversationConfirm": "すべてのメッセージをクリアしてもよろしいですか？この操作は元に戻せません。",
     "compactConversation": "会話をコンパクト化",
@@ -787,6 +788,18 @@
     "description": "お探しのページは存在しません。",
     "goHome": "ホームに戻る"
   },
+  "butler": {
+    "disabled": "バトラー無効",
+    "status_idle": "バトラー待機中",
+    "status_initializing": "バトラー起動中...",
+    "status_running": "バトラー稼働中",
+    "status_reasoning": "バトラー思考中...",
+    "status_shutting_down": "バトラー停止中...",
+    "enable": "バトラーを有効にする",
+    "disable": "バトラーを無効にする",
+    "openProject": "バトラープロジェクトを開く",
+    "startTask": "Butler Task"
+  },
   "globalError": {
     "title": "問題が発生しました！",
     "fallbackMessage": "予期しないエラーが発生しました",

package/locales/ko.json

@@ -617,6 +617,7 @@
     "cancelled": "취소됨",
     "detachToFloating": "플로팅 창으로 분리",
     "maximizeToPanel": "패널로 최대화",
+    "sendError": "전송 실패",
     "clearConversation": "대화 지우기",
     "clearConversationConfirm": "모든 메시지를 지우시겠습니까? 이 작업은 취소할 수 없습니다.",
     "compactConversation": "대화 압축",
@@ -787,6 +788,18 @@
     "description": "찾고 있는 페이지가 존재하지 않습니다.",
     "goHome": "홈으로 돌아가기"
   },
+  "butler": {
+    "disabled": "버틀러 비활성화",
+    "status_idle": "버틀러 대기 중",
+    "status_initializing": "버틀러 시작 중...",
+    "status_running": "버틀러 활성",
+    "status_reasoning": "버틀러 생각 중...",
+    "status_shutting_down": "버틀러 종료 중...",
+    "enable": "버틀러 활성화",
+    "disable": "버틀러 비활성화",
+    "openProject": "버틀러 프로젝트 열기",
+    "startTask": "Butler Task"
+  },
   "globalError": {
     "title": "문제가 발생했습니다!",
     "fallbackMessage": "예기치 않은 오류가 발생했습니다",

package/locales/vi.json

@@ -619,6 +619,7 @@
     "cancelled": "Đã hủy",
     "detachToFloating": "Tách thành cửa sổ nổi",
     "maximizeToPanel": "Phóng to thành bảng",
+    "sendError": "Gửi thất bại",
     "clearConversation": "Xóa cuộc trò chuyện",
     "clearConversationConfirm": "Bạn có chắc muốn xóa tất cả tin nhắn? Hành động này không thể hoàn tác.",
     "compactConversation": "Nén cuộc trò chuyện",
@@ -789,6 +790,25 @@
     "description": "Trang bạn đang tìm không tồn tại.",
     "goHome": "Quay về trang chủ"
   },
+  "butler": {
+    "disabled": "Butler đã tắt",
+    "status_idle": "Butler đang rảnh",
+    "status_initializing": "Butler đang khởi động...",
+    "status_running": "Butler đang hoạt động",
+    "status_reasoning": "Butler đang suy nghĩ...",
+    "status_shutting_down": "Butler đang dừng...",
+    "enable": "Bật Butler",
+    "disable": "Tắt Butler",
+    "openProject": "Mở dự án Butler",
+    "notifications": "Thông báo",
+    "noNotifications": "Không có thông báo",
+    "clearAll": "Xóa tất cả",
+    "justNow": "vừa xong",
+    "minutesAgo": "{m} phút trước",
+    "hoursAgo": "{h} giờ trước",
+    "daysAgo": "{d} ngày trước",
+    "startTask": "Butler Task"
+  },
   "globalError": {
     "title": "Đã xảy ra lỗi!",
     "fallbackMessage": "Đã xảy ra lỗi không mong đợi",

package/locales/zh.json

@@ -617,6 +617,7 @@
     "cancelled": "已取消",
     "detachToFloating": "分离为浮动窗口",
     "maximizeToPanel": "最大化为面板",
+    "sendError": "发送失败",
     "clearConversation": "清除对话",
     "clearConversationConfirm": "您确定要清除所有消息吗？此操作无法撤销。",
     "compactConversation": "压缩对话",
@@ -787,6 +788,18 @@
     "description": "您所查找的页面不存在。",
     "goHome": "返回首页"
   },
+  "butler": {
+    "disabled": "管家已禁用",
+    "status_idle": "管家空闲",
+    "status_initializing": "管家启动中...",
+    "status_running": "管家运行中",
+    "status_reasoning": "管家思考中...",
+    "status_shutting_down": "管家停止中...",
+    "enable": "启用管家",
+    "disable": "禁用管家",
+    "openProject": "打开管家项目",
+    "startTask": "Butler Task"
+  },
   "globalError": {
     "title": "出现错误！",
     "fallbackMessage": "发生了意外错误",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-ws",
-  "version": "0.4.9",
+  "version": "0.5.1-beta.1",
   "private": false,
   "description": "AI-powered workspace for solo CEOs and indie builders — manage your entire business with AI agents, not just code. Kanban board, code editor, Git integration, claw agent hub, local-first SQLite.",
   "keywords": [

package/packages/agentic-sdk/src/agent/claude-sdk-agent-provider.ts

@@ -11,10 +11,11 @@ import { homedir } from 'os';
 import { query, type Query } from '@anthropic-ai/claude-agent-sdk';
 import { createRequire } from 'module';
 
-// Resolve cli.js path explicitly to work around pnpm nested node_modules layout
-// where the SDK's built-in dirname-based resolution fails
+// Resolve cli.js path by finding the SDK package directory first, then appending cli.js.
+// Direct subpath resolution fails because cli.js is not in the SDK's exports map.
 const require_ = createRequire(import.meta.url);
-const CLAUDE_CLI_PATH = require_.resolve('@anthropic-ai/claude-agent-sdk/cli.js');
+const sdkMainPath = require_.resolve('@anthropic-ai/claude-agent-sdk');
+const CLAUDE_CLI_PATH = join(sdkMainPath, '..', 'cli.js');
 import { adaptSDKMessage, isValidSDKMessage } from './claude-sdk-message-to-output-adapter';
 import type { SDKResultMessage } from './claude-sdk-message-to-output-adapter';
 import { createLogger } from '../lib/pino-logger';

package/packages/agentic-sdk/src/services/task/task-conversation-history-builder.ts

@@ -36,7 +36,7 @@ export async function buildConversationHistory(db: any, taskId: string): Promise
 
     turns.push({
       type: 'user',
-      prompt: attempt.displayPrompt || attempt.prompt,
+      prompt: attempt.displayPrompt ?? attempt.prompt,
       messages: [],
       attemptId: attempt.id,
       timestamp: attempt.createdAt,

package/packages/agentic-sdk/src/services/task/task-crud-and-reorder.ts

@@ -3,7 +3,7 @@
  * Read-heavy query methods (conversation history, stats, running attempt) live in
  * task-attempt-and-conversation-queries.ts and are composed in here.
  */
-import { eq, and, desc, inArray } from 'drizzle-orm';
+import { eq, and, desc, inArray, gte, ne, sql } from 'drizzle-orm';
 import * as schema from '../../db/database-schema';
 import { generateId } from '../../lib/nanoid-id-generator';
 import { createTaskQueryMethods } from './task-attempt-and-conversation-queries';
@@ -85,6 +85,20 @@ export function createTaskService(db: any) {
     // --- reorder ---
 
     async reorder(taskId: string, newPosition: number, newStatus?: string) {
+      const task = db.select().from(schema.tasks).where(eq(schema.tasks.id, taskId)).get();
+      if (!task) return null;
+
+      const targetStatus = (newStatus || task.status) as any;
+
+      // Shift tasks at position >= newPosition up by 1 in the target column
+      await db.update(schema.tasks)
+        .set({ position: sql`${schema.tasks.position} + 1` })
+        .where(and(
+          eq(schema.tasks.status, targetStatus),
+          gte(schema.tasks.position, newPosition),
+          ne(schema.tasks.id, taskId)
+        ));
+
       const updates: any = { position: newPosition, updatedAt: Date.now() };
       if (newStatus) updates.status = newStatus;
       await db.update(schema.tasks).set(updates).where(eq(schema.tasks.id, taskId));

package/server.ts

@@ -47,6 +47,7 @@ const log = createLogger('Server');
 import { eq } from 'drizzle-orm';
 import { nanoid } from 'nanoid';
 import type { AttemptStatus } from './src/types';
+import { setSocketServer } from './src/lib/socket-io-server-singleton';
 import { processAttachments } from './src/lib/file-processor';
 import { usageTracker } from './src/lib/usage-tracker';
 import { workflowTracker } from './src/lib/workflow-tracker';
@@ -56,6 +57,9 @@ import { getMinioPullQueueWorker } from './src/lib/minio-pull-queue';
 import { getMinioPushQueueWorker } from './src/lib/minio-push-queue';
 import { createAutopilotManager, appendQuestionAnswer, appendSubagentEnded, appendTrackedTaskUpdate } from './src/lib/autopilot';
 import type { AutopilotMode } from './src/lib/autopilot';
+import { createButlerManager, type ButlerManager } from './src/lib/butler';
+import { createTaskService } from '@agentic-sdk/services/task/task-crud-and-reorder';
+import { createTaskServiceWithSocketEmit } from './src/lib/services/task-service-with-socket-emit';
 
 import { getPort, getHostname } from './src/lib/server-port-configuration';
 
@@ -141,6 +145,9 @@ app.prepare().then(async () => {
 
   log.info(`[Server] Restored ${shellManager.runningCount} running shells`);
 
+  // Initialize task service with auto-emit for Socket.IO events
+  const taskService = createTaskServiceWithSocketEmit(createTaskService(db));
+
   // Initialize Autopilot Manager
   const autopilotManager = createAutopilotManager();
   autopilotManager.registerQuestionListener(agentManager);
@@ -161,8 +168,24 @@ app.prepare().then(async () => {
     },
   });
 
+  // Expose io singleton for Next.js API routes to emit events
+  setSocketServer(io);
+
   // Restore autopilot state from DB (needs io for worker callbacks)
-  await autopilotManager.restoreFromDb({ db, io, schema, agentManager, sessionManager });
+  await autopilotManager.restoreFromDb({ db, io, schema, agentManager, sessionManager, taskService });
+
+  // Initialize Butler Agent (workspace-wide orchestrator)
+  // NOTE: Do not await — Butler spawns SDK sessions that hit our proxy endpoint,
+  // which requires httpServer.listen() to complete first. Fire and forget to avoid deadlock.
+  const butlerManager = createButlerManager();
+
+  // Export butlerManager singleton for API routes to access
+  const globalKey = '__claude_butler_manager__' as const;
+  (globalThis as any)[globalKey] = butlerManager;
+
+  butlerManager.initialize({ db, io, schema, agentManager, sessionManager }).catch(err => {
+    log.error({ err }, '[Butler] Background initialization failed');
+  });
 
   // Disconnect cleanup timers - keyed by attemptId
   const disconnectTimers = new Map<string, NodeJS.Timeout>();
@@ -408,25 +431,33 @@ app.prepare().then(async () => {
 
           // Update task status to in_progress if it was todo
           // Also clear pendingFileIds since they've been processed
-          const taskUpdates: any = { updatedAt: Date.now() };
-          if (task.status === 'todo') taskUpdates.status = 'in_progress';
-          if (task.pendingFileIds) taskUpdates.pendingFileIds = null;
-          if (Object.keys(taskUpdates).length > 1) {
-            await db
-              .update(schema.tasks)
-              .set(taskUpdates)
-              .where(eq(schema.tasks.id, taskId));
+          if (task.status === 'todo' || task.pendingFileIds) {
+            const taskUpdates: any = {};
+            if (task.status === 'todo') taskUpdates.status = 'in_progress';
+            if (task.pendingFileIds) taskUpdates.pendingFileIds = null;
+            await taskService.update(taskId, taskUpdates);
           }
 
           // Join attempt room
           socket.join(`attempt:${attemptId}`);
 
+          // Inject Butler persona into prompt when task belongs to Butler's project
+          let effectivePrompt = prompt;
+          const butlerProjectId = butlerManager.getProjectId();
+          if (butlerProjectId && task.projectId === butlerProjectId) {
+            const personaPrefix = butlerManager.buildPersonaPrompt();
+            if (personaPrefix) {
+              effectivePrompt = `${personaPrefix}\n\n---\n\n${prompt}`;
+              log.info({ taskId }, '[Butler] Persona context injected into task prompt');
+            }
+          }
+
           // Start Claude Agent SDK query
 
           agentManager.start({
             attemptId,
             projectPath: project.path,
-            prompt,
+            prompt: effectivePrompt,
             model: model || undefined,
             provider: provider || undefined,
             sessionOptions: Object.keys(sessionOptions).length > 0 ? sessionOptions : undefined,
@@ -448,6 +479,11 @@ app.prepare().then(async () => {
 
           // Global event for all clients to track running tasks
           io.emit('task:started', { taskId });
+
+          // Forward to butler event collector
+          if (butlerManager.isEnabled()) {
+            butlerManager.pushEvent({ type: 'task:started', payload: { taskId }, timestamp: Date.now() });
+          }
         } catch (error) {
           log.error({ error }, 'Error starting attempt');
           socket.emit('error', {
@@ -896,7 +932,7 @@ app.prepare().then(async () => {
       if (!['off', 'autonomous', 'ask'].includes(mode)) return;
       log.info({ projectId, mode }, '[Autopilot] Setting mode');
       await autopilotManager.setMode(projectId, mode as AutopilotMode, {
-        db, io, schema, agentManager, sessionManager,
+        db, io, schema, agentManager, sessionManager, taskService,
       });
     });
 
@@ -904,7 +940,7 @@ app.prepare().then(async () => {
     socket.on('autopilot:enable', async (data: { projectId: string }) => {
       log.info({ projectId: data.projectId }, '[Autopilot] Enable (compat → autonomous)');
       await autopilotManager.setMode(data.projectId, 'autonomous', {
-        db, io, schema, agentManager, sessionManager,
+        db, io, schema, agentManager, sessionManager, taskService,
       });
     });
 
@@ -912,7 +948,7 @@ app.prepare().then(async () => {
     socket.on('autopilot:disable', async (data: { projectId: string }) => {
       log.info({ projectId: data.projectId }, '[Autopilot] Disable (compat → off)');
       await autopilotManager.setMode(data.projectId, 'off', {
-        db, io, schema, agentManager, sessionManager,
+        db, io, schema, agentManager, sessionManager, taskService,
       });
     });
 
@@ -924,6 +960,99 @@ app.prepare().then(async () => {
       });
     });
 
+    // Butler handlers
+    socket.on('butler:status-request', () => {
+      socket.emit('butler:status', butlerManager.getStatus());
+      // Replay buffered notifications to late-connecting clients
+      const notifService = butlerManager.getNotificationService();
+      if (notifService) {
+        const buffered = notifService.getRecentNotifications();
+        for (const n of buffered) {
+          socket.emit('butler:notification', n);
+        }
+      }
+    });
+
+    socket.on('butler:clear-notifications', () => {
+      const notifService = butlerManager.getNotificationService();
+      if (notifService) notifService.clearBuffer();
+    });
+
+    socket.on('butler:enable', async () => {
+      log.info('[Butler] Enable requested');
+      await butlerManager.start();
+    });
+
+    socket.on('butler:disable', async () => {
+      log.info('[Butler] Disable requested by user');
+      await butlerManager.stop(true);
+    });
+
+    // Butler scheduler handlers
+    socket.on('butler:schedule-create', async (data: { cronExpression: string; actionType: string; actionPayload: any }) => {
+      try {
+        const scheduler = butlerManager.getSchedulerService();
+        if (!scheduler) {
+          socket.emit('butler:error', { message: 'Scheduler not available' });
+          return;
+        }
+        const task = await scheduler.createTask(data.cronExpression, data.actionType as any, data.actionPayload);
+        socket.emit('butler:schedule-created', task);
+      } catch (err) {
+        log.error({ err }, '[Butler] Failed to create scheduled task');
+        socket.emit('butler:error', { message: 'Failed to create scheduled task' });
+      }
+    });
+
+    socket.on('butler:schedule-list', async () => {
+      try {
+        const scheduler = butlerManager.getSchedulerService();
+        if (!scheduler) {
+          socket.emit('butler:schedule-list', []);
+          return;
+        }
+        const tasks = scheduler.listTasks();
+        socket.emit('butler:schedule-list', tasks);
+      } catch (err) {
+        log.error({ err }, '[Butler] Failed to list scheduled tasks');
+        socket.emit('butler:error', { message: 'Failed to list scheduled tasks' });
+      }
+    });
+
+    socket.on('butler:schedule-delete', async (data: { id: string }) => {
+      try {
+        const scheduler = butlerManager.getSchedulerService();
+        if (!scheduler) {
+          socket.emit('butler:error', { message: 'Scheduler not available' });
+          return;
+        }
+        const deleted = await scheduler.deleteTask(data.id);
+        socket.emit('butler:schedule-deleted', { id: data.id, success: deleted });
+      } catch (err) {
+        log.error({ err }, '[Butler] Failed to delete scheduled task');
+        socket.emit('butler:error', { message: 'Failed to delete scheduled task' });
+      }
+    });
+
+    socket.on('butler:schedule-update', async (data: { id: string; updates: any }) => {
+      try {
+        const scheduler = butlerManager.getSchedulerService();
+        if (!scheduler) {
+          socket.emit('butler:error', { message: 'Scheduler not available' });
+          return;
+        }
+        const task = await scheduler.updateTask(data.id, data.updates);
+        if (!task) {
+          socket.emit('butler:error', { message: 'Task not found' });
+          return;
+        }
+        socket.emit('butler:schedule-updated', task);
+      } catch (err) {
+        log.error({ err }, '[Butler] Failed to update scheduled task');
+        socket.emit('butler:error', { message: 'Failed to update scheduled task' });
+      }
+    });
+
     socket.on('disconnect', () => {
       log.info(`Client disconnected: ${socket.id}`);
 
@@ -1574,6 +1703,25 @@ app.prepare().then(async () => {
       // Global event for all clients to track completed tasks
       if (attempt?.taskId) {
         io.emit('task:finished', { taskId: attempt.taskId, status });
+
+        // Forward to butler event collector (include projectId for per-project rule matching)
+        if (butlerManager.isEnabled()) {
+          const taskRow = await db.query.tasks.findFirst({ where: eq(schema.tasks.id, attempt.taskId) });
+          const projectRow = taskRow?.projectId
+            ? await db.query.projects.findFirst({ where: eq(schema.projects.id, taskRow.projectId) })
+            : undefined;
+          butlerManager.pushEvent({
+            type: 'task:finished',
+            payload: {
+              taskId: attempt.taskId,
+              status,
+              projectId: taskRow?.projectId,
+              taskTitle: taskRow?.title,
+              projectName: projectRow?.name,
+            },
+            timestamp: Date.now(),
+          });
+        }
       }
 
       const shouldCompact = !!(status === 'completed' && usageStats?.contextHealth?.shouldCompact);
@@ -1941,6 +2089,10 @@ app.prepare().then(async () => {
     minioPushQueueWorker.stop();
     log.info('> MinIO push queue worker stopped');
 
+    // Stop butler agent
+    await butlerManager.stop();
+    log.info('> Butler agent stopped');
+
     // Cancel all Claude agents first
     agentManager.cancelAll();
     log.info('> Cancelled all Claude agents');

package/src/app/[locale]/page.tsx

@@ -12,6 +12,7 @@ import { AccessAnywhereWizard } from '@/components/access-anywhere';
 import { TerminalPanel } from '@/components/terminal/terminal-panel';
 import { useProjectStore } from '@/stores/project-store';
 import { useTaskStore } from '@/stores/task-store';
+import { useButlerStore } from '@/stores/butler-store';
 import { useFloatingWindowsStore } from '@/stores/floating-windows-store';
 import { useTunnelStore } from '@/stores/tunnel-store';
 import { useAgentFactoryUIStore } from '@/stores/agent-factory-ui-store';
@@ -73,6 +74,8 @@ function KanbanApp() {
 
   const { projects, selectedProjectIds, loading: projectLoading, error: projectError } = useProjectStore();
   const { selectedTask, setSelectedTask, setPendingAutoStartTask, setSelectedTaskId } = useTaskStore();
+  const butlerEnabled = useButlerStore(s => s.enabled);
+  const butlerProjectId = useButlerStore(s => s.projectId);
 
   const autoShowSetup = !projectLoading && !projectError && projects.length === 0;
 
@@ -88,9 +91,25 @@ function KanbanApp() {
   // Fetch tasks when project selection changes
   useEffect(() => {
     if (!projectLoading) {
-      useTaskStore.getState().fetchTasks(selectedProjectIds);
+      let projectIds = selectedProjectIds;
+      // Auto-include butler project when butler is enabled and user has selected specific projects
+      // Skip when all-projects mode (empty array) — butler tasks already included in that mode
+      if (butlerEnabled && butlerProjectId && projectIds.length > 0 && !projectIds.includes(butlerProjectId)) {
+        projectIds = [...projectIds, butlerProjectId];
+      }
+      useTaskStore.getState().fetchTasks(projectIds);
+    }
+  }, [selectedProjectIds, projectLoading, butlerEnabled, butlerProjectId]);
+
+  // Re-fetch when butler status changes (handles delayed socket connection)
+  // This fixes timing issue where butler:status arrives after initial render
+  useEffect(() => {
+    if (!projectLoading && butlerEnabled && butlerProjectId && selectedProjectIds.length > 0) {
+      if (!selectedProjectIds.includes(butlerProjectId)) {
+        useTaskStore.getState().fetchTasks([...selectedProjectIds, butlerProjectId]);
+      }
     }
-  }, [selectedProjectIds, projectLoading]);
+  }, [butlerEnabled, butlerProjectId, projectLoading, selectedProjectIds]);
 
   // Mobile: redirect panel selection to floating window
   useEffect(() => {