commandmate 0.11.2 → 0.11.4

package/dist/cli/utils/npx-runner.d.ts

@@ -70,6 +70,20 @@ export declare function sanitizeNpxEnv(env?: Record<string, string | undefined>)
  * @param packageName - Package name (a literal constant, e.g. `commandmate`)
  * @returns The fetched version, or a classified failure
  */
+/**
+ * Working directory for the npx spawns (Issue #1410).
+ *
+ * The server — and the detached update process it spawns — run from the npx
+ * cache package dir (`~/.npm/_npx/<hash>/node_modules/commandmate`). While
+ * `warmNpxLatest` fetches the new version, npx deletes/replaces that dir, so a
+ * later npx spawn that inherited it crashes when npm calls `process.cwd()`
+ * (`ENOENT: uv_cwd`) during bootstrap, aborting the relaunch after the old
+ * server is already stopped. Running the npx spawns from the always-present home
+ * directory keeps `process.cwd()` valid regardless of npx cache churn. The
+ * relaunched daemon sets its own cwd to the (new) package root, so this does not
+ * change where the server ultimately runs.
+ */
+export declare function stableNpxCwd(): string;
 export declare function warmNpxLatest(packageName: string): NpxWarmResult;
 /**
  * Relaunch the server as a daemon from the freshly-cached npx version.

package/dist/cli/utils/npx-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"npx-runner.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/npx-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAIH;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,QAAgB,CAAC;AAEnD,2CAA2C;AAC3C,MAAM,WAAW,aAAa;IAC5B,0DAA0D;IAC1D,OAAO,EAAE,OAAO,CAAC;IACjB,gEAAgE;IAChE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yDAAyD;IACzD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,oCAAoC;AACpC,MAAM,WAAW,eAAe;IAC9B,oCAAoC;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,8DAA8D;IAC9D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,yDAAyD;IACzD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAC5B,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GACpD,MAAM,CAAC,UAAU,CAWnB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,CAoChE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,eAAe,CAyCnE"}
+{"version":3,"file":"npx-runner.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/npx-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAKH;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,QAAgB,CAAC;AAEnD,2CAA2C;AAC3C,MAAM,WAAW,aAAa;IAC5B,0DAA0D;IAC1D,OAAO,EAAE,OAAO,CAAC;IACjB,gEAAgE;IAChE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yDAAyD;IACzD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,oCAAoC;AACpC,MAAM,WAAW,eAAe;IAC9B,oCAAoC;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,8DAA8D;IAC9D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,yDAAyD;IACzD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAC5B,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GACpD,MAAM,CAAC,UAAU,CAWnB;AAED;;;;;;;;;;;GAWG;AACH;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,CAqChE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,eAAe,CA0CnE"}

package/dist/cli/utils/npx-runner.js

@@ -22,9 +22,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NPX_WARMUP_TIMEOUT_MS = void 0;
 exports.sanitizeNpxEnv = sanitizeNpxEnv;
+exports.stableNpxCwd = stableNpxCwd;
 exports.warmNpxLatest = warmNpxLatest;
 exports.spawnNpxDaemon = spawnNpxDaemon;
 const child_process_1 = require("child_process");
+const os_1 = require("os");
 /**
  * Upper bound for the warmup download.
  *
@@ -70,10 +72,27 @@ function sanitizeNpxEnv(env = process.env) {
  * @param packageName - Package name (a literal constant, e.g. `commandmate`)
  * @returns The fetched version, or a classified failure
  */
+/**
+ * Working directory for the npx spawns (Issue #1410).
+ *
+ * The server — and the detached update process it spawns — run from the npx
+ * cache package dir (`~/.npm/_npx/<hash>/node_modules/commandmate`). While
+ * `warmNpxLatest` fetches the new version, npx deletes/replaces that dir, so a
+ * later npx spawn that inherited it crashes when npm calls `process.cwd()`
+ * (`ENOENT: uv_cwd`) during bootstrap, aborting the relaunch after the old
+ * server is already stopped. Running the npx spawns from the always-present home
+ * directory keeps `process.cwd()` valid regardless of npx cache churn. The
+ * relaunched daemon sets its own cwd to the (new) package root, so this does not
+ * change where the server ultimately runs.
+ */
+function stableNpxCwd() {
+    return (0, os_1.homedir)();
+}
 function warmNpxLatest(packageName) {
     const result = (0, child_process_1.spawnSync)('npx', ['--yes', `${packageName}@latest`, '--version'], {
         encoding: 'utf-8',
         timeout: exports.NPX_WARMUP_TIMEOUT_MS,
+        cwd: stableNpxCwd(),
         env: sanitizeNpxEnv(),
     });
     if (result.error) {
@@ -115,6 +134,7 @@ function warmNpxLatest(packageName) {
 function spawnNpxDaemon(packageName) {
     const result = (0, child_process_1.spawnSync)('npx', ['--yes', `${packageName}@latest`, 'start', '--daemon'], {
         encoding: 'utf-8',
+        cwd: stableNpxCwd(),
         env: sanitizeNpxEnv(),
     });
     const stdout = readStream(result.stdout);

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.4",
   "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",