commandmate 0.44.1 → 0.44.3

package/dist/server/src/lib/session/prompt-view.js

@@ -0,0 +1,290 @@
+"use strict";
+/**
+ * How a waiting prompt is shown and answered, decided once (Issue #3184).
+ *
+ * Before this module every reader of a prompt payload re-derived the same three
+ * facts for itself — "can it be answered?", "where are the choices?", "is the
+ * answer a keystroke or an API call?" — from `type`, `options`,
+ * `decisionOptions`, `decisionId` and `askUserQuestion`. The panel, the phone
+ * sheet, the chat surface, Auto-Yes and `wait` each combined them a little
+ * differently, and a fix to one surface kept missing the others (#2775 →
+ * #2810 → #2822, #3181). {@link derivePromptView} is the one combination; a
+ * reader takes its {@link PromptView} and does not look at the raw fields to
+ * decide what to show.
+ *
+ * ## No imports, on purpose
+ *
+ * The CLI (`tsconfig.cli.json`) compiles with `"paths": {}`, so it can reach a
+ * module under `src/lib` by a relative path only when nothing in that module's
+ * graph uses the `@/` alias. `types/models` and `session/structured-prompt` both
+ * do. The input is therefore a structural type ({@link PromptViewSource}) that
+ * every existing prompt shape — `LivePromptData`, `StoredPromptData`, the CLI's
+ * own `PromptData` mirror — satisfies without a cast, and this file stays
+ * importable from a client component, the server and the CLI alike.
+ *
+ * ## What it does not replace
+ *
+ * `isAnswerablePromptData()` (`types/models`) stays: it narrows to the closed
+ * `PromptData` union (#1725) for the code that builds an answer body. The two
+ * agree by construction — `derivePromptView(x)?.kind === 'screen-choices'`
+ * exactly when `isAnswerablePromptData(x)` — and
+ * `tests/unit/session/prompt-view-3184.test.ts` holds that over every fixture.
+ *
+ * @module lib/session/prompt-view
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TYPED_TEXT_FIELD_LABEL_PATTERNS = exports.UNCLASSIFIED_PROMPT_VIEW_TYPE = void 0;
+exports.promptHeadingMessage = promptHeadingMessage;
+exports.optionTakesTypedText = optionTakesTypedText;
+exports.readDecisionId = readDecisionId;
+exports.readQuestionChoices = readQuestionChoices;
+exports.readDecisionHeading = readDecisionHeading;
+exports.derivePromptView = derivePromptView;
+exports.readPromptView = readPromptView;
+/**
+ * `promptData.type` for a frame nothing could classify. Same value as
+ * `UNCLASSIFIED_PROMPT_TYPE` in `types/models`, restated because this module may
+ * not import it (see the module note); the test asserts the two are equal.
+ */
+exports.UNCLASSIFIED_PROMPT_VIEW_TYPE = 'unclassified';
+function promptHeadingMessage(heading) {
+    switch (heading.kind) {
+        case 'question':
+            return { text: heading.text };
+        case 'approval':
+            return heading.toolName
+                ? { key: 'structuredApprovalTitle', values: { toolName: heading.toolName } }
+                : { key: 'structuredApprovalTitleNoTool' };
+        case 'agent-question':
+            return { key: 'structuredQuestionTitle' };
+        case 'unreadable':
+            return { key: 'unclassifiedTitle' };
+    }
+}
+// =============================================================================
+// Field readers (moved from components/worktree/prompt-decision-id, #1932/#2039/#3181)
+// =============================================================================
+/**
+ * Labels of the rows measured to BE a text field on screen (Issue #2573).
+ *
+ * `requiresTextInput` (from {@link TEXT_INPUT_PATTERNS}) reads the WORDS of a
+ * label — "tell … what to do differently", "custom", "enter …" — and says the
+ * option is about the user's own text. It does not say where typed characters
+ * land, and for two rows it flags alike the measured answer is opposite:
+ *
+ * | row | on screen | free text + Enter |
+ * |-----|-----------|-------------------|
+ * | Command Code `AskUserQuestion` `Type something...` (#2522) | a `TextInput` | lands in the field — the answer |
+ * | Command Code permission `No, tell Command Code what to do differently` | a menu row | ignored; the Enter confirms the highlighted `1. Yes` |
+ *
+ * The second is how a "No + reason" was delivered as an approval. The same
+ * words sit on codex's and copilot's approval rows (codex's also name letter
+ * hotkeys, `(y)` / `(p)`), and the generic patterns match inside the command an
+ * approval row quotes (`… commands that start with 'npm run custom'`).
+ *
+ * So this is an allowlist of what was measured, not a denylist of what went
+ * wrong: a flagged row is a field only when its label is one of these. Anchored
+ * at the start so Command Code's folded description (`Type something... Give me
+ * a branch name …`) still matches. Command Code's reader
+ * (`tools/command-code/dialog.ts`) marks the same rows with the same expression.
+ *
+ * The one definition since Issue #3218: `isTypedTextFieldOption` in
+ * `lib/detection/prompt-detect-multiple-choice`, whose graph reaches `fs`,
+ * reads it through `optionTakesTypedText` below.
+ */
+exports.TYPED_TEXT_FIELD_LABEL_PATTERNS = [
+    /^[^\S\n]*type\s+something\b/i,
+];
+/**
+ * Whether an option is a text field on screen, so its answer is the typed TEXT
+ * rather than its number (Issue #2573). `requiresTextInput` alone is also true
+ * for a menu row such as `No, tell Command Code what to do differently`.
+ */
+function optionTakesTypedText(option) {
+    return option.requiresTextInput === true
+        && exports.TYPED_TEXT_FIELD_LABEL_PATTERNS.some((pattern) => pattern.test(option.label));
+}
+/**
+ * The decision id a payload names, or null (Issue #1932). A validating read:
+ * absent, empty or not a string is "no addressable decision".
+ */
+function readDecisionId(source) {
+    if (!source)
+        return null;
+    const candidate = source.decisionId;
+    return typeof candidate === 'string' && candidate !== '' ? candidate : null;
+}
+function hasDecisionOptions(source) {
+    return Array.isArray(source.decisionOptions) && source.decisionOptions.length > 0;
+}
+/**
+ * The choices a question offers when it may be answered over the API, or null
+ * (Issue #2039). All three must hold: a decision id, exactly one question with
+ * a complete label list, and NO approval verdicts on the same payload.
+ */
+function readQuestionChoices(source) {
+    if (!source || readDecisionId(source) === null)
+        return null;
+    if (hasDecisionOptions(source))
+        return null;
+    const asked = source.askUserQuestion;
+    if (!asked || typeof asked.question !== 'string' || asked.question === '')
+        return null;
+    if (!Array.isArray(asked.labels) || asked.labels.length === 0)
+        return null;
+    const labels = asked.labels.filter((label) => typeof label === 'string' && label !== '');
+    // Partial is worse than none: the numbers are positions in this list.
+    if (labels.length !== asked.labels.length)
+        return null;
+    const questionCount = typeof asked.questionCount === 'number' ? asked.questionCount : 1;
+    if (questionCount !== 1)
+        return null;
+    return {
+        question: asked.question,
+        labels,
+        questionCount,
+        ...(asked.custom === true ? { custom: true } : {}),
+    };
+}
+/** The heading for addressable choices, or null when there is nothing to click (#3181). */
+function readDecisionHeading(source) {
+    if (!source || readDecisionId(source) === null)
+        return null;
+    if (hasDecisionOptions(source)) {
+        return {
+            kind: 'approval',
+            toolName: typeof source.toolName === 'string' && source.toolName ? source.toolName : null,
+        };
+    }
+    return readQuestionChoices(source) ? { kind: 'question' } : null;
+}
+// =============================================================================
+// The view
+// =============================================================================
+function screenChoices(source) {
+    const options = Array.isArray(source.options) ? source.options : [];
+    const choices = [];
+    for (const option of options) {
+        if (typeof option === 'string') {
+            // yes_no: `['yes', 'no']`, answered by the word itself.
+            choices.push({
+                answer: option,
+                label: option,
+                isDefault: source.defaultOption === option,
+                takesText: false,
+            });
+            continue;
+        }
+        if (!option || typeof option !== 'object')
+            continue;
+        const o = option;
+        if (typeof o.number !== 'number' || typeof o.label !== 'string')
+            continue;
+        choices.push({
+            answer: String(o.number),
+            label: o.label,
+            isDefault: o.isDefault === true,
+            takesText: optionTakesTypedText({ label: o.label, requiresTextInput: o.requiresTextInput === true }),
+            ...(typeof o.description === 'string' ? { description: o.description } : {}),
+        });
+    }
+    return choices;
+}
+function decisionChoices(decisionOptions) {
+    if (!Array.isArray(decisionOptions))
+        return [];
+    const choices = [];
+    for (const option of decisionOptions) {
+        const o = option;
+        if (!o || typeof o.number !== 'number' || typeof o.label !== 'string')
+            continue;
+        choices.push({ answer: String(o.number), label: o.label, isDefault: false, takesText: false });
+    }
+    return choices;
+}
+const UNREADABLE_VIEW = {
+    kind: 'unreadable',
+    heading: { kind: 'unreadable' },
+    choices: [],
+    multiSelect: false,
+    freeText: null,
+    decisionId: null,
+    apiTarget: null,
+};
+/**
+ * Decide how a prompt payload is shown and answered (Issue #3184).
+ *
+ * Evaluated in this order (design §2.3):
+ *  1. any `type` but the unclassified sentinel → `screen-choices`;
+ *  2. unclassified + decision id + approval verdicts → `api-choices` (approval);
+ *  3. unclassified + decision id + one complete question → `api-choices` (question);
+ *  4. every other unclassified payload — no id, #1932's options-without-id half
+ *     state, and both stored history records — → `unreadable`.
+ *
+ * @param source - A live or stored prompt payload, or null
+ * @returns The view, or null when there is no prompt
+ */
+function derivePromptView(source) {
+    if (source == null)
+        return null;
+    if (source.type !== exports.UNCLASSIFIED_PROMPT_VIEW_TYPE) {
+        const choices = screenChoices(source);
+        return {
+            kind: 'screen-choices',
+            heading: { kind: 'question', text: typeof source.question === 'string' ? source.question : '' },
+            choices,
+            multiSelect: source.multiSelect === true,
+            freeText: choices.some((choice) => choice.takesText) ? { via: 'screen' } : null,
+            decisionId: null,
+            apiTarget: null,
+        };
+    }
+    const decisionId = readDecisionId(source);
+    if (decisionId !== null && hasDecisionOptions(source)) {
+        const choices = decisionChoices(source.decisionOptions);
+        if (choices.length > 0) {
+            return {
+                kind: 'api-choices',
+                heading: {
+                    kind: 'approval',
+                    toolName: typeof source.toolName === 'string' && source.toolName ? source.toolName : null,
+                },
+                choices,
+                multiSelect: false,
+                freeText: null,
+                decisionId,
+                apiTarget: 'approval',
+            };
+        }
+    }
+    const question = readQuestionChoices(source);
+    if (decisionId !== null && question !== null) {
+        return {
+            kind: 'api-choices',
+            heading: { kind: 'agent-question', text: question.question },
+            choices: question.labels.map((label, index) => ({
+                answer: String(index + 1),
+                label,
+                isDefault: false,
+                takesText: false,
+            })),
+            multiSelect: false,
+            freeText: question.custom === true ? { via: 'api' } : null,
+            decisionId,
+            apiTarget: 'question',
+        };
+    }
+    return UNREADABLE_VIEW;
+}
+/**
+ * The view a `current-output` payload carries, falling back to deriving it.
+ *
+ * `??`, not `||`: a server from before #3184 sends no `promptView`, and its
+ * absence means "this daemon does not publish the field" — the same function
+ * then decides from `promptData`, so old and new servers reach the same answer.
+ */
+function readPromptView(payload) {
+    if (!payload)
+        return null;
+    return payload.promptView ?? derivePromptView(payload.promptData);
+}

package/dist/server/src/lib/session/prompt-waiting-composition.js

@@ -33,11 +33,46 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.STRUCTURED_SEND_GUARD_ENV = exports.STRUCTURED_SEND_BLOCK_MAX_AGE_MS = void 0;
+exports.isApiAnswerableStructuredWait = isApiAnswerableStructuredWait;
+exports.isApiAnswerableWaitNow = isApiAnswerableWaitNow;
 exports.structuredWaitingReason = structuredWaitingReason;
 exports.resolvePromptWaiting = resolvePromptWaiting;
 exports.peekPromptWaiting = peekPromptWaiting;
 const agent_event_state_1 = require("../../lib/session/agent-event-state");
 const status_mapping_1 = require("../../lib/session/status-mapping");
+const structured_prompt_1 = require("../../lib/session/structured-prompt");
+/**
+ * Whether a structured wait is one the app answers over the agent's own API
+ * (Issue #3184, design §6-2).
+ *
+ * The three conjuncts `composePromptData` in `current-output-builder` requires
+ * — by calling this function (Issue #3215) — before it publishes a
+ * `decisionId` on the live payload (its `addressableDecisionId`):
+ * the record came from `Notification(permission_prompt)` rather than being a
+ * `permission-request` forecast, the tool's event source names each decision
+ * by id (`eventIdentity: 'permission-id'`), and the record carries such an id.
+ * That is exactly when `derivePromptView` reads the payload as `api-choices` —
+ * an approval or a question the panel draws buttons for — so the waiting kind
+ * published beside it says `prompt` too, instead of the scraper's `menu` /
+ * `unclassified` and the push body's "check the terminal".
+ *
+ * @param structured - The structured record, or null
+ * @param eventIdentity - `capabilities.eventIdentity` of the tool's event source
+ */
+function isApiAnswerableStructuredWait(structured, eventIdentity) {
+    return (structured !== null &&
+        structured.source === 'notification' &&
+        eventIdentity === 'permission-id' &&
+        (0, structured_prompt_1.isAddressableDecision)(structured.decisionId));
+}
+/**
+ * {@link isApiAnswerableStructuredWait} for the record as it stands now — a
+ * read, like {@link peekPromptWaiting}: nothing is released or corroborated.
+ * Kept here so the structured record is still read in this one module (#1737).
+ */
+function isApiAnswerableWaitNow(worktreeId, cliToolId, instanceId, eventIdentity) {
+    return isApiAnswerableStructuredWait((0, agent_event_state_1.getStructuredPromptWaiting)(worktreeId, cliToolId, instanceId), eventIdentity);
+}
 /**
  * How long a structured-only dialog may keep refusing sends (Issue #1737).
  *

package/dist/server/src/lib/session/provisional-turn.js

@@ -88,7 +88,9 @@ exports.TURN_ACTIVITY_EVENTS = new Set([
  *    bound that stops a lost `Stop` from asserting `running` forever.
  *  - `scraper_evidence` — the terminal frame said "done" on
  *    {@link SCRAPER_COMPLETION_POLLS} consecutive polls with positive evidence.
- *    The screen, not the agent.
+ *    The screen, not the agent. For a codex hooks source only when the frame
+ *    shows a turn whose `Stop` is not coming — an interrupt (Issue #3337, see
+ *    `lib/detection/turn-abandoned`).
  *  - `resync_idle` — a source that can be re-read (`capabilities.resync`) was
  *    asked after a dropped transport and answered "not busy".
  *  - `generation` — the process that owned the turn was replaced.

package/dist/server/src/lib/session/send-user-message.js

@@ -401,7 +401,7 @@ async function sendUserMessage(db, params) {
     (0, db_1.updateLastUserMessage)(db, worktreeId, content, userMessageTimestamp);
     // 8. Clear in-progress message ID (session state managed by savePendingAssistantResponse).
     (0, db_1.clearInProgressMessageId)(db, worktreeId, cliToolId, instanceId);
-    logger.info('cleared-in-progress-message-for');
+    logger.info('cleared-in-progress-message');
     // 9. Start polling for the CLI tool's response.
     (0, response_poller_1.startPolling)(worktreeId, cliToolId, instanceId);
     return { ok: true, message };

package/dist/server/src/lib/session/session-starting-state.js

@@ -73,13 +73,11 @@ const node_async_hooks_1 = require("node:async_hooks");
 const auto_yes_state_1 = require("../../lib/auto-yes-state");
 const status_reason_1 = require("../../lib/detection/status-reason");
 const session_starting_config_1 = require("../../config/session-starting-config");
-const records = globalThis.__sessionStartingRecords ??
-    (globalThis.__sessionStartingRecords = new Map());
+const global_state_1 = require("../global-state");
+const records = (0, global_state_1.getOrInitGlobal)('__sessionStartingRecords', () => new Map());
 /** On `globalThis` like the map, so tokens keep growing across route bundles. */
-const tokenSeq = globalThis.__sessionStartingTokenSeq ??
-    (globalThis.__sessionStartingTokenSeq = { last: 0 });
-const tokenScope = globalThis.__sessionStartingTokenScope ??
-    (globalThis.__sessionStartingTokenScope = new node_async_hooks_1.AsyncLocalStorage());
+const tokenSeq = (0, global_state_1.getOrInitGlobal)('__sessionStartingTokenSeq', () => ({ last: 0 }));
+const tokenScope = (0, global_state_1.getOrInitGlobal)('__sessionStartingTokenScope', () => new node_async_hooks_1.AsyncLocalStorage());
 /**
  * A token for a launch about to begin (Issue #3195). Strictly greater than
  * every token issued before it.

package/dist/server/src/lib/session/status-evidence-type.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/server/src/lib/session/status-evidence.js

@@ -55,6 +55,7 @@ exports.clearLastKnownStatuses = clearLastKnownStatuses;
 // at exactly that moment (`worktree-status-helper.test.ts` does).
 const status_reason_1 = require("../../lib/detection/status-reason");
 const agent_event_state_1 = require("../../lib/session/agent-event-state");
+const global_state_1 = require("../global-state");
 /**
  * The reasons that mean "no rule could read this frame" (Issue #2011).
  *
@@ -110,8 +111,7 @@ function isUnclassifiedFrame(status, reason) {
  * whole job is to be honest about age.
  */
 exports.LAST_KNOWN_STATUS_TTL_MS = agent_event_state_1.STRUCTURED_STATE_MAX_AGE_MS;
-const latches = globalThis.__lastKnownStatusByKey ??
-    (globalThis.__lastKnownStatusByKey = new Map());
+const latches = (0, global_state_1.getOrInitGlobal)('__lastKnownStatusByKey', () => new Map());
 /**
  * Cap on retained latches, so a long-lived server cannot grow one per worktree
  * per tool per instance forever.