commandmate 0.3.2 → 0.3.4

package/dist/server/src/lib/db-migrations.js

@@ -19,7 +19,7 @@ const db_1 = require("./db");
  * Current schema version
  * Increment this when adding new migrations
  */
-exports.CURRENT_SCHEMA_VERSION = 17;
+exports.CURRENT_SCHEMA_VERSION = 20;
 /**
  * Migration registry
  * All migrations should be added to this array in order
@@ -811,6 +811,71 @@ const migrations = [
             db.exec('DROP TABLE IF EXISTS scheduled_executions');
             console.log('✓ Dropped scheduled_executions and execution_logs tables');
         }
+    },
+    {
+        version: 18,
+        name: 'add-selected-agents-column',
+        up: (db) => {
+            // Issue #368: Add selected_agents column for agent selection persistence
+            // NOTE (R1-010): The literal values 'claude', 'codex' in the SQL CASE below
+            // are fixed at migration time and do NOT sync with TypeScript CLI_TOOL_IDS.
+            // Changes to CLI_TOOL_IDS will not retroactively affect already-migrated data.
+            // Migration tests cover all CLIToolType values to catch sync issues.
+            // Step 1: Add column
+            db.exec(`
+        ALTER TABLE worktrees ADD COLUMN selected_agents TEXT;
+      `);
+            // Step 2: Initialize existing data based on cli_tool_id
+            // - If cli_tool_id is 'claude' or 'codex' -> default ["claude","codex"]
+            // - Otherwise (e.g. 'gemini', 'vibe-local') -> [cli_tool_id, "claude"]
+            db.exec(`
+        UPDATE worktrees SET selected_agents =
+          CASE
+            WHEN cli_tool_id NOT IN ('claude', 'codex')
+            THEN json_array(cli_tool_id, 'claude')
+            ELSE '["claude","codex"]'
+          END;
+      `);
+            console.log('✓ Added selected_agents column to worktrees table');
+            console.log('✓ Initialized selected_agents based on cli_tool_id');
+        },
+        down: () => {
+            // selected_agents is a nullable TEXT column; dropping it requires table recreation
+            // which is disproportionate for a rollback. The column is harmless if unused.
+            console.log('No rollback for selected_agents column (SQLite limitation)');
+        }
+    },
+    {
+        version: 19,
+        name: 'add-vibe-local-model-column',
+        up: (db) => {
+            // Issue #368: Add vibe_local_model column for Ollama model selection
+            // NULL means use the default model (vibe-local decides)
+            db.exec(`
+        ALTER TABLE worktrees ADD COLUMN vibe_local_model TEXT DEFAULT NULL;
+      `);
+            console.log('✓ Added vibe_local_model column to worktrees table');
+        },
+        down: () => {
+            // vibe_local_model is a nullable TEXT column; harmless if unused
+            console.log('No rollback for vibe_local_model column (SQLite limitation)');
+        }
+    },
+    {
+        version: 20,
+        name: 'add-vibe-local-context-window-column',
+        up: (db) => {
+            // Issue #374: Add vibe_local_context_window column for Ollama context window size
+            // NULL means use the default (vibe-local CLI decides)
+            db.exec(`
+        ALTER TABLE worktrees ADD COLUMN vibe_local_context_window INTEGER DEFAULT NULL;
+      `);
+            console.log('✓ Added vibe_local_context_window column to worktrees table');
+        },
+        down: () => {
+            // vibe_local_context_window is a nullable INTEGER column; harmless if unused
+            console.log('No rollback for vibe_local_context_window column (SQLite limitation)');
+        }
     }
 ];
 /**

package/dist/server/src/lib/db.js

@@ -32,6 +32,9 @@ exports.markPendingPromptsAsAnswered = markPendingPromptsAsAnswered;
 exports.updateFavorite = updateFavorite;
 exports.updateStatus = updateStatus;
 exports.updateCliToolId = updateCliToolId;
+exports.updateSelectedAgents = updateSelectedAgents;
+exports.updateVibeLocalModel = updateVibeLocalModel;
+exports.updateVibeLocalContextWindow = updateVibeLocalContextWindow;
 exports.getMemosByWorktreeId = getMemosByWorktreeId;
 exports.getMemoById = getMemoById;
 exports.createMemo = createMemo;
@@ -44,6 +47,7 @@ exports.getWorktreeIdsByRepository = getWorktreeIdsByRepository;
 exports.deleteRepositoryWorktrees = deleteRepositoryWorktrees;
 exports.deleteWorktreesByIds = deleteWorktreesByIds;
 const crypto_1 = require("crypto");
+const selected_agents_validator_1 = require("../lib/selected-agents-validator");
 function mapChatMessage(row) {
     return {
         id: row.id,
@@ -129,6 +133,16 @@ function initDatabase(db) {
  * Get latest user message per CLI tool for multiple worktrees (batch query)
  * Optimized to avoid N+1 query problem
  */
+/**
+ * Get latest user message per CLI tool for multiple worktrees (batch query)
+ * Optimized to avoid N+1 query problem
+ *
+ * R4-001: SQL IN clause for cli_tool_id removed to eliminate SQLインジェクション risk.
+ * All cli_tool_id values are fetched; filtering happens at application layer.
+ * Tool count is at most 4-5, so the performance impact is negligible.
+ *
+ * R2-002: Return type changed to Partial<Record<CLIToolType, string>>
+ */
 function getLastMessagesByCliBatch(db, worktreeIds) {
     if (worktreeIds.length === 0) {
         return new Map();
@@ -149,7 +163,6 @@ function getLastMessagesByCliBatch(db, worktreeIds) {
       FROM chat_messages
       WHERE worktree_id IN (${placeholders})
         AND role = 'user'
-        AND cli_tool_id IN ('claude', 'codex', 'gemini')
     )
     SELECT worktree_id, cli_tool_id, content
     FROM ranked_messages
@@ -181,6 +194,7 @@ function getWorktrees(db, repositoryPath) {
       w.id, w.name, w.path, w.repository_path, w.repository_name, w.description,
       w.last_user_message, w.last_user_message_at, w.last_message_summary,
       w.updated_at, w.favorite, w.status, w.link, w.cli_tool_id, w.last_viewed_at,
+      w.selected_agents, w.vibe_local_model, w.vibe_local_context_window,
       (SELECT MAX(timestamp) FROM chat_messages
        WHERE worktree_id = w.id AND role = 'assistant') as last_assistant_message_at
     FROM worktrees w
@@ -216,6 +230,9 @@ function getWorktrees(db, repositoryPath) {
             status: row.status || null,
             link: row.link || undefined,
             cliToolId: row.cli_tool_id ?? 'claude',
+            selectedAgents: (0, selected_agents_validator_1.parseSelectedAgents)(row.selected_agents),
+            vibeLocalModel: row.vibe_local_model ?? null,
+            vibeLocalContextWindow: row.vibe_local_context_window ?? null,
         };
     });
 }
@@ -250,6 +267,7 @@ function getWorktreeById(db, id) {
       w.id, w.name, w.path, w.repository_path, w.repository_name, w.description,
       w.last_user_message, w.last_user_message_at, w.last_message_summary,
       w.updated_at, w.favorite, w.status, w.link, w.cli_tool_id, w.last_viewed_at,
+      w.selected_agents, w.vibe_local_model, w.vibe_local_context_window,
       (SELECT MAX(timestamp) FROM chat_messages
        WHERE worktree_id = w.id AND role = 'assistant') as last_assistant_message_at
     FROM worktrees w
@@ -276,6 +294,9 @@ function getWorktreeById(db, id) {
         status: row.status || null,
         link: row.link || undefined,
         cliToolId: row.cli_tool_id ?? 'claude',
+        selectedAgents: (0, selected_agents_validator_1.parseSelectedAgents)(row.selected_agents),
+        vibeLocalModel: row.vibe_local_model ?? null,
+        vibeLocalContextWindow: row.vibe_local_context_window ?? null,
     };
 }
 /**
@@ -678,6 +699,54 @@ function updateCliToolId(db, id, cliToolId) {
   `);
     stmt.run(cliToolId, id);
 }
+/**
+ * Update selected_agents for a worktree
+ * Issue #368: Persists the user's choice of 2 display agents
+ *
+ * @param db - Database instance
+ * @param id - Worktree ID
+ * @param selectedAgents - Tuple of 2 CLIToolType values
+ */
+function updateSelectedAgents(db, id, selectedAgents) {
+    const stmt = db.prepare(`
+    UPDATE worktrees
+    SET selected_agents = ?
+    WHERE id = ?
+  `);
+    stmt.run(JSON.stringify(selectedAgents), id);
+}
+/**
+ * Update vibe_local_model for a worktree
+ * Issue #368: Persists the user's Ollama model selection for vibe-local
+ *
+ * @param db - Database instance
+ * @param id - Worktree ID
+ * @param model - Model name or null for default
+ */
+function updateVibeLocalModel(db, id, model) {
+    const stmt = db.prepare(`
+    UPDATE worktrees
+    SET vibe_local_model = ?
+    WHERE id = ?
+  `);
+    stmt.run(model, id);
+}
+/**
+ * Update vibe_local_context_window for a worktree
+ * Issue #374: Persists the user's Ollama context window size for vibe-local
+ *
+ * @param db - Database instance
+ * @param id - Worktree ID
+ * @param contextWindow - Context window size or null for default
+ */
+function updateVibeLocalContextWindow(db, id, contextWindow) {
+    const stmt = db.prepare(`
+    UPDATE worktrees
+    SET vibe_local_context_window = ?
+    WHERE id = ?
+  `);
+    stmt.run(contextWindow, id);
+}
 /**
  * Map database row to WorktreeMemo model
  */

package/dist/server/src/lib/prompt-detector.js

@@ -166,11 +166,12 @@ const TEXT_INPUT_PATTERNS = [
     /differently/i,
 ];
 /**
- * Pattern for ❯ (U+276F) indicator lines used by Claude CLI to mark the default selection.
+ * Pattern for ❯ (U+276F) / ● (U+25CF) / › (U+203A) indicator lines used by CLI tools to mark the default selection.
+ * Claude CLI uses ❯, Gemini CLI uses ●, Codex CLI uses › (Issue #372).
  * Used in Pass 1 (existence check) and Pass 2 (option collection) of the 2-pass detection.
  * Anchored at both ends -- ReDoS safe (S4-001).
  */
-const DEFAULT_OPTION_PATTERN = /^\s*\u276F\s*(\d+)\.\s*(.+)$/;
+const DEFAULT_OPTION_PATTERN = /^\s*[\u276F\u25CF\u203A]\s*(\d+)\.\s*(.+)$/;
 /**
  * Pattern for normal option lines (no ❯ indicator, just leading whitespace + number).
  * Only applied in Pass 2 when ❯ indicator existence is confirmed by Pass 1.
@@ -206,6 +207,13 @@ const SEPARATOR_LINE_PATTERN = /^[-─]+$/;
  * @see Issue #256: multiple_choice prompt detection improvement
  */
 const QUESTION_SCAN_RANGE = 3;
+/**
+ * Maximum consecutive continuation lines allowed between options and question.
+ * Issue #372: Codex TUI indents all output with 2 spaces, causing isContinuationLine()
+ * to match body text lines indefinitely. Without this limit, the scanner would traverse
+ * through the entire command output, picking up numbered lists as false options.
+ */
+const MAX_CONTINUATION_LINES = 5;
 /**
  * Creates a "no prompt detected" result.
  * Centralizes the repeated pattern of returning isPrompt: false with trimmed content.
@@ -543,6 +551,7 @@ function detectMultipleChoicePrompt(output, options) {
     // ==========================================================================
     const collectedOptions = [];
     let questionEndIndex = -1;
+    let continuationLineCount = 0;
     for (let i = effectiveEnd - 1; i >= scanStart; i--) {
         const line = lines[i].trim();
         // Try DEFAULT_OPTION_PATTERN first (❯ indicator)
@@ -551,6 +560,7 @@ function detectMultipleChoicePrompt(output, options) {
             const number = parseInt(defaultMatch[1], 10);
             const label = defaultMatch[2].trim();
             collectedOptions.unshift({ number, label, isDefault: true });
+            continuationLineCount = 0;
             continue;
         }
         // Try NORMAL_OPTION_PATTERN (no ❯ indicator)
@@ -559,6 +569,7 @@ function detectMultipleChoicePrompt(output, options) {
             const number = parseInt(normalMatch[1], 10);
             const label = normalMatch[2].trim();
             collectedOptions.unshift({ number, label, isDefault: false });
+            continuationLineCount = 0;
             continue;
         }
         // [Issue #287 Bug3] User input prompt barrier:
@@ -567,7 +578,7 @@ function detectMultipleChoicePrompt(output, options) {
         // user input prompt (e.g., "❯ 1", "❯ /command") or idle prompt ("❯").
         // Anything above this line in the scrollback is historical conversation text,
         // not an active prompt. Stop scanning to prevent false positives.
-        if (collectedOptions.length === 0 && line.startsWith('\u276F')) {
+        if (collectedOptions.length === 0 && (line.startsWith('\u276F') || line.startsWith('\u25CF') || line.startsWith('\u203A'))) {
             return noPromptResult(output);
         }
         // Non-option line handling
@@ -590,6 +601,15 @@ function detectMultipleChoicePrompt(output, options) {
             // or path/filename fragments from terminal width wrapping - Issue #181)
             const rawLine = lines[i]; // Original line with indentation preserved
             if (isContinuationLine(rawLine, line)) {
+                continuationLineCount++;
+                // Issue #372: Codex TUI indents all output with 2 spaces, causing
+                // every line to match isContinuationLine(). Limit the scan distance
+                // to prevent traversing into body text where numbered lists would be
+                // collected as false options.
+                if (continuationLineCount > MAX_CONTINUATION_LINES) {
+                    questionEndIndex = i;
+                    break;
+                }
                 // Skip continuation lines and continue scanning for more options
                 continue;
             }

package/dist/server/src/lib/response-poller.js

@@ -90,13 +90,15 @@ function incompleteResult(lineCount) {
  * @param findRecentUserPromptIndex - Callback to locate the most recent user prompt
  * @returns ExtractionResult with isComplete: true and ANSI-stripped response
  */
-function buildPromptExtractionResult(lines, lastCapturedLine, totalLines, bufferReset, cliToolId, findRecentUserPromptIndex) {
+function buildPromptExtractionResult(lines, lastCapturedLine, totalLines, bufferReset, cliToolId, findRecentUserPromptIndex, promptDetection) {
     const startIndex = resolveExtractionStartIndex(lastCapturedLine, totalLines, bufferReset, cliToolId, findRecentUserPromptIndex);
     const extractedLines = lines.slice(startIndex);
     return {
         response: (0, cli_patterns_1.stripAnsi)(extractedLines.join('\n')),
         isComplete: true,
         lineCount: totalLines,
+        promptDetection,
+        bufferReset,
     };
 }
 /**
@@ -131,7 +133,7 @@ function getPollerKey(worktreeId, cliToolId) {
  */
 function detectPromptWithOptions(output, cliToolId) {
     const promptOptions = (0, cli_patterns_1.buildDetectPromptOptions)(cliToolId);
-    return (0, prompt_detector_1.detectPrompt)((0, cli_patterns_1.stripAnsi)(output), promptOptions);
+    return (0, prompt_detector_1.detectPrompt)((0, cli_patterns_1.stripBoxDrawing)((0, cli_patterns_1.stripAnsi)(output)), promptOptions);
 }
 /**
  * Clean up Claude response by removing shell setup commands, environment exports, ANSI codes, and banner
@@ -357,14 +359,20 @@ function extractResponse(output, lastCapturedLine, cliToolId) {
         }
         return -1;
     };
-    // Early check for Claude permission prompts (before extraction logic)
-    // Permission prompts appear after normal responses and need special handling
-    if (cliToolId === 'claude') {
+    // Early check for interactive prompts (before extraction logic)
+    // Permission prompts appear after normal responses and need special handling.
+    // Issue #372: Codex command confirmation prompts (› 1. Yes, proceed) match
+    // CODEX_PROMPT_PATTERN, causing isCodexOrGeminiComplete to fire prematurely.
+    // Early detection ensures prompt options are preserved in the extraction result.
+    if (cliToolId === 'claude' || cliToolId === 'codex') {
         const fullOutput = lines.join('\n');
         const promptDetection = detectPromptWithOptions(fullOutput, cliToolId);
         if (promptDetection.isPrompt) {
-            // Prompt detection uses full buffer for accuracy, but return only lastCapturedLine onwards
-            return buildPromptExtractionResult(lines, lastCapturedLine, totalLines, bufferReset, cliToolId, findRecentUserPromptIndex);
+            // Prompt detection uses full buffer for accuracy, but return only lastCapturedLine onwards.
+            // Issue #372: Carry promptDetection through ExtractionResult so checkForResponse()
+            // can use it directly, avoiding a second detection on the (potentially truncated)
+            // extracted portion which may miss the › indicator line.
+            return buildPromptExtractionResult(lines, lastCapturedLine, totalLines, bufferReset, cliToolId, findRecentUserPromptIndex, promptDetection);
         }
     }
     // Strip ANSI codes before pattern matching
@@ -372,11 +380,12 @@ function extractResponse(output, lastCapturedLine, cliToolId) {
     const hasPrompt = promptPattern.test(cleanOutputToCheck);
     const hasSeparator = separatorPattern.test(cleanOutputToCheck);
     const isThinking = thinkingPattern.test(cleanOutputToCheck);
-    // Codex/Gemini completion logic: prompt detected and not thinking (separator optional)
+    // Codex/Gemini/Vibe-Local completion logic: prompt detected and not thinking (separator optional)
     // - Codex: Interactive TUI, detects › prompt
-    // - Gemini: Non-interactive one-shot, detects shell prompt (%, $)
+    // - Gemini: Interactive REPL, detects > / ❯ prompt
+    // - Vibe-Local: Interactive REPL, detects > prompt
     // Claude: require both prompt and separator
-    const isCodexOrGeminiComplete = (cliToolId === 'codex' || cliToolId === 'gemini') && hasPrompt && !isThinking;
+    const isCodexOrGeminiComplete = (cliToolId === 'codex' || cliToolId === 'gemini' || cliToolId === 'vibe-local') && hasPrompt && !isThinking;
     const isClaudeComplete = cliToolId === 'claude' && hasPrompt && hasSeparator && !isThinking;
     if (isCodexOrGeminiComplete || isClaudeComplete) {
         // CLI tool has completed response
@@ -465,6 +474,7 @@ function extractResponse(output, lastCapturedLine, cliToolId) {
             response,
             isComplete: true,
             lineCount: endIndex, // Use endIndex instead of totalLines to track where we actually stopped
+            bufferReset,
         };
     }
     // Check if this is an interactive prompt (yes/no or multiple choice)
@@ -474,7 +484,7 @@ function extractResponse(output, lastCapturedLine, cliToolId) {
     if (promptDetection.isPrompt) {
         // Prompt detection uses full buffer for accuracy, but return only lastCapturedLine onwards
         // stripAnsi is applied inside buildPromptExtractionResult (Stage 4 MF-001: XSS risk mitigation)
-        return buildPromptExtractionResult(lines, lastCapturedLine, totalLines, bufferReset, cliToolId, findRecentUserPromptIndex);
+        return buildPromptExtractionResult(lines, lastCapturedLine, totalLines, bufferReset, cliToolId, findRecentUserPromptIndex, promptDetection);
     }
     // Not a prompt, but we may have a partial response in progress (even if Claude shows a spinner)
     const responseLines = [];
@@ -524,6 +534,7 @@ async function checkForResponse(worktreeId, cliToolId) {
         // Check if CLI tool session is running
         const running = await (0, cli_session_1.isSessionRunning)(worktreeId, cliToolId);
         if (!running) {
+            console.log(`[checkForResponse] Session not running for ${worktreeId} (${cliToolId}), stopping poller`);
             stopPolling(worktreeId, cliToolId);
             return false;
         }
@@ -555,17 +566,23 @@ async function checkForResponse(worktreeId, cliToolId) {
         }
         // CRITICAL FIX: If lineCount == lastCapturedLine AND there's no in-progress message,
         // this response has already been saved. Skip to prevent duplicates.
-        if (result.lineCount === lastCapturedLine && !sessionState?.inProgressMessageId) {
+        // Issue #372: Skip when buffer reset detected (TUI redraw may coincidentally match lineCount).
+        if (!result.bufferReset && result.lineCount === lastCapturedLine && !sessionState?.inProgressMessageId) {
             return false;
         }
         // Additional duplicate prevention: check if savePendingAssistantResponse
-        // already saved this content by comparing line counts
-        if (result.lineCount <= lastCapturedLine) {
+        // already saved this content by comparing line counts.
+        // Issue #372: Skip this check when buffer reset is detected (TUI redraw, screen clear).
+        // Codex TUI redraws cause totalLines to shrink, making lineCount < lastCapturedLine.
+        if (!result.bufferReset && result.lineCount <= lastCapturedLine) {
             console.log(`[checkForResponse] Already saved up to line ${lastCapturedLine}, skipping (result: ${result.lineCount})`);
             return false;
         }
-        // Response is complete! Check if it's a prompt
-        const promptDetection = detectPromptWithOptions(result.response, cliToolId);
+        // Response is complete! Check if it's a prompt.
+        // Issue #372: Prefer the prompt detection carried from extractResponse() early check,
+        // which uses the full tmux output for accuracy. The extracted portion (result.response)
+        // may be truncated and miss the › indicator line when lastCapturedLine falls just before it.
+        const promptDetection = result.promptDetection ?? detectPromptWithOptions(result.response, cliToolId);
         if (promptDetection.isPrompt) {
             // This is a prompt - save as prompt message
             (0, db_1.clearInProgressMessageId)(db, worktreeId, cliToolId);
@@ -667,10 +684,15 @@ function startPolling(worktreeId, cliToolId) {
     stopPolling(worktreeId, cliToolId);
     // Record start time
     pollingStartTimes.set(pollerKey, Date.now());
-    // Start polling
-    const interval = setInterval(async () => {
-        const startTime = pollingStartTimes.get(pollerKey);
+    // Start polling with setTimeout chain to prevent race conditions
+    scheduleNextResponsePoll(worktreeId, cliToolId);
+}
+/** Schedule next checkForResponse() after current one completes (setTimeout chain) */
+function scheduleNextResponsePoll(worktreeId, cliToolId) {
+    const pollerKey = getPollerKey(worktreeId, cliToolId);
+    const timerId = setTimeout(async () => {
         // Check if max duration exceeded
+        const startTime = pollingStartTimes.get(pollerKey);
         if (startTime && Date.now() - startTime > MAX_POLLING_DURATION) {
             stopPolling(worktreeId, cliToolId);
             return;
@@ -682,8 +704,13 @@ function startPolling(worktreeId, cliToolId) {
         catch (error) {
             console.error(`[Poller] Error:`, error);
         }
+        // Schedule next poll ONLY after current one completes
+        // Guard: only if poller is still active (not stopped during checkForResponse)
+        if (activePollers.has(pollerKey)) {
+            scheduleNextResponsePoll(worktreeId, cliToolId);
+        }
     }, POLLING_INTERVAL);
-    activePollers.set(pollerKey, interval);
+    activePollers.set(pollerKey, timerId);
 }
 /**
  * Stop polling for a worktree and CLI tool combination
@@ -698,9 +725,9 @@ function startPolling(worktreeId, cliToolId) {
  */
 function stopPolling(worktreeId, cliToolId) {
     const pollerKey = getPollerKey(worktreeId, cliToolId);
-    const interval = activePollers.get(pollerKey);
-    if (interval) {
-        clearInterval(interval);
+    const timerId = activePollers.get(pollerKey);
+    if (timerId) {
+        clearTimeout(timerId);
         activePollers.delete(pollerKey);
         pollingStartTimes.delete(pollerKey);
     }

package/dist/server/src/lib/schedule-manager.js

@@ -220,12 +220,16 @@ async function executeSchedule(state) {
     const logId = createExecutionLog(state.scheduleId, state.worktreeId, state.entry.message);
     try {
         const db = getLazyDbInstance();
-        const worktree = db.prepare('SELECT path FROM worktrees WHERE id = ?').get(state.worktreeId);
+        const worktree = db.prepare('SELECT path, vibe_local_model FROM worktrees WHERE id = ?').get(state.worktreeId);
         if (!worktree) {
             updateExecutionLog(logId, 'failed', 'Worktree not found', null);
             return;
         }
-        const result = await (0, claude_executor_1.executeClaudeCommand)(state.entry.message, worktree.path, state.entry.cliToolId, state.entry.permission);
+        // Build options for vibe-local model
+        const options = state.entry.cliToolId === 'vibe-local' && worktree.vibe_local_model
+            ? { model: worktree.vibe_local_model }
+            : undefined;
+        const result = await (0, claude_executor_1.executeClaudeCommand)(state.entry.message, worktree.path, state.entry.cliToolId, state.entry.permission, options);
         updateExecutionLog(logId, result.status, result.output, result.exitCode);
         updateScheduleLastExecuted(state.scheduleId);
         console.log(`[schedule-manager] Executed ${state.entry.name}: ${result.status}`);

package/dist/server/src/lib/selected-agents-validator.js

@@ -0,0 +1,99 @@
+"use strict";
+/**
+ * Selected Agents Validator
+ * Issue #368: Validation and parsing for worktree selected_agents field
+ *
+ * Provides:
+ * - validateAgentsPair(): Core validation logic (R1-001)
+ * - parseSelectedAgents(): DB read with fallback + console.warn (R4-005 log sanitization)
+ * - validateSelectedAgentsInput(): API input validation
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_SELECTED_AGENTS = void 0;
+exports.validateAgentsPair = validateAgentsPair;
+exports.parseSelectedAgents = parseSelectedAgents;
+exports.validateSelectedAgentsInput = validateSelectedAgentsInput;
+const types_1 = require("./cli-tools/types");
+/**
+ * ANSI escape code pattern for log sanitization (R4-005)
+ * Duplicated from cli-patterns.ts to avoid importing server-side logger chain
+ */
+const ANSI_PATTERN = /\x1b\[[0-9;]*[a-zA-Z]|\x1b\][^\x07]*\x07|\[[0-9;]*m/g;
+/**
+ * Strip ANSI escape codes from a string
+ */
+function stripAnsi(str) {
+    return str.replace(ANSI_PATTERN, '');
+}
+/**
+ * Sanitize raw DB value for safe console.warn output (R4-005)
+ * Removes ANSI escapes, newlines, and truncates to 100 chars
+ */
+function sanitizeRawForLog(raw) {
+    return stripAnsi(raw).replace(/[\n\r]/g, ' ').substring(0, 100);
+}
+/** Default selected agents when DB value is missing or invalid */
+exports.DEFAULT_SELECTED_AGENTS = ['claude', 'codex'];
+/**
+ * Core validation function for a pair of CLI tool IDs (R1-001)
+ * Shared between parseSelectedAgents() and validateSelectedAgentsInput()
+ *
+ * @param input - Array of values to validate
+ * @returns Validation result with optional typed value or error message
+ */
+function validateAgentsPair(input) {
+    if (input.length !== 2) {
+        return { valid: false, error: 'Must be 2 elements' };
+    }
+    if (!input.every(id => typeof id === 'string' && types_1.CLI_TOOL_IDS.includes(id))) {
+        return { valid: false, error: 'Invalid CLI tool ID' };
+    }
+    if (input[0] === input[1]) {
+        return { valid: false, error: 'Duplicate tool IDs not allowed' };
+    }
+    return { valid: true, value: input };
+}
+/**
+ * Parse selected_agents JSON from DB with safe fallback
+ * Returns default value for any invalid input (never throws)
+ *
+ * Logs a warning when fallback is triggered to help detect DB data issues.
+ * Log output is sanitized (R4-005): ANSI stripped, newlines removed, truncated.
+ *
+ * @param raw - Raw JSON string from DB (or null)
+ * @returns Validated tuple of 2 CLIToolType values
+ */
+function parseSelectedAgents(raw) {
+    if (!raw)
+        return exports.DEFAULT_SELECTED_AGENTS;
+    try {
+        const parsed = JSON.parse(raw);
+        if (!Array.isArray(parsed)) {
+            console.warn(`[selected-agents] Invalid format in DB, falling back to default: ${sanitizeRawForLog(raw)}`);
+            return exports.DEFAULT_SELECTED_AGENTS;
+        }
+        const result = validateAgentsPair(parsed);
+        if (!result.valid) {
+            console.warn(`[selected-agents] Invalid data in DB (${result.error}), falling back to default: ${sanitizeRawForLog(raw)}`);
+            return exports.DEFAULT_SELECTED_AGENTS;
+        }
+        return result.value;
+    }
+    catch {
+        console.warn(`[selected-agents] JSON parse error in DB, falling back to default: ${sanitizeRawForLog(raw)}`);
+        return exports.DEFAULT_SELECTED_AGENTS;
+    }
+}
+/**
+ * Validate selectedAgents input from API request body
+ * Returns structured error for API error responses (does not fallback)
+ *
+ * @param input - Raw input from request body (unknown type for safety)
+ * @returns Validation result with typed value or error string
+ */
+function validateSelectedAgentsInput(input) {
+    if (!Array.isArray(input) || input.length !== 2) {
+        return { valid: false, error: 'selected_agents must be an array of 2 elements' };
+    }
+    return validateAgentsPair(input);
+}

package/dist/server/src/types/sidebar.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deriveCliStatus = deriveCliStatus;
 exports.calculateHasUnread = calculateHasUnread;
 exports.toBranchItem = toBranchItem;
+const selected_agents_validator_1 = require("../lib/selected-agents-validator");
 /**
  * Derive BranchStatus from per-CLI tool session status flags.
  * Shared by sidebar (toBranchItem) and WorktreeDetailRefactored tab dots.
@@ -58,6 +59,13 @@ function toBranchItem(worktree) {
     const status = 'idle';
     // Use new hasUnread logic based on lastAssistantMessageAt and lastViewedAt
     const hasUnread = calculateHasUnread(worktree);
+    // Issue #368: Use selectedAgents to determine which tools to show status for
+    // Falls back to DEFAULT_SELECTED_AGENTS when selectedAgents is not set
+    const agents = worktree.selectedAgents ?? selected_agents_validator_1.DEFAULT_SELECTED_AGENTS;
+    const cliStatus = {};
+    for (const agent of agents) {
+        cliStatus[agent] = deriveCliStatus(worktree.sessionStatusByCli?.[agent]);
+    }
     return {
         id: worktree.id,
         name: worktree.name,
@@ -66,9 +74,6 @@ function toBranchItem(worktree) {
         hasUnread,
         lastActivity: worktree.updatedAt,
         description: worktree.description,
-        cliStatus: {
-            claude: deriveCliStatus(worktree.sessionStatusByCli?.claude),
-            codex: deriveCliStatus(worktree.sessionStatusByCli?.codex),
-        },
+        cliStatus,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commandmate",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Git worktree management with Claude CLI and tmux sessions",
   "keywords": [
     "claude-code",
@@ -88,14 +88,14 @@
     "@types/uuid": "^10.0.0",
     "@types/ws": "^8.18.1",
     "@vitejs/plugin-react": "^5.1.1",
-    "@vitest/coverage-v8": "^4.0.16",
-    "@vitest/ui": "^4.0.9",
+    "@vitest/coverage-v8": "^4.0.18",
+    "@vitest/ui": "^4.0.18",
     "eslint": "^8.57.0",
     "eslint-config-next": "^14.2.35",
     "tailwindcss": "^3.4.18",
     "tsc-alias": "~1.8.16",
     "tsx": "^4.20.6",
     "typescript": "^5.5.0",
-    "vitest": "^4.0.16"
+    "vitest": "^4.0.18"
   }
 }