commandmate 0.20.0 → 0.21.0

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

@@ -16,6 +16,15 @@ import { ApiClient } from './api-client';
 export declare const VERIFY_POLL_INTERVAL_MS = 5000;
 /** Built-in gate id; mirrors WORK_EVIDENCE_GATE_ID in lib/verification/gate-runner.ts. */
 export declare const WORK_EVIDENCE_GATE_ID = "work-evidence";
+/**
+ * Lines of a failing gate's log echoed to stderr before the rest becomes a
+ * count (#1683).
+ *
+ * log_tail is byte-capped only when stored (options.maxLogTailBytes, default
+ * 8KB but configurable up to 1MB), so echoing it whole lets one misconfigured
+ * gate flood the terminal and scroll the GATE verdict lines out of sight.
+ */
+export declare const MAX_PRINTED_LOG_TAIL_LINES = 40;
 export interface VerificationRequest {
     worktreeId: string;
     /** 'manual' for the verify command, 'wait' when chained after wait. */

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

@@ -1 +1 @@
-{"version":3,"file":"verify-runner.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/verify-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,KAAK,EAEV,qBAAqB,EACrB,mBAAmB,EAGpB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAiC,MAAM,cAAc,CAAC;AAExE,8EAA8E;AAC9E,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAE5C,0FAA0F;AAC1F,eAAO,MAAM,qBAAqB,kBAAkB,CAAC;AAErD,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,uEAAuE;IACvE,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2EAA2E;IAC3E,YAAY,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IACnC,iFAAiF;IACjF,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,GAAG,CAAC,EAAE,mBAAmB,CAAC;CAC3B;AAUD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAW1E;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,CAOnF;AAqED;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,mBAAmB,CAAC,CAyD9B"}
+{"version":3,"file":"verify-runner.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/verify-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,KAAK,EAEV,qBAAqB,EACrB,mBAAmB,EAGpB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAiC,MAAM,cAAc,CAAC;AAExE,8EAA8E;AAC9E,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAE5C,0FAA0F;AAC1F,eAAO,MAAM,qBAAqB,kBAAkB,CAAC;AAErD;;;;;;;GAOG;AACH,eAAO,MAAM,0BAA0B,KAAK,CAAC;AAE7C,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,uEAAuE;IACvE,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2EAA2E;IAC3E,YAAY,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IACnC,iFAAiF;IACjF,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,GAAG,CAAC,EAAE,mBAAmB,CAAC;CAC3B;AAUD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAW1E;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,CAOnF;AAsFD;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,mBAAmB,CAAC,CAyD9B"}

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

@@ -12,7 +12,7 @@
  * @module cli/utils/verify-runner
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WORK_EVIDENCE_GATE_ID = exports.VERIFY_POLL_INTERVAL_MS = void 0;
+exports.MAX_PRINTED_LOG_TAIL_LINES = exports.WORK_EVIDENCE_GATE_ID = exports.VERIFY_POLL_INTERVAL_MS = void 0;
 exports.exitCodeForRunStatus = exitCodeForRunStatus;
 exports.parseGateIds = parseGateIds;
 exports.runVerification = runVerification;
@@ -22,6 +22,15 @@ const api_client_1 = require("./api-client");
 exports.VERIFY_POLL_INTERVAL_MS = 5000;
 /** Built-in gate id; mirrors WORK_EVIDENCE_GATE_ID in lib/verification/gate-runner.ts. */
 exports.WORK_EVIDENCE_GATE_ID = 'work-evidence';
+/**
+ * Lines of a failing gate's log echoed to stderr before the rest becomes a
+ * count (#1683).
+ *
+ * log_tail is byte-capped only when stored (options.maxLogTailBytes, default
+ * 8KB but configurable up to 1MB), so echoing it whole lets one misconfigured
+ * gate flood the terminal and scroll the GATE verdict lines out of sight.
+ */
+exports.MAX_PRINTED_LOG_TAIL_LINES = 40;
 const GATE_LABELS = {
     passed: 'PASS',
     failed: 'FAIL',
@@ -86,6 +95,23 @@ function formatGateLine(gate) {
     const detail = formatDetail(gate);
     return detail ? `GATE ${gate.gateId} ${label} (${detail})` : `GATE ${gate.gateId} ${label}`;
 }
+/**
+ * Cap a failing gate's log for display, keeping the LAST lines: every producer
+ * puts its conclusion there — a failing suite ends with its summary, the scope
+ * gate ends with its violation list and guidance. The omission marker leads so
+ * the reader knows lines are missing before reading, and it names `verify show`
+ * because that is where the full stored log lives.
+ */
+function formatLogTailForDisplay(gate) {
+    const lines = (gate.logTail ?? '').replace(/\n+$/, '').split('\n');
+    if (lines.length <= exports.MAX_PRINTED_LOG_TAIL_LINES)
+        return lines.join('\n');
+    const omitted = lines.length - exports.MAX_PRINTED_LOG_TAIL_LINES;
+    return [
+        `... (+${omitted} more lines; run \`commandmate verify show ${gate.runId}\` for the full log)`,
+        ...lines.slice(-exports.MAX_PRINTED_LOG_TAIL_LINES),
+    ].join('\n');
+}
 /**
  * Print each gate exactly once, when it reaches a terminal status.
  * @param reported - Gate row ids already printed; mutated in place.
@@ -99,7 +125,7 @@ function reportGates(gates, reported) {
         // A failing gate without its log forces the caller back to the API to learn
         // anything actionable, which defeats the point of a CLI verdict.
         if (gate.status !== 'passed' && gate.logTail) {
-            console.error(gate.logTail.replace(/\n+$/, ''));
+            console.error(formatLogTailForDisplay(gate));
         }
     }
 }

package/dist/config/history-display-config.d.ts

@@ -0,0 +1,61 @@
+/**
+ * History Display Configuration (Issue #701)
+ *
+ * Single Source of Truth for the history display limit options used by:
+ * - GET /api/worktrees/:id/messages (upper-bound validation)
+ * - HistoryPane selector UI (selectable options)
+ * - WorktreeDetailRefactored state (persisted to localStorage)
+ *
+ * Design decisions:
+ * - MAX_MESSAGES_LIMIT is derived from HISTORY_DISPLAY_LIMIT_OPTIONS (no duplication).
+ * - DEFAULT_MESSAGES_LIMIT (50) matches the historical default before this issue.
+ * - Storage key uses the `commandmate:` namespace, matching other keys
+ *   (e.g. `commandmate:showArchived`).
+ */
+/**
+ * Selectable history display limit options (ascending).
+ * The first entry is the historical default; the last entry is the maximum.
+ *
+ * Issue #1123: the 250 ceiling was a performance mitigation for the previously
+ * flat-rendered HistoryPane. Now that the list is virtualized (render cost is
+ * O(visible rows), not O(total)), the ceiling is relaxed to 1000. The API still
+ * bounds the *fetch* by the maximum option (data volume); server-side paging is
+ * tracked separately.
+ */
+export declare const HISTORY_DISPLAY_LIMIT_OPTIONS: readonly [50, 100, 150, 200, 250, 500, 1000];
+/**
+ * Union type representing any selectable history display limit.
+ */
+export type HistoryDisplayLimit = (typeof HISTORY_DISPLAY_LIMIT_OPTIONS)[number];
+/**
+ * Upper bound enforced by the API, derived from the maximum option.
+ *
+ * Typed as `HistoryDisplayLimit` (not a brittle `as 250` literal) so that
+ * extending `HISTORY_DISPLAY_LIMIT_OPTIONS` does not require touching this line.
+ */
+export declare const MAX_MESSAGES_LIMIT: HistoryDisplayLimit;
+/**
+ * Default history display limit (used when no localStorage value is present).
+ */
+export declare const DEFAULT_MESSAGES_LIMIT: HistoryDisplayLimit;
+/**
+ * localStorage key used to persist the user-selected history display limit.
+ */
+export declare const HISTORY_DISPLAY_LIMIT_STORAGE_KEY = "commandmate:historyDisplayLimit";
+/**
+ * Type guard: returns true if `value` is one of the allowed limit options.
+ *
+ * Used when reading from localStorage (which may contain stale/corrupted data)
+ * to safely narrow `number` to `HistoryDisplayLimit`.
+ */
+export declare function isHistoryDisplayLimit(value: number): value is HistoryDisplayLimit;
+/**
+ * localStorage key used to persist the HistoryPane "User only" filter toggle
+ * (Issue #725).
+ *
+ * Value representation: `'true'` / `'false'` (string), matching the existing
+ * `commandmate:showArchived` convention. Any other value (including legacy
+ * `'1'`/`'0'` or missing) is treated as `false` (safe-off fallback).
+ */
+export declare const HISTORY_USER_ONLY_STORAGE_KEY = "commandmate:historyUserOnly";
+//# sourceMappingURL=history-display-config.d.ts.map

package/dist/config/history-display-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"history-display-config.d.ts","sourceRoot":"","sources":["../../src/config/history-display-config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH;;;;;;;;;GASG;AACH,eAAO,MAAM,6BAA6B,8CAA+C,CAAC;AAE1F;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,6BAA6B,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjF;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,EAAE,mBAET,CAAC;AAEzB;;GAEG;AACH,eAAO,MAAM,sBAAsB,EAAE,mBAAwB,CAAC;AAE9D;;GAEG;AACH,eAAO,MAAM,iCAAiC,oCAAoC,CAAC;AAEnF;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,mBAAmB,CAEjF;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,6BAA6B,gCAAgC,CAAC"}

package/dist/config/history-display-config.js

@@ -0,0 +1,62 @@
+"use strict";
+/**
+ * History Display Configuration (Issue #701)
+ *
+ * Single Source of Truth for the history display limit options used by:
+ * - GET /api/worktrees/:id/messages (upper-bound validation)
+ * - HistoryPane selector UI (selectable options)
+ * - WorktreeDetailRefactored state (persisted to localStorage)
+ *
+ * Design decisions:
+ * - MAX_MESSAGES_LIMIT is derived from HISTORY_DISPLAY_LIMIT_OPTIONS (no duplication).
+ * - DEFAULT_MESSAGES_LIMIT (50) matches the historical default before this issue.
+ * - Storage key uses the `commandmate:` namespace, matching other keys
+ *   (e.g. `commandmate:showArchived`).
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HISTORY_USER_ONLY_STORAGE_KEY = exports.HISTORY_DISPLAY_LIMIT_STORAGE_KEY = exports.DEFAULT_MESSAGES_LIMIT = exports.MAX_MESSAGES_LIMIT = exports.HISTORY_DISPLAY_LIMIT_OPTIONS = void 0;
+exports.isHistoryDisplayLimit = isHistoryDisplayLimit;
+/**
+ * Selectable history display limit options (ascending).
+ * The first entry is the historical default; the last entry is the maximum.
+ *
+ * Issue #1123: the 250 ceiling was a performance mitigation for the previously
+ * flat-rendered HistoryPane. Now that the list is virtualized (render cost is
+ * O(visible rows), not O(total)), the ceiling is relaxed to 1000. The API still
+ * bounds the *fetch* by the maximum option (data volume); server-side paging is
+ * tracked separately.
+ */
+exports.HISTORY_DISPLAY_LIMIT_OPTIONS = [50, 100, 150, 200, 250, 500, 1000];
+/**
+ * Upper bound enforced by the API, derived from the maximum option.
+ *
+ * Typed as `HistoryDisplayLimit` (not a brittle `as 250` literal) so that
+ * extending `HISTORY_DISPLAY_LIMIT_OPTIONS` does not require touching this line.
+ */
+exports.MAX_MESSAGES_LIMIT = Math.max(...exports.HISTORY_DISPLAY_LIMIT_OPTIONS);
+/**
+ * Default history display limit (used when no localStorage value is present).
+ */
+exports.DEFAULT_MESSAGES_LIMIT = 50;
+/**
+ * localStorage key used to persist the user-selected history display limit.
+ */
+exports.HISTORY_DISPLAY_LIMIT_STORAGE_KEY = 'commandmate:historyDisplayLimit';
+/**
+ * Type guard: returns true if `value` is one of the allowed limit options.
+ *
+ * Used when reading from localStorage (which may contain stale/corrupted data)
+ * to safely narrow `number` to `HistoryDisplayLimit`.
+ */
+function isHistoryDisplayLimit(value) {
+    return exports.HISTORY_DISPLAY_LIMIT_OPTIONS.includes(value);
+}
+/**
+ * localStorage key used to persist the HistoryPane "User only" filter toggle
+ * (Issue #725).
+ *
+ * Value representation: `'true'` / `'false'` (string), matching the existing
+ * `commandmate:showArchived` convention. Any other value (including legacy
+ * `'1'`/`'0'` or missing) is treated as `false` (safe-off fallback).
+ */
+exports.HISTORY_USER_ONLY_STORAGE_KEY = 'commandmate:historyUserOnly';

package/dist/server/src/lib/auto-yes-poller.js

@@ -62,8 +62,10 @@ const cli_session_1 = require("./session/cli-session");
 const prompt_detector_1 = require("./detection/prompt-detector");
 const auto_yes_resolver_1 = require("./polling/auto-yes-resolver");
 const auto_yes_policy_1 = require("./polling/auto-yes-policy");
+const auto_yes_suppression_state_1 = require("./polling/auto-yes-suppression-state");
 const task_transition_service_1 = require("./tasks/task-transition-service");
 const db_instance_1 = require("./db/db-instance");
+const chat_db_1 = require("./db/chat-db");
 const prompt_answer_sender_1 = require("./prompt-answer-sender");
 const manager_1 = require("./cli-tools/manager");
 const cli_patterns_1 = require("./detection/cli-patterns");
@@ -303,6 +305,15 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         const policy = (0, auto_yes_policy_1.getSessionAutoYesPolicy)(worktreeId, cliToolId, instanceId);
         const resolution = (0, auto_yes_resolver_1.resolveAutoAnswerWithPolicy)(promptDetection.promptData, policy);
         if (resolution.suppressedBy) {
+            // Issue #1684: the log line alone leaves a CLI-driven pipeline blind to
+            // why its worker stalled. Record the suppression so buildCurrentOutput
+            // can publish it (`autoYes.lastSuppression` in capture --json).
+            (0, auto_yes_suppression_state_1.recordPolicySuppression)(worktreeId, cliToolId, instanceId, {
+                reason: resolution.suppressedBy,
+                mode: policy?.mode ?? null,
+                promptType: promptDetection.promptData.type,
+                pattern: resolution.pattern,
+            });
             logger.warn('poller:auto-yes-suppressed-by-policy', {
                 worktreeId,
                 cliToolId,
@@ -346,6 +357,44 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // Undefined means the primary instance, which the task lookup identifies
         // by the tool id itself (see getActiveTaskForInstance).
         instanceId ?? cliToolId, 'prompt_answered_auto', { promptType: promptDetection.promptData.type });
+        // Issue #1685: persist question/options/answer to chat history so the audit
+        // trail survives even when the answer landed inside the response poller's
+        // interval and the prompt was never saved as a pending message. Must never
+        // fail the answer that already reached tmux.
+        let auditRecord = null;
+        try {
+            auditRecord = (0, chat_db_1.recordAnsweredPrompt)((0, db_instance_1.getDbInstance)(), {
+                worktreeId,
+                cliToolId,
+                instanceId: instanceId ?? cliToolId,
+                promptData: promptDetection.promptData,
+                answer,
+                answeredBy: 'auto',
+                content: promptDetection.rawContent || promptDetection.cleanContent,
+            });
+        }
+        catch (recordError) {
+            logger.warn('poller:prompt-audit-record-failed', {
+                worktreeId,
+                cliToolId,
+                instanceId,
+                error: (0, errors_1.getErrorMessage)(recordError),
+            });
+        }
+        if (auditRecord) {
+            const record = auditRecord;
+            // Fire-and-forget on purpose: the WS push is advisory, and awaiting a
+            // cold ws-server module load inside the poll path would make its
+            // completion timing nondeterministic for a side effect it doesn't
+            // depend on (the audit row is already committed above).
+            void Promise.resolve().then(() => __importStar(require('../lib/ws-server'))).then(({ broadcastMessage }) => {
+                broadcastMessage(record.created ? 'message' : 'message_updated', {
+                    worktreeId,
+                    message: record.message,
+                });
+            })
+                .catch(() => { });
+        }
         // Dynamic imports avoid a module cycle through terminal-broadcast ->
         // current-output-builder -> auto-yes-manager -> this poller.
         const [{ startPolling: startResponsePolling }, { broadcastTerminalSnapshotAfterInteraction }] = await Promise.all([

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

@@ -24,6 +24,7 @@ exports.getMessagesByDateRange = getMessagesByDateRange;
 exports.getMessageById = getMessageById;
 exports.updatePromptData = updatePromptData;
 exports.markPendingPromptsAsAnswered = markPendingPromptsAsAnswered;
+exports.recordAnsweredPrompt = recordAnsweredPrompt;
 const crypto_1 = require("crypto");
 const logger_1 = require("../../lib/logger");
 const logger = (0, logger_1.createLogger)('chat-db');
@@ -123,7 +124,7 @@ 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, limitUnit = 'messages' } = options;
+    const { before, limit = 50, cliToolId, instanceId, includeArchived = false, messageType, 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.
@@ -144,6 +145,11 @@ function getMessages(db, worktreeId, options = {}) {
             clause += ` AND cli_tool_id = ?`;
             params.push(cliToolId);
         }
+        // Issue #1685: message-type filter (prompt audit listing)
+        if (messageType) {
+            clause += ` AND message_type = ?`;
+            params.push(messageType);
+        }
         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`;
@@ -425,6 +431,10 @@ function markPendingPromptsAsAnswered(db, worktreeId, cliToolId, instanceId) {
             promptData.status = 'answered';
             promptData.answer = '(answered via terminal)';
             promptData.answeredAt = new Date().toISOString();
+            // Issue #1685: attribution for the audit trail. This sweep only sees
+            // prompts nothing else claimed, so all that is known is that the agent
+            // moved on — i.e. someone acted in the terminal.
+            promptData.answeredBy = 'terminal';
             updateStmt.run(JSON.stringify(promptData), row.id);
             updatedCount++;
         }
@@ -434,3 +444,67 @@ function markPendingPromptsAsAnswered(db, worktreeId, cliToolId, instanceId) {
     }
     return updatedCount;
 }
+/**
+ * Persist "this prompt was just answered" to chat history (Issue #1685).
+ *
+ * The answer paths (Auto-Yes poller, /prompt-response) act on what is on
+ * screen, not on a stored message, so the prompt they resolve may or may not
+ * have been saved by the response poller yet:
+ *
+ * - If a pending prompt row exists for the instance, it is marked answered in
+ *   place — preferring the row whose question matches the screen, falling back
+ *   to the newest pending row (the two capture paths can clean text slightly
+ *   differently).
+ * - If none exists (the answer landed inside the response poller's interval —
+ *   the exact case Issue #1685 is about), a new already-answered prompt row is
+ *   created so the question/options/answer survive for the audit trail.
+ */
+function recordAnsweredPrompt(db, params) {
+    const { worktreeId, cliToolId, promptData, answer, answeredBy } = params;
+    const resolvedInstanceId = params.instanceId ?? cliToolId;
+    const rows = db
+        .prepare(`
+    SELECT id, prompt_data
+    FROM chat_messages
+    WHERE worktree_id = ?
+      AND instance_id = ?
+      AND message_type = 'prompt'
+      AND json_extract(prompt_data, '$.status') = 'pending'
+      ${exports.ACTIVE_FILTER}
+    ORDER BY timestamp DESC
+  `)
+        .all(worktreeId, resolvedInstanceId);
+    let target = null;
+    for (const row of rows) {
+        try {
+            const parsed = JSON.parse(row.prompt_data);
+            if (!target) {
+                target = { id: row.id, parsed };
+            }
+            if (parsed.question === promptData.question) {
+                target = { id: row.id, parsed };
+                break;
+            }
+        }
+        catch {
+            // Skip if prompt_data is invalid JSON
+        }
+    }
+    const answeredAt = new Date().toISOString();
+    if (target) {
+        const updated = { ...target.parsed, status: 'answered', answer, answeredAt, answeredBy };
+        updatePromptData(db, target.id, updated);
+        return { message: getMessageById(db, target.id), created: false };
+    }
+    const message = createMessage(db, {
+        worktreeId,
+        role: 'assistant',
+        content: params.content || promptData.question || '[prompt]',
+        messageType: 'prompt',
+        promptData: { ...promptData, status: 'answered', answer, answeredAt, answeredBy },
+        timestamp: new Date(),
+        cliToolId,
+        instanceId: resolvedInstanceId,
+    });
+    return { message, created: true };
+}

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

@@ -10,9 +10,9 @@
  * @internal functions from being unintentionally exposed.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearInProgressMessageId = exports.setInProgressMessageId = exports.updateSessionState = exports.getSessionState = exports.getMessagesByDateRange = exports.ACTIVE_FILTER = exports.markPendingPromptsAsAnswered = exports.updatePromptData = exports.getMessageById = exports.recomputeLastUserMessage = exports.clearLastUserMessage = exports.updateLastUserMessage = exports.deleteMessagesByInstance = exports.deleteMessagesByCliTool = exports.deleteMessageById = exports.deleteAllMessages = exports.getLastMessage = exports.getLastUserMessage = exports.getMessages = exports.updateMessageContent = exports.createMessage = exports.getLastAssistantMessageAt = exports.getAliasedWorktreeIds = exports.getAllWorktreeAliases = exports.getWorktreeAliases = exports.resolveWorktreeIdWithAlias = exports.recordWorktreeAlias = exports.deleteWorktreesByIds = exports.deleteRepositoryWorktrees = exports.migrateWorktreeIdPreservingChildren = exports.getAllWorktreePathIds = exports.getAllWorktreeIds = exports.getWorktreesByRepository = exports.getWorktreeIdsByRepository = exports.getInitialBranch = exports.saveInitialBranch = exports.updateVibeLocalContextWindow = exports.updateVibeLocalModel = exports.updateSelectedAgents = exports.updateCliToolId = exports.updateStatus = exports.updateFavorite = exports.updateLastViewedAt = exports.updateWorktreeLink = exports.updateWorktreeDescription = exports.upsertWorktree = exports.getWorktreeById = exports.getRepositories = exports.getWorktrees = exports.initDatabase = void 0;
-exports.updateAssistantMessageStatus = exports.createAssistantMessage = exports.updateAssistantConversation = exports.createAssistantConversation = exports.getAssistantConversationByRepositoryAndCliTool = exports.getAssistantConversationById = exports.updateDailyReportContent = exports.saveDailyReport = exports.getDailyReport = exports.recoverStuckSendingTimers = exports.clearTimerHistory = exports.cleanupOldTimers = exports.getPendingTimerCountByWorktree = exports.cancelTimersByWorktree = exports.cancelTimer = exports.updateTimerStatus = exports.getPendingTimers = exports.getTimerById = exports.getTimersByWorktree = exports.createTimer = exports.WORKTREE_TODO_STATUSES = exports.isWorktreeTodoStatus = exports.reorderWorktreeTodos = exports.deleteWorktreeTodo = exports.updateWorktreeTodo = exports.createWorktreeTodo = exports.getWorktreeTodoById = exports.getTodosByWorktreeId = exports.deleteTodo = exports.updateTodo = exports.createTodo = exports.getTodoById = exports.getAllTodos = exports.getTodosByRepositoryId = exports.MemoDbError = exports.reorderMemos = exports.deleteMemo = exports.updateMemo = exports.createMemo = exports.getMemoById = exports.getMemosByWorktreeId = exports.InvalidAgentInstanceError = exports.AgentInstanceLimitError = exports.removeAgentInstance = exports.addAgentInstance = exports.setAgentInstances = exports.countAgentInstances = exports.getAgentInstance = exports.getAgentInstances = exports.deleteSessionState = void 0;
-exports.listTaskEvents = exports.ACTIVE_TASK_STATUSES = exports.TERMINAL_TASK_STATUSES = exports.TASK_STATUSES = exports.isTerminalTaskStatus = exports.getActiveTaskForInstance = exports.getActiveTask = exports.listTasks = exports.getTask = exports.createTask = exports.VERIFICATION_TRIGGERS = exports.MAX_RUN_HISTORY_DAYS = exports.MAX_RUN_HISTORY_LIMIT = exports.DEFAULT_RUN_HISTORY_LIMIT = exports.listVerificationRunsForPeriod = exports.listRunningVerificationRuns = exports.getRunningVerificationRun = exports.listVerificationRuns = exports.getVerificationRun = exports.finishGateResult = exports.createGateResult = exports.finishVerificationRun = exports.createVerificationRun = exports.deletePushSubscriptionByEndpoint = exports.updatePushSubscriptionPreferences = exports.getPushSubscriptionsForKind = exports.getAllPushSubscriptions = exports.getPushSubscriptionByEndpoint = exports.upsertPushSubscription = exports.deleteAssistantSessionState = exports.updateAssistantSessionState = exports.getAssistantSessionState = exports.listRunningAssistantExecutions = exports.getRunningAssistantExecutionByConversation = exports.getLatestAssistantExecutionByConversation = exports.getAssistantExecutionById = exports.updateAssistantExecution = exports.createAssistantExecution = exports.archiveAssistantMessagesFrom = exports.archiveAllAssistantMessages = exports.getAssistantMessageById = exports.getAssistantMessages = void 0;
+exports.setInProgressMessageId = exports.updateSessionState = exports.getSessionState = exports.getMessagesByDateRange = exports.ACTIVE_FILTER = exports.recordAnsweredPrompt = exports.markPendingPromptsAsAnswered = exports.updatePromptData = exports.getMessageById = exports.recomputeLastUserMessage = exports.clearLastUserMessage = exports.updateLastUserMessage = exports.deleteMessagesByInstance = exports.deleteMessagesByCliTool = exports.deleteMessageById = exports.deleteAllMessages = exports.getLastMessage = exports.getLastUserMessage = exports.getMessages = exports.updateMessageContent = exports.createMessage = exports.getLastAssistantMessageAt = exports.getAliasedWorktreeIds = exports.getAllWorktreeAliases = exports.getWorktreeAliases = exports.resolveWorktreeIdWithAlias = exports.recordWorktreeAlias = exports.deleteWorktreesByIds = exports.deleteRepositoryWorktrees = exports.migrateWorktreeIdPreservingChildren = exports.getAllWorktreePathIds = exports.getAllWorktreeIds = exports.getWorktreesByRepository = exports.getWorktreeIdsByRepository = exports.getInitialBranch = exports.saveInitialBranch = exports.updateVibeLocalContextWindow = exports.updateVibeLocalModel = exports.updateSelectedAgents = exports.updateCliToolId = exports.updateStatus = exports.updateFavorite = exports.updateLastViewedAt = exports.updateWorktreeLink = exports.updateWorktreeDescription = exports.upsertWorktree = exports.getWorktreeById = exports.getRepositories = exports.getWorktrees = exports.initDatabase = void 0;
+exports.createAssistantMessage = exports.updateAssistantConversation = exports.createAssistantConversation = exports.getAssistantConversationByRepositoryAndCliTool = exports.getAssistantConversationById = exports.updateDailyReportContent = exports.saveDailyReport = exports.getDailyReport = exports.recoverStuckSendingTimers = exports.clearTimerHistory = exports.cleanupOldTimers = exports.getPendingTimerCountByWorktree = exports.cancelTimersByWorktree = exports.cancelTimer = exports.updateTimerStatus = exports.getPendingTimers = exports.getTimerById = exports.getTimersByWorktree = exports.createTimer = exports.WORKTREE_TODO_STATUSES = exports.isWorktreeTodoStatus = exports.reorderWorktreeTodos = exports.deleteWorktreeTodo = exports.updateWorktreeTodo = exports.createWorktreeTodo = exports.getWorktreeTodoById = exports.getTodosByWorktreeId = exports.deleteTodo = exports.updateTodo = exports.createTodo = exports.getTodoById = exports.getAllTodos = exports.getTodosByRepositoryId = exports.MemoDbError = exports.reorderMemos = exports.deleteMemo = exports.updateMemo = exports.createMemo = exports.getMemoById = exports.getMemosByWorktreeId = exports.InvalidAgentInstanceError = exports.AgentInstanceLimitError = exports.removeAgentInstance = exports.addAgentInstance = exports.setAgentInstances = exports.countAgentInstances = exports.getAgentInstance = exports.getAgentInstances = exports.deleteSessionState = exports.clearInProgressMessageId = void 0;
+exports.listTaskEvents = exports.ACTIVE_TASK_STATUSES = exports.TERMINAL_TASK_STATUSES = exports.TASK_STATUSES = exports.isTerminalTaskStatus = exports.getActiveTaskForInstance = exports.getActiveTask = exports.listTasks = exports.getTask = exports.createTask = exports.VERIFICATION_TRIGGERS = exports.MAX_RUN_HISTORY_DAYS = exports.MAX_RUN_HISTORY_LIMIT = exports.DEFAULT_RUN_HISTORY_LIMIT = exports.listVerificationRunsForPeriod = exports.listRunningVerificationRuns = exports.getRunningVerificationRun = exports.listVerificationRuns = exports.getVerificationRun = exports.finishGateResult = exports.createGateResult = exports.finishVerificationRun = exports.createVerificationRun = exports.deletePushSubscriptionByEndpoint = exports.updatePushSubscriptionPreferences = exports.getPushSubscriptionsForKind = exports.getAllPushSubscriptions = exports.getPushSubscriptionByEndpoint = exports.upsertPushSubscription = exports.deleteAssistantSessionState = exports.updateAssistantSessionState = exports.getAssistantSessionState = exports.listRunningAssistantExecutions = exports.getRunningAssistantExecutionByConversation = exports.getLatestAssistantExecutionByConversation = exports.getAssistantExecutionById = exports.updateAssistantExecution = exports.createAssistantExecution = exports.archiveAssistantMessagesFrom = exports.archiveAllAssistantMessages = exports.getAssistantMessageById = exports.getAssistantMessages = exports.updateAssistantMessageStatus = void 0;
 // init-db
 var init_db_1 = require("./init-db");
 Object.defineProperty(exports, "initDatabase", { enumerable: true, get: function () { return init_db_1.initDatabase; } });
@@ -65,6 +65,7 @@ Object.defineProperty(exports, "recomputeLastUserMessage", { enumerable: true, g
 Object.defineProperty(exports, "getMessageById", { enumerable: true, get: function () { return chat_db_1.getMessageById; } });
 Object.defineProperty(exports, "updatePromptData", { enumerable: true, get: function () { return chat_db_1.updatePromptData; } });
 Object.defineProperty(exports, "markPendingPromptsAsAnswered", { enumerable: true, get: function () { return chat_db_1.markPendingPromptsAsAnswered; } });
+Object.defineProperty(exports, "recordAnsweredPrompt", { enumerable: true, get: function () { return chat_db_1.recordAnsweredPrompt; } });
 Object.defineProperty(exports, "ACTIVE_FILTER", { enumerable: true, get: function () { return chat_db_1.ACTIVE_FILTER; } });
 Object.defineProperty(exports, "getMessagesByDateRange", { enumerable: true, get: function () { return chat_db_1.getMessagesByDateRange; } });
 // session-db

package/dist/server/src/lib/polling/auto-yes-suppression-state.js

@@ -0,0 +1,54 @@
+"use strict";
+/**
+ * In-memory record of the last Auto-Yes answer withheld by a contract policy
+ * (Issue #1684).
+ *
+ * Until now a policy suppression (Issue #1547) was visible only in the server
+ * log (`poller:auto-yes-suppressed-by-policy`), so an unattended pipeline that
+ * stalled on a suppressed prompt looked identical to one that simply had no
+ * answer. This module keeps the last suppression per session so
+ * `buildCurrentOutput` can publish it and `commandmate capture --json` can show
+ * *why* the worker is waiting.
+ *
+ * Exposure only: nothing reads this to make a decision. The poller keeps
+ * re-evaluating a suppressed prompt every poll (the duplicate guard only
+ * remembers *answered* prompts), so while the prompt stays on screen the record
+ * is refreshed and `at` stays current; consumers combine it with
+ * `isPromptWaiting` to tell an active suppression from a historical one.
+ *
+ * In-memory and not in SQLite for the same reason `agent-event-state` is: the
+ * record describes a prompt on a live tmux session, and a session does not
+ * survive a server restart for the record to still be about.
+ *
+ * @module lib/polling/auto-yes-suppression-state
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.recordPolicySuppression = recordPolicySuppression;
+exports.getLastPolicySuppression = getLastPolicySuppression;
+exports.clearPolicySuppressions = clearPolicySuppressions;
+const auto_yes_state_1 = require("../../lib/auto-yes-state");
+/** compositeKey -> the most recent policy suppression for that session. */
+const lastPolicySuppressions = new Map();
+/**
+ * Record that the policy withheld an answer for `instanceId`'s current prompt.
+ *
+ * @param at - Epoch ms; defaults to now. Overridable so tests are deterministic.
+ */
+function recordPolicySuppression(worktreeId, cliToolId, instanceId, suppression, at = Date.now()) {
+    lastPolicySuppressions.set((0, auto_yes_state_1.buildCompositeKey)(worktreeId, cliToolId, instanceId), {
+        ...suppression,
+        at,
+    });
+}
+/**
+ * @returns The last policy suppression for this session, or null when the
+ *   policy has never withheld an answer — the ordinary case for a session
+ *   running without a contract.
+ */
+function getLastPolicySuppression(worktreeId, cliToolId, instanceId) {
+    return lastPolicySuppressions.get((0, auto_yes_state_1.buildCompositeKey)(worktreeId, cliToolId, instanceId)) ?? null;
+}
+/** Drop every recorded suppression. Test seam. */
+function clearPolicySuppressions() {
+    lastPolicySuppressions.clear();
+}

package/dist/server/src/lib/session/current-output-builder.js

@@ -14,6 +14,7 @@ const manager_1 = require("../../lib/cli-tools/manager");
 const cli_session_1 = require("../../lib/session/cli-session");
 const status_detector_1 = require("../../lib/detection/status-detector");
 const auto_yes_manager_1 = require("../../lib/polling/auto-yes-manager");
+const auto_yes_suppression_state_1 = require("../../lib/polling/auto-yes-suppression-state");
 const status_capture_config_1 = require("../../config/status-capture-config");
 const tmux_capture_cache_1 = require("../../lib/tmux/tmux-capture-cache");
 const agent_event_state_1 = require("../../lib/session/agent-event-state");
@@ -101,6 +102,7 @@ async function buildCurrentOutput(db, worktreeId, cliToolId, instanceId) {
             enabled: autoYesState?.enabled ?? false,
             expiresAt: autoYesState?.enabled ? autoYesState.expiresAt : null,
             stopReason: autoYesState?.stopReason,
+            lastSuppression: (0, auto_yes_suppression_state_1.getLastPolicySuppression)(worktreeId, cliToolId, instanceId),
         },
         isSelectionListActive,
         isPagerActive,

package/dist/server/src/lib/skills/install-apply.js

@@ -47,6 +47,8 @@ exports.inspectSkillDestination = inspectSkillDestination;
 exports.hasCommittedSkillPayload = hasCommittedSkillPayload;
 exports.writeSkillPayloadFile = writeSkillPayloadFile;
 exports.applySkillInstall = applySkillInstall;
+exports.directoriesForSkillPayload = directoriesForSkillPayload;
+exports.stageSkillRootPayload = stageSkillRootPayload;
 exports.completeSecondarySkillInstallRoots = completeSecondarySkillInstallRoots;
 exports.cleanupSkillInstallStaging = cleanupSkillInstallStaging;
 const fs_1 = require("fs");
@@ -397,7 +399,7 @@ function applySkillInstall(input) {
         }
         return { relativePath: file.path, bytes, executable: file.executable };
     });
-    const directories = directoriesFor(input.snapshot.files.map((f) => f.path), input.snapshot.directories);
+    const directories = directoriesForSkillPayload(input.snapshot.files.map((f) => f.path), input.snapshot.directories);
     // Every destination is proven safe and absent *before* the primary commits, so
     // a secondary that is already blocked cannot leave a committed primary behind.
     for (const prefix of rootPrefixes) {
@@ -463,7 +465,7 @@ function applySkillInstall(input) {
     };
 }
 /** Sorted set of directories a payload implies, plus any the package declared. */
-function directoriesFor(filePaths, declared = []) {
+function directoriesForSkillPayload(filePaths, declared = []) {
     const directories = new Set(declared);
     for (const filePath of filePaths) {
         const parents = filePath.split('/').slice(0, -1);
@@ -476,30 +478,29 @@ function directoriesFor(filePaths, declared = []) {
     return [...directories].sort();
 }
 /**
- * Stage the verified payload into one root and atomically publish it (#1460).
+ * Stage the verified payload for one root without publishing it (#1244).
  *
- * The single-root commit #1235 built, lifted to take the root prefix as a
- * parameter: staging lives under *that* root's reserved namespace so the rename
- * stays on one filesystem, and every check — ancestor lstat walk, exclusive
- * no-follow writes, tree-hash gate, destination-absent, same-filesystem — is
- * applied per root. Throws {@link SkillInstallError} on any failure, having
- * removed its own staging; the destination is untouched unless the rename ran.
+ * The staging half of {@link stageAndCommitSkillRoot}, exported so update can
+ * reuse the exact write path — exclusive no-follow writes, tree-hash gate,
+ * same-filesystem check — and supply its own rename sequence. On any failure the
+ * staging directory is removed and {@link SkillInstallError} is thrown; the
+ * destination is never touched. The caller owns the returned directory: it must
+ * either rename it into place or remove it.
+ *
+ * @internal Shared between install and update apply; not a public API.
  */
-function stageAndCommitSkillRoot(input) {
+function stageSkillRootPayload(input) {
+    if (!exports.SKILL_INSTALL_OPERATION_ID_PATTERN.test(input.stagingName)) {
+        fail(exports.SkillInstallErrorCode.STAGING_IO, { reason: 'staging-name' });
+    }
     const installRootAbs = resolveSkillInstallTargetFor(input.worktreePath, input.rootPrefix, input.skillId);
     assertAncestorsAreRealDirectories(input.worktreeRealPath, input.worktreePath, input.rootPrefix);
-    const destinationBefore = inspectSkillDestination(installRootAbs);
-    if (destinationBefore.present) {
-        fail(destinationBefore.managed
-            ? exports.SkillInstallErrorCode.DESTINATION_EXISTS
-            : exports.SkillInstallErrorCode.DESTINATION_UNMANAGED, destinationBefore.version ? { version: destinationBefore.version } : undefined);
-    }
     const stagingRoot = (0, operation_store_1.getSkillInstallStagingRoot)(input.worktreePath, input.rootPrefix);
     makeDirectory(path_1.default.dirname(stagingRoot), 0o755, true);
     makeDirectory(stagingRoot, exports.SKILL_INSTALL_DIR_MODE, true);
     // Not recursive: a staging directory that already exists means another
-    // operation is using this ID, and silently adopting it would merge two writes.
-    const stagingDir = path_1.default.join(stagingRoot, input.operationId);
+    // operation is using this name, and silently adopting it would merge two writes.
+    const stagingDir = path_1.default.join(stagingRoot, input.stagingName);
     makeDirectory(stagingDir, exports.SKILL_INSTALL_DIR_MODE, false);
     try {
         for (const directory of input.directories) {
@@ -520,6 +521,45 @@ function stageAndCommitSkillRoot(input) {
             fail(exports.SkillInstallErrorCode.PAYLOAD_MISMATCH, { reason: 'tree-hash' });
         }
         assertSameFilesystem(stagingDir, path_1.default.dirname(installRootAbs));
+    }
+    catch (error) {
+        (0, fs_1.rmSync)(stagingDir, { recursive: true, force: true });
+        pruneStagingRoot(stagingRoot);
+        throw error;
+    }
+    return { stagingDir, stagingRoot, installRootAbs };
+}
+/**
+ * Stage the verified payload into one root and atomically publish it (#1460).
+ *
+ * The single-root commit #1235 built, lifted to take the root prefix as a
+ * parameter: staging lives under *that* root's reserved namespace so the rename
+ * stays on one filesystem, and every check — ancestor lstat walk, exclusive
+ * no-follow writes, tree-hash gate, destination-absent, same-filesystem — is
+ * applied per root. Throws {@link SkillInstallError} on any failure, having
+ * removed its own staging; the destination is untouched unless the rename ran.
+ */
+function stageAndCommitSkillRoot(input) {
+    const installRootAbs = resolveSkillInstallTargetFor(input.worktreePath, input.rootPrefix, input.skillId);
+    assertAncestorsAreRealDirectories(input.worktreeRealPath, input.worktreePath, input.rootPrefix);
+    const destinationBefore = inspectSkillDestination(installRootAbs);
+    if (destinationBefore.present) {
+        fail(destinationBefore.managed
+            ? exports.SkillInstallErrorCode.DESTINATION_EXISTS
+            : exports.SkillInstallErrorCode.DESTINATION_UNMANAGED, destinationBefore.version ? { version: destinationBefore.version } : undefined);
+    }
+    const staged = stageSkillRootPayload({
+        worktreePath: input.worktreePath,
+        worktreeRealPath: input.worktreeRealPath,
+        rootPrefix: input.rootPrefix,
+        skillId: input.skillId,
+        stagingName: input.operationId,
+        payload: input.payload,
+        directories: input.directories,
+        receiptBytes: input.receiptBytes,
+        plannedTreeHash: input.plannedTreeHash,
+    });
+    try {
         // Re-checked immediately before the rename rather than only at entry: the
         // exclusive lock keeps CommandMate out, but nothing keeps the user's own
         // editor from creating this directory while the payload was being staged.
@@ -531,18 +571,18 @@ function stageAndCommitSkillRoot(input) {
                 : exports.SkillInstallErrorCode.DESTINATION_UNMANAGED);
         }
         try {
-            (0, fs_1.renameSync)(stagingDir, installRootAbs);
+            (0, fs_1.renameSync)(staged.stagingDir, installRootAbs);
         }
         catch {
             fail(exports.SkillInstallErrorCode.COMMIT_FAILED, { reason: 'rename' });
         }
     }
     catch (error) {
-        (0, fs_1.rmSync)(stagingDir, { recursive: true, force: true });
-        pruneStagingRoot(stagingRoot);
+        (0, fs_1.rmSync)(staged.stagingDir, { recursive: true, force: true });
+        pruneStagingRoot(staged.stagingRoot);
         throw error;
     }
-    pruneStagingRoot(stagingRoot);
+    pruneStagingRoot(staged.stagingRoot);
 }
 /**
  * Converge a committed install's secondary roots forward from the primary (#1460).
@@ -573,7 +613,7 @@ function completeSecondarySkillInstallRoots(worktreePath, worktreeRealPath, skil
         }
         return { relativePath: file.path, bytes, executable: file.executable };
     });
-    const directories = directoriesFor(receipt.files.map((file) => file.path));
+    const directories = directoriesForSkillPayload(receipt.files.map((file) => file.path));
     const plannedTreeHash = (0, preview_diff_1.computeSkillTreeHash)([
         ...receipt.files.map((file) => ({
             path: file.path,