commandmate 0.48.0 → 0.49.1

package/dist/config/auto-yes-duration.d.ts

@@ -0,0 +1,56 @@
+/**
+ * Auto-Yes duration definitions (Issue #3913)
+ *
+ * The one definition of how long an Auto-Yes grant may last: any whole number
+ * of hours from 1 to 24. Server (route, state), browser (confirm dialog, new
+ * task) and CLI (`--duration`) all read it from here.
+ *
+ * Dependency-free on purpose: no `@/` alias and no safe-regex2, so the CLI
+ * build (tsconfig.cli.json sets `"paths": {}`) can re-export it through a
+ * relative path (`src/cli/config/duration-constants.ts`) instead of keeping a
+ * copy. `scripts/orchestrate/launch-worker.mjs` cannot import TypeScript and
+ * copies only {@link AUTO_YES_DURATION_FLAG_PATTERN}; a unit test keeps the
+ * copy equal to this one.
+ */
+/** Milliseconds per hour */
+export declare const AUTO_YES_MS_PER_HOUR = 3600000;
+/** Shortest grant, in hours */
+export declare const MIN_AUTO_YES_HOURS = 1;
+/** Longest grant, in hours (agreed upper bound, 2026-10-25) */
+export declare const MAX_AUTO_YES_HOURS = 24;
+/**
+ * Every allowed duration in milliseconds: 1h, 2h, ..., 24h.
+ *
+ * Written out as literals so {@link AutoYesDuration} stays a literal union —
+ * a `number` would let NaN, Infinity and fractions through the type.
+ */
+export declare const AUTO_YES_DURATIONS: readonly [3600000, 7200000, 10800000, 14400000, 18000000, 21600000, 25200000, 28800000, 32400000, 36000000, 39600000, 43200000, 46800000, 50400000, 54000000, 57600000, 61200000, 64800000, 68400000, 72000000, 75600000, 79200000, 82800000, 86400000];
+/** Auto-Yes duration type (literal union of the 24 values in AUTO_YES_DURATIONS) */
+export type AutoYesDuration = typeof AUTO_YES_DURATIONS[number];
+/** The often-used durations offered as one-tap choices (1h / 3h / 8h) */
+export declare const PRESET_AUTO_YES_DURATIONS: readonly [3600000, 10800000, 28800000];
+/** Default Auto-Yes duration (1 hour = 3600000ms) */
+export declare const DEFAULT_AUTO_YES_DURATION: AutoYesDuration;
+/**
+ * Type guard: check whether a value is one of the 24 allowed durations.
+ * Rejects every non-number, NaN, ±Infinity, fractions of an hour and values
+ * outside 1〜24h.
+ */
+export declare function isAllowedDuration(value: unknown): value is AutoYesDuration;
+/** Whole hours of an allowed duration (e.g. 18000000 → 5) */
+export declare function autoYesDurationToHours(duration: AutoYesDuration): number;
+/** The duration for a whole number of hours, or null outside 1〜24 */
+export declare function hoursToAutoYesDuration(hours: number): AutoYesDuration | null;
+/**
+ * The CLI `--duration` format: `1h`〜`24h`, lower-case `h`, no leading zero,
+ * sign, whitespace, fraction or other unit.
+ */
+export declare const AUTO_YES_DURATION_FLAG_PATTERN: RegExp;
+/** How the CLI help and errors name the accepted range */
+export declare const AUTO_YES_DURATION_FLAG_RANGE = "1h-24h, whole hours";
+/**
+ * Parse a CLI `--duration` value (e.g. '5h') to milliseconds.
+ * @returns The duration, or null when the value is not `1h`〜`24h`
+ */
+export declare function parseAutoYesDurationFlag(flag: string): AutoYesDuration | null;
+//# sourceMappingURL=auto-yes-duration.d.ts.map

package/dist/config/auto-yes-duration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-yes-duration.d.ts","sourceRoot":"","sources":["../../src/config/auto-yes-duration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,4BAA4B;AAC5B,eAAO,MAAM,oBAAoB,UAAY,CAAC;AAE9C,+BAA+B;AAC/B,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC,+DAA+D;AAC/D,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,yPAKrB,CAAC;AAEX,oFAAoF;AACpF,MAAM,MAAM,eAAe,GAAG,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;AAEhE,yEAAyE;AACzE,eAAO,MAAM,yBAAyB,wCAAoF,CAAC;AAE3H,qDAAqD;AACrD,eAAO,MAAM,yBAAyB,EAAE,eAA2B,CAAC;AAEpE;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,eAAe,CAE1E;AAED,6DAA6D;AAC7D,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,CAExE;AAED,qEAAqE;AACrE,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAG5E;AAED;;;GAGG;AACH,eAAO,MAAM,8BAA8B,QAA+B,CAAC;AAE3E,0DAA0D;AAC1D,eAAO,MAAM,4BAA4B,wBAAwB,CAAC;AAElE;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAG7E"}

package/dist/config/auto-yes-duration.js

@@ -0,0 +1,76 @@
+"use strict";
+/**
+ * Auto-Yes duration definitions (Issue #3913)
+ *
+ * The one definition of how long an Auto-Yes grant may last: any whole number
+ * of hours from 1 to 24. Server (route, state), browser (confirm dialog, new
+ * task) and CLI (`--duration`) all read it from here.
+ *
+ * Dependency-free on purpose: no `@/` alias and no safe-regex2, so the CLI
+ * build (tsconfig.cli.json sets `"paths": {}`) can re-export it through a
+ * relative path (`src/cli/config/duration-constants.ts`) instead of keeping a
+ * copy. `scripts/orchestrate/launch-worker.mjs` cannot import TypeScript and
+ * copies only {@link AUTO_YES_DURATION_FLAG_PATTERN}; a unit test keeps the
+ * copy equal to this one.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AUTO_YES_DURATION_FLAG_RANGE = exports.AUTO_YES_DURATION_FLAG_PATTERN = exports.DEFAULT_AUTO_YES_DURATION = exports.PRESET_AUTO_YES_DURATIONS = exports.AUTO_YES_DURATIONS = exports.MAX_AUTO_YES_HOURS = exports.MIN_AUTO_YES_HOURS = exports.AUTO_YES_MS_PER_HOUR = void 0;
+exports.isAllowedDuration = isAllowedDuration;
+exports.autoYesDurationToHours = autoYesDurationToHours;
+exports.hoursToAutoYesDuration = hoursToAutoYesDuration;
+exports.parseAutoYesDurationFlag = parseAutoYesDurationFlag;
+/** Milliseconds per hour */
+exports.AUTO_YES_MS_PER_HOUR = 3_600_000;
+/** Shortest grant, in hours */
+exports.MIN_AUTO_YES_HOURS = 1;
+/** Longest grant, in hours (agreed upper bound, 2026-10-25) */
+exports.MAX_AUTO_YES_HOURS = 24;
+/**
+ * Every allowed duration in milliseconds: 1h, 2h, ..., 24h.
+ *
+ * Written out as literals so {@link AutoYesDuration} stays a literal union —
+ * a `number` would let NaN, Infinity and fractions through the type.
+ */
+exports.AUTO_YES_DURATIONS = [
+    3_600_000, 7_200_000, 10_800_000, 14_400_000, 18_000_000, 21_600_000,
+    25_200_000, 28_800_000, 32_400_000, 36_000_000, 39_600_000, 43_200_000,
+    46_800_000, 50_400_000, 54_000_000, 57_600_000, 61_200_000, 64_800_000,
+    68_400_000, 72_000_000, 75_600_000, 79_200_000, 82_800_000, 86_400_000,
+];
+/** The often-used durations offered as one-tap choices (1h / 3h / 8h) */
+exports.PRESET_AUTO_YES_DURATIONS = [3_600_000, 10_800_000, 28_800_000];
+/** Default Auto-Yes duration (1 hour = 3600000ms) */
+exports.DEFAULT_AUTO_YES_DURATION = 3_600_000;
+/**
+ * Type guard: check whether a value is one of the 24 allowed durations.
+ * Rejects every non-number, NaN, ±Infinity, fractions of an hour and values
+ * outside 1〜24h.
+ */
+function isAllowedDuration(value) {
+    return typeof value === 'number' && exports.AUTO_YES_DURATIONS.includes(value);
+}
+/** Whole hours of an allowed duration (e.g. 18000000 → 5) */
+function autoYesDurationToHours(duration) {
+    return duration / exports.AUTO_YES_MS_PER_HOUR;
+}
+/** The duration for a whole number of hours, or null outside 1〜24 */
+function hoursToAutoYesDuration(hours) {
+    const ms = hours * exports.AUTO_YES_MS_PER_HOUR;
+    return isAllowedDuration(ms) ? ms : null;
+}
+/**
+ * The CLI `--duration` format: `1h`〜`24h`, lower-case `h`, no leading zero,
+ * sign, whitespace, fraction or other unit.
+ */
+exports.AUTO_YES_DURATION_FLAG_PATTERN = /^(?:[1-9]|1[0-9]|2[0-4])h$/;
+/** How the CLI help and errors name the accepted range */
+exports.AUTO_YES_DURATION_FLAG_RANGE = '1h-24h, whole hours';
+/**
+ * Parse a CLI `--duration` value (e.g. '5h') to milliseconds.
+ * @returns The duration, or null when the value is not `1h`〜`24h`
+ */
+function parseAutoYesDurationFlag(flag) {
+    if (!exports.AUTO_YES_DURATION_FLAG_PATTERN.test(flag))
+        return null;
+    return hoursToAutoYesDuration(Number(flag.slice(0, -1)));
+}

package/dist/lib/session/send-attempt-types.d.ts

@@ -30,7 +30,7 @@ export type SendAttemptReason =
  | 'session-starting'
 /** `not-sent`: the session could not be started. */
  | 'session-start-failed'
-/** `not-sent`: a prompt dialog was open (#1708). */
+/** `not-sent`: a prompt dialog was open (#1708), or opened while the send waited for the composer (#3945). */
  | 'prompt-waiting'
 /** `not-sent`: the tmux session belongs to another server (#2865). */
  | 'foreign-session'
@@ -40,6 +40,20 @@ export type SendAttemptReason =
  | 'composer-not-empty'
 /** `not-sent`: a Command Code plan review overlay refused the send before the body (#3125/#3772). */
  | 'plan-review'
+/** `not-sent`: another send held the instance's composer past the input lock's wait (#3945). */
+ | 'input-lock-timeout'
+/** `not-sent`: the session was killed or recreated while the send waited for its composer (#3945). */
+ | 'session-replaced'
+/** `not-sent`: the composer was handed to another writer before the body was typed (#3945). */
+ | 'input-lock-lost'
+/**
+ * `not-sent`: the bound relay the send was going in under was no longer its
+ * own right before the first key (cancelled, expired or taken), so the
+ * input-boundary hook refused it and nothing was typed or dispatched (#3957/#3992).
+ */
+ | 'relay-reservation-lost'
+/** `not-sent`: the pane could not be re-read under the input lock, so nothing was typed (#3945). */
+ | 'recheck-failed'
 /** `indeterminate`: the body was typed, did not land intact, and was taken back out best-effort (#2464/#3366). */
  | 'body-not-landed'
 /** `indeterminate`: an autocompletion replaced the body; the line was cleared best-effort (#1501). */
@@ -63,4 +77,12 @@ export interface LastSendAttempt {
  * send before any body is typed (Issue #3772). Matched by code, never by wording.
  */
 export declare const PLAN_REVIEW_SEND_REFUSED_CODE = "PLAN_REVIEW_SEND_REFUSED";
+/**
+ * `code` on the errors the input re-check throws before any key
+ * (`recheckComposerBeforeInput`, Issue #3952): a dialog was open, or the pane
+ * could not be read. Carried by copilot's `/model` switch, whose caller records
+ * the reason by code rather than by the wording around it.
+ */
+export declare const INPUT_RECHECK_PROMPT_WAITING_CODE = "INPUT_RECHECK_PROMPT_WAITING";
+export declare const INPUT_RECHECK_FAILED_CODE = "INPUT_RECHECK_FAILED";
 //# sourceMappingURL=send-attempt-types.d.ts.map

package/dist/lib/session/send-attempt-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"send-attempt-types.d.ts","sourceRoot":"","sources":["../../../src/lib/session/send-attempt-types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,MAAM,GAAG,eAAe,CAAC;AAErE,MAAM,MAAM,iBAAiB;AAC3B,wCAAwC;AACtC,WAAW;AACb,2EAA2E;GACzE,kBAAkB;AACpB,mEAAmE;GACjE,kBAAkB;AACpB,oDAAoD;GAClD,sBAAsB;AACxB,oDAAoD;GAClD,gBAAgB;AAClB,sEAAsE;GACpE,iBAAiB;AACnB,oEAAoE;GAClE,qBAAqB;AACvB,4EAA4E;GAC1E,oBAAoB;AACtB,qGAAqG;GACnG,aAAa;AACf,kHAAkH;GAChH,iBAAiB;AACnB,sGAAsG;GACpG,wBAAwB;AAC1B,sGAAsG;GACpG,oBAAoB;AACtB,sFAAsF;GACpF,kBAAkB;AACpB,yEAAyE;GACvE,YAAY,CAAC;AAEjB,0EAA0E;AAC1E,MAAM,WAAW,eAAe;IAC9B,kCAAkC;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,gBAAgB,CAAC;IACxB,8FAA8F;IAC9F,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAAC;CACpC;AAED;;;GAGG;AACH,eAAO,MAAM,6BAA6B,6BAA6B,CAAC"}
+{"version":3,"file":"send-attempt-types.d.ts","sourceRoot":"","sources":["../../../src/lib/session/send-attempt-types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,MAAM,GAAG,eAAe,CAAC;AAErE,MAAM,MAAM,iBAAiB;AAC3B,wCAAwC;AACtC,WAAW;AACb,2EAA2E;GACzE,kBAAkB;AACpB,mEAAmE;GACjE,kBAAkB;AACpB,oDAAoD;GAClD,sBAAsB;AACxB,8GAA8G;GAC5G,gBAAgB;AAClB,sEAAsE;GACpE,iBAAiB;AACnB,oEAAoE;GAClE,qBAAqB;AACvB,4EAA4E;GAC1E,oBAAoB;AACtB,qGAAqG;GACnG,aAAa;AACf,gGAAgG;GAC9F,oBAAoB;AACtB,sGAAsG;GACpG,kBAAkB;AACpB,+FAA+F;GAC7F,iBAAiB;AACnB;;;;GAIG;GACD,wBAAwB;AAC1B,oGAAoG;GAClG,gBAAgB;AAClB,kHAAkH;GAChH,iBAAiB;AACnB,sGAAsG;GACpG,wBAAwB;AAC1B,sGAAsG;GACpG,oBAAoB;AACtB,sFAAsF;GACpF,kBAAkB;AACpB,yEAAyE;GACvE,YAAY,CAAC;AAEjB,0EAA0E;AAC1E,MAAM,WAAW,eAAe;IAC9B,kCAAkC;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,gBAAgB,CAAC;IACxB,8FAA8F;IAC9F,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAAC;CACpC;AAED;;;GAGG;AACH,eAAO,MAAM,6BAA6B,6BAA6B,CAAC;AAExE;;;;;GAKG;AACH,eAAO,MAAM,iCAAiC,iCAAiC,CAAC;AAChF,eAAO,MAAM,yBAAyB,yBAAyB,CAAC"}

package/dist/lib/session/send-attempt-types.js

@@ -9,9 +9,17 @@
  * @module lib/session/send-attempt-types
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PLAN_REVIEW_SEND_REFUSED_CODE = void 0;
+exports.INPUT_RECHECK_FAILED_CODE = exports.INPUT_RECHECK_PROMPT_WAITING_CODE = exports.PLAN_REVIEW_SEND_REFUSED_CODE = void 0;
 /**
  * `code` on the error a tool throws when a plan review overlay refuses the
  * send before any body is typed (Issue #3772). Matched by code, never by wording.
  */
 exports.PLAN_REVIEW_SEND_REFUSED_CODE = 'PLAN_REVIEW_SEND_REFUSED';
+/**
+ * `code` on the errors the input re-check throws before any key
+ * (`recheckComposerBeforeInput`, Issue #3952): a dialog was open, or the pane
+ * could not be read. Carried by copilot's `/model` switch, whose caller records
+ * the reason by code rather than by the wording around it.
+ */
+exports.INPUT_RECHECK_PROMPT_WAITING_CODE = 'INPUT_RECHECK_PROMPT_WAITING';
+exports.INPUT_RECHECK_FAILED_CODE = 'INPUT_RECHECK_FAILED';

package/dist/server/locales/en/worktree.json

@@ -334,7 +334,10 @@
             "remote": "Toggle remote control from GitHub web and mobile",
             "research": "Run a deep research investigation",
             "reset-allowed-tools": "Reset the list of allowed tools",
-            "restart": "Restart the CLI, preserving the current session",
+            "restart": {
+                "copilot": "Restart the CLI, preserving the current session",
+                "claude": "Restart Claude Code and resume this session, which applies an installed update"
+            },
             "rubber-duck": "Get an independent critique of the current work",
             "search": "Search the conversation timeline",
             "session": "View and manage sessions",
@@ -695,7 +698,14 @@
         "regionLabel": "Unsent input",
         "label": "Unsent input:",
         "run": "Run",
-        "clear": "Clear"
+        "clear": "Clear",
+        "clearError": {
+            "dismiss": "Dismiss",
+            "otherServer": "Could not clear: this session is owned by another server.",
+            "busy": "Could not clear: a send is in progress. Wait a moment and try again.",
+            "notCleared": "The text is still in the input box; it could not be cleared.",
+            "failed": "Failed to clear. Please try again."
+        }
     },
     "todo": {
         "addPlaceholder": "Add a todo…",
@@ -1144,8 +1154,11 @@
         "commentPlaceholder": "What should change? (Add comment → Submit review)",
         "comment": "Add comment",
         "submit": "Submit review (Ctrl+R)",
+        "submitCompact": "Submit review",
         "approve": "Approve (Ctrl+A)",
+        "approveCompact": "Approve",
         "cancel": "Cancel (Esc)",
+        "cancelCompact": "Cancel",
         "approveConfirmLabel": "Confirm plan approval",
         "approveConfirmText": "Approving runs the plan. Approve it?",
         "approveConfirmYes": "Approve and run",
@@ -1157,7 +1170,9 @@
             "invalidRequest": "That action does not fit this screen. Nothing was sent.",
             "notActive": "Nothing was sent: no plan review is on screen.",
             "generic": "Could not send."
-        }
+        },
+        "composerNotice": "The plan is waiting for your review — approve, cancel or comment.",
+        "composerGoto": "Go to the controls"
     },
     "selectionKeys": {
         "numbersToolbarLabel": "Option number keys",

package/dist/server/locales/ja/worktree.json

@@ -334,7 +334,10 @@
             "remote": "GitHub の Web・モバイルからのリモート操作を切り替え",
             "research": "ディープリサーチ調査を実行",
             "reset-allowed-tools": "許可済みツールの一覧をリセット",
-            "restart": "現在のセッションを保ったまま CLI を再起動",
+            "restart": {
+                "copilot": "現在のセッションを保ったまま CLI を再起動",
+                "claude": "Claude Code を再起動してこのセッションを再開し、インストール済みの更新を適用"
+            },
             "rubber-duck": "現在の作業への独立した批評を取得",
             "search": "会話タイムラインを検索",
             "session": "セッションを表示・管理",
@@ -695,7 +698,14 @@
         "regionLabel": "未送信の入力",
         "label": "未送信の入力:",
         "run": "実行",
-        "clear": "クリア"
+        "clear": "クリア",
+        "clearError": {
+            "dismiss": "閉じる",
+            "otherServer": "別のサーバーが管理しているセッションのため、クリアできませんでした。",
+            "busy": "送信中のため、クリアできませんでした。少し待ってからもう一度お試しください。",
+            "notCleared": "入力欄に文字が残っています。クリアできませんでした。",
+            "failed": "クリアに失敗しました。もう一度お試しください。"
+        }
     },
     "todo": {
         "addPlaceholder": "ToDoを追加…",
@@ -1144,8 +1154,11 @@
         "commentPlaceholder": "直してほしい点を書く（コメントを追加 → レビューを送信）",
         "comment": "コメントを追加",
         "submit": "レビューを送信 (Ctrl+R)",
+        "submitCompact": "レビューを送信",
         "approve": "承認 (Ctrl+A)",
+        "approveCompact": "承認",
         "cancel": "取り消し (Esc)",
+        "cancelCompact": "取り消し",
         "approveConfirmLabel": "プランの承認の確認",
         "approveConfirmText": "承認するとプランが実行されます。承認しますか？",
         "approveConfirmYes": "承認して実行",
@@ -1157,7 +1170,9 @@
             "invalidRequest": "この画面では送れない操作です。何も送っていません。",
             "notActive": "計画のレビュー画面が表示されていないため、何も送っていません。",
             "generic": "送信できませんでした。"
-        }
+        },
+        "composerNotice": "計画の確認待ちです。承認・取り消し・コメントを選んでください",
+        "composerGoto": "操作へ"
     },
     "selectionKeys": {
         "numbersToolbarLabel": "選択肢の番号キー",

package/dist/server/src/config/auto-yes-config.js

@@ -8,36 +8,31 @@
  *
  * Issue #225: Duration selection feature
  * Issue #314: Stop condition (regex) validation
+ * Issue #3913: Durations widened to 1〜24 hours (defined in auto-yes-duration.ts)
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_STOP_PATTERN_LENGTH = exports.AUTO_STOP_ERROR_THRESHOLD = exports.AUTO_YES_COUNTDOWN_INTERVAL_MS = exports.FULL_CAPTURE_LINES = exports.REDUCED_CAPTURE_LINES = exports.THINKING_POLLING_INTERVAL_MS = exports.DURATION_LABELS = exports.DEFAULT_AUTO_YES_DURATION = exports.ALLOWED_DURATIONS = void 0;
-exports.isAllowedDuration = isAllowedDuration;
+exports.MAX_STOP_PATTERN_LENGTH = exports.AUTO_STOP_ERROR_THRESHOLD = exports.AUTO_YES_COUNTDOWN_INTERVAL_MS = exports.FULL_CAPTURE_LINES = exports.REDUCED_CAPTURE_LINES = exports.THINKING_POLLING_INTERVAL_MS = exports.hoursToAutoYesDuration = exports.autoYesDurationToHours = exports.isAllowedDuration = exports.MAX_AUTO_YES_HOURS = exports.MIN_AUTO_YES_HOURS = exports.DEFAULT_AUTO_YES_DURATION = exports.PRESET_AUTO_YES_DURATIONS = exports.AUTO_YES_DURATIONS = void 0;
 exports.isReleasedByRestart = isReleasedByRestart;
 exports.validateStopPattern = validateStopPattern;
 exports.executeRegexWithTimeout = executeRegexWithTimeout;
 exports.formatTimeRemaining = formatTimeRemaining;
 const safe_regex2_1 = __importDefault(require("safe-regex2"));
 const tmux_pane_config_1 = require("../config/tmux-pane-config");
-/** Allowed Auto-Yes durations in milliseconds */
-exports.ALLOWED_DURATIONS = [3600000, 10800000, 28800000];
-/** Default Auto-Yes duration (1 hour = 3600000ms) */
-exports.DEFAULT_AUTO_YES_DURATION = 3600000;
-/** i18n translation keys for each duration value */
-exports.DURATION_LABELS = {
-    3600000: 'autoYes.durations.1h',
-    10800000: 'autoYes.durations.3h',
-    28800000: 'autoYes.durations.8h',
-};
-/**
- * Type guard: check whether a value is a valid AutoYesDuration.
- * Replaces `as AutoYesDuration` casts with a runtime-safe check.
- */
-function isAllowedDuration(value) {
-    return typeof value === 'number' && exports.ALLOWED_DURATIONS.includes(value);
-}
+// Issue #3913: the duration definitions live in the dependency-free
+// `auto-yes-duration.ts` so the CLI can re-export them; re-exported here so
+// server and browser code keep importing from this module.
+var auto_yes_duration_1 = require("./auto-yes-duration");
+Object.defineProperty(exports, "AUTO_YES_DURATIONS", { enumerable: true, get: function () { return auto_yes_duration_1.AUTO_YES_DURATIONS; } });
+Object.defineProperty(exports, "PRESET_AUTO_YES_DURATIONS", { enumerable: true, get: function () { return auto_yes_duration_1.PRESET_AUTO_YES_DURATIONS; } });
+Object.defineProperty(exports, "DEFAULT_AUTO_YES_DURATION", { enumerable: true, get: function () { return auto_yes_duration_1.DEFAULT_AUTO_YES_DURATION; } });
+Object.defineProperty(exports, "MIN_AUTO_YES_HOURS", { enumerable: true, get: function () { return auto_yes_duration_1.MIN_AUTO_YES_HOURS; } });
+Object.defineProperty(exports, "MAX_AUTO_YES_HOURS", { enumerable: true, get: function () { return auto_yes_duration_1.MAX_AUTO_YES_HOURS; } });
+Object.defineProperty(exports, "isAllowedDuration", { enumerable: true, get: function () { return auto_yes_duration_1.isAllowedDuration; } });
+Object.defineProperty(exports, "autoYesDurationToHours", { enumerable: true, get: function () { return auto_yes_duration_1.autoYesDurationToHours; } });
+Object.defineProperty(exports, "hoursToAutoYesDuration", { enumerable: true, get: function () { return auto_yes_duration_1.hoursToAutoYesDuration; } });
 // =============================================================================
 // Polling Interval Constants (Issue #499)
 // =============================================================================

package/dist/server/src/config/auto-yes-duration.js

@@ -0,0 +1,76 @@
+"use strict";
+/**
+ * Auto-Yes duration definitions (Issue #3913)
+ *
+ * The one definition of how long an Auto-Yes grant may last: any whole number
+ * of hours from 1 to 24. Server (route, state), browser (confirm dialog, new
+ * task) and CLI (`--duration`) all read it from here.
+ *
+ * Dependency-free on purpose: no `@/` alias and no safe-regex2, so the CLI
+ * build (tsconfig.cli.json sets `"paths": {}`) can re-export it through a
+ * relative path (`src/cli/config/duration-constants.ts`) instead of keeping a
+ * copy. `scripts/orchestrate/launch-worker.mjs` cannot import TypeScript and
+ * copies only {@link AUTO_YES_DURATION_FLAG_PATTERN}; a unit test keeps the
+ * copy equal to this one.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AUTO_YES_DURATION_FLAG_RANGE = exports.AUTO_YES_DURATION_FLAG_PATTERN = exports.DEFAULT_AUTO_YES_DURATION = exports.PRESET_AUTO_YES_DURATIONS = exports.AUTO_YES_DURATIONS = exports.MAX_AUTO_YES_HOURS = exports.MIN_AUTO_YES_HOURS = exports.AUTO_YES_MS_PER_HOUR = void 0;
+exports.isAllowedDuration = isAllowedDuration;
+exports.autoYesDurationToHours = autoYesDurationToHours;
+exports.hoursToAutoYesDuration = hoursToAutoYesDuration;
+exports.parseAutoYesDurationFlag = parseAutoYesDurationFlag;
+/** Milliseconds per hour */
+exports.AUTO_YES_MS_PER_HOUR = 3_600_000;
+/** Shortest grant, in hours */
+exports.MIN_AUTO_YES_HOURS = 1;
+/** Longest grant, in hours (agreed upper bound, 2026-10-25) */
+exports.MAX_AUTO_YES_HOURS = 24;
+/**
+ * Every allowed duration in milliseconds: 1h, 2h, ..., 24h.
+ *
+ * Written out as literals so {@link AutoYesDuration} stays a literal union —
+ * a `number` would let NaN, Infinity and fractions through the type.
+ */
+exports.AUTO_YES_DURATIONS = [
+    3_600_000, 7_200_000, 10_800_000, 14_400_000, 18_000_000, 21_600_000,
+    25_200_000, 28_800_000, 32_400_000, 36_000_000, 39_600_000, 43_200_000,
+    46_800_000, 50_400_000, 54_000_000, 57_600_000, 61_200_000, 64_800_000,
+    68_400_000, 72_000_000, 75_600_000, 79_200_000, 82_800_000, 86_400_000,
+];
+/** The often-used durations offered as one-tap choices (1h / 3h / 8h) */
+exports.PRESET_AUTO_YES_DURATIONS = [3_600_000, 10_800_000, 28_800_000];
+/** Default Auto-Yes duration (1 hour = 3600000ms) */
+exports.DEFAULT_AUTO_YES_DURATION = 3_600_000;
+/**
+ * Type guard: check whether a value is one of the 24 allowed durations.
+ * Rejects every non-number, NaN, ±Infinity, fractions of an hour and values
+ * outside 1〜24h.
+ */
+function isAllowedDuration(value) {
+    return typeof value === 'number' && exports.AUTO_YES_DURATIONS.includes(value);
+}
+/** Whole hours of an allowed duration (e.g. 18000000 → 5) */
+function autoYesDurationToHours(duration) {
+    return duration / exports.AUTO_YES_MS_PER_HOUR;
+}
+/** The duration for a whole number of hours, or null outside 1〜24 */
+function hoursToAutoYesDuration(hours) {
+    const ms = hours * exports.AUTO_YES_MS_PER_HOUR;
+    return isAllowedDuration(ms) ? ms : null;
+}
+/**
+ * The CLI `--duration` format: `1h`〜`24h`, lower-case `h`, no leading zero,
+ * sign, whitespace, fraction or other unit.
+ */
+exports.AUTO_YES_DURATION_FLAG_PATTERN = /^(?:[1-9]|1[0-9]|2[0-4])h$/;
+/** How the CLI help and errors name the accepted range */
+exports.AUTO_YES_DURATION_FLAG_RANGE = '1h-24h, whole hours';
+/**
+ * Parse a CLI `--duration` value (e.g. '5h') to milliseconds.
+ * @returns The duration, or null when the value is not `1h`〜`24h`
+ */
+function parseAutoYesDurationFlag(flag) {
+    if (!exports.AUTO_YES_DURATION_FLAG_PATTERN.test(flag))
+        return null;
+    return hoursToAutoYesDuration(Number(flag.slice(0, -1)));
+}

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

@@ -71,6 +71,7 @@ const db_instance_1 = require("./db/db-instance");
 const chat_db_1 = require("./db/chat-db");
 const worktree_session_ownership_1 = require("./cli-tools/worktree-session-ownership");
 const prompt_answer_sender_1 = require("./prompt-answer-sender");
+const instance_input_lock_1 = require("../lib/session/instance-input-lock");
 const session_created_signal_1 = require("./tmux/session-created-signal");
 const manager_1 = require("./cli-tools/manager");
 const cli_patterns_1 = require("./detection/cli-patterns");
@@ -401,6 +402,24 @@ function settleFailedTick(error, tick) {
         logger.info('poller:auto-yes-answer-abandoned', { worktreeId, cliToolId, instanceId, keysSent, delivery });
         return 'no_answer';
     }
+    // Issue #3952: the answer waited for a send holding the session's input and
+    // was then not typed — the prompt moved, or the wait ran out. Nothing is on
+    // the pane and the poller did nothing wrong: the next tick reads the screen
+    // afresh and decides again, without counting an error. By name, as the
+    // transport's errors are read: test doubles of the sender need not export it.
+    if (error instanceof Error && error.name === 'PromptAnswerNotDeliveredError') {
+        if (attempt !== null)
+            (0, auto_yes_poller_state_1.settleSendAttempt)(attempt, false);
+        if (sendInFlight)
+            (0, auto_yes_poller_receipt_log_1.noteAnswerSent)(cliToolId, worktreeId, instanceId, true, receiptEpisode);
+        logger.info('poller:auto-yes-answer-not-delivered', {
+            worktreeId,
+            cliToolId,
+            instanceId,
+            skip: error.skip,
+        });
+        return 'no_answer';
+    }
     // Issue #3839: a failure with keys already on the pane is held the same way —
     // the next tick must not type the answer again over them (step 2.5); the
     // screen leaving or changing forgets it (`forgetPartialAnswer`). Issue #3880:
@@ -445,10 +464,14 @@ function settleFailedTick(error, tick) {
  *   dropped rows from the top of what tmux returned, as the capture layer said
  *   ({@link capturePollerFrame}'s `headCut`). At a window of the pane's height
  *   the row count cannot tell. Omitted, judged from the row count as before.
+ * @param inputReadMark - Issue #3952: `instanceInputReadMark()` taken before the
+ *   tick's capture. Omitted, it is taken when this function is called.
  * @returns 'responded' | 'no_prompt' | 'duplicate' | 'no_answer' | 'error'
  */
-async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, cleanOutput, precomputedLines, instanceId, rawOutput, generation, observation, captureWindowLines, captureHeadCut) {
+async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, cleanOutput, precomputedLines, instanceId, rawOutput, generation, observation, captureWindowLines, captureHeadCut, inputReadMark) {
     const compositeKey = (0, auto_yes_state_1.buildCompositeKey)(worktreeId, cliToolId, instanceId);
+    // Issue #3952: where the session's input order stood when the frame was read.
+    const readMark = inputReadMark ?? (0, instance_input_lock_1.instanceInputReadMark)();
     const captureExtent = captureWindowLines === undefined ? undefined : { windowLines: captureWindowLines, headCut: captureHeadCut };
     const tickObservation = observation ?? {
         start: (0, waiting_episode_binding_1.startWaitingObservation)(worktreeId, cliToolId, instanceId),
@@ -690,15 +713,28 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // Issue #3798: the wait this answer goes to, fixed as the send begins.
         const answerTarget = (0, auto_yes_poller_answer_target_1.fixAnswerTarget)(worktreeId, cliToolId, instanceId);
         sendInFlight = true;
+        const answerParams = {
+            sessionName,
+            answer,
+            cliToolId,
+            promptData: promptDetection.promptData,
+            // Issue #3706: asked after each wait inside the send.
+            ...(generation !== undefined ? { stillCurrent: () => (0, auto_yes_poller_generation_1.isTickCurrent)(generation) } : {}),
+            // Issue #3952: an answer that had to wait for a send is read again.
+            readMark,
+        };
+        // Issue #3952 review P1-2: and step 5.5's last look is taken again after
+        // that wait, right before the first key — the contract or the grant may
+        // have changed while the answer waited for the input. Not enumerable: the
+        // params stay the plain record of what was answered (as the ledger's
+        // fault-injection test compares them across runs); the sender reads it as
+        // the field it is.
+        Object.defineProperty(answerParams, 'stillAllowedAtSend', {
+            value: () => !(0, auto_yes_poller_steps_1.withheldAtSend)(judged, generation !== undefined),
+            enumerable: false,
+        });
         try {
-            await (0, prompt_answer_sender_1.sendPromptAnswer)({
-                sessionName,
-                answer,
-                cliToolId,
-                promptData: promptDetection.promptData,
-                // Issue #3706: asked after each wait inside the send.
-                ...(generation !== undefined ? { stillCurrent: () => (0, auto_yes_poller_generation_1.isTickCurrent)(generation) } : {}),
-            });
+            await (0, prompt_answer_sender_1.sendPromptAnswer)(answerParams);
         }
         finally {
             (0, tmux_capture_cache_1.invalidateCache)(sessionName);
@@ -788,6 +824,9 @@ async function pollAutoYes(worktreeId, cliToolId, instanceId, owner) {
     // Issue #3798: the waiting episode as this tick found it, before its first wait.
     const observationStart = (0, waiting_episode_binding_1.startWaitingObservation)(worktreeId, cliToolId, instanceId);
     try {
+        // Issue #3952: taken before the capture, so a send admitted after it makes
+        // an answer from this frame read the screen again.
+        const inputReadMark = (0, instance_input_lock_1.instanceInputReadMark)();
         // 2. Capture and clean output
         const captureLines = grant.stopPattern
             ? auto_yes_config_1.FULL_CAPTURE_LINES
@@ -819,7 +858,7 @@ async function pollAutoYes(worktreeId, cliToolId, instanceId, owner) {
         const result = await detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, cleanOutput, lines, instanceId, rawOutput, generation, { start: observationStart, frameTime }, 
         // Issue #3881 (review P2-1): the window this capture was taken with,
         // and (third review N4) whether it cut the pane's top.
-        captureLines, headCut);
+        captureLines, headCut, inputReadMark);
         if (!(0, auto_yes_poller_generation_1.isTickCurrent)(generation)) {
             endStaleTick(generation);
             return;

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

@@ -203,8 +203,10 @@ function getAutoYesState(worktreeId, cliToolId = 'claude', instanceId) {
  * @param worktreeId - Worktree identifier
  * @param cliToolId - CLI tool type
  * @param enabled - Whether to enable or disable auto-yes
- * @param duration - Optional duration in milliseconds (must be an ALLOWED_DURATIONS value).
- *                   Defaults to DEFAULT_AUTO_YES_DURATION (1 hour) when omitted.
+ * @param duration - Optional duration in milliseconds (must be an AUTO_YES_DURATIONS value,
+ *                   1〜24 whole hours). Defaults to DEFAULT_AUTO_YES_DURATION (1 hour) when omitted.
+ *                   Issue #3913: checked at run time too — an enable with any other
+ *                   value throws a RangeError and leaves the state as it was.
  * @param stopPattern - Optional regex pattern for stop condition (Issue #314).
  * @param instanceId - Optional instance identifier (Issue #896; defaults to primary).
  * @param answerMode - Issue #3863: how questions are answered. Omitted, an
@@ -217,6 +219,11 @@ function getAutoYesState(worktreeId, cliToolId = 'claude', instanceId) {
 function setAutoYesEnabled(worktreeId, cliToolId, enabled, duration, stopPattern, instanceId, answerMode) {
     const key = buildCompositeKey(worktreeId, cliToolId, instanceId);
     if (enabled) {
+        // Issue #3913: the type is not proof (a cast, or a caller outside the
+        // route's check), so the value is checked before anything is written.
+        if (duration !== undefined && !(0, auto_yes_config_1.isAllowedDuration)(duration)) {
+            throw new RangeError(`Invalid Auto-Yes duration: ${String(duration)} (must be 1-24 whole hours in ms)`);
+        }
         const current = answerMode === undefined ? getAutoYesState(worktreeId, cliToolId, instanceId) : null;
         const now = Date.now();
         const effectiveDuration = duration ?? auto_yes_config_1.DEFAULT_AUTO_YES_DURATION;