commandmate 0.11.2 → 0.11.3

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

@@ -123,30 +123,57 @@ function updateMessageContent(db, messageId, content, options) {
  * Get messages for a worktree, optionally filtered by CLI tool
  */
 function getMessages(db, worktreeId, options = {}) {
-    const { before, limit = 50, cliToolId, instanceId, includeArchived = false } = options;
-    let query = `
-    SELECT id, worktree_id, role, content, summary, timestamp, log_file_name, request_id, message_type, prompt_data, cli_tool_id, instance_id, archived
-    FROM chat_messages
-    WHERE worktree_id = ? AND (? IS NULL OR timestamp < ?)
-  `;
-    const params = [worktreeId, before?.getTime() || null, before?.getTime() || null];
-    // archived filter (default: non-archived only)
-    if (!includeArchived) {
-        query += ` ${exports.ACTIVE_FILTER}`;
-    }
-    // Issue #868: instance filter takes precedence; otherwise fall back to CLI tool filter.
-    if (instanceId) {
-        query += ` AND instance_id = ?`;
-        params.push(instanceId);
-    }
-    else if (cliToolId) {
-        query += ` AND cli_tool_id = ?`;
-        params.push(cliToolId);
+    const { before, limit = 50, cliToolId, instanceId, includeArchived = false, limitUnit = 'messages' } = options;
+    // Build the shared scope clause (worktree + before cursor + archived + instance/cli
+    // filter) and its bound params. Used for both the message-unit and pair-unit paths
+    // so their filtering stays identical.
+    const buildScope = () => {
+        let clause = `FROM chat_messages
+    WHERE worktree_id = ? AND (? IS NULL OR timestamp < ?)`;
+        const params = [worktreeId, before?.getTime() || null, before?.getTime() || null];
+        // archived filter (default: non-archived only)
+        if (!includeArchived) {
+            clause += ` ${exports.ACTIVE_FILTER}`;
+        }
+        // Issue #868: instance filter takes precedence; otherwise fall back to CLI tool filter.
+        if (instanceId) {
+            clause += ` AND instance_id = ?`;
+            params.push(instanceId);
+        }
+        else if (cliToolId) {
+            clause += ` AND cli_tool_id = ?`;
+            params.push(cliToolId);
+        }
+        return { clause, params };
+    };
+    const SELECT_COLS = `SELECT id, worktree_id, role, content, summary, timestamp, log_file_name, request_id, message_type, prompt_data, cli_tool_id, instance_id, archived`;
+    // Issue #1407: pair-unit paging. Resolve a timestamp cutoff so the newest `limit`
+    // user turns are fully included (with all their assistant rows). This keeps the
+    // rendered conversation-pair count equal to `limit` even when a single turn emits
+    // many assistant rows (codex prompts/intermediate outputs). Falls back to
+    // message-unit paging when no user messages exist in scope.
+    if (limitUnit === 'pairs') {
+        const scope = buildScope();
+        const cutoffRow = db
+            .prepare(`SELECT MIN(timestamp) AS cutoff FROM (
+          SELECT timestamp ${scope.clause} AND role = 'user'
+          ORDER BY timestamp DESC LIMIT ?
+        )`)
+            .get(...scope.params, limit);
+        const cutoff = cutoffRow?.cutoff ?? null;
+        if (cutoff !== null) {
+            const full = buildScope();
+            const rows = db
+                .prepare(`${SELECT_COLS} ${full.clause} AND timestamp >= ? ORDER BY timestamp DESC`)
+                .all(...full.params, cutoff);
+            return rows.map(mapChatMessage);
+        }
+        // No user messages in scope → fall through to message-unit behavior below.
     }
-    query += ` ORDER BY timestamp DESC LIMIT ?`;
-    params.push(limit);
-    const stmt = db.prepare(query);
-    const rows = stmt.all(...params);
+    const scope = buildScope();
+    const rows = db
+        .prepare(`${SELECT_COLS} ${scope.clause} ORDER BY timestamp DESC LIMIT ?`)
+        .all(...scope.params, limit);
     return rows.map(mapChatMessage);
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commandmate",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "A local control plane for agent CLIs — orchestration and visibility for Claude Code, Codex, Gemini CLI, and more across Git worktrees",
   "keywords": [
     "claude-code",