commandmate 0.3.3 → 0.3.4

package/dist/server/src/lib/cli-tools/types.js

@@ -3,10 +3,11 @@
  * Type definitions and interfaces for CLI tools
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OLLAMA_MODEL_PATTERN = exports.CLI_TOOL_DISPLAY_NAMES = exports.CLI_TOOL_IDS = void 0;
+exports.OLLAMA_MODEL_PATTERN = exports.VIBE_LOCAL_CONTEXT_WINDOW_MAX = exports.VIBE_LOCAL_CONTEXT_WINDOW_MIN = exports.CLI_TOOL_DISPLAY_NAMES = exports.CLI_TOOL_IDS = void 0;
 exports.isCliToolType = isCliToolType;
 exports.getCliToolDisplayName = getCliToolDisplayName;
 exports.getCliToolDisplayNameSafe = getCliToolDisplayNameSafe;
+exports.isValidVibeLocalContextWindow = isValidVibeLocalContextWindow;
 /**
  * CLI Tool IDs constant array
  * T2.1: Single source of truth for CLI tool IDs
@@ -64,6 +65,39 @@ function getCliToolDisplayNameSafe(cliToolId, fallback = 'Assistant') {
         return getCliToolDisplayName(cliToolId);
     return fallback;
 }
+/**
+ * Minimum context window size for vibe-local.
+ * [S1-007] Lower bound rationale: Ollama's actual minimum context window is
+ * typically 2048+, but 128 is set as a permissive lower bound to accommodate
+ * custom models or future models with smaller contexts. Users are recommended
+ * to use practical values (e.g., 2048+).
+ * [S1-004] vibe-local specific constant. If more vibe-local constants are added,
+ * consider extracting to src/lib/cli-tools/vibe-local-config.ts.
+ * [SEC-002] Used to prevent unreasonable values in CLI arguments.
+ */
+exports.VIBE_LOCAL_CONTEXT_WINDOW_MIN = 128;
+/**
+ * Maximum context window size for vibe-local (2M tokens).
+ * Shared between API validation and defense-in-depth (DRY principle).
+ * [S1-004] vibe-local specific constant. If more vibe-local constants are added,
+ * consider extracting to src/lib/cli-tools/vibe-local-config.ts.
+ * [SEC-002] Used to prevent unreasonable values in CLI arguments.
+ */
+exports.VIBE_LOCAL_CONTEXT_WINDOW_MAX = 2097152;
+/**
+ * Validate vibe-local context window value.
+ * Shared between API layer and CLI layer (defense-in-depth).
+ * [S1-001] DRY: Single source of truth for context window validation.
+ *
+ * @param value - Value to validate (accepts unknown for type guard usage)
+ * @returns True if value is a valid context window size (integer between MIN and MAX)
+ */
+function isValidVibeLocalContextWindow(value) {
+    return (typeof value === 'number' &&
+        Number.isInteger(value) &&
+        value >= exports.VIBE_LOCAL_CONTEXT_WINDOW_MIN &&
+        value <= exports.VIBE_LOCAL_CONTEXT_WINDOW_MAX);
+}
 /**
  * Ollama model name validation pattern.
  * Allows: alphanumeric start, followed by alphanumeric, dots, underscores, colons, slashes, hyphens.

package/dist/server/src/lib/cli-tools/vibe-local.js

@@ -69,18 +69,27 @@ class VibeLocalTool extends base_1.BaseCLITool {
             });
             // Wait a moment for the session to be created
             await new Promise((resolve) => setTimeout(resolve, 100));
-            // Read Ollama model preference from DB
+            // Read Ollama model and context window preferences from DB
             // [SEC-001] Re-validate model name at point of use (defense-in-depth)
+            // [S1-005] DB direct access follows existing vibeLocalModel pattern;
+            // future DIP refactoring should pass these as startSession() arguments.
             let vibeLocalCommand = 'vibe-local -y';
             try {
                 const db = (0, db_instance_1.getDbInstance)();
                 const wt = (0, db_1.getWorktreeById)(db, worktreeId);
                 if (wt?.vibeLocalModel && types_1.OLLAMA_MODEL_PATTERN.test(wt.vibeLocalModel)) {
-                    vibeLocalCommand = `vibe-local -y -m ${wt.vibeLocalModel}`;
+                    vibeLocalCommand += ` -m ${wt.vibeLocalModel}`;
+                }
+                // [C2-008] contextWindow from the same wt object (no additional DB call)
+                const ctxWindow = wt?.vibeLocalContextWindow;
+                // [SEC-002] Defense-in-depth: re-validate at point of use
+                // [S4-001] Number() cast for additional safety in template literal
+                if ((0, types_1.isValidVibeLocalContextWindow)(ctxWindow)) {
+                    vibeLocalCommand += ` --context-window ${Number(ctxWindow)}`;
                 }
             }
             catch {
-                // DB read failure is non-fatal; use default model
+                // DB read failure is non-fatal; use defaults
             }
             // Start vibe-local in interactive mode with auto-approve (-y)
             // -y flag skips the permission confirmation prompt

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 = 19;
+exports.CURRENT_SCHEMA_VERSION = 20;
 /**
  * Migration registry
  * All migrations should be added to this array in order
@@ -860,6 +860,22 @@ const migrations = [
             // 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

@@ -34,6 +34,7 @@ exports.updateStatus = updateStatus;
 exports.updateCliToolId = updateCliToolId;
 exports.updateSelectedAgents = updateSelectedAgents;
 exports.updateVibeLocalModel = updateVibeLocalModel;
+exports.updateVibeLocalContextWindow = updateVibeLocalContextWindow;
 exports.getMemosByWorktreeId = getMemosByWorktreeId;
 exports.getMemoById = getMemoById;
 exports.createMemo = createMemo;
@@ -193,7 +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.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
@@ -231,6 +232,7 @@ function getWorktrees(db, repositoryPath) {
             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,
         };
     });
 }
@@ -265,7 +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.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
@@ -294,6 +296,7 @@ function getWorktreeById(db, id) {
         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,
     };
 }
 /**
@@ -728,6 +731,22 @@ function updateVibeLocalModel(db, id, model) {
   `);
     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,12 +166,12 @@ const TEXT_INPUT_PATTERNS = [
     /differently/i,
 ];
 /**
- * Pattern for ❯ (U+276F) / ● (U+25CF) indicator lines used by CLI tools to mark the default selection.
- * Claude CLI uses ❯, Gemini CLI uses ●.
+ * 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\u25CF]\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.
@@ -207,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.
@@ -544,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)
@@ -552,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)
@@ -560,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:
@@ -568,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') || line.startsWith('\u25CF'))) {
+        if (collectedOptions.length === 0 && (line.startsWith('\u276F') || line.startsWith('\u25CF') || line.startsWith('\u203A'))) {
             return noPromptResult(output);
         }
         // Non-option line handling
@@ -591,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,
     };
 }
 /**
@@ -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
@@ -466,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)
@@ -475,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 = [];
@@ -525,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;
         }
@@ -556,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commandmate",
-  "version": "0.3.3",
+  "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"
   }
 }