commandmate 0.45.1 → 0.46.0

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

@@ -1,7 +1,12 @@
 {
     "agentStatus": {
-        "moreAgents": "{count} more agents",
-        "overflowTrigger": "More agents"
+        "overflowTrigger": "More agents",
+        "otherSessions": "{count} more",
+        "otherSessionsLabel": "{count} other sessions",
+        "otherSessionsWaitingLabel": "{count} other sessions, {waiting} waiting for your answer",
+        "otherSessionsList": "Other sessions",
+        "inSplit": "Split {index}",
+        "addSession": "Add session…"
     },
     "toc": {
         "title": "Contents",
@@ -508,6 +513,7 @@
     },
     "terminal": {
         "historyLabel": "History",
+        "actionBarMore": "Show hidden items",
         "filesLabel": "Open Files",
         "showHistory": "Show history",
         "hideHistory": "Hide history",
@@ -515,8 +521,6 @@
         "hideFiles": "Hide open files",
         "equalizeWidths": "Equal widths",
         "equalizeWidthsHint": "Equalize terminal widths and reset History width",
-        "addSplit": "Add split",
-        "removeSplit": "Remove split",
         "selectInstance": "Select agent instance for {split}",
         "moreActions": "More actions",
         "searchTerminal": "Search terminal",
@@ -531,7 +535,13 @@
         "maximizeShortcutHint": "⌘ / Ctrl + Shift + Enter",
         "maximizedStatus": "Split {split} maximized",
         "loading": "Loading…",
-        "sessionEnded": "The session has ended. Send a message to start a new session."
+        "sessionEnded": "The session has ended. Send a message to start a new session.",
+        "layoutGroupLabel": "Split layout",
+        "layoutSplits": "Split layout: {count}",
+        "composerTarget": "To: {agent} · {branch}",
+        "composerTargetNoBranch": "To: {agent}",
+        "composerTargetLabel": "This input sends to {agent} on {branch}",
+        "composerTargetLabelNoBranch": "This input sends to {agent}"
     },
     "surfaceMode": {
         "groupLabel": "Output surface for {split}",
@@ -1063,7 +1073,6 @@
         }
     },
     "activityBar": {
-        "toggleSidebar": "Toggle sidebar",
         "label": "Activity Bar",
         "files": "File Tree",
         "git": "Git",
@@ -1075,7 +1084,6 @@
         "skills": "Skills",
         "verification": "Verification",
         "env": "Env",
-        "settings": "Settings",
         "settingsMenu": {
             "settings": "Settings",
             "skills": "Skills",
@@ -1089,6 +1097,11 @@
             "version": "CommandMate {version}"
         }
     },
+    "headerTools": {
+        "label": "Worktree tools",
+        "more": "More tools",
+        "moreActive": "More tools ({label} is open)"
+    },
     "branchMismatch": {
         "changedFrom": "Branch changed from",
         "to": "to",
@@ -1169,7 +1182,10 @@
     },
     "desktopLayout": {
         "activityPane": "Activity pane",
-        "terminalPane": "Terminal pane"
+        "terminalPane": "Terminal pane",
+        "pinPane": "Pin beside the terminal",
+        "unpinPane": "Unpin (show over the terminal)",
+        "closePane": "Close panel"
     },
     "worktreeStatus": {
         "notSet": "Not set",
@@ -1178,13 +1194,6 @@
         "inReview": "In Review",
         "done": "Done"
     },
-    "card": {
-        "main": "Main",
-        "description": "Description",
-        "link": "Link",
-        "openLink": "Open link in new tab",
-        "updated": "Updated {time}"
-    },
     "detail": {
         "worktree": "Worktree",
         "repository": "Repository",
@@ -1218,7 +1227,8 @@
         "subTabGit": "Git",
         "statusPillWithModel": "{label}: {status} — model {model}",
         "statusPillWithUsage": "{base} — {usage}",
-        "statusPillWithSource": "{base} — {source}"
+        "statusPillWithSource": "{base} — {source}",
+        "openRepositories": "{repository} — open Repositories"
     },
     "detailStatus": {
         "idle": "Idle - No active session",
@@ -1476,6 +1486,7 @@
             "failingGates": "Gates that did not pass: {gates}",
             "gatesPassed": "All {count} gates passed",
             "openHint": "Open the Verification pane",
+            "closeHint": "Close the Verification pane",
             "dash": "—",
             "unverified": "Not verified",
             "noTask": "No execution contract has been sent to this branch",
@@ -1670,5 +1681,24 @@
         "noteInstanceFlag": "--instance is how a command names its target. --agent is only for starting an ad-hoc session the roster does not know, and wait has no --agent at all.",
         "noteWaitOnPrompt": "wait carries --on-prompt human so it keeps waiting when the agent asks something. Without it the default (agent) exits 10 the moment a prompt is detected.",
         "noteRespondNumber": "respond does not interpret its answer. Send the NUMBER of the option: \"yes\" is typed, ignored, and followed by Enter, which picks whatever the default option happens to be."
+    },
+    "agentAdd": {
+        "button": "Add agent",
+        "title": "Add agent",
+        "tool": "Agent",
+        "notInstalled": "{name} (not installed)",
+        "installedUnknown": "Could not check which agents are installed; every agent is listed.",
+        "name": "Name (optional)",
+        "namePlaceholder": "e.g. Review",
+        "placement": "Open in",
+        "placementNewSplit": "New split",
+        "placementReplace": "Replace the current split",
+        "placementRosterOnly": "Add only",
+        "placementNewSplitFull": "All {max} splits are in use",
+        "startHint": "The session starts when you send the first message.",
+        "submit": "Add",
+        "cancel": "Cancel",
+        "saveError": "Could not add the agent.",
+        "maxReached": "Up to {max} agents per branch"
     }
 }

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

@@ -1,7 +1,12 @@
 {
     "agentStatus": {
-        "moreAgents": "他 {count} 件のエージェント",
-        "overflowTrigger": "他のエージェント"
+        "overflowTrigger": "他のエージェント",
+        "otherSessions": "ほか {count}",
+        "otherSessionsLabel": "ほかのセッション {count} 件",
+        "otherSessionsWaitingLabel": "ほかのセッション {count} 件（うち {waiting} 件が応答待ち）",
+        "otherSessionsList": "ほかのセッション",
+        "inSplit": "分割 {index}",
+        "addSession": "セッションを追加…"
     },
     "toc": {
         "title": "目次",
@@ -508,6 +513,7 @@
     },
     "terminal": {
         "historyLabel": "履歴",
+        "actionBarMore": "隠れている項目を表示",
         "filesLabel": "開いているファイル",
         "showHistory": "履歴を表示",
         "hideHistory": "履歴を非表示",
@@ -515,8 +521,6 @@
         "hideFiles": "開いているファイルを非表示",
         "equalizeWidths": "均等幅",
         "equalizeWidthsHint": "ターミナル幅を均等にし、履歴幅を初期値に戻す",
-        "addSplit": "分割を追加",
-        "removeSplit": "分割を削除",
         "selectInstance": "{split} のエージェントインスタンスを選択",
         "moreActions": "その他の操作",
         "searchTerminal": "ターミナル内を検索",
@@ -531,7 +535,13 @@
         "maximizeShortcutHint": "⌘ / Ctrl + Shift + Enter",
         "maximizedStatus": "{split} を最大化中",
         "loading": "読込中...",
-        "sessionEnded": "セッションは終了しています。送信すると新しいセッションが起動します。"
+        "sessionEnded": "セッションは終了しています。送信すると新しいセッションが起動します。",
+        "layoutGroupLabel": "分割の並べ方",
+        "layoutSplits": "{count} 分割",
+        "composerTarget": "To: {agent} · {branch}",
+        "composerTargetNoBranch": "To: {agent}",
+        "composerTargetLabel": "この入力欄は {branch} の {agent} に送信します",
+        "composerTargetLabelNoBranch": "この入力欄は {agent} に送信します"
     },
     "surfaceMode": {
         "groupLabel": "{split} の出力面",
@@ -1063,7 +1073,6 @@
         }
     },
     "activityBar": {
-        "toggleSidebar": "サイドバーを切り替え",
         "label": "アクティビティバー",
         "files": "ファイルツリー",
         "git": "Git",
@@ -1075,7 +1084,6 @@
         "skills": "スキル",
         "verification": "検証",
         "env": "環境変数",
-        "settings": "設定",
         "settingsMenu": {
             "settings": "設定",
             "skills": "スキル",
@@ -1089,6 +1097,11 @@
             "version": "CommandMate {version}"
         }
     },
+    "headerTools": {
+        "label": "ワークツリーの道具",
+        "more": "ほかの道具",
+        "moreActive": "ほかの道具（{label} を表示中）"
+    },
     "branchMismatch": {
         "changedFrom": "ブランチが",
         "to": "から",
@@ -1169,7 +1182,10 @@
     },
     "desktopLayout": {
         "activityPane": "アクティビティペイン",
-        "terminalPane": "ターミナルペイン"
+        "terminalPane": "ターミナルペイン",
+        "pinPane": "ターミナルの横に固定",
+        "unpinPane": "固定を解除（ターミナルの上に重ねる）",
+        "closePane": "パネルを閉じる"
     },
     "worktreeStatus": {
         "notSet": "未設定",
@@ -1178,13 +1194,6 @@
         "inReview": "レビュー中",
         "done": "完了"
     },
-    "card": {
-        "main": "メイン",
-        "description": "説明",
-        "link": "リンク",
-        "openLink": "リンクを新しいタブで開く",
-        "updated": "更新 {time}"
-    },
     "detail": {
         "worktree": "ワークツリー",
         "repository": "リポジトリ",
@@ -1218,7 +1227,8 @@
         "subTabGit": "Git",
         "statusPillWithModel": "{label}: {status} — モデル {model}",
         "statusPillWithUsage": "{base} — {usage}",
-        "statusPillWithSource": "{base} — {source}"
+        "statusPillWithSource": "{base} — {source}",
+        "openRepositories": "{repository} — リポジトリの画面を開く"
     },
     "detailStatus": {
         "idle": "アイドル - セッションなし",
@@ -1476,6 +1486,7 @@
             "failingGates": "不合格ゲート: {gates}",
             "gatesPassed": "全 {count} ゲート合格",
             "openHint": "検証ペインを開く",
+            "closeHint": "検証ペインを閉じる",
             "dash": "—",
             "unverified": "未検証",
             "noTask": "このブランチには実行契約が送られていません",
@@ -1670,5 +1681,24 @@
         "noteInstanceFlag": "送り先を指定するのは --instance です。--agent は roster に無いインスタンスをアドホックに起動するためのもので、wait には --agent 自体がありません。",
         "noteWaitOnPrompt": "wait には --on-prompt human を付けてあります。付けないと既定の agent モードになり、プロンプトを検出した時点で exit 10 で即座に終了します。",
         "noteRespondNumber": "respond は回答を意味解決しません。選択肢は番号で送ってください。「yes」は入力されたあと無視され、続く Enter がその時点の既定選択を選んでしまいます。"
+    },
+    "agentAdd": {
+        "button": "エージェントを追加",
+        "title": "エージェントを追加",
+        "tool": "エージェント",
+        "notInstalled": "{name}（未インストール）",
+        "installedUnknown": "インストール済みかを確認できなかったため、すべてのエージェントを表示しています。",
+        "name": "名前（任意）",
+        "namePlaceholder": "例: レビュー",
+        "placement": "開く場所",
+        "placementNewSplit": "新しい分割",
+        "placementReplace": "今の分割を置き換え",
+        "placementRosterOnly": "追加だけ",
+        "placementNewSplitFull": "分割は {max} つすべて使用中です",
+        "startHint": "セッションは最初のメッセージを送ったときに起動します。",
+        "submit": "追加",
+        "cancel": "キャンセル",
+        "saveError": "エージェントを追加できませんでした。",
+        "maxReached": "1 つのブランチに追加できるのは {max} 件までです"
     }
 }

package/dist/server/src/config/activity-bar-config.js

@@ -5,22 +5,26 @@
  * Defines the VS Code-style Activity Bar identifiers and metadata.
  * This module is consumed by:
  *   - `src/hooks/useActivityBarState.ts`
- *   - `src/components/worktree/ActivityBar.tsx`
+ *   - `src/components/worktree/HeaderToolBar.tsx` (PC, Issue #3591)
  *   - `src/components/worktree/ActivityPane.tsx`
  *   - `src/components/worktree/WorktreeDetailRefactored.tsx`
  *
- * The Activity Bar is a 48px-wide vertical bar that hosts the activities below.
+ * The Activity Bar was a 48px-wide vertical bar that hosted the activities
+ * below. Issue #3591: on PC they are icons at the right of the worktree header
+ * ({@link HEADER_TOOLS}) and the Verification chip; the names below keep the
+ * "activity bar" wording (storage keys, test helpers).
  * Re-clicking the active icon toggles the ActivityPane closed (null).
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ACTIVITY_CLOSED_SENTINEL = exports.ACTIVITY_BAR_STORAGE_KEY_PREFIX = exports.DEFAULT_ACTIVITY = exports.VALID_ACTIVITY_IDS = exports.ACTIVITIES = void 0;
+exports.ACTIVITY_PANE_PINNED_STORAGE_KEY = exports.ACTIVITY_CLOSED_SENTINEL = exports.ACTIVITY_BAR_STORAGE_KEY_PREFIX = exports.INITIAL_ACTIVITY = exports.DEFAULT_ACTIVITY = exports.VALID_ACTIVITY_IDS = exports.HEADER_TOOLS = exports.CHIP_ACTIVITY_ID = exports.ACTIVITIES = void 0;
 exports.getActivityBarStorageKey = getActivityBarStorageKey;
 exports.isActivityId = isActivityId;
 const lucide_react_1 = require("lucide-react");
 /**
- * Ordered list of activities rendered top-to-bottom in the Activity Bar.
- * The order here is the visual order in the ActivityBar UI and the keyboard
- * navigation order (ArrowDown/ArrowUp).
+ * Ordered list of activities. The order here is the visual order of the
+ * header tools ({@link HEADER_TOOLS}, drawn by `HeaderToolBar.tsx`) and the
+ * keyboard navigation order (ArrowLeft/ArrowRight in the header). The mobile
+ * tab bar has its own list and does not follow it.
  */
 exports.ACTIVITIES = [
     // Issue #2616: the two-sheet `Files`, not the single-sheet `File` — at 20px
@@ -44,14 +48,43 @@ exports.ACTIVITIES = [
     // both users and tests, so an insert would silently renumber every tab.
     { id: 'env', labelKey: 'activityBar.env', icon: lucide_react_1.KeyRound },
 ];
+/**
+ * The activity whose entry point is not a header tool (Issue #3591): the
+ * Verification pane opens from the Verification chip on the second row
+ * (`VerificationStatusChip`, #3590), which already says where the branch
+ * stands. It stays in {@link ACTIVITIES} — the pane, its label and the stored
+ * state are unchanged — and is only left out of {@link HEADER_TOOLS}.
+ */
+exports.CHIP_ACTIVITY_ID = 'verification';
+/**
+ * The tools drawn at the right of the PC worktree header (Issue #3591), in
+ * {@link ACTIVITIES} order — the order of the ←/→ keys. Every activity except
+ * {@link CHIP_ACTIVITY_ID}. On a narrow header the trailing ones fold behind a
+ * "…" button (`useDesktopHeaderFit`).
+ */
+exports.HEADER_TOOLS = exports.ACTIVITIES.filter((activity) => activity.id !== exports.CHIP_ACTIVITY_ID);
 /**
  * Set of valid ActivityId values for runtime validation.
  */
 exports.VALID_ACTIVITY_IDS = new Set(exports.ACTIVITIES.map((a) => a.id));
 /**
- * Default activity selected on first visit / fallback when persisted value is invalid.
+ * The first activity — where keyboard focus lands when no activity is open
+ * (`HeaderToolBar`'s roving tabindex).
+ *
+ * Issue #3589: no longer what an unvisited worktree opens. That is
+ * {@link INITIAL_ACTIVITY} (closed), so the terminal starts at full width.
  */
 exports.DEFAULT_ACTIVITY = 'files';
+/**
+ * What the worktree screen shows when nothing is stored for the worktree (or
+ * the stored value is not a known activity) — Issue #3589: `null`, the pane
+ * starts closed. Before #3589 this was {@link DEFAULT_ACTIVITY} ('files'),
+ * which took ~18% of the body away from the terminal on every first visit.
+ *
+ * A stored value (an activity or {@link ACTIVITY_CLOSED_SENTINEL}) is still
+ * honoured as-is.
+ */
+exports.INITIAL_ACTIVITY = null;
 /**
  * localStorage key prefix used by `useActivityBarState` (Issue #858).
  *
@@ -72,8 +105,8 @@ exports.ACTIVITY_BAR_STORAGE_KEY_PREFIX = 'commandmate.worktree.activeActivity-'
  * Unlike the pre-#858 behavior — which intentionally did NOT persist the closed
  * state — the closed state is now stored so that hiding the pane on one branch
  * survives a round-trip to another branch and back. It is distinct from "no
- * stored value" (an unvisited worktree), which still defaults to
- * {@link DEFAULT_ACTIVITY}.
+ * stored value" (an unvisited worktree), which defaults to
+ * {@link INITIAL_ACTIVITY} (closed since Issue #3589).
  */
 exports.ACTIVITY_CLOSED_SENTINEL = '__closed__';
 /**
@@ -88,3 +121,17 @@ function getActivityBarStorageKey(worktreeId) {
 function isActivityId(value) {
     return typeof value === 'string' && exports.VALID_ACTIVITY_IDS.has(value);
 }
+/**
+ * localStorage key for whether the activity pane is pinned (Issue #3589).
+ *
+ * - `'true'`  → pinned: the pane sits beside the body and narrows it (the
+ *   pre-#3589 layout).
+ * - anything else / absent → not pinned: the pane is laid OVER the body, which
+ *   keeps its width, and closes on Esc / × / a re-click of its icon / an
+ *   outside click / opening a file.
+ *
+ * One global key, not one per worktree: pinning is a choice about how the
+ * screen is laid out, so it carries across worktrees. Read and written by
+ * `usePanePinnedState` in `src/hooks/useActivityPaneOverlay.ts`.
+ */
+exports.ACTIVITY_PANE_PINNED_STORAGE_KEY = 'commandmate.worktree.activityPanePinned';

package/dist/server/src/lib/polling/prompt-dedup-state.js

@@ -37,6 +37,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.recordPromptDedupSkip = recordPromptDedupSkip;
 exports.getPromptDedupSkips = getPromptDedupSkips;
 exports.renamePromptDedupSkips = renamePromptDedupSkips;
+exports.renamePromptDedupSkipsBatch = renamePromptDedupSkipsBatch;
 exports.clearPromptDedupSkips = clearPromptDedupSkips;
 const auto_yes_state_1 = require("../../lib/auto-yes-state");
 const global_state_1 = require("../global-state");
@@ -80,13 +81,31 @@ function getPromptDedupSkips(worktreeId, cliToolId, instanceId) {
  * No-op when the IDs match or nothing is recorded under the old one.
  */
 function renamePromptDedupSkips(oldWorktreeId, newWorktreeId, cliToolId, instanceId) {
-    if (oldWorktreeId === newWorktreeId)
-        return;
-    const oldKey = (0, auto_yes_state_1.buildCompositeKey)(oldWorktreeId, cliToolId, instanceId);
-    const record = promptDedupSkips.get(oldKey);
-    promptDedupSkips.delete(oldKey);
-    if (record !== undefined) {
-        promptDedupSkips.set((0, auto_yes_state_1.buildCompositeKey)(newWorktreeId, cliToolId, instanceId), record);
+    renamePromptDedupSkipsBatch([{ oldWorktreeId, newWorktreeId, cliToolId, instanceId }]);
+}
+/**
+ * Carry the tallies of a whole batch of sessions across a worktree-ID rename
+ * (Issue #3553).
+ *
+ * Every source tally is lifted before any is written, so a swap (A→B, B→A) or
+ * a chain (A→B→C) cannot overwrite a tally that has not moved yet. Per entry
+ * this is exactly {@link renamePromptDedupSkips}.
+ */
+function renamePromptDedupSkipsBatch(renames) {
+    const lifted = [];
+    for (const { oldWorktreeId, newWorktreeId, cliToolId, instanceId } of renames) {
+        if (oldWorktreeId === newWorktreeId)
+            continue;
+        const oldKey = (0, auto_yes_state_1.buildCompositeKey)(oldWorktreeId, cliToolId, instanceId);
+        lifted.push({
+            newKey: (0, auto_yes_state_1.buildCompositeKey)(newWorktreeId, cliToolId, instanceId),
+            record: promptDedupSkips.get(oldKey),
+        });
+        promptDedupSkips.delete(oldKey);
+    }
+    for (const { newKey, record } of lifted) {
+        if (record !== undefined)
+            promptDedupSkips.set(newKey, record);
     }
 }
 /** Drop every recorded tally. Test seam. */

package/dist/server/src/lib/polling/prompt-dedup.js

@@ -34,6 +34,7 @@ exports.claimDuplicatePromptSkipLog = claimDuplicatePromptSkipLog;
 exports.resetDuplicatePromptSkipStreak = resetDuplicatePromptSkipStreak;
 exports.clearPromptHashCache = clearPromptHashCache;
 exports.renamePromptHashCacheKey = renamePromptHashCacheKey;
+exports.renamePromptHashCacheKeys = renamePromptHashCacheKeys;
 exports.normalizePromptForDedup = normalizePromptForDedup;
 const crypto_1 = require("crypto");
 const global_state_1 = require("../global-state");
@@ -95,10 +96,14 @@ function claimDuplicatePromptSkipLog(pollerKey) {
  * End the current run of duplicate prompt ticks for this pollerKey without
  * touching the cached hash (Issue #3538).
  *
- * Called by `response-checker` on every tick that does not reach the prompt
- * guard with a live prompt — a working screen, an unfinished frame, a reply.
- * The prompt is no longer on screen, so if the same prompt comes back the next
- * duplicate is the first of a new run and logs. The hash stays: whether the
+ * Called by `response-checker` in two places: `extractCompletedTurn`, when the
+ * frame was read and is unfinished (a working screen), and `checkForResponse`,
+ * when a finished frame carries no live prompt (a reply). The prompt is no
+ * longer on screen, so if the same prompt comes back the next duplicate is the
+ * first of a new run and logs. Not called on a tick that skipped extraction on
+ * the line count (a null result) or returned on the cursor, nor on a tick that
+ * ended before extraction: none of them says the prompt has left the screen,
+ * so the run carries on through them. The hash stays: whether the
  * returning prompt is saved again is the guard's question (#565), and this
  * Issue only thins the log line.
  *
@@ -126,30 +131,53 @@ function clearPromptHashCache(pollerKey) {
  * re-save the prompt it is currently sitting on as a fresh message, which is
  * the duplicate this module exists to prevent.
  *
- * No-op when nothing is cached under `oldKey`.
+ * No-op when nothing is cached under `oldKey`. A batch of renames whose keys
+ * overlap must go through {@link renamePromptHashCacheKeys} instead.
  *
  * @param oldKey - Poller key the cache entry lives under
  * @param newKey - Poller key it should live under
  */
 function renamePromptHashCacheKey(oldKey, newKey) {
-    if (oldKey === newKey)
-        return;
-    const hash = promptHashCache.get(oldKey);
-    const streak = duplicatePromptSkipStreak.get(oldKey);
-    promptHashCache.delete(oldKey);
-    duplicatePromptSkipStreak.delete(oldKey);
-    if (hash === undefined)
-        return;
-    promptHashCache.set(newKey, hash);
-    // Issue #3538: the skip count moves with the hash, so a rename mid-run does
-    // not restart the thinning and log as if a new run had begun. Whenever the
-    // hash under `newKey` is replaced, so is its count — a count left over from
-    // the hash that was there before is about a different prompt.
-    if (streak !== undefined) {
-        duplicatePromptSkipStreak.set(newKey, streak);
+    renamePromptHashCacheKeys([{ oldKey, newKey }]);
+}
+/**
+ * Move the prompt hash and its skip count for a whole batch of pollerKeys
+ * (Issue #3553).
+ *
+ * Every source key is lifted before any destination is written, so a swap
+ * (A→B, B→A) or a chain (A→B→C) cannot overwrite a source that has not moved
+ * yet. Per pair this is exactly {@link renamePromptHashCacheKey}: nothing
+ * happens at the destination when the source held no hash.
+ *
+ * @param renames - Poller key moves applied together; `oldKey === newKey` is ignored
+ */
+function renamePromptHashCacheKeys(renames) {
+    const lifted = [];
+    for (const { oldKey, newKey } of renames) {
+        if (oldKey === newKey)
+            continue;
+        lifted.push({
+            newKey,
+            hash: promptHashCache.get(oldKey),
+            streak: duplicatePromptSkipStreak.get(oldKey),
+        });
+        promptHashCache.delete(oldKey);
+        duplicatePromptSkipStreak.delete(oldKey);
     }
-    else {
-        duplicatePromptSkipStreak.delete(newKey);
+    for (const { newKey, hash, streak } of lifted) {
+        if (hash === undefined)
+            continue;
+        promptHashCache.set(newKey, hash);
+        // Issue #3538: the skip count moves with the hash, so a rename mid-run does
+        // not restart the thinning and log as if a new run had begun. Whenever the
+        // hash under `newKey` is replaced, so is its count — a count left over from
+        // the hash that was there before is about a different prompt.
+        if (streak !== undefined) {
+            duplicatePromptSkipStreak.set(newKey, streak);
+        }
+        else {
+            duplicatePromptSkipStreak.delete(newKey);
+        }
     }
 }
 /**

package/dist/server/src/lib/polling/response-checker.js

@@ -498,8 +498,13 @@ function extractCompletedTurn(ctx, output, lastCapturedLine) {
         // skipped on the line count ("no new output"), which says nothing about
         // whether the prompt is still on screen, and neither do the cursor returns
         // further down.
-        if (result)
+        //
+        // Issue #3552: the same frame ends a run of duplicate response ticks for
+        // the same reason — an unfinished frame is not the saved reply.
+        if (result) {
             (0, prompt_dedup_1.resetDuplicatePromptSkipStreak)(pollerKey);
+            (0, response_dedup_1.resetDuplicateResponseSkipStreak)(pollerKey);
+        }
         // DR-004 windowing: Only check tail lines
         const { thinkingPattern } = (0, cli_patterns_1.getCliToolPatterns)(cliToolId);
         const cleanOutput = (0, cli_patterns_1.stripAnsi)(output);
@@ -1189,6 +1194,10 @@ async function checkForResponse(worktreeId, cliToolId, instanceId) {
         // has lost the position `detectDialog` judges by.
         const promptIsLive = promptDetection.isPrompt && (0, response_checker_dialog_gate_1.isNumberedDialogVouched)(cliToolId, promptDetection, output);
         if (promptIsLive) {
+            // Issue #3552: a live prompt is not the saved reply, so a run of
+            // duplicate response ticks is over; the response hash is kept (a resume
+            // after the answer must not re-save the reply underneath, #2230).
+            (0, response_dedup_1.resetDuplicateResponseSkipStreak)(pollerKey);
             return savePromptMessage(ctx, promptDetection, result, isFullScreenTui);
         }
         // Issue #3538: a finished frame without a live prompt ends the run of
@@ -1196,6 +1205,8 @@ async function checkForResponse(worktreeId, cliToolId, instanceId) {
         (0, prompt_dedup_1.resetDuplicatePromptSkipStreak)(pollerKey);
         // Validate response content is not empty
         if (!result.response || result.response.trim() === '') {
+            // Issue #3552: an empty response is not the saved reply either.
+            (0, response_dedup_1.resetDuplicateResponseSkipStreak)(pollerKey);
             (0, db_1.updateSessionState)(db, worktreeId, cliToolId, result.lineCount, resolvedInstanceId);
             return false;
         }
@@ -1206,6 +1217,8 @@ async function checkForResponse(worktreeId, cliToolId, instanceId) {
         const cleanedResponse = cleanCompletedResponse(cliToolId, result, pollerKey);
         // If cleaned response is empty or just "[No content]", skip saving
         if (!cleanedResponse || cleanedResponse.trim() === '' || cleanedResponse === '[No content]') {
+            // Issue #3552: nor is one that cleans down to nothing.
+            (0, response_dedup_1.resetDuplicateResponseSkipStreak)(pollerKey);
             (0, db_1.updateSessionState)(db, worktreeId, cliToolId, result.lineCount, resolvedInstanceId);
             (0, db_1.clearInProgressMessageId)(db, worktreeId, cliToolId, resolvedInstanceId);
             return false;