From 12359e5631930981550fac2ad2f6f8c44efcdcb7 Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Thu, 22 Oct 2026 10:20:42 -0600
Subject: [PATCH 01/18] Add native Kapa conversation history

Co-Authored-By: Warp <agent@warp.dev>
---
 package-lock.json                          |  43 ++------
 package.json                               |   3 +-
 src/components/KapaChatLauncher.css        | 120 +++++++++++++++++++++
 src/components/KapaChatLauncher.tsx        | 116 +++++++++++++++++++-
 src/lib/kapa-conversation-history.mjs      |  27 +++++
 src/lib/kapa-conversation-history.test.mjs |  41 +++++++
 6 files changed, 313 insertions(+), 37 deletions(-)
 create mode 100644 src/lib/kapa-conversation-history.mjs
 create mode 100644 src/lib/kapa-conversation-history.test.mjs

diff --git a/package-lock.json b/package-lock.json
index 02a7fe97e..179036a6b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@astrojs/sitemap": "^3.7.2",
         "@astrojs/starlight": "^0.41.4",
         "@astrojs/vercel": "^11.0.3",
-        "@kapaai/react-sdk": "^0.9.2",
+        "@kapaai/react-sdk": "^0.17.0",
         "@radix-ui/react-popover": "^1.1.15",
         "@vercel/analytics": "^2.0.1",
         "@vercel/speed-insights": "^2.0.0",
@@ -1244,15 +1244,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/runtime": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz",
-      "integrity": "sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/template": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-8.0.0.tgz",
@@ -2206,25 +2197,11 @@
       "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==",
       "license": "MIT"
     },
-    "node_modules/@hcaptcha/loader": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@hcaptcha/loader/-/loader-2.3.0.tgz",
-      "integrity": "sha512-i4lnNxKBe+COf3R1nFZEWaZoHIoJjvDgWqvcNrdZq8ehoSNMN6KVZ56dcQ02qKie2h3+BkbkwlJA9DOIuLlK/g==",
-      "license": "MIT"
-    },
     "node_modules/@hcaptcha/react-hcaptcha": {
-      "version": "1.17.4",
-      "resolved": "https://registry.npmjs.org/@hcaptcha/react-hcaptcha/-/react-hcaptcha-1.17.4.tgz",
-      "integrity": "sha512-rIvgesG1N7SS9sAYYHFoWm+nXqRrxq7RcA9z2pKkDWV+S1GdfmrTNYA1aPyVWVe3eowphTCwyDJvl97Swwy0mw==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.17.9",
-        "@hcaptcha/loader": "^2.3.0"
-      },
-      "peerDependencies": {
-        "react": ">= 16.3.0",
-        "react-dom": ">= 16.3.0"
-      }
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@hcaptcha/react-hcaptcha/-/react-hcaptcha-2.2.0.tgz",
+      "integrity": "sha512-/HrPgNLRrJziLrh2s+qFRO33ubBSuHn9sdNsQcP0wQElpORxlpR6wnq3X9j/bZGd+uQtYIvPl4QSU2la+Jl9Hg==",
+      "license": "MIT"
     },
     "node_modules/@iconify/types": {
       "version": "2.0.0",
@@ -2849,15 +2826,15 @@
       }
     },
     "node_modules/@kapaai/react-sdk": {
-      "version": "0.9.10",
-      "resolved": "https://registry.npmjs.org/@kapaai/react-sdk/-/react-sdk-0.9.10.tgz",
-      "integrity": "sha512-osQyFgBJmhNM207MpB0aZbjs2kjNHjEJbNc5YEReJuyFE72Iydn9CoZGxox2GYRgMIlQ7wljHCzgQqkvR8lXqA==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@kapaai/react-sdk/-/react-sdk-0.17.0.tgz",
+      "integrity": "sha512-wBqknpqI++w4/ttbdZl8Hf+PBk1Jm+Z3J11S/SwVYViW5xyD5JKn/4CwbjR6FTMr5WLCznjRq28LOH2Ot21IRQ==",
       "license": "MIT",
       "dependencies": {
         "@fingerprintjs/fingerprintjs-pro-react": "^2.7.0",
         "@fingerprintjs/fingerprintjs-pro-spa": "^1.3.0",
-        "@hcaptcha/react-hcaptcha": "^1.12.0",
-        "js-cookie": "^3.0.5",
+        "@hcaptcha/react-hcaptcha": "^2.0.2",
+        "js-cookie": "^3.0.7",
         "tldts": "^7.0.7"
       },
       "peerDependencies": {
diff --git a/package.json b/package.json
index d56eb55f6..6d07c8dd8 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "seo:audit": "node scripts/seo-audit.mjs",
     "test:heading-tocs": "node scripts/validate-heading-tocs.mjs",
     "test:heading-vars": "node --test src/plugins/heading-vars-core.test.mjs",
+    "test:kapa-history": "node --test src/lib/kapa-conversation-history.test.mjs",
     "test:kapa-webmcp": "node --test src/lib/kapa-webmcp.test.mjs",
     "test:homepage-json-ld": "node scripts/validate-homepage-json-ld.mjs",
     "postinstall": "patch-package"
@@ -32,7 +33,7 @@
     "@astrojs/sitemap": "^3.7.2",
     "@astrojs/starlight": "^0.41.4",
     "@astrojs/vercel": "^11.0.3",
-    "@kapaai/react-sdk": "^0.9.2",
+    "@kapaai/react-sdk": "^0.17.0",
     "@radix-ui/react-popover": "^1.1.15",
     "@vercel/analytics": "^2.0.1",
     "@vercel/speed-insights": "^2.0.0",
diff --git a/src/components/KapaChatLauncher.css b/src/components/KapaChatLauncher.css
index fd70b9fd4..31058d057 100644
--- a/src/components/KapaChatLauncher.css
+++ b/src/components/KapaChatLauncher.css
@@ -325,6 +325,122 @@
 	gap: 1rem;
 }
 
+.sl-kapa-history {
+	display: flex;
+	flex: 1;
+	flex-direction: column;
+	gap: 1rem;
+}
+
+.sl-kapa-history__header {
+	display: flex;
+	align-items: flex-start;
+	justify-content: space-between;
+	gap: 1rem;
+}
+
+.sl-kapa-history__header h2,
+.sl-kapa-history__header p,
+.sl-kapa-history__empty {
+	margin: 0;
+}
+
+.sl-kapa-history__header h2 {
+	color: var(--sl-color-white);
+	font-size: var(--sl-text-lg);
+	line-height: 1.3;
+}
+
+.sl-kapa-history__header p,
+.sl-kapa-history__empty {
+	margin-top: 0.375rem;
+	color: var(--sl-color-gray-3);
+	font-size: var(--sl-text-xs);
+	line-height: 1.45;
+}
+
+.sl-kapa-history__clear {
+	flex: none;
+	min-height: 2rem;
+	padding: 0.375rem 0.5rem;
+	border: 1px solid var(--sl-color-gray-5);
+	border-radius: var(--sl-radius-sm);
+	background: transparent;
+	color: var(--sl-color-gray-2);
+	font: inherit;
+	font-size: var(--sl-text-xs);
+	font-weight: 600;
+	line-height: 1.2;
+	cursor: pointer;
+}
+
+.sl-kapa-history__clear:hover {
+	border-color: var(--warp-control-border-hover);
+	background: var(--warp-control-bg-hover);
+	color: var(--sl-color-white);
+}
+
+.sl-kapa-history__clear:focus-visible,
+.sl-kapa-history__thread:focus-visible {
+	outline: 2px solid var(--sl-color-accent-high);
+	outline-offset: 2px;
+}
+
+.sl-kapa-history__empty {
+	margin: auto 0;
+	padding: 1rem;
+	border: 1px dashed var(--sl-color-gray-5);
+	border-radius: var(--sl-radius-lg);
+}
+
+.sl-kapa-history__list {
+	display: flex;
+	flex-direction: column;
+	gap: 0.5rem;
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+.sl-kapa-history__thread {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 0.75rem;
+	width: 100%;
+	min-height: 3rem;
+	padding: 0.625rem 0.75rem;
+	border: 1px solid var(--sl-color-gray-5);
+	border-radius: var(--sl-radius-sm);
+	background: color-mix(in srgb, var(--sl-color-black), var(--sl-color-gray-6) 28%);
+	color: var(--sl-color-gray-1);
+	font: inherit;
+	font-size: var(--sl-text-sm);
+	line-height: 1.4;
+	text-align: left;
+	cursor: pointer;
+}
+
+.sl-kapa-history__thread:hover,
+.sl-kapa-history__thread[aria-current='page'] {
+	border-color: var(--warp-control-border-hover);
+	background: var(--warp-control-bg-hover);
+}
+
+.sl-kapa-history__thread > span:first-child {
+	min-width: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.sl-kapa-history__active {
+	flex: none;
+	color: var(--sl-color-text-accent);
+	font-size: var(--sl-text-2xs);
+	font-weight: 600;
+}
+
 .sl-kapa-empty-state {
 	margin: auto 0;
 	padding: 1rem;
@@ -1088,6 +1204,10 @@
 }
 
 @media (max-width: 36rem) {
+	.sl-kapa-history__header {
+		flex-direction: column;
+	}
+
 	.sl-kapa-meta {
 		flex-direction: column;
 		align-items: flex-start;
diff --git a/src/components/KapaChatLauncher.tsx b/src/components/KapaChatLauncher.tsx
index 816f333a5..78d61c1fc 100644
--- a/src/components/KapaChatLauncher.tsx
+++ b/src/components/KapaChatLauncher.tsx
@@ -8,14 +8,25 @@ import {
 	useRef,
 	useState,
 } from 'react';
-import { CaptchaAction, KapaProvider, useCaptcha, useChat } from '@kapaai/react-sdk';
+import {
+	CaptchaAction,
+	KapaProvider,
+	useCaptcha,
+	useChat,
+	useConversationHistory,
+} from '@kapaai/react-sdk';
 import { PUBLIC_KAPA_INTEGRATION_ID, PUBLIC_KAPA_PROJECT_ID } from 'astro:env/client';
 import { isMac, keymatch } from 'keymatch';
 import ReactMarkdown from 'react-markdown';
+import {
+	KAPA_CONVERSATION_HISTORY_OPTIONS,
+	getConversationHistoryView,
+} from '../lib/kapa-conversation-history.mjs';
 import {
 	LuExternalLink,
 	LuCheck,
 	LuCopy,
+	LuHistory,
 	LuLoaderCircle,
 	LuMessageSquare,
 	LuPlug,
@@ -51,6 +62,19 @@ type GenericRecord = Record<string, unknown>;
 type HandoffApiSuccess = {
 	message?: string;
 };
+type ConversationHistoryView = {
+	title: string;
+	empty: string;
+	privacy: string;
+	clear: string;
+	canClear: boolean;
+	isEmpty: boolean;
+	items: Array<{
+		threadId: string;
+		title: string;
+		isActive: boolean;
+	}>;
+};
 
 function isObject(value: unknown): value is GenericRecord {
 	return typeof value === 'object' && value !== null;
@@ -529,6 +553,7 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 	const [query, setQuery] = useState('');
 	const [hasStartedConversation, setHasStartedConversation] = useState(false);
 	const [isAppleDevice, setIsAppleDevice] = useState(false);
+	const [isHistoryOpen, setIsHistoryOpen] = useState(false);
 	const [storedThreadId, setStoredThreadId] = useState<string | null>(null);
 	const [downvotedAnswerIds, setDownvotedAnswerIds] = useState<Record<string, true>>({});
 	const [handoffEmailInput, setHandoffEmailInput] = useState('');
@@ -552,6 +577,12 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 		submitQuery,
 		threadId,
 	} = useChat();
+	const {
+		clear: clearConversationHistory,
+		enabled: isConversationHistoryEnabled,
+		restoreThread,
+		threads: conversationHistoryThreads,
+	} = useConversationHistory();
 	const { executeCaptcha } = useCaptcha();
 
 	useEffect(() => {
@@ -654,6 +685,10 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 
 	const hasConversation = conversation.length > 0;
 	const isBusy = isGeneratingAnswer || isPreparingAnswer;
+	const conversationHistory = getConversationHistoryView(
+		conversationHistoryThreads,
+		threadId
+	) as ConversationHistoryView;
 
 	const submit = () => {
 		const value = query.trim();
@@ -723,6 +758,19 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 		setHandoffSuccessMessage(null);
 	};
 
+	const restoreSavedConversation = (savedThreadId: string) => {
+		closeHandoffForm();
+		restoreThread(savedThreadId);
+		setHasStartedConversation(true);
+		setIsHistoryOpen(false);
+	};
+
+	const clearSavedConversations = () => {
+		clearConversationHistory();
+		localStorage.removeItem('warp_docs_kapa_thread_id');
+		setStoredThreadId(null);
+	};
+
 	const submitSupportHandoff = async (qa: { id?: string | null; question?: string }) => {
 		if (isSubmittingHandoff) return;
 		const userEmail = handoffEmailInput.trim().toLowerCase();
@@ -894,6 +942,20 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 							<LuSquarePen aria-hidden="true" />
 						</button>
 						<div className="sl-kapa-panel__header-actions">
+								<button
+									type="button"
+									className="sl-kapa-icon-button sl-kapa-icon-button--ghost"
+									onClick={() => setIsHistoryOpen((isOpen) => !isOpen)}
+									disabled={!isConversationHistoryEnabled || isBusy}
+									aria-label={
+										isHistoryOpen ? 'Return to current conversation' : 'Open conversation history'
+									}
+									aria-controls="sl-kapa-conversation-history"
+									aria-pressed={isHistoryOpen}
+									data-tooltip={isHistoryOpen ? 'Current conversation' : 'Conversation history'}
+								>
+									<LuHistory aria-hidden="true" />
+								</button>
 							<Popover.Root>
 								<Popover.Trigger asChild>
 									<button
@@ -997,6 +1059,51 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 						</header>
 
 						<div className="sl-kapa-panel__body" ref={messagesRef}>
+						{isHistoryOpen ? (
+							<section
+								className="sl-kapa-history"
+								id="sl-kapa-conversation-history"
+								aria-labelledby="sl-kapa-conversation-history-title"
+							>
+								<div className="sl-kapa-history__header">
+									<div>
+										<h2 id="sl-kapa-conversation-history-title">{conversationHistory.title}</h2>
+										<p>{conversationHistory.privacy}</p>
+									</div>
+									{conversationHistory.canClear ? (
+										<button
+											type="button"
+											className="sl-kapa-history__clear"
+											onClick={clearSavedConversations}
+										>
+											{conversationHistory.clear}
+										</button>
+									) : null}
+								</div>
+								{conversationHistory.isEmpty ? (
+									<p className="sl-kapa-history__empty">{conversationHistory.empty}</p>
+								) : (
+									<ul className="sl-kapa-history__list">
+										{conversationHistory.items.map((savedConversation) => (
+											<li key={savedConversation.threadId}>
+												<button
+													type="button"
+													className="sl-kapa-history__thread"
+													onClick={() => restoreSavedConversation(savedConversation.threadId)}
+													aria-current={savedConversation.isActive ? 'page' : undefined}
+												>
+													<span>{savedConversation.title}</span>
+													{savedConversation.isActive ? (
+														<span className="sl-kapa-history__active">Current conversation</span>
+													) : null}
+												</button>
+											</li>
+										))}
+									</ul>
+								)}
+							</section>
+						) : (
+							<>
 						{!hasConversation && (
 							<div className="sl-kapa-empty-state">
 								<p className="sl-kapa-empty-state__title">Ask a question</p>
@@ -1151,8 +1258,10 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 						))}
 
 						{error ? <div className="sl-kapa-error">{getChatErrorMessage(error)}</div> : null}
+							</>
+						)}
 						</div>
-						<footer className="sl-kapa-panel__footer">
+						{!isHistoryOpen ? <footer className="sl-kapa-panel__footer">
 						<form className="sl-kapa-form" onSubmit={onSubmit}>
 							<input
 								ref={inputRef}
@@ -1207,7 +1316,7 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 								</Popover.Content>
 							</Popover.Root>
 						</div>
-						</footer>
+						</footer> : null}
 					</div>
 			</dialog>
 		</div>
@@ -1244,6 +1353,7 @@ export default function KapaChatLauncher({ autoOpen = false }: { autoOpen?: bool
 			key={chatSessionKey}
 			integrationId={integrationId}
 			callbacks={callbacks}
+			conversationHistory={KAPA_CONVERSATION_HISTORY_OPTIONS}
 			// Anonymous first-party cookie (`kapa_web_id`). Default in the Kapa
 			// React SDK; set explicitly so we do not accidentally ship `none` again.
 			// https://docs.kapa.ai/dev/sdk/components/KapaProvider#user-tracking-mode
diff --git a/src/lib/kapa-conversation-history.mjs b/src/lib/kapa-conversation-history.mjs
new file mode 100644
index 000000000..723bf1666
--- /dev/null
+++ b/src/lib/kapa-conversation-history.mjs
@@ -0,0 +1,27 @@
+export const KAPA_CONVERSATION_HISTORY_OPTIONS = Object.freeze({
+	enabled: true,
+	maxThreads: 50,
+});
+
+export const KAPA_CONVERSATION_HISTORY_COPY = Object.freeze({
+	title: 'Conversation history',
+	empty: 'No saved conversations yet.',
+	privacy: 'Saved only in this browser. Clearing removes all saved conversations from this device.',
+	clear: 'Clear saved conversations',
+	untitled: 'Untitled conversation',
+});
+
+export function getConversationHistoryView(threads, activeThreadId) {
+	const items = threads.map((thread) => ({
+		threadId: thread.threadId,
+		title: thread.title.trim() || KAPA_CONVERSATION_HISTORY_COPY.untitled,
+		isActive: thread.threadId === activeThreadId,
+	}));
+
+	return {
+		...KAPA_CONVERSATION_HISTORY_COPY,
+		canClear: items.length > 0,
+		isEmpty: items.length === 0,
+		items,
+	};
+}
diff --git a/src/lib/kapa-conversation-history.test.mjs b/src/lib/kapa-conversation-history.test.mjs
new file mode 100644
index 000000000..e33ac09bf
--- /dev/null
+++ b/src/lib/kapa-conversation-history.test.mjs
@@ -0,0 +1,41 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import {
+	KAPA_CONVERSATION_HISTORY_COPY,
+	KAPA_CONVERSATION_HISTORY_OPTIONS,
+	getConversationHistoryView,
+} from './kapa-conversation-history.mjs';
+
+test('uses native SDK threads in recency order and exposes their restore IDs', () => {
+	const view = getConversationHistoryView(
+		[
+			{ threadId: 'most-recent', title: 'Latest question', updatedAt: 20 },
+			{ threadId: 'older', title: 'Earlier question', updatedAt: 10 },
+		],
+		'older'
+	);
+
+	assert.equal(view.isEmpty, false);
+	assert.equal(view.canClear, true);
+	assert.deepEqual(view.items, [
+		{ threadId: 'most-recent', title: 'Latest question', isActive: false },
+		{ threadId: 'older', title: 'Earlier question', isActive: true },
+	]);
+});
+
+test('renders the empty state and local-storage disclosure without creating a duplicate store', () => {
+	const view = getConversationHistoryView([], null);
+
+	assert.equal(view.isEmpty, true);
+	assert.equal(view.canClear, false);
+	assert.deepEqual(view.items, []);
+	assert.equal(
+		view.privacy,
+		'Saved only in this browser. Clearing removes all saved conversations from this device.'
+	);
+	assert.deepEqual(KAPA_CONVERSATION_HISTORY_OPTIONS, {
+		enabled: true,
+		maxThreads: 50,
+	});
+	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.clear, 'Clear saved conversations');
+});

From 0674364fa3420de394b49ca6622954b6de779e67 Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Thu, 22 Oct 2026 14:16:22 -0600
Subject: [PATCH 02/18] Polish Kapa chat header controls and history contrast

Reorder history next to new conversation, use a plus icon, make MCP icon-only with tooltip, and fix light-mode active-row contrast.

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.css | 89 ++++++++++-------------------
 src/components/KapaChatLauncher.tsx | 58 ++++++++++---------
 2 files changed, 61 insertions(+), 86 deletions(-)

diff --git a/src/components/KapaChatLauncher.css b/src/components/KapaChatLauncher.css
index 31058d057..0d1b4ae95 100644
--- a/src/components/KapaChatLauncher.css
+++ b/src/components/KapaChatLauncher.css
@@ -42,48 +42,19 @@
 	border: 0;
 }
 
+.sl-kapa-panel__header-start,
 .sl-kapa-panel__header-actions {
 	display: flex;
 	align-items: center;
 	gap: 0.5rem;
 }
-.sl-kapa-mcp-connect__trigger {
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-	gap: 0.375rem;
-	min-height: 2rem;
-	padding: 0.375rem 0.625rem;
-	border: 1px solid color-mix(in srgb, var(--sl-color-text-accent), var(--warp-control-border) 48%);
-	border-radius: var(--sl-radius-sm);
-	background: color-mix(in srgb, var(--sl-color-text-accent), var(--warp-control-bg) 88%);
-	color: var(--sl-color-text-accent);
-	font: inherit;
-	font-size: var(--sl-text-xs);
-	font-weight: 600;
-	line-height: 1.2;
-	white-space: nowrap;
-	cursor: pointer;
-	transition:
-		border-color 0.15s ease,
-		background-color 0.15s ease,
-		color 0.15s ease;
-}
 
-.sl-kapa-mcp-connect__trigger svg {
-	width: 0.875rem;
-	height: 0.875rem;
-	flex: none;
-}
-
-.sl-kapa-mcp-connect__trigger:hover,
 .sl-kapa-mcp-connect__trigger[data-state='open'] {
-	border-color: var(--sl-color-text-accent);
-	background: color-mix(in srgb, var(--sl-color-text-accent), var(--warp-control-bg) 78%);
-	color: var(--sl-color-white);
+	border-color: var(--warp-control-border-hover);
+	background: var(--warp-control-bg-hover);
+	color: var(--warp-control-text-hover);
 }
 
-.sl-kapa-mcp-connect__trigger:focus-visible,
 .sl-kapa-mcp-connect__action:focus-visible {
 	outline: 2px solid var(--sl-color-accent-high);
 	outline-offset: 2px;
@@ -303,6 +274,11 @@
 	transform: translateY(0);
 }
 
+.sl-kapa-icon-button--tooltip-end[data-tooltip]::after {
+	left: auto;
+	right: 0;
+}
+
 .sl-kapa-icon-button:hover:not(:disabled),
 .sl-kapa-feedback__button:hover:not(:disabled) {
 	border-color: var(--warp-control-border-hover);
@@ -421,12 +397,17 @@
 	cursor: pointer;
 }
 
-.sl-kapa-history__thread:hover,
-.sl-kapa-history__thread[aria-current='page'] {
+.sl-kapa-history__thread:hover {
 	border-color: var(--warp-control-border-hover);
 	background: var(--warp-control-bg-hover);
 }
 
+.sl-kapa-history__thread[aria-current='page'] {
+	border-color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-gray-5) 55%);
+	background: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-black) 88%);
+	color: var(--sl-color-white);
+}
+
 .sl-kapa-history__thread > span:first-child {
 	min-width: 0;
 	overflow: hidden;
@@ -441,6 +422,20 @@
 	font-weight: 600;
 }
 
+.sl-kapa-history__thread[aria-current='page'] .sl-kapa-history__active {
+	color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-white) 35%);
+}
+
+:root[data-theme='light'] .sl-kapa-history__thread[aria-current='page'] {
+	border-color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-gray-5) 40%);
+	background: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-white) 88%);
+	color: var(--sl-color-black);
+}
+
+:root[data-theme='light'] .sl-kapa-history__thread[aria-current='page'] .sl-kapa-history__active {
+	color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-black) 28%);
+}
+
 .sl-kapa-empty-state {
 	margin: auto 0;
 	padding: 1rem;
@@ -1217,32 +1212,10 @@
 		padding-inline: 0.75rem;
 	}
 
+	.sl-kapa-panel__header-start,
 	.sl-kapa-panel__header-actions {
 		gap: 0.25rem;
 	}
-
-	.sl-kapa-mcp-connect__trigger {
-		padding-inline: 0.5rem;
-	}
-}
-
-@media (max-width: 22rem) {
-	.sl-kapa-mcp-connect__trigger span {
-		position: absolute;
-		width: 1px;
-		height: 1px;
-		padding: 0;
-		margin: -1px;
-		overflow: hidden;
-		clip: rect(0, 0, 0, 0);
-		white-space: nowrap;
-		border: 0;
-	}
-
-	.sl-kapa-mcp-connect__trigger {
-		width: 2rem;
-		padding: 0;
-	}
 }
 
 @keyframes sl-kapa-spin {
diff --git a/src/components/KapaChatLauncher.tsx b/src/components/KapaChatLauncher.tsx
index 78d61c1fc..6a5c6ff66 100644
--- a/src/components/KapaChatLauncher.tsx
+++ b/src/components/KapaChatLauncher.tsx
@@ -30,8 +30,8 @@ import {
 	LuLoaderCircle,
 	LuMessageSquare,
 	LuPlug,
+	LuPlus,
 	LuSend,
-	LuSquarePen,
 	LuThumbsDown,
 	LuThumbsUp,
 	LuX,
@@ -931,40 +931,42 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 			>
 					<div className="sl-kapa-panel">
 						<header className="sl-kapa-panel__header">
-						<button
-							type="button"
-							className="sl-kapa-icon-button sl-kapa-icon-button--ghost"
-							onClick={onNewConversation}
-							disabled={!hasStartedConversation}
-							aria-label="New conversation"
-							data-tooltip="New conversation"
-						>
-							<LuSquarePen aria-hidden="true" />
-						</button>
+						<div className="sl-kapa-panel__header-start">
+							<button
+								type="button"
+								className="sl-kapa-icon-button sl-kapa-icon-button--ghost"
+								onClick={() => setIsHistoryOpen((isOpen) => !isOpen)}
+								disabled={!isConversationHistoryEnabled || isBusy}
+								aria-label={
+									isHistoryOpen ? 'Return to current conversation' : 'Open conversation history'
+								}
+								aria-controls="sl-kapa-conversation-history"
+								aria-pressed={isHistoryOpen}
+								data-tooltip={isHistoryOpen ? 'Current conversation' : 'Conversation history'}
+							>
+								<LuHistory aria-hidden="true" />
+							</button>
+							<button
+								type="button"
+								className="sl-kapa-icon-button sl-kapa-icon-button--ghost"
+								onClick={onNewConversation}
+								disabled={!hasStartedConversation}
+								aria-label="New conversation"
+								data-tooltip="New conversation"
+							>
+								<LuPlus aria-hidden="true" />
+							</button>
+						</div>
 						<div className="sl-kapa-panel__header-actions">
-								<button
-									type="button"
-									className="sl-kapa-icon-button sl-kapa-icon-button--ghost"
-									onClick={() => setIsHistoryOpen((isOpen) => !isOpen)}
-									disabled={!isConversationHistoryEnabled || isBusy}
-									aria-label={
-										isHistoryOpen ? 'Return to current conversation' : 'Open conversation history'
-									}
-									aria-controls="sl-kapa-conversation-history"
-									aria-pressed={isHistoryOpen}
-									data-tooltip={isHistoryOpen ? 'Current conversation' : 'Conversation history'}
-								>
-									<LuHistory aria-hidden="true" />
-								</button>
 							<Popover.Root>
 								<Popover.Trigger asChild>
 									<button
 										type="button"
-										className="sl-kapa-mcp-connect__trigger"
-										aria-label="Connect to Warp Docs with MCP"
+										className="sl-kapa-icon-button sl-kapa-icon-button--ghost sl-kapa-icon-button--tooltip-end sl-kapa-mcp-connect__trigger"
+										aria-label="Connect with MCP"
+										data-tooltip="Connect with MCP"
 									>
 										<LuPlug aria-hidden="true" />
-										<span>Connect with MCP</span>
 									</button>
 								</Popover.Trigger>
 								<Popover.Content

From b6b0594c556349ee9993e647de17b57b5d29f65e Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Thu, 22 Oct 2026 14:42:51 -0600
Subject: [PATCH 03/18] Add real local rename/delete for Kapa conversation
 history

Chat SDK 0.17 only exposes clear-all, so own the browser history store for true per-thread delete and overlay titles for rename while keeping native restore. Lighten the active row and add accessible row actions with confirmation.

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.css        | 200 ++++++++++++++--
 src/components/KapaChatLauncher.tsx        | 260 +++++++++++++++++++--
 src/lib/kapa-conversation-history.mjs      | 189 ++++++++++++++-
 src/lib/kapa-conversation-history.test.mjs | 164 ++++++++++++-
 4 files changed, 758 insertions(+), 55 deletions(-)

diff --git a/src/components/KapaChatLauncher.css b/src/components/KapaChatLauncher.css
index 0d1b4ae95..b9e31baf4 100644
--- a/src/components/KapaChatLauncher.css
+++ b/src/components/KapaChatLauncher.css
@@ -357,7 +357,10 @@
 }
 
 .sl-kapa-history__clear:focus-visible,
-.sl-kapa-history__thread:focus-visible {
+.sl-kapa-history__open:focus-visible,
+.sl-kapa-history__icon-button:focus-visible,
+.sl-kapa-history__text-button:focus-visible,
+.sl-kapa-history__rename input:focus-visible {
 	outline: 2px solid var(--sl-color-accent-high);
 	outline-offset: 2px;
 }
@@ -378,37 +381,53 @@
 	list-style: none;
 }
 
-.sl-kapa-history__thread {
-	display: flex;
+.sl-kapa-history__row {
+	display: grid;
+	grid-template-columns: minmax(0, 1fr) auto;
 	align-items: center;
-	justify-content: space-between;
-	gap: 0.75rem;
-	width: 100%;
+	gap: 0.5rem;
 	min-height: 3rem;
-	padding: 0.625rem 0.75rem;
+	padding: 0.5rem 0.625rem;
 	border: 1px solid var(--sl-color-gray-5);
 	border-radius: var(--sl-radius-sm);
 	background: color-mix(in srgb, var(--sl-color-black), var(--sl-color-gray-6) 28%);
 	color: var(--sl-color-gray-1);
-	font: inherit;
-	font-size: var(--sl-text-sm);
-	line-height: 1.4;
-	text-align: left;
-	cursor: pointer;
 }
 
-.sl-kapa-history__thread:hover {
+.sl-kapa-history__row:hover {
 	border-color: var(--warp-control-border-hover);
 	background: var(--warp-control-bg-hover);
 }
 
-.sl-kapa-history__thread[aria-current='page'] {
+.sl-kapa-history__row[data-active='true'] {
 	border-color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-gray-5) 55%);
-	background: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-black) 88%);
+	background: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-black) 78%);
 	color: var(--sl-color-white);
 }
 
-.sl-kapa-history__thread > span:first-child {
+.sl-kapa-history__row[data-pending-delete='true'] {
+	grid-template-columns: 1fr;
+}
+
+.sl-kapa-history__open {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 0.75rem;
+	min-width: 0;
+	padding: 0.125rem 0.25rem;
+	border: 0;
+	border-radius: var(--sl-radius-sm);
+	background: transparent;
+	color: inherit;
+	font: inherit;
+	font-size: var(--sl-text-sm);
+	line-height: 1.4;
+	text-align: left;
+	cursor: pointer;
+}
+
+.sl-kapa-history__open-title {
 	min-width: 0;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -417,25 +436,160 @@
 
 .sl-kapa-history__active {
 	flex: none;
-	color: var(--sl-color-text-accent);
+	color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-white) 35%);
 	font-size: var(--sl-text-2xs);
 	font-weight: 600;
 }
 
-.sl-kapa-history__thread[aria-current='page'] .sl-kapa-history__active {
-	color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-white) 35%);
+.sl-kapa-history__row-actions {
+	display: inline-flex;
+	align-items: center;
+	gap: 0.25rem;
+	flex: none;
+}
+
+.sl-kapa-history__icon-button {
+	position: relative;
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	width: 1.75rem;
+	height: 1.75rem;
+	padding: 0;
+	border: 1px solid transparent;
+	border-radius: var(--sl-radius-sm);
+	background: transparent;
+	color: inherit;
+	cursor: pointer;
+}
+
+.sl-kapa-history__icon-button svg {
+	width: 0.95rem;
+	height: 0.95rem;
+}
+
+.sl-kapa-history__icon-button:hover {
+	border-color: var(--warp-control-border-hover);
+	background: var(--warp-control-bg-hover);
+}
+
+.sl-kapa-history__icon-button[data-tooltip]::after {
+	content: attr(data-tooltip);
+	position: absolute;
+	top: calc(100% + 0.35rem);
+	right: 0;
+	padding: 0.3rem 0.45rem;
+	border: 1px solid var(--warp-control-border-hover);
+	border-radius: var(--sl-radius-sm);
+	background: var(--warp-control-bg);
+	color: var(--warp-control-text-hover);
+	font-family: var(--__sl-font, 'Inter', sans-serif);
+	font-size: var(--sl-text-2xs);
+	font-weight: 400;
+	line-height: 1.2;
+	white-space: nowrap;
+	pointer-events: none;
+	opacity: 0;
+	transform: translateY(-2px);
+	transition:
+		opacity 0.15s ease,
+		transform 0.15s ease;
+	transition-delay: 0.35s;
+	z-index: 10;
+	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.25);
+}
+
+.sl-kapa-history__icon-button[data-tooltip]:hover::after,
+.sl-kapa-history__icon-button[data-tooltip]:focus-visible::after {
+	opacity: 1;
+	transform: translateY(0);
+}
+
+.sl-kapa-history__rename {
+	display: grid;
+	grid-template-columns: minmax(0, 1fr) auto;
+	gap: 0.5rem;
+	align-items: center;
+	width: 100%;
+}
+
+.sl-kapa-history__rename input {
+	min-width: 0;
+	height: 2rem;
+	padding: 0 0.5rem;
+	border: 1px solid var(--sl-color-gray-5);
+	border-radius: var(--sl-radius-sm);
+	background: var(--sl-color-black);
+	color: var(--sl-color-white);
+	font: inherit;
+	font-size: var(--sl-text-sm);
 }
 
-:root[data-theme='light'] .sl-kapa-history__thread[aria-current='page'] {
-	border-color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-gray-5) 40%);
-	background: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-white) 88%);
+.sl-kapa-history__rename-error {
+	grid-column: 1 / -1;
+	margin: 0;
+	color: #fecaca;
+	font-size: var(--sl-text-2xs);
+}
+
+.sl-kapa-history__confirm {
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	justify-content: space-between;
+	gap: 0.5rem;
+	width: 100%;
+}
+
+.sl-kapa-history__confirm-copy {
+	margin: 0;
+	font-size: var(--sl-text-sm);
+	font-weight: 600;
+}
+
+.sl-kapa-history__text-button {
+	min-height: 1.75rem;
+	padding: 0.25rem 0.5rem;
+	border: 1px solid var(--sl-color-gray-5);
+	border-radius: var(--sl-radius-sm);
+	background: transparent;
+	color: inherit;
+	font: inherit;
+	font-size: var(--sl-text-xs);
+	font-weight: 600;
+	cursor: pointer;
+}
+
+.sl-kapa-history__text-button:hover {
+	border-color: var(--warp-control-border-hover);
+	background: var(--warp-control-bg-hover);
+}
+
+.sl-kapa-history__text-button--danger {
+	border-color: color-mix(in srgb, #ef4444, var(--sl-color-gray-5) 35%);
+	color: #fecaca;
+}
+
+:root[data-theme='light'] .sl-kapa-history__row[data-active='true'] {
+	border-color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-gray-5) 45%);
+	background: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-white) 92%);
 	color: var(--sl-color-black);
 }
 
-:root[data-theme='light'] .sl-kapa-history__thread[aria-current='page'] .sl-kapa-history__active {
+:root[data-theme='light'] .sl-kapa-history__row[data-active='true'] .sl-kapa-history__active {
 	color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-black) 28%);
 }
 
+:root[data-theme='light'] .sl-kapa-history__rename input {
+	background: var(--sl-color-white);
+	color: var(--sl-color-black);
+}
+
+:root[data-theme='light'] .sl-kapa-history__rename-error,
+:root[data-theme='light'] .sl-kapa-history__text-button--danger {
+	color: #b91c1c;
+}
+
 .sl-kapa-empty-state {
 	margin: auto 0;
 	padding: 1rem;
diff --git a/src/components/KapaChatLauncher.tsx b/src/components/KapaChatLauncher.tsx
index 6a5c6ff66..658a805d6 100644
--- a/src/components/KapaChatLauncher.tsx
+++ b/src/components/KapaChatLauncher.tsx
@@ -20,12 +20,19 @@ import { isMac, keymatch } from 'keymatch';
 import ReactMarkdown from 'react-markdown';
 import {
 	KAPA_CONVERSATION_HISTORY_OPTIONS,
+	clearStoredConversationHistory,
+	deleteStoredConversation,
 	getConversationHistoryView,
+	readStoredHistoryThreads,
+	readTitleOverrides,
+	renameStoredConversation,
+	validateRenameTitle,
 } from '../lib/kapa-conversation-history.mjs';
 import {
 	LuExternalLink,
 	LuCheck,
 	LuCopy,
+	LuEllipsis,
 	LuHistory,
 	LuLoaderCircle,
 	LuMessageSquare,
@@ -67,11 +74,20 @@ type ConversationHistoryView = {
 	empty: string;
 	privacy: string;
 	clear: string;
+	rename: string;
+	delete: string;
+	confirmDelete: string;
+	confirmDeleteAction: string;
+	cancelDeleteAction: string;
+	renameSave: string;
+	renameCancel: string;
+	current: string;
 	canClear: boolean;
 	isEmpty: boolean;
 	items: Array<{
 		threadId: string;
 		title: string;
+		generatedTitle: string;
 		isActive: boolean;
 	}>;
 };
@@ -554,7 +570,14 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 	const [hasStartedConversation, setHasStartedConversation] = useState(false);
 	const [isAppleDevice, setIsAppleDevice] = useState(false);
 	const [isHistoryOpen, setIsHistoryOpen] = useState(false);
+	const [historyThreads, setHistoryThreads] = useState<Array<{ threadId: string; title: string }>>([]);
+	const [titleOverrides, setTitleOverrides] = useState<Record<string, string>>({});
+	const [renamingThreadId, setRenamingThreadId] = useState<string | null>(null);
+	const [renameDraft, setRenameDraft] = useState('');
+	const [renameError, setRenameError] = useState<string | null>(null);
+	const [pendingDeleteThreadId, setPendingDeleteThreadId] = useState<string | null>(null);
 	const [storedThreadId, setStoredThreadId] = useState<string | null>(null);
+	const renameInputRef = useRef<HTMLInputElement | null>(null);
 	const [downvotedAnswerIds, setDownvotedAnswerIds] = useState<Record<string, true>>({});
 	const [handoffEmailInput, setHandoffEmailInput] = useState('');
 	const [handoffQaId, setHandoffQaId] = useState<string | null>(null);
@@ -601,14 +624,34 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 		if (savedThreadId) {
 			setStoredThreadId(savedThreadId);
 		}
+		setTitleOverrides(readTitleOverrides());
 	}, []);
 
+	useEffect(() => {
+		// Prefer disk when our storage key exists so owned deletes cannot be undone by
+		// stale in-memory SDK history until the next provider remount or completed answer.
+		let hasOwnedStore = false;
+		try {
+			hasOwnedStore = localStorage.getItem(KAPA_CONVERSATION_HISTORY_OPTIONS.storageKey) !== null;
+		} catch {
+			hasOwnedStore = false;
+		}
+		setHistoryThreads(hasOwnedStore ? readStoredHistoryThreads() : conversationHistoryThreads);
+		setTitleOverrides(readTitleOverrides());
+	}, [conversationHistoryThreads]);
+
 	useEffect(() => {
 		if (!threadId) return;
 		setStoredThreadId(threadId);
 		localStorage.setItem('warp_docs_kapa_thread_id', threadId);
 	}, [threadId]);
 
+	useEffect(() => {
+		if (!renamingThreadId || !renameInputRef.current) return;
+		renameInputRef.current.focus();
+		renameInputRef.current.select();
+	}, [renamingThreadId]);
+
 	useEffect(() => {
 		if (!isOpen || !messagesRef.current) return;
 		messagesRef.current.scrollTop = messagesRef.current.scrollHeight;
@@ -686,10 +729,16 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 	const hasConversation = conversation.length > 0;
 	const isBusy = isGeneratingAnswer || isPreparingAnswer;
 	const conversationHistory = getConversationHistoryView(
-		conversationHistoryThreads,
-		threadId
+		historyThreads,
+		threadId,
+		titleOverrides
 	) as ConversationHistoryView;
 
+	const refreshHistoryFromDisk = () => {
+		setHistoryThreads(readStoredHistoryThreads());
+		setTitleOverrides(readTitleOverrides());
+	};
+
 	const submit = () => {
 		const value = query.trim();
 		if (!value || isBusy) return;
@@ -759,16 +808,72 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 	};
 
 	const restoreSavedConversation = (savedThreadId: string) => {
+		if (renamingThreadId || pendingDeleteThreadId) return;
 		closeHandoffForm();
 		restoreThread(savedThreadId);
 		setHasStartedConversation(true);
 		setIsHistoryOpen(false);
 	};
 
+	const beginRename = (savedConversation: ConversationHistoryView['items'][number]) => {
+		setPendingDeleteThreadId(null);
+		setRenamingThreadId(savedConversation.threadId);
+		setRenameDraft(savedConversation.title);
+		setRenameError(null);
+	};
+
+	const cancelRename = () => {
+		setRenamingThreadId(null);
+		setRenameDraft('');
+		setRenameError(null);
+	};
+
+	const commitRename = (threadIdToRename: string) => {
+		const validation = validateRenameTitle(renameDraft);
+		if (!validation.ok) {
+			setRenameError(validation.error);
+			return;
+		}
+		const result = renameStoredConversation(threadIdToRename, validation.title);
+		if (!result.ok) {
+			setRenameError(result.error || 'Could not rename conversation.');
+			return;
+		}
+		refreshHistoryFromDisk();
+		cancelRename();
+	};
+
+	const requestDelete = (threadIdToDelete: string) => {
+		cancelRename();
+		setPendingDeleteThreadId(threadIdToDelete);
+	};
+
+	const cancelDelete = () => {
+		setPendingDeleteThreadId(null);
+	};
+
+	const confirmDelete = (threadIdToDelete: string) => {
+		const wasActive = threadIdToDelete === threadId;
+		deleteStoredConversation(threadIdToDelete);
+		refreshHistoryFromDisk();
+		setPendingDeleteThreadId(null);
+		if (wasActive) {
+			localStorage.removeItem('warp_docs_kapa_thread_id');
+			setStoredThreadId(null);
+			onNewConversation();
+			return;
+		}
+	};
+
 	const clearSavedConversations = () => {
 		clearConversationHistory();
+		clearStoredConversationHistory();
 		localStorage.removeItem('warp_docs_kapa_thread_id');
 		setStoredThreadId(null);
+		setHistoryThreads([]);
+		setTitleOverrides({});
+		cancelRename();
+		cancelDelete();
 	};
 
 	const submitSupportHandoff = async (qa: { id?: string | null; question?: string }) => {
@@ -1086,21 +1191,142 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 									<p className="sl-kapa-history__empty">{conversationHistory.empty}</p>
 								) : (
 									<ul className="sl-kapa-history__list">
-										{conversationHistory.items.map((savedConversation) => (
-											<li key={savedConversation.threadId}>
-												<button
-													type="button"
-													className="sl-kapa-history__thread"
-													onClick={() => restoreSavedConversation(savedConversation.threadId)}
-													aria-current={savedConversation.isActive ? 'page' : undefined}
-												>
-													<span>{savedConversation.title}</span>
-													{savedConversation.isActive ? (
-														<span className="sl-kapa-history__active">Current conversation</span>
-													) : null}
-												</button>
-											</li>
-										))}
+										{conversationHistory.items.map((savedConversation) => {
+											const isRenaming = renamingThreadId === savedConversation.threadId;
+											const isPendingDelete = pendingDeleteThreadId === savedConversation.threadId;
+											return (
+												<li key={savedConversation.threadId}>
+													<div
+														className="sl-kapa-history__row"
+														data-active={savedConversation.isActive ? 'true' : undefined}
+														data-pending-delete={isPendingDelete ? 'true' : undefined}
+													>
+														{isRenaming ? (
+															<form
+																className="sl-kapa-history__rename"
+																onSubmit={(event) => {
+																	event.preventDefault();
+																	commitRename(savedConversation.threadId);
+																}}
+															>
+																<label className="sr-only" htmlFor={`sl-kapa-history-rename-${savedConversation.threadId}`}>
+																	{conversationHistory.rename}
+																</label>
+																<input
+																	ref={renameInputRef}
+																	id={`sl-kapa-history-rename-${savedConversation.threadId}`}
+																	type="text"
+																	value={renameDraft}
+																	onChange={(event) => {
+																		setRenameDraft(event.target.value);
+																		setRenameError(null);
+																	}}
+																	onKeyDown={(event) => {
+																		if (event.key === 'Escape') {
+																			event.preventDefault();
+																			cancelRename();
+																		}
+																	}}
+																	aria-invalid={renameError ? true : undefined}
+																	aria-describedby={
+																		renameError
+																			? `sl-kapa-history-rename-error-${savedConversation.threadId}`
+																			: undefined
+																	}
+																/>
+																<div className="sl-kapa-history__row-actions">
+																	<button
+																		type="submit"
+																		className="sl-kapa-history__icon-button"
+																		aria-label={conversationHistory.renameSave}
+																		data-tooltip={conversationHistory.renameSave}
+																	>
+																		<LuCheck aria-hidden="true" />
+																	</button>
+																	<button
+																		type="button"
+																		className="sl-kapa-history__icon-button"
+																		onClick={cancelRename}
+																		aria-label={conversationHistory.renameCancel}
+																		data-tooltip={conversationHistory.renameCancel}
+																	>
+																		<LuX aria-hidden="true" />
+																	</button>
+																</div>
+																{renameError ? (
+																	<p
+																		className="sl-kapa-history__rename-error"
+																		id={`sl-kapa-history-rename-error-${savedConversation.threadId}`}
+																	>
+																		{renameError}
+																	</p>
+																) : null}
+															</form>
+														) : isPendingDelete ? (
+															<div
+																className="sl-kapa-history__confirm"
+																role="group"
+																aria-label={conversationHistory.confirmDelete}
+															>
+																<p className="sl-kapa-history__confirm-copy">
+																	{conversationHistory.confirmDelete}
+																</p>
+																<div className="sl-kapa-history__row-actions">
+																	<button
+																		type="button"
+																		className="sl-kapa-history__text-button sl-kapa-history__text-button--danger"
+																		onClick={() => confirmDelete(savedConversation.threadId)}
+																	>
+																		{conversationHistory.confirmDeleteAction}
+																	</button>
+																	<button
+																		type="button"
+																		className="sl-kapa-history__text-button"
+																		onClick={cancelDelete}
+																	>
+																		{conversationHistory.cancelDeleteAction}
+																	</button>
+																</div>
+															</div>
+														) : (
+															<>
+																<button
+																	type="button"
+																	className="sl-kapa-history__open"
+																	onClick={() => restoreSavedConversation(savedConversation.threadId)}
+																	aria-current={savedConversation.isActive ? 'page' : undefined}
+																>
+																	<span className="sl-kapa-history__open-title">{savedConversation.title}</span>
+																	{savedConversation.isActive ? (
+																		<span className="sl-kapa-history__active">{conversationHistory.current}</span>
+																	) : null}
+																</button>
+																<div className="sl-kapa-history__row-actions">
+																	<button
+																		type="button"
+																		className="sl-kapa-history__icon-button"
+																		onClick={() => beginRename(savedConversation)}
+																		aria-label={conversationHistory.rename}
+																		data-tooltip={conversationHistory.rename}
+																	>
+																		<LuEllipsis aria-hidden="true" />
+																	</button>
+																	<button
+																		type="button"
+																		className="sl-kapa-history__icon-button"
+																		onClick={() => requestDelete(savedConversation.threadId)}
+																		aria-label={conversationHistory.delete}
+																		data-tooltip={conversationHistory.delete}
+																	>
+																		<LuX aria-hidden="true" />
+																	</button>
+																</div>
+															</>
+														)}
+													</div>
+												</li>
+											);
+										})}
 									</ul>
 								)}
 							</section>
diff --git a/src/lib/kapa-conversation-history.mjs b/src/lib/kapa-conversation-history.mjs
index 723bf1666..deba809ce 100644
--- a/src/lib/kapa-conversation-history.mjs
+++ b/src/lib/kapa-conversation-history.mjs
@@ -1,22 +1,197 @@
+export const KAPA_CONVERSATION_HISTORY_STORAGE_KEY = 'warp_docs_kapa_conversation_history';
+export const KAPA_CONVERSATION_TITLE_OVERRIDES_KEY = 'warp_docs_kapa_conversation_titles';
+
 export const KAPA_CONVERSATION_HISTORY_OPTIONS = Object.freeze({
 	enabled: true,
 	maxThreads: 50,
+	storageKey: KAPA_CONVERSATION_HISTORY_STORAGE_KEY,
 });
 
 export const KAPA_CONVERSATION_HISTORY_COPY = Object.freeze({
 	title: 'Conversation history',
 	empty: 'No saved conversations yet.',
-	privacy: 'Saved only in this browser. Clearing removes all saved conversations from this device.',
+	privacy:
+		'Saved only in this browser. Renaming or deleting updates this device only. Clearing removes all saved conversations.',
 	clear: 'Clear saved conversations',
 	untitled: 'Untitled conversation',
+	rename: 'Rename conversation',
+	delete: 'Delete conversation',
+	confirmDelete: 'Are you sure?',
+	confirmDeleteAction: 'Delete',
+	cancelDeleteAction: 'Cancel',
+	renameSave: 'Save name',
+	renameCancel: 'Cancel rename',
+	current: 'Current conversation',
+});
+
+/** Lightened active-row tokens for static/contrast contracts. */
+export const KAPA_HISTORY_ACTIVE_ROW_STYLE = Object.freeze({
+	darkBackground: 'color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-black) 78%)',
+	darkText: 'var(--sl-color-white)',
+	lightBackground: 'color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-white) 92%)',
+	lightText: 'var(--sl-color-black)',
 });
 
-export function getConversationHistoryView(threads, activeThreadId) {
-	const items = threads.map((thread) => ({
-		threadId: thread.threadId,
-		title: thread.title.trim() || KAPA_CONVERSATION_HISTORY_COPY.untitled,
-		isActive: thread.threadId === activeThreadId,
-	}));
+function safeParseJson(raw) {
+	if (!raw) return null;
+	try {
+		return JSON.parse(raw);
+	} catch {
+		return null;
+	}
+}
+
+function readStorage(key) {
+	try {
+		return localStorage.getItem(key);
+	} catch {
+		return null;
+	}
+}
+
+function writeStorage(key, value) {
+	try {
+		localStorage.setItem(key, value);
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+function removeStorage(key) {
+	try {
+		localStorage.removeItem(key);
+	} catch {
+		// ignore quota / private mode failures
+	}
+}
+
+export function readStoredHistoryThreads(storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY) {
+	const parsed = safeParseJson(readStorage(storageKey));
+	if (!parsed || !Array.isArray(parsed.threads)) return [];
+	return parsed.threads
+		.filter((thread) => thread && typeof thread.threadId === 'string')
+		.sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0));
+}
+
+export function writeStoredHistoryThreads(
+	threads,
+	storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY
+) {
+	const payload = JSON.stringify({
+		version: 1,
+		threads,
+	});
+	return writeStorage(storageKey, payload);
+}
+
+export function readTitleOverrides(key = KAPA_CONVERSATION_TITLE_OVERRIDES_KEY) {
+	const parsed = safeParseJson(readStorage(key));
+	if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) return {};
+	const overrides = {};
+	for (const [threadId, title] of Object.entries(parsed)) {
+		if (typeof title === 'string' && title.trim()) {
+			overrides[threadId] = title.trim();
+		}
+	}
+	return overrides;
+}
+
+export function writeTitleOverrides(overrides, key = KAPA_CONVERSATION_TITLE_OVERRIDES_KEY) {
+	const cleaned = {};
+	for (const [threadId, title] of Object.entries(overrides)) {
+		if (typeof title === 'string' && title.trim()) {
+			cleaned[threadId] = title.trim();
+		}
+	}
+	if (Object.keys(cleaned).length === 0) {
+		removeStorage(key);
+		return true;
+	}
+	return writeStorage(key, JSON.stringify(cleaned));
+}
+
+export function validateRenameTitle(value) {
+	const trimmed = typeof value === 'string' ? value.trim() : '';
+	if (!trimmed) {
+		return { ok: false, title: '', error: 'Name cannot be empty.' };
+	}
+	return { ok: true, title: trimmed, error: null };
+}
+
+/**
+ * Rename is stored in an overlay key because the Chat SDK re-derives `title`
+ * from the first question on every completed answer and would overwrite edits.
+ */
+export function renameStoredConversation(
+	threadId,
+	nextTitle,
+	{
+		storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY,
+		overridesKey = KAPA_CONVERSATION_TITLE_OVERRIDES_KEY,
+	} = {}
+) {
+	const validation = validateRenameTitle(nextTitle);
+	if (!validation.ok) {
+		return { ok: false, error: validation.error, threads: readStoredHistoryThreads(storageKey) };
+	}
+	const threads = readStoredHistoryThreads(storageKey);
+	if (!threads.some((thread) => thread.threadId === threadId)) {
+		return { ok: false, error: 'Conversation not found.', threads };
+	}
+	const overrides = readTitleOverrides(overridesKey);
+	overrides[threadId] = validation.title;
+	writeTitleOverrides(overrides, overridesKey);
+	return { ok: true, error: null, title: validation.title, threads };
+}
+
+/** True local deletion from the browser history store (not a cosmetic hide). */
+export function deleteStoredConversation(
+	threadId,
+	{
+		storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY,
+		overridesKey = KAPA_CONVERSATION_TITLE_OVERRIDES_KEY,
+	} = {}
+) {
+	const existing = readStoredHistoryThreads(storageKey);
+	const threads = existing.filter((thread) => thread.threadId !== threadId);
+	const removed = threads.length !== existing.length;
+	if (removed) {
+		// Always write (including empty) so stale SDK in-memory threads cannot
+		// reappear before the next provider remount/completed answer.
+		writeStoredHistoryThreads(threads, storageKey);
+	}
+	const overrides = readTitleOverrides(overridesKey);
+	if (overrides[threadId]) {
+		delete overrides[threadId];
+		writeTitleOverrides(overrides, overridesKey);
+	}
+	return { ok: removed, threads, deletedActiveCandidate: threadId };
+}
+
+export function clearStoredConversationHistory({
+	storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY,
+	overridesKey = KAPA_CONVERSATION_TITLE_OVERRIDES_KEY,
+} = {}) {
+	writeStoredHistoryThreads([], storageKey);
+	removeStorage(overridesKey);
+}
+
+export function getConversationHistoryView(
+	threads,
+	activeThreadId,
+	titleOverrides = {}
+) {
+	const items = threads.map((thread) => {
+		const override = titleOverrides[thread.threadId];
+		const generatedTitle = typeof thread.title === 'string' ? thread.title.trim() : '';
+		return {
+			threadId: thread.threadId,
+			title: override || generatedTitle || KAPA_CONVERSATION_HISTORY_COPY.untitled,
+			generatedTitle: generatedTitle || KAPA_CONVERSATION_HISTORY_COPY.untitled,
+			isActive: thread.threadId === activeThreadId,
+		};
+	});
 
 	return {
 		...KAPA_CONVERSATION_HISTORY_COPY,
diff --git a/src/lib/kapa-conversation-history.test.mjs b/src/lib/kapa-conversation-history.test.mjs
index e33ac09bf..0ea1cecd6 100644
--- a/src/lib/kapa-conversation-history.test.mjs
+++ b/src/lib/kapa-conversation-history.test.mjs
@@ -3,39 +3,187 @@ import test from 'node:test';
 import {
 	KAPA_CONVERSATION_HISTORY_COPY,
 	KAPA_CONVERSATION_HISTORY_OPTIONS,
+	KAPA_CONVERSATION_HISTORY_STORAGE_KEY,
+	KAPA_CONVERSATION_TITLE_OVERRIDES_KEY,
+	KAPA_HISTORY_ACTIVE_ROW_STYLE,
+	clearStoredConversationHistory,
+	deleteStoredConversation,
 	getConversationHistoryView,
+	readStoredHistoryThreads,
+	readTitleOverrides,
+	renameStoredConversation,
+	validateRenameTitle,
+	writeStoredHistoryThreads,
+	writeTitleOverrides,
 } from './kapa-conversation-history.mjs';
 
+const memory = new Map();
+
+function installLocalStorageMock() {
+	memory.clear();
+	globalThis.localStorage = {
+		getItem(key) {
+			return memory.has(key) ? memory.get(key) : null;
+		},
+		setItem(key, value) {
+			memory.set(key, String(value));
+		},
+		removeItem(key) {
+			memory.delete(key);
+		},
+	};
+}
+
+function seedThreads(threads) {
+	writeStoredHistoryThreads(threads);
+}
+
 test('uses native SDK threads in recency order and exposes their restore IDs', () => {
 	const view = getConversationHistoryView(
 		[
 			{ threadId: 'most-recent', title: 'Latest question', updatedAt: 20 },
 			{ threadId: 'older', title: 'Earlier question', updatedAt: 10 },
 		],
-		'older'
+		'older',
+		{}
 	);
 
 	assert.equal(view.isEmpty, false);
 	assert.equal(view.canClear, true);
 	assert.deepEqual(view.items, [
-		{ threadId: 'most-recent', title: 'Latest question', isActive: false },
-		{ threadId: 'older', title: 'Earlier question', isActive: true },
+		{
+			threadId: 'most-recent',
+			title: 'Latest question',
+			generatedTitle: 'Latest question',
+			isActive: false,
+		},
+		{
+			threadId: 'older',
+			title: 'Earlier question',
+			generatedTitle: 'Earlier question',
+			isActive: true,
+		},
 	]);
 });
 
 test('renders the empty state and local-storage disclosure without creating a duplicate store', () => {
-	const view = getConversationHistoryView([], null);
+	const view = getConversationHistoryView([], null, {});
 
 	assert.equal(view.isEmpty, true);
 	assert.equal(view.canClear, false);
 	assert.deepEqual(view.items, []);
-	assert.equal(
-		view.privacy,
-		'Saved only in this browser. Clearing removes all saved conversations from this device.'
-	);
+	assert.match(view.privacy, /this browser/i);
 	assert.deepEqual(KAPA_CONVERSATION_HISTORY_OPTIONS, {
 		enabled: true,
 		maxThreads: 50,
+		storageKey: KAPA_CONVERSATION_HISTORY_STORAGE_KEY,
 	});
 	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.clear, 'Clear saved conversations');
+	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.rename, 'Rename conversation');
+	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.delete, 'Delete conversation');
+	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.confirmDelete, 'Are you sure?');
+});
+
+test('validateRenameTitle rejects empty names and trims valid ones', () => {
+	assert.deepEqual(validateRenameTitle('   '), {
+		ok: false,
+		title: '',
+		error: 'Name cannot be empty.',
+	});
+	assert.deepEqual(validateRenameTitle('  Agents  '), {
+		ok: true,
+		title: 'Agents',
+		error: null,
+	});
+});
+
+test('rename persists an overlay title without dropping the stored thread', () => {
+	installLocalStorageMock();
+	seedThreads([
+		{
+			threadId: 't1',
+			title: 'Generated from first question',
+			createdAt: 1,
+			updatedAt: 2,
+			qas: [{ id: 'qa1', question: 'Generated from first question', answer: 'A' }],
+		},
+	]);
+
+	const result = renameStoredConversation('t1', '  My custom name  ');
+	assert.equal(result.ok, true);
+	assert.equal(result.title, 'My custom name');
+	assert.equal(readTitleOverrides().t1, 'My custom name');
+	assert.equal(readStoredHistoryThreads().length, 1);
+	assert.equal(readStoredHistoryThreads()[0].title, 'Generated from first question');
+
+	const view = getConversationHistoryView(readStoredHistoryThreads(), 't1', readTitleOverrides());
+	assert.equal(view.items[0].title, 'My custom name');
+	assert.equal(view.items[0].generatedTitle, 'Generated from first question');
+});
+
+test('rename validation failure leaves storage untouched', () => {
+	installLocalStorageMock();
+	seedThreads([
+		{ threadId: 't1', title: 'Keep me', createdAt: 1, updatedAt: 1, qas: [] },
+	]);
+	writeTitleOverrides({ t1: 'Existing' });
+
+	const result = renameStoredConversation('t1', '   ');
+	assert.equal(result.ok, false);
+	assert.equal(readTitleOverrides().t1, 'Existing');
+});
+
+test('delete removes the thread from browser storage and cleans title overrides', () => {
+	installLocalStorageMock();
+	seedThreads([
+		{ threadId: 'keep', title: 'Keep', createdAt: 1, updatedAt: 3, qas: [] },
+		{ threadId: 'drop', title: 'Drop', createdAt: 1, updatedAt: 2, qas: [] },
+	]);
+	writeTitleOverrides({ drop: 'Renamed drop', keep: 'Renamed keep' });
+
+	const result = deleteStoredConversation('drop');
+	assert.equal(result.ok, true);
+	assert.deepEqual(
+		readStoredHistoryThreads().map((thread) => thread.threadId),
+		['keep']
+	);
+	assert.deepEqual(readTitleOverrides(), { keep: 'Renamed keep' });
+	assert.equal(memory.has(KAPA_CONVERSATION_HISTORY_STORAGE_KEY), true);
+});
+
+test('deleting the last conversation clears the history storage key entirely', () => {
+	installLocalStorageMock();
+	seedThreads([{ threadId: 'only', title: 'Only', createdAt: 1, updatedAt: 1, qas: [] }]);
+	writeTitleOverrides({ only: 'Solo' });
+
+	const result = deleteStoredConversation('only');
+	assert.equal(result.ok, true);
+	assert.deepEqual(result.threads, []);
+	assert.deepEqual(readStoredHistoryThreads(), []);
+	assert.equal(memory.get(KAPA_CONVERSATION_TITLE_OVERRIDES_KEY), undefined);
+});
+
+test('clear removes history threads and rename metadata together', () => {
+	installLocalStorageMock();
+	seedThreads([{ threadId: 't1', title: 'T', createdAt: 1, updatedAt: 1, qas: [] }]);
+	writeTitleOverrides({ t1: 'Custom' });
+
+	clearStoredConversationHistory();
+	assert.deepEqual(readStoredHistoryThreads(), []);
+	assert.equal(memory.get(KAPA_CONVERSATION_TITLE_OVERRIDES_KEY), undefined);
+});
+
+test('active-row style contract stays lightened with readable text tokens', () => {
+	assert.match(KAPA_HISTORY_ACTIVE_ROW_STYLE.darkBackground, /78%/);
+	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.darkText, 'var(--sl-color-white)');
+	assert.match(KAPA_HISTORY_ACTIVE_ROW_STYLE.lightBackground, /92%/);
+	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.lightText, 'var(--sl-color-black)');
+});
+
+test('row control copy covers rename delete and confirmation states', () => {
+	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.confirmDeleteAction, 'Delete');
+	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.cancelDeleteAction, 'Cancel');
+	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.renameSave, 'Save name');
+	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.renameCancel, 'Cancel rename');
+	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.current, 'Current conversation');
 });

From 68f2765ed3cd1cb5fd11bf6f3f6aa29dd171d2a2 Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Thu, 22 Oct 2026 15:01:28 -0600
Subject: [PATCH 04/18] Block multi-tab resurrection of deleted Kapa history

Treat owned localStorage as authoritative before restore, sync history and title overlays via storage events, prune orphans, and harden delete confirmation focus/Escape behavior.

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.css        |  11 ++
 src/components/KapaChatLauncher.tsx        | 176 +++++++++++++-----
 src/lib/kapa-conversation-history.mjs      | 185 +++++++++++++++++--
 src/lib/kapa-conversation-history.test.mjs | 204 ++++++++++++++++-----
 4 files changed, 470 insertions(+), 106 deletions(-)

diff --git a/src/components/KapaChatLauncher.css b/src/components/KapaChatLauncher.css
index b9e31baf4..de66e8427 100644
--- a/src/components/KapaChatLauncher.css
+++ b/src/components/KapaChatLauncher.css
@@ -372,6 +372,17 @@
 	border-radius: var(--sl-radius-lg);
 }
 
+.sl-kapa-history__status {
+	margin: 0;
+	padding: 0.5rem 0.625rem;
+	border: 1px solid var(--sl-color-gray-5);
+	border-radius: var(--sl-radius-sm);
+	background: color-mix(in srgb, var(--sl-color-black), var(--sl-color-gray-6) 22%);
+	color: var(--sl-color-gray-2);
+	font-size: var(--sl-text-xs);
+	line-height: 1.4;
+}
+
 .sl-kapa-history__list {
 	display: flex;
 	flex-direction: column;
diff --git a/src/components/KapaChatLauncher.tsx b/src/components/KapaChatLauncher.tsx
index 658a805d6..6fca1d5cf 100644
--- a/src/components/KapaChatLauncher.tsx
+++ b/src/components/KapaChatLauncher.tsx
@@ -23,9 +23,10 @@ import {
 	clearStoredConversationHistory,
 	deleteStoredConversation,
 	getConversationHistoryView,
-	readStoredHistoryThreads,
-	readTitleOverrides,
+	isOwnedHistoryStorageEvent,
+	readHistoryUiSnapshot,
 	renameStoredConversation,
+	resolveRestoreAttempt,
 	validateRenameTitle,
 } from '../lib/kapa-conversation-history.mjs';
 import {
@@ -82,6 +83,7 @@ type ConversationHistoryView = {
 	renameSave: string;
 	renameCancel: string;
 	current: string;
+	missingThread: string;
 	canClear: boolean;
 	isEmpty: boolean;
 	items: Array<{
@@ -570,14 +572,20 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 	const [hasStartedConversation, setHasStartedConversation] = useState(false);
 	const [isAppleDevice, setIsAppleDevice] = useState(false);
 	const [isHistoryOpen, setIsHistoryOpen] = useState(false);
-	const [historyThreads, setHistoryThreads] = useState<Array<{ threadId: string; title: string }>>([]);
+	const [historyThreads, setHistoryThreads] = useState<
+		Array<{ threadId: string; title: string; createdAt?: number; updatedAt?: number; qas?: unknown[] }>
+	>([]);
 	const [titleOverrides, setTitleOverrides] = useState<Record<string, string>>({});
 	const [renamingThreadId, setRenamingThreadId] = useState<string | null>(null);
 	const [renameDraft, setRenameDraft] = useState('');
 	const [renameError, setRenameError] = useState<string | null>(null);
 	const [pendingDeleteThreadId, setPendingDeleteThreadId] = useState<string | null>(null);
+	const [historyStatusMessage, setHistoryStatusMessage] = useState<string | null>(null);
 	const [storedThreadId, setStoredThreadId] = useState<string | null>(null);
 	const renameInputRef = useRef<HTMLInputElement | null>(null);
+	const deleteConfirmRef = useRef<HTMLButtonElement | null>(null);
+	const deleteTriggerRef = useRef<HTMLButtonElement | null>(null);
+	const threadIdRef = useRef<string | null>(null);
 	const [downvotedAnswerIds, setDownvotedAnswerIds] = useState<Record<string, true>>({});
 	const [handoffEmailInput, setHandoffEmailInput] = useState('');
 	const [handoffQaId, setHandoffQaId] = useState<string | null>(null);
@@ -619,39 +627,90 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 		};
 	}, []);
 
+	const applyHistorySnapshot = (options?: { allowActiveRemount?: boolean }) => {
+		const snapshot = (
+			readHistoryUiSnapshot as unknown as (input: {
+				sdkThreads?: unknown;
+				activeThreadId?: string | null;
+			}) => {
+				threads: Array<{ threadId: string; title: string; createdAt?: number; updatedAt?: number; qas?: unknown[] }>;
+				titleOverrides: Record<string, string>;
+				activeThreadMissing: boolean;
+				view: ConversationHistoryView;
+			}
+		)({
+			sdkThreads: conversationHistoryThreads,
+			activeThreadId: threadIdRef.current,
+		});
+		setHistoryThreads(snapshot.threads);
+		setTitleOverrides({ ...snapshot.titleOverrides });
+
+		if (
+			renamingThreadId &&
+			!snapshot.threads.some((thread: { threadId: string }) => thread.threadId === renamingThreadId)
+		) {
+			setRenamingThreadId(null);
+			setRenameDraft('');
+			setRenameError(null);
+		}
+		if (
+			pendingDeleteThreadId &&
+			!snapshot.threads.some((thread: { threadId: string }) => thread.threadId === pendingDeleteThreadId)
+		) {
+			setPendingDeleteThreadId(null);
+		}
+
+		if (options?.allowActiveRemount !== false && snapshot.activeThreadMissing) {
+			localStorage.removeItem('warp_docs_kapa_thread_id');
+			setStoredThreadId(null);
+			setHistoryStatusMessage(snapshot.view.missingThread);
+			onNewConversation();
+			return snapshot;
+		}
+		return snapshot;
+	};
+
 	useEffect(() => {
 		const savedThreadId = localStorage.getItem('warp_docs_kapa_thread_id');
 		if (savedThreadId) {
 			setStoredThreadId(savedThreadId);
 		}
-		setTitleOverrides(readTitleOverrides());
+		applyHistorySnapshot({ allowActiveRemount: false });
 	}, []);
 
 	useEffect(() => {
-		// Prefer disk when our storage key exists so owned deletes cannot be undone by
-		// stale in-memory SDK history until the next provider remount or completed answer.
-		let hasOwnedStore = false;
-		try {
-			hasOwnedStore = localStorage.getItem(KAPA_CONVERSATION_HISTORY_OPTIONS.storageKey) !== null;
-		} catch {
-			hasOwnedStore = false;
-		}
-		setHistoryThreads(hasOwnedStore ? readStoredHistoryThreads() : conversationHistoryThreads);
-		setTitleOverrides(readTitleOverrides());
+		applyHistorySnapshot({ allowActiveRemount: false });
 	}, [conversationHistoryThreads]);
 
 	useEffect(() => {
+		threadIdRef.current = threadId;
 		if (!threadId) return;
 		setStoredThreadId(threadId);
 		localStorage.setItem('warp_docs_kapa_thread_id', threadId);
 	}, [threadId]);
 
+	useEffect(() => {
+		const onStorage = (event: StorageEvent) => {
+			if (!isOwnedHistoryStorageEvent(event)) return;
+			applyHistorySnapshot({ allowActiveRemount: true });
+		};
+		window.addEventListener('storage', onStorage);
+		return () => {
+			window.removeEventListener('storage', onStorage);
+		};
+	}, [conversationHistoryThreads, renamingThreadId, pendingDeleteThreadId, onNewConversation]);
+
 	useEffect(() => {
 		if (!renamingThreadId || !renameInputRef.current) return;
 		renameInputRef.current.focus();
 		renameInputRef.current.select();
 	}, [renamingThreadId]);
 
+	useEffect(() => {
+		if (!pendingDeleteThreadId || !deleteConfirmRef.current) return;
+		deleteConfirmRef.current.focus();
+	}, [pendingDeleteThreadId]);
+
 	useEffect(() => {
 		if (!isOpen || !messagesRef.current) return;
 		messagesRef.current.scrollTop = messagesRef.current.scrollHeight;
@@ -734,10 +793,7 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 		titleOverrides
 	) as ConversationHistoryView;
 
-	const refreshHistoryFromDisk = () => {
-		setHistoryThreads(readStoredHistoryThreads());
-		setTitleOverrides(readTitleOverrides());
-	};
+	const refreshHistoryFromDisk = () => applyHistorySnapshot({ allowActiveRemount: false });
 
 	const submit = () => {
 		const value = query.trim();
@@ -809,7 +865,15 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 
 	const restoreSavedConversation = (savedThreadId: string) => {
 		if (renamingThreadId || pendingDeleteThreadId) return;
+		const attempt = resolveRestoreAttempt(savedThreadId);
+		if (!attempt.ok) {
+			setHistoryStatusMessage(attempt.message || conversationHistory.missingThread);
+			refreshHistoryFromDisk();
+			return;
+		}
 		closeHandoffForm();
+		setHistoryStatusMessage(null);
+		// Disk already proved the thread is restorable; native restore keeps backend continuity.
 		restoreThread(savedThreadId);
 		setHasStartedConversation(true);
 		setIsHistoryOpen(false);
@@ -817,6 +881,7 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 
 	const beginRename = (savedConversation: ConversationHistoryView['items'][number]) => {
 		setPendingDeleteThreadId(null);
+		setHistoryStatusMessage(null);
 		setRenamingThreadId(savedConversation.threadId);
 		setRenameDraft(savedConversation.title);
 		setRenameError(null);
@@ -845,11 +910,16 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 
 	const requestDelete = (threadIdToDelete: string) => {
 		cancelRename();
+		setHistoryStatusMessage(null);
+		deleteTriggerRef.current = document.activeElement as HTMLButtonElement | null;
 		setPendingDeleteThreadId(threadIdToDelete);
 	};
 
 	const cancelDelete = () => {
 		setPendingDeleteThreadId(null);
+		window.requestAnimationFrame(() => {
+			deleteTriggerRef.current?.focus();
+		});
 	};
 
 	const confirmDelete = (threadIdToDelete: string) => {
@@ -858,11 +928,16 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 		refreshHistoryFromDisk();
 		setPendingDeleteThreadId(null);
 		if (wasActive) {
+			// Remount drops stale SDK memory for the deleted active thread without
+			// clearing history for an unrelated active conversation.
 			localStorage.removeItem('warp_docs_kapa_thread_id');
 			setStoredThreadId(null);
 			onNewConversation();
 			return;
 		}
+		window.requestAnimationFrame(() => {
+			deleteTriggerRef.current?.focus();
+		});
 	};
 
 	const clearSavedConversations = () => {
@@ -872,8 +947,9 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 		setStoredThreadId(null);
 		setHistoryThreads([]);
 		setTitleOverrides({});
+		setHistoryStatusMessage(null);
 		cancelRename();
-		cancelDelete();
+		setPendingDeleteThreadId(null);
 	};
 
 	const submitSupportHandoff = async (qa: { id?: string | null; question?: string }) => {
@@ -1187,6 +1263,11 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 										</button>
 									) : null}
 								</div>
+								{historyStatusMessage ? (
+									<p className="sl-kapa-history__status" role="status" aria-live="polite">
+										{historyStatusMessage}
+									</p>
+								) : null}
 								{conversationHistory.isEmpty ? (
 									<p className="sl-kapa-history__empty">{conversationHistory.empty}</p>
 								) : (
@@ -1262,32 +1343,39 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 																	</p>
 																) : null}
 															</form>
-														) : isPendingDelete ? (
-															<div
-																className="sl-kapa-history__confirm"
-																role="group"
-																aria-label={conversationHistory.confirmDelete}
-															>
-																<p className="sl-kapa-history__confirm-copy">
-																	{conversationHistory.confirmDelete}
-																</p>
-																<div className="sl-kapa-history__row-actions">
-																	<button
-																		type="button"
-																		className="sl-kapa-history__text-button sl-kapa-history__text-button--danger"
-																		onClick={() => confirmDelete(savedConversation.threadId)}
-																	>
-																		{conversationHistory.confirmDeleteAction}
-																	</button>
-																	<button
-																		type="button"
-																		className="sl-kapa-history__text-button"
-																		onClick={cancelDelete}
-																	>
-																		{conversationHistory.cancelDeleteAction}
-																	</button>
-																</div>
+											) : isPendingDelete ? (
+														<div
+															className="sl-kapa-history__confirm"
+															role="group"
+															aria-label={conversationHistory.confirmDelete}
+															onKeyDown={(event) => {
+																if (event.key === 'Escape') {
+																	event.preventDefault();
+																	cancelDelete();
+																}
+															}}
+														>
+															<p className="sl-kapa-history__confirm-copy" role="status">
+																{conversationHistory.confirmDelete}
+															</p>
+															<div className="sl-kapa-history__row-actions">
+																<button
+																	ref={deleteConfirmRef}
+																	type="button"
+																	className="sl-kapa-history__text-button sl-kapa-history__text-button--danger"
+																	onClick={() => confirmDelete(savedConversation.threadId)}
+																>
+																	{conversationHistory.confirmDeleteAction}
+																</button>
+																<button
+																	type="button"
+																	className="sl-kapa-history__text-button"
+																	onClick={cancelDelete}
+																>
+																	{conversationHistory.cancelDeleteAction}
+																</button>
 															</div>
+														</div>
 														) : (
 															<>
 																<button
diff --git a/src/lib/kapa-conversation-history.mjs b/src/lib/kapa-conversation-history.mjs
index deba809ce..4be1e7457 100644
--- a/src/lib/kapa-conversation-history.mjs
+++ b/src/lib/kapa-conversation-history.mjs
@@ -22,6 +22,7 @@ export const KAPA_CONVERSATION_HISTORY_COPY = Object.freeze({
 	renameSave: 'Save name',
 	renameCancel: 'Cancel rename',
 	current: 'Current conversation',
+	missingThread: 'That conversation is no longer saved on this device.',
 });
 
 /** Lightened active-row tokens for static/contrast contracts. */
@@ -66,25 +67,111 @@ function removeStorage(key) {
 	}
 }
 
+function objectItems(value) {
+	return Array.isArray(value)
+		? value.filter((item) => item !== null && typeof item === 'object')
+		: [];
+}
+
+/** Mirrors Chat SDK QA normalization so unrestorable rows are never listed. */
+export function normalizeStoredQA(value) {
+	if (!value || typeof value !== 'object') return null;
+	const raw = value;
+	if (typeof raw.id !== 'string' || raw.id.length === 0) return null;
+	const rawThinking = raw.thinking;
+	const thinking =
+		rawThinking && typeof rawThinking.startedAt === 'number'
+			? {
+					startedAt: rawThinking.startedAt,
+					completedAt:
+						typeof rawThinking.completedAt === 'number'
+							? rawThinking.completedAt
+							: rawThinking.startedAt,
+				}
+			: undefined;
+	return {
+		id: raw.id,
+		question: typeof raw.question === 'string' ? raw.question : '',
+		answer: typeof raw.answer === 'string' ? raw.answer : '',
+		sources: objectItems(raw.sources),
+		files: objectItems(raw.files),
+		toolCalls: objectItems(raw.toolCalls),
+		reaction: raw.reaction === 'upvote' || raw.reaction === 'downvote' ? raw.reaction : null,
+		isGenerationAborted: raw.isGenerationAborted === true,
+		isFeedbackSubmissionEnabled: true,
+		status: 'completed',
+		metadata: {
+			is_uncertain:
+				typeof raw.metadata === 'object' &&
+				raw.metadata !== null &&
+				raw.metadata.is_uncertain === true,
+		},
+		thinking,
+	};
+}
+
+/** Mirrors Chat SDK thread normalization requirements. */
+export function normalizeStoredThread(value) {
+	if (!value || typeof value !== 'object') return null;
+	const thread = value;
+	if (
+		typeof thread.threadId !== 'string' ||
+		thread.threadId.length === 0 ||
+		typeof thread.title !== 'string' ||
+		typeof thread.createdAt !== 'number' ||
+		typeof thread.updatedAt !== 'number' ||
+		!Array.isArray(thread.qas)
+	) {
+		return null;
+	}
+	const qas = thread.qas.map(normalizeStoredQA).filter((qa) => qa !== null);
+	if (qas.length === 0) return null;
+	return {
+		threadId: thread.threadId,
+		title: thread.title,
+		createdAt: thread.createdAt,
+		updatedAt: thread.updatedAt,
+		qas,
+	};
+}
+
+export function hasOwnedHistoryStore(storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY) {
+	return readStorage(storageKey) !== null;
+}
+
 export function readStoredHistoryThreads(storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY) {
 	const parsed = safeParseJson(readStorage(storageKey));
 	if (!parsed || !Array.isArray(parsed.threads)) return [];
 	return parsed.threads
-		.filter((thread) => thread && typeof thread.threadId === 'string')
-		.sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0));
+		.map(normalizeStoredThread)
+		.filter((thread) => thread !== null)
+		.sort((a, b) => b.updatedAt - a.updatedAt);
 }
 
 export function writeStoredHistoryThreads(
 	threads,
 	storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY
 ) {
+	const normalized = threads.map(normalizeStoredThread).filter((thread) => thread !== null);
 	const payload = JSON.stringify({
 		version: 1,
-		threads,
+		threads: normalized,
 	});
 	return writeStorage(storageKey, payload);
 }
 
+export function getRestorableThread(
+	threadId,
+	storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY
+) {
+	if (typeof threadId !== 'string' || threadId.length === 0) return null;
+	return readStoredHistoryThreads(storageKey).find((thread) => thread.threadId === threadId) || null;
+}
+
+export function canRestoreThread(threadId, storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY) {
+	return getRestorableThread(threadId, storageKey) !== null;
+}
+
 export function readTitleOverrides(key = KAPA_CONVERSATION_TITLE_OVERRIDES_KEY) {
 	const parsed = safeParseJson(readStorage(key));
 	if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) return {};
@@ -111,6 +198,22 @@ export function writeTitleOverrides(overrides, key = KAPA_CONVERSATION_TITLE_OVE
 	return writeStorage(key, JSON.stringify(cleaned));
 }
 
+export function pruneTitleOverrides(
+	threads,
+	overridesKey = KAPA_CONVERSATION_TITLE_OVERRIDES_KEY
+) {
+	const liveIds = new Set(
+		(Array.isArray(threads) ? threads : []).map((thread) => thread.threadId).filter(Boolean)
+	);
+	const current = readTitleOverrides(overridesKey);
+	const next = {};
+	for (const [threadId, title] of Object.entries(current)) {
+		if (liveIds.has(threadId)) next[threadId] = title;
+	}
+	writeTitleOverrides(next, overridesKey);
+	return next;
+}
+
 export function validateRenameTitle(value) {
 	const trimmed = typeof value === 'string' ? value.trim() : '';
 	if (!trimmed) {
@@ -158,14 +261,10 @@ export function deleteStoredConversation(
 	const removed = threads.length !== existing.length;
 	if (removed) {
 		// Always write (including empty) so stale SDK in-memory threads cannot
-		// reappear before the next provider remount/completed answer.
+		// reappear before the next provider remount or completed answer.
 		writeStoredHistoryThreads(threads, storageKey);
 	}
-	const overrides = readTitleOverrides(overridesKey);
-	if (overrides[threadId]) {
-		delete overrides[threadId];
-		writeTitleOverrides(overrides, overridesKey);
-	}
+	pruneTitleOverrides(threads, overridesKey);
 	return { ok: removed, threads, deletedActiveCandidate: threadId };
 }
 
@@ -177,11 +276,69 @@ export function clearStoredConversationHistory({
 	removeStorage(overridesKey);
 }
 
-export function getConversationHistoryView(
-	threads,
-	activeThreadId,
-	titleOverrides = {}
-) {
+/**
+ * Snapshot used by the UI and by storage-event handlers.
+ * Disk is authoritative whenever the owned history key exists.
+ */
+export function readHistoryUiSnapshot({
+	storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY,
+	overridesKey = KAPA_CONVERSATION_TITLE_OVERRIDES_KEY,
+	sdkThreads = [],
+	activeThreadId = null,
+} = {}) {
+	const owned = hasOwnedHistoryStore(storageKey);
+	const threads = owned ? readStoredHistoryThreads(storageKey) : sdkThreads.map(normalizeStoredThread).filter(Boolean);
+	const titleOverrides = pruneTitleOverrides(threads, overridesKey);
+	const activeStillPresent =
+		typeof activeThreadId === 'string' &&
+		activeThreadId.length > 0 &&
+		threads.some((thread) => thread.threadId === activeThreadId);
+	return {
+		owned,
+		threads,
+		titleOverrides,
+		activeThreadMissing: Boolean(activeThreadId) && owned && !activeStillPresent,
+		view: getConversationHistoryView(threads, activeThreadId, titleOverrides),
+	};
+}
+
+export function isOwnedHistoryStorageEvent(event, {
+	storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY,
+	overridesKey = KAPA_CONVERSATION_TITLE_OVERRIDES_KEY,
+} = {}) {
+	if (!event) return false;
+	// A null key means clear() wiped the whole origin storage.
+	if (event.key === null) return true;
+	return event.key === storageKey || event.key === overridesKey;
+}
+
+/**
+ * Pure decision helper for restore attempts.
+ * Never allow native restore unless a fully normalized disk thread exists.
+ */
+export function resolveRestoreAttempt(threadId, storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY) {
+	const thread = getRestorableThread(threadId, storageKey);
+	if (!thread) {
+		return {
+			ok: false,
+			reason: 'missing-or-invalid',
+			thread: null,
+			message: KAPA_CONVERSATION_HISTORY_COPY.missingThread,
+		};
+	}
+	return { ok: true, reason: null, thread, message: null };
+}
+
+/**
+ * After local deletion, SDK memory may still hold the thread. Callers must not
+ * re-persist deleted IDs; this helper models the guard used before any upsert path.
+ */
+export function shouldPersistThreadId(threadId, storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY) {
+	if (!hasOwnedHistoryStore(storageKey)) return true;
+	return canRestoreThread(threadId, storageKey);
+}
+
+export function getConversationHistoryView(threads, activeThreadId, titleOverrides = {}) {
 	const items = threads.map((thread) => {
 		const override = titleOverrides[thread.threadId];
 		const generatedTitle = typeof thread.title === 'string' ? thread.title.trim() : '';
diff --git a/src/lib/kapa-conversation-history.test.mjs b/src/lib/kapa-conversation-history.test.mjs
index 0ea1cecd6..d5443be97 100644
--- a/src/lib/kapa-conversation-history.test.mjs
+++ b/src/lib/kapa-conversation-history.test.mjs
@@ -6,12 +6,21 @@ import {
 	KAPA_CONVERSATION_HISTORY_STORAGE_KEY,
 	KAPA_CONVERSATION_TITLE_OVERRIDES_KEY,
 	KAPA_HISTORY_ACTIVE_ROW_STYLE,
+	canRestoreThread,
 	clearStoredConversationHistory,
 	deleteStoredConversation,
 	getConversationHistoryView,
+	getRestorableThread,
+	hasOwnedHistoryStore,
+	isOwnedHistoryStorageEvent,
+	normalizeStoredThread,
+	pruneTitleOverrides,
+	readHistoryUiSnapshot,
 	readStoredHistoryThreads,
 	readTitleOverrides,
 	renameStoredConversation,
+	resolveRestoreAttempt,
+	shouldPersistThreadId,
 	validateRenameTitle,
 	writeStoredHistoryThreads,
 	writeTitleOverrides,
@@ -34,6 +43,27 @@ function installLocalStorageMock() {
 	};
 }
 
+function validThread(threadId, title, updatedAt = 1) {
+	return {
+		threadId,
+		title,
+		createdAt: 1,
+		updatedAt,
+		qas: [
+			{
+				id: `${threadId}-qa`,
+				question: title,
+				answer: 'Answer',
+				sources: [],
+				files: [],
+				toolCalls: [],
+				reaction: null,
+				isGenerationAborted: false,
+			},
+		],
+	};
+}
+
 function seedThreads(threads) {
 	writeStoredHistoryThreads(threads);
 }
@@ -41,8 +71,8 @@ function seedThreads(threads) {
 test('uses native SDK threads in recency order and exposes their restore IDs', () => {
 	const view = getConversationHistoryView(
 		[
-			{ threadId: 'most-recent', title: 'Latest question', updatedAt: 20 },
-			{ threadId: 'older', title: 'Earlier question', updatedAt: 10 },
+			validThread('most-recent', 'Latest question', 20),
+			validThread('older', 'Earlier question', 10),
 		],
 		'older',
 		{}
@@ -50,20 +80,11 @@ test('uses native SDK threads in recency order and exposes their restore IDs', (
 
 	assert.equal(view.isEmpty, false);
 	assert.equal(view.canClear, true);
-	assert.deepEqual(view.items, [
-		{
-			threadId: 'most-recent',
-			title: 'Latest question',
-			generatedTitle: 'Latest question',
-			isActive: false,
-		},
-		{
-			threadId: 'older',
-			title: 'Earlier question',
-			generatedTitle: 'Earlier question',
-			isActive: true,
-		},
-	]);
+	assert.deepEqual(
+		view.items.map((item) => item.threadId),
+		['most-recent', 'older']
+	);
+	assert.equal(view.items[1].isActive, true);
 });
 
 test('renders the empty state and local-storage disclosure without creating a duplicate store', () => {
@@ -78,9 +99,6 @@ test('renders the empty state and local-storage disclosure without creating a du
 		maxThreads: 50,
 		storageKey: KAPA_CONVERSATION_HISTORY_STORAGE_KEY,
 	});
-	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.clear, 'Clear saved conversations');
-	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.rename, 'Rename conversation');
-	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.delete, 'Delete conversation');
 	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.confirmDelete, 'Are you sure?');
 });
 
@@ -99,21 +117,12 @@ test('validateRenameTitle rejects empty names and trims valid ones', () => {
 
 test('rename persists an overlay title without dropping the stored thread', () => {
 	installLocalStorageMock();
-	seedThreads([
-		{
-			threadId: 't1',
-			title: 'Generated from first question',
-			createdAt: 1,
-			updatedAt: 2,
-			qas: [{ id: 'qa1', question: 'Generated from first question', answer: 'A' }],
-		},
-	]);
+	seedThreads([validThread('t1', 'Generated from first question', 2)]);
 
 	const result = renameStoredConversation('t1', '  My custom name  ');
 	assert.equal(result.ok, true);
 	assert.equal(result.title, 'My custom name');
 	assert.equal(readTitleOverrides().t1, 'My custom name');
-	assert.equal(readStoredHistoryThreads().length, 1);
 	assert.equal(readStoredHistoryThreads()[0].title, 'Generated from first question');
 
 	const view = getConversationHistoryView(readStoredHistoryThreads(), 't1', readTitleOverrides());
@@ -123,9 +132,7 @@ test('rename persists an overlay title without dropping the stored thread', () =
 
 test('rename validation failure leaves storage untouched', () => {
 	installLocalStorageMock();
-	seedThreads([
-		{ threadId: 't1', title: 'Keep me', createdAt: 1, updatedAt: 1, qas: [] },
-	]);
+	seedThreads([validThread('t1', 'Keep me')]);
 	writeTitleOverrides({ t1: 'Existing' });
 
 	const result = renameStoredConversation('t1', '   ');
@@ -135,10 +142,7 @@ test('rename validation failure leaves storage untouched', () => {
 
 test('delete removes the thread from browser storage and cleans title overrides', () => {
 	installLocalStorageMock();
-	seedThreads([
-		{ threadId: 'keep', title: 'Keep', createdAt: 1, updatedAt: 3, qas: [] },
-		{ threadId: 'drop', title: 'Drop', createdAt: 1, updatedAt: 2, qas: [] },
-	]);
+	seedThreads([validThread('keep', 'Keep', 3), validThread('drop', 'Drop', 2)]);
 	writeTitleOverrides({ drop: 'Renamed drop', keep: 'Renamed keep' });
 
 	const result = deleteStoredConversation('drop');
@@ -148,24 +152,24 @@ test('delete removes the thread from browser storage and cleans title overrides'
 		['keep']
 	);
 	assert.deepEqual(readTitleOverrides(), { keep: 'Renamed keep' });
-	assert.equal(memory.has(KAPA_CONVERSATION_HISTORY_STORAGE_KEY), true);
 });
 
-test('deleting the last conversation clears the history storage key entirely', () => {
+test('deleting the last conversation writes an empty owned history store', () => {
 	installLocalStorageMock();
-	seedThreads([{ threadId: 'only', title: 'Only', createdAt: 1, updatedAt: 1, qas: [] }]);
+	seedThreads([validThread('only', 'Only')]);
 	writeTitleOverrides({ only: 'Solo' });
 
 	const result = deleteStoredConversation('only');
 	assert.equal(result.ok, true);
 	assert.deepEqual(result.threads, []);
 	assert.deepEqual(readStoredHistoryThreads(), []);
+	assert.equal(hasOwnedHistoryStore(), true);
 	assert.equal(memory.get(KAPA_CONVERSATION_TITLE_OVERRIDES_KEY), undefined);
 });
 
 test('clear removes history threads and rename metadata together', () => {
 	installLocalStorageMock();
-	seedThreads([{ threadId: 't1', title: 'T', createdAt: 1, updatedAt: 1, qas: [] }]);
+	seedThreads([validThread('t1', 'T')]);
 	writeTitleOverrides({ t1: 'Custom' });
 
 	clearStoredConversationHistory();
@@ -173,17 +177,121 @@ test('clear removes history threads and rename metadata together', () => {
 	assert.equal(memory.get(KAPA_CONVERSATION_TITLE_OVERRIDES_KEY), undefined);
 });
 
+test('stale row restore is blocked unless a fully normalized disk thread exists', () => {
+	installLocalStorageMock();
+	seedThreads([validThread('live', 'Live')]);
+
+	assert.equal(canRestoreThread('missing'), false);
+	assert.equal(resolveRestoreAttempt('missing').ok, false);
+	assert.equal(resolveRestoreAttempt('live').ok, true);
+	assert.equal(getRestorableThread('live')?.threadId, 'live');
+});
+
+test('cross-tab delete of inactive thread keeps active thread and prunes UI snapshot', () => {
+	installLocalStorageMock();
+	seedThreads([validThread('active', 'Active', 5), validThread('other', 'Other', 4)]);
+	writeTitleOverrides({ active: 'A', other: 'O' });
+
+	deleteStoredConversation('other');
+	const snapshot = readHistoryUiSnapshot({ activeThreadId: 'active' });
+	assert.equal(snapshot.activeThreadMissing, false);
+	assert.deepEqual(
+		snapshot.threads.map((thread) => thread.threadId),
+		['active']
+	);
+	assert.deepEqual(snapshot.titleOverrides, { active: 'A' });
+});
+
+test('cross-tab delete of active thread marks active missing so UI can remount fresh', () => {
+	installLocalStorageMock();
+	seedThreads([validThread('active', 'Active', 5), validThread('other', 'Other', 4)]);
+
+	deleteStoredConversation('active');
+	const snapshot = readHistoryUiSnapshot({ activeThreadId: 'active' });
+	assert.equal(snapshot.activeThreadMissing, true);
+	assert.deepEqual(
+		snapshot.threads.map((thread) => thread.threadId),
+		['other']
+	);
+});
+
+test('deleted thread cannot be re-persisted once owned store exists', () => {
+	installLocalStorageMock();
+	seedThreads([validThread('keep', 'Keep'), validThread('drop', 'Drop')]);
+	deleteStoredConversation('drop');
+
+	assert.equal(shouldPersistThreadId('drop'), false);
+	assert.equal(shouldPersistThreadId('keep'), true);
+	assert.equal(resolveRestoreAttempt('drop').ok, false);
+});
+
+test('storage-event helper recognizes history and title-overlay keys', () => {
+	assert.equal(
+		isOwnedHistoryStorageEvent({ key: KAPA_CONVERSATION_HISTORY_STORAGE_KEY }),
+		true
+	);
+	assert.equal(
+		isOwnedHistoryStorageEvent({ key: KAPA_CONVERSATION_TITLE_OVERRIDES_KEY }),
+		true
+	);
+	assert.equal(isOwnedHistoryStorageEvent({ key: null }), true);
+	assert.equal(isOwnedHistoryStorageEvent({ key: 'unrelated' }), false);
+});
+
+test('malformed threads and empty QA payloads are rejected by normalization', () => {
+	assert.equal(normalizeStoredThread({ threadId: 'x' }), null);
+	assert.equal(
+		normalizeStoredThread({
+			threadId: 'x',
+			title: 't',
+			createdAt: 1,
+			updatedAt: 1,
+			qas: [{ question: 'no id' }],
+		}),
+		null
+	);
+	installLocalStorageMock();
+	writeStoredHistoryThreads([
+		{
+			threadId: 'bad',
+			title: 'Bad',
+			createdAt: 1,
+			updatedAt: 1,
+			qas: [{ question: 'missing id' }],
+		},
+		validThread('good', 'Good'),
+	]);
+	assert.deepEqual(
+		readStoredHistoryThreads().map((thread) => thread.threadId),
+		['good']
+	);
+});
+
+test('confirmation copy contracts cover Escape cancel and announce labels', () => {
+	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.confirmDelete, 'Are you sure?');
+	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.cancelDeleteAction, 'Cancel');
+	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.confirmDeleteAction, 'Delete');
+	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.missingThread, 'That conversation is no longer saved on this device.');
+});
+
+test('overlay pruning drops titles for threads removed by delete eviction or clear', () => {
+	installLocalStorageMock();
+	seedThreads([validThread('keep', 'Keep'), validThread('drop', 'Drop')]);
+	writeTitleOverrides({ keep: 'K', drop: 'D', orphan: 'O' });
+
+	const afterDelete = pruneTitleOverrides(readStoredHistoryThreads());
+	assert.deepEqual(afterDelete, { keep: 'K', drop: 'D' });
+
+	deleteStoredConversation('drop');
+	assert.deepEqual(readTitleOverrides(), { keep: 'K' });
+
+	clearStoredConversationHistory();
+	assert.deepEqual(readTitleOverrides(), {});
+});
+
 test('active-row style contract stays lightened with readable text tokens', () => {
 	assert.match(KAPA_HISTORY_ACTIVE_ROW_STYLE.darkBackground, /78%/);
 	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.darkText, 'var(--sl-color-white)');
 	assert.match(KAPA_HISTORY_ACTIVE_ROW_STYLE.lightBackground, /92%/);
 	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.lightText, 'var(--sl-color-black)');
 });
-
-test('row control copy covers rename delete and confirmation states', () => {
-	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.confirmDeleteAction, 'Delete');
-	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.cancelDeleteAction, 'Cancel');
-	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.renameSave, 'Save name');
-	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.renameCancel, 'Cancel rename');
-	assert.equal(KAPA_CONVERSATION_HISTORY_COPY.current, 'Current conversation');
-});

From ddc9ab0ed4688ed6fa6cb9c0892fc4ffc27118f6 Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Thu, 29 Oct 2026 14:41:42 -0400
Subject: [PATCH 05/18] Fix storage docs line wrapping

Co-Authored-By: Warp <agent@warp.dev>
---
 .../docs/factories/self-hosting/data-storage.mdx      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/content/docs/factories/self-hosting/data-storage.mdx b/src/content/docs/factories/self-hosting/data-storage.mdx
index 151878a52..871104c27 100644
--- a/src/content/docs/factories/self-hosting/data-storage.mdx
+++ b/src/content/docs/factories/self-hosting/data-storage.mdx
@@ -36,10 +36,13 @@ Data is not migrated when changing storage mappings. It stays in its original lo
 
 Mapping a category to your bucket changes where that category's objects are written and read. Everything else about a run stays the same.
 
-Warp's control plane accesses self-hosted storage through provider-specific permissions that you grant and can revoke at any time.
-The control plane writes to your storage over the course of a run, such as by updating the conversation transcript after
-each turn. It also reads from the bucket to provide run data, including conversation history and the display of computer use screenshots. Warp periodically
-accesses persisted data for background maintenance such as to run [scorers](/factories/measure-and-improve/scorers/).
+Warp's control plane accesses self-hosted storage through provider-specific
+permissions that you grant and can revoke at any time. The control plane writes
+to your storage over the course of a run, such as by updating the conversation
+transcript after each turn. It also reads from the bucket to provide run data,
+including conversation history and the display of computer use screenshots.
+Warp periodically accesses persisted data for background maintenance such as
+to run [scorers](/factories/measure-and-improve/scorers/).
 
 Warp never caches bucket contents. It uses presigned URLs wherever possible so that data flows directly from your bucket to the client, without
 transiting Warp's backend.

From 2c0957f8d2f749a12edf9c6b868540b863b64c57 Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Thu, 29 Oct 2026 14:41:55 -0400
Subject: [PATCH 06/18] Fix light-mode history highlight

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/KapaChatLauncher.css b/src/components/KapaChatLauncher.css
index de66e8427..217f2a2d8 100644
--- a/src/components/KapaChatLauncher.css
+++ b/src/components/KapaChatLauncher.css
@@ -583,12 +583,12 @@
 
 :root[data-theme='light'] .sl-kapa-history__row[data-active='true'] {
 	border-color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-gray-5) 45%);
-	background: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-white) 92%);
-	color: var(--sl-color-black);
+	background: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-black) 88%);
+	color: var(--sl-color-white);
 }
 
 :root[data-theme='light'] .sl-kapa-history__row[data-active='true'] .sl-kapa-history__active {
-	color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-black) 28%);
+	color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-white) 32%);
 }
 
 :root[data-theme='light'] .sl-kapa-history__rename input {

From 1d601149de147f6c93a4183d6db49d881b24b0c2 Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Thu, 29 Oct 2026 15:08:43 -0400
Subject: [PATCH 07/18] Use dark text for light history row

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.css        | 2 +-
 src/lib/kapa-conversation-history.mjs      | 4 ++--
 src/lib/kapa-conversation-history.test.mjs | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/KapaChatLauncher.css b/src/components/KapaChatLauncher.css
index c983ebf81..910d8ec19 100644
--- a/src/components/KapaChatLauncher.css
+++ b/src/components/KapaChatLauncher.css
@@ -584,7 +584,7 @@
 :root[data-theme='light'] .sl-kapa-history__row[data-active='true'] {
 	border-color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-gray-5) 45%);
 	background: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-black) 88%);
-	color: var(--sl-color-white);
+	color: var(--sl-color-gray-1);
 }
 
 :root[data-theme='light'] .sl-kapa-history__row[data-active='true'] .sl-kapa-history__active {
diff --git a/src/lib/kapa-conversation-history.mjs b/src/lib/kapa-conversation-history.mjs
index 4be1e7457..65f786745 100644
--- a/src/lib/kapa-conversation-history.mjs
+++ b/src/lib/kapa-conversation-history.mjs
@@ -29,8 +29,8 @@ export const KAPA_CONVERSATION_HISTORY_COPY = Object.freeze({
 export const KAPA_HISTORY_ACTIVE_ROW_STYLE = Object.freeze({
 	darkBackground: 'color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-black) 78%)',
 	darkText: 'var(--sl-color-white)',
-	lightBackground: 'color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-white) 92%)',
-	lightText: 'var(--sl-color-black)',
+	lightBackground: 'color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-black) 88%)',
+	lightText: 'var(--sl-color-gray-1)',
 });
 
 function safeParseJson(raw) {
diff --git a/src/lib/kapa-conversation-history.test.mjs b/src/lib/kapa-conversation-history.test.mjs
index d5443be97..072f2427e 100644
--- a/src/lib/kapa-conversation-history.test.mjs
+++ b/src/lib/kapa-conversation-history.test.mjs
@@ -292,6 +292,6 @@ test('overlay pruning drops titles for threads removed by delete eviction or cle
 test('active-row style contract stays lightened with readable text tokens', () => {
 	assert.match(KAPA_HISTORY_ACTIVE_ROW_STYLE.darkBackground, /78%/);
 	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.darkText, 'var(--sl-color-white)');
-	assert.match(KAPA_HISTORY_ACTIVE_ROW_STYLE.lightBackground, /92%/);
-	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.lightText, 'var(--sl-color-black)');
+	assert.match(KAPA_HISTORY_ACTIVE_ROW_STYLE.lightBackground, /88%/);
+	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.lightText, 'var(--sl-color-gray-1)');
 });

From 982154da340df2de95632dc46b639882c41c521d Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Thu, 29 Oct 2026 15:33:24 -0400
Subject: [PATCH 08/18] Fix light-mode Kapa active history title contrast

Paint the open-title span directly in light mode so button form-control
text fill cannot keep the active conversation title white on the pale
accent row. Strengthen the static style contract against that selector.

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.css        |  8 ++++++++
 src/lib/kapa-conversation-history.mjs      |  4 ++++
 src/lib/kapa-conversation-history.test.mjs | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/src/components/KapaChatLauncher.css b/src/components/KapaChatLauncher.css
index 910d8ec19..56b403ebb 100644
--- a/src/components/KapaChatLauncher.css
+++ b/src/components/KapaChatLauncher.css
@@ -587,6 +587,14 @@
 	color: var(--sl-color-gray-1);
 }
 
+/* Title lives inside a <button>; some engines keep form-control text paint
+   (incl. -webkit-text-fill-color) from following parent `color: inherit`.
+   Set the span color explicitly so light-mode active titles stay dark. */
+:root[data-theme='light'] .sl-kapa-history__row[data-active='true'] .sl-kapa-history__open-title {
+	color: var(--sl-color-gray-1);
+	-webkit-text-fill-color: var(--sl-color-gray-1);
+}
+
 :root[data-theme='light'] .sl-kapa-history__row[data-active='true'] .sl-kapa-history__active {
 	color: color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-white) 32%);
 }
diff --git a/src/lib/kapa-conversation-history.mjs b/src/lib/kapa-conversation-history.mjs
index 65f786745..0f5f7d136 100644
--- a/src/lib/kapa-conversation-history.mjs
+++ b/src/lib/kapa-conversation-history.mjs
@@ -31,6 +31,10 @@ export const KAPA_HISTORY_ACTIVE_ROW_STYLE = Object.freeze({
 	darkText: 'var(--sl-color-white)',
 	lightBackground: 'color-mix(in srgb, var(--sl-color-text-accent), var(--sl-color-black) 88%)',
 	lightText: 'var(--sl-color-gray-1)',
+	/** Element-specific light title paint; row `color` alone is not enough on buttons. */
+	lightTitleSelector:
+		":root[data-theme='light'] .sl-kapa-history__row[data-active='true'] .sl-kapa-history__open-title",
+	lightTitleText: 'var(--sl-color-gray-1)',
 });
 
 function safeParseJson(raw) {
diff --git a/src/lib/kapa-conversation-history.test.mjs b/src/lib/kapa-conversation-history.test.mjs
index 072f2427e..600a29f09 100644
--- a/src/lib/kapa-conversation-history.test.mjs
+++ b/src/lib/kapa-conversation-history.test.mjs
@@ -1,5 +1,8 @@
 import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
 import test from 'node:test';
+import { fileURLToPath } from 'node:url';
 import {
 	KAPA_CONVERSATION_HISTORY_COPY,
 	KAPA_CONVERSATION_HISTORY_OPTIONS,
@@ -294,4 +297,20 @@ test('active-row style contract stays lightened with readable text tokens', () =
 	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.darkText, 'var(--sl-color-white)');
 	assert.match(KAPA_HISTORY_ACTIVE_ROW_STYLE.lightBackground, /88%/);
 	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.lightText, 'var(--sl-color-gray-1)');
+	assert.equal(
+		KAPA_HISTORY_ACTIVE_ROW_STYLE.lightTitleSelector,
+		":root[data-theme='light'] .sl-kapa-history__row[data-active='true'] .sl-kapa-history__open-title"
+	);
+	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.lightTitleText, 'var(--sl-color-gray-1)');
+
+	const cssPath = join(dirname(fileURLToPath(import.meta.url)), '../components/KapaChatLauncher.css');
+	const css = readFileSync(cssPath, 'utf8');
+	assert.match(
+		css,
+		/:root\[data-theme='light'\]\s*\.sl-kapa-history__row\[data-active='true'\]\s*\.sl-kapa-history__open-title\s*\{[^}]*color:\s*var\(--sl-color-gray-1\)/s
+	);
+	assert.match(
+		css,
+		/:root\[data-theme='light'\]\s*\.sl-kapa-history__row\[data-active='true'\]\s*\.sl-kapa-history__open-title\s*\{[^}]*-webkit-text-fill-color:\s*var\(--sl-color-gray-1\)/s
+	);
 });

From 3bca36e801a3780bc778fb407f1f10d8983b9ce2 Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Thu, 29 Oct 2026 15:44:01 -0400
Subject: [PATCH 09/18] Fix light-mode Kapa rename field contrast

Use the light surface and dark foreground tokens for rename inputs, including explicit browser text fill, and lock the declarations into the focused style contract.

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.css        |  5 +++--
 src/lib/kapa-conversation-history.mjs      |  3 +++
 src/lib/kapa-conversation-history.test.mjs | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/components/KapaChatLauncher.css b/src/components/KapaChatLauncher.css
index 56b403ebb..166fb8b8e 100644
--- a/src/components/KapaChatLauncher.css
+++ b/src/components/KapaChatLauncher.css
@@ -600,8 +600,9 @@
 }
 
 :root[data-theme='light'] .sl-kapa-history__rename input {
-	background: var(--sl-color-white);
-	color: var(--sl-color-black);
+	background: var(--sl-color-black);
+	color: var(--sl-color-gray-1);
+	-webkit-text-fill-color: var(--sl-color-gray-1);
 }
 
 :root[data-theme='light'] .sl-kapa-history__rename-error,
diff --git a/src/lib/kapa-conversation-history.mjs b/src/lib/kapa-conversation-history.mjs
index 0f5f7d136..388135489 100644
--- a/src/lib/kapa-conversation-history.mjs
+++ b/src/lib/kapa-conversation-history.mjs
@@ -35,6 +35,9 @@ export const KAPA_HISTORY_ACTIVE_ROW_STYLE = Object.freeze({
 	lightTitleSelector:
 		":root[data-theme='light'] .sl-kapa-history__row[data-active='true'] .sl-kapa-history__open-title",
 	lightTitleText: 'var(--sl-color-gray-1)',
+	lightRenameSelector: ":root[data-theme='light'] .sl-kapa-history__rename input",
+	lightRenameBackground: 'var(--sl-color-black)',
+	lightRenameText: 'var(--sl-color-gray-1)',
 });
 
 function safeParseJson(raw) {
diff --git a/src/lib/kapa-conversation-history.test.mjs b/src/lib/kapa-conversation-history.test.mjs
index 600a29f09..d1ffb6e63 100644
--- a/src/lib/kapa-conversation-history.test.mjs
+++ b/src/lib/kapa-conversation-history.test.mjs
@@ -302,6 +302,12 @@ test('active-row style contract stays lightened with readable text tokens', () =
 		":root[data-theme='light'] .sl-kapa-history__row[data-active='true'] .sl-kapa-history__open-title"
 	);
 	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.lightTitleText, 'var(--sl-color-gray-1)');
+	assert.equal(
+		KAPA_HISTORY_ACTIVE_ROW_STYLE.lightRenameSelector,
+		":root[data-theme='light'] .sl-kapa-history__rename input"
+	);
+	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.lightRenameBackground, 'var(--sl-color-black)');
+	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.lightRenameText, 'var(--sl-color-gray-1)');
 
 	const cssPath = join(dirname(fileURLToPath(import.meta.url)), '../components/KapaChatLauncher.css');
 	const css = readFileSync(cssPath, 'utf8');
@@ -313,4 +319,16 @@ test('active-row style contract stays lightened with readable text tokens', () =
 		css,
 		/:root\[data-theme='light'\]\s*\.sl-kapa-history__row\[data-active='true'\]\s*\.sl-kapa-history__open-title\s*\{[^}]*-webkit-text-fill-color:\s*var\(--sl-color-gray-1\)/s
 	);
+	assert.match(
+		css,
+		/:root\[data-theme='light'\]\s*\.sl-kapa-history__rename input\s*\{[^}]*background:\s*var\(--sl-color-black\)/s
+	);
+	assert.match(
+		css,
+		/:root\[data-theme='light'\]\s*\.sl-kapa-history__rename input\s*\{[^}]*color:\s*var\(--sl-color-gray-1\)/s
+	);
+	assert.match(
+		css,
+		/:root\[data-theme='light'\]\s*\.sl-kapa-history__rename input\s*\{[^}]*-webkit-text-fill-color:\s*var\(--sl-color-gray-1\)/s
+	);
 });

From b97ede673ffd8abb23eba529932b7e3b65a829dc Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Thu, 29 Oct 2026 15:55:08 -0400
Subject: [PATCH 10/18] Use pencil icon for Kapa conversation rename

Replace the ambiguous ellipsis action with a dedicated edit icon while preserving the accessible rename label and tooltip.

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/KapaChatLauncher.tsx b/src/components/KapaChatLauncher.tsx
index eefb0cf04..a2ad5b871 100644
--- a/src/components/KapaChatLauncher.tsx
+++ b/src/components/KapaChatLauncher.tsx
@@ -30,10 +30,10 @@ import {
 	LuExternalLink,
 	LuCheck,
 	LuCopy,
-	LuEllipsis,
 	LuHistory,
 	LuLoaderCircle,
 	LuMessageSquare,
+	LuPencil,
 	LuPlug,
 	LuPlus,
 	LuSend,
@@ -1212,7 +1212,7 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 																		aria-label={conversationHistory.rename}
 																		data-tooltip={conversationHistory.rename}
 																	>
-																		<LuEllipsis aria-hidden="true" />
+																		<LuPencil aria-hidden="true" />
 																	</button>
 																	<button
 																		type="button"

From 821359994e22c9c2cfe69e73f06d3b6891ff8b1c Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Thu, 29 Oct 2026 16:11:05 -0400
Subject: [PATCH 11/18] Refine Kapa history delete and new-conversation flow

Remove bulk clear from the history UI. After deleting the active
conversation, remount with history open when other threads remain, or a
fresh chat when none do. Enable + for current conversations and non-empty
history views, and leave history when starting fresh.

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.css        | 22 ------
 src/components/KapaChatLauncher.tsx        | 81 ++++++++++----------
 src/lib/kapa-conversation-history.mjs      | 57 +++++++++++++-
 src/lib/kapa-conversation-history.test.mjs | 87 +++++++++++++++++++++-
 4 files changed, 181 insertions(+), 66 deletions(-)

diff --git a/src/components/KapaChatLauncher.css b/src/components/KapaChatLauncher.css
index 166fb8b8e..a4123a280 100644
--- a/src/components/KapaChatLauncher.css
+++ b/src/components/KapaChatLauncher.css
@@ -335,28 +335,6 @@
 	line-height: 1.45;
 }
 
-.sl-kapa-history__clear {
-	flex: none;
-	min-height: 2rem;
-	padding: 0.375rem 0.5rem;
-	border: 1px solid var(--sl-color-gray-5);
-	border-radius: var(--sl-radius-sm);
-	background: transparent;
-	color: var(--sl-color-gray-2);
-	font: inherit;
-	font-size: var(--sl-text-xs);
-	font-weight: 600;
-	line-height: 1.2;
-	cursor: pointer;
-}
-
-.sl-kapa-history__clear:hover {
-	border-color: var(--warp-control-border-hover);
-	background: var(--warp-control-bg-hover);
-	color: var(--sl-color-white);
-}
-
-.sl-kapa-history__clear:focus-visible,
 .sl-kapa-history__open:focus-visible,
 .sl-kapa-history__icon-button:focus-visible,
 .sl-kapa-history__text-button:focus-visible,
diff --git a/src/components/KapaChatLauncher.tsx b/src/components/KapaChatLauncher.tsx
index a2ad5b871..9306e56d4 100644
--- a/src/components/KapaChatLauncher.tsx
+++ b/src/components/KapaChatLauncher.tsx
@@ -17,12 +17,13 @@ import { isMac, keymatch } from 'keymatch';
 import ReactMarkdown from 'react-markdown';
 import {
 	KAPA_CONVERSATION_HISTORY_OPTIONS,
-	clearStoredConversationHistory,
 	deleteStoredConversation,
 	getConversationHistoryView,
+	isNewConversationActionEnabled,
 	isOwnedHistoryStorageEvent,
 	readHistoryUiSnapshot,
 	renameStoredConversation,
+	resolvePostDeleteNavigation,
 	resolveRestoreAttempt,
 	validateRenameTitle,
 } from '../lib/kapa-conversation-history.mjs';
@@ -64,7 +65,6 @@ type ConversationHistoryView = {
 	title: string;
 	empty: string;
 	privacy: string;
-	clear: string;
 	rename: string;
 	delete: string;
 	confirmDelete: string;
@@ -74,7 +74,6 @@ type ConversationHistoryView = {
 	renameCancel: string;
 	current: string;
 	missingThread: string;
-	canClear: boolean;
 	isEmpty: boolean;
 	items: Array<{
 		threadId: string;
@@ -84,6 +83,10 @@ type ConversationHistoryView = {
 	}>;
 };
 
+type NewConversationOptions = {
+	openHistory?: boolean;
+};
+
 function getChatErrorMessage(error: unknown) {
 	const message = typeof error === 'string' ? error : String(error ?? '');
 	const normalized = message.toLowerCase();
@@ -504,17 +507,24 @@ function ChatCodeBlock({
 	);
 }
 
-function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversation }: {
+function ChatSurface({
+	title,
+	welcomeMessage,
+	autoOpen = false,
+	initialHistoryOpen = false,
+	onNewConversation,
+}: {
 	title: string;
 	welcomeMessage: string;
 	autoOpen?: boolean;
-	onNewConversation: () => void;
+	initialHistoryOpen?: boolean;
+	onNewConversation: (options?: NewConversationOptions) => void;
 }) {
 	const [isOpen, setIsOpen] = useState(autoOpen);
 	const [query, setQuery] = useState('');
 	const [hasStartedConversation, setHasStartedConversation] = useState(false);
 	const [isAppleDevice, setIsAppleDevice] = useState(false);
-	const [isHistoryOpen, setIsHistoryOpen] = useState(false);
+	const [isHistoryOpen, setIsHistoryOpen] = useState(initialHistoryOpen);
 	const [historyThreads, setHistoryThreads] = useState<
 		Array<{ threadId: string; title: string; createdAt?: number; updatedAt?: number; qas?: unknown[] }>
 	>([]);
@@ -546,7 +556,6 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 		threadId,
 	} = useChat();
 	const {
-		clear: clearConversationHistory,
 		enabled: isConversationHistoryEnabled,
 		restoreThread,
 		threads: conversationHistoryThreads,
@@ -599,7 +608,7 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 		if (options?.allowActiveRemount !== false && snapshot.activeThreadMissing) {
 			localStorage.removeItem('warp_docs_kapa_thread_id');
 			setHistoryStatusMessage(snapshot.view.missingThread);
-			onNewConversation();
+			onNewConversation({ openHistory: snapshot.threads.length > 0 });
 			return snapshot;
 		}
 		return snapshot;
@@ -708,6 +717,11 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 		threadId,
 		titleOverrides
 	) as ConversationHistoryView;
+	const canStartNewConversation = isNewConversationActionEnabled({
+		hasCurrentConversation: hasStartedConversation || hasConversation || Boolean(threadId),
+		isHistoryOpen,
+		historyItemCount: conversationHistory.items.length,
+	});
 
 	const refreshHistoryFromDisk = () => applyHistorySnapshot({ allowActiveRemount: false });
 
@@ -806,15 +820,19 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 	};
 
 	const confirmDelete = (threadIdToDelete: string) => {
-		const wasActive = threadIdToDelete === threadId;
 		deleteStoredConversation(threadIdToDelete);
-		refreshHistoryFromDisk();
+		const snapshot = refreshHistoryFromDisk();
 		setPendingDeleteThreadId(null);
-		if (wasActive) {
-			// Remount drops stale SDK memory for the deleted active thread without
-			// clearing history for an unrelated active conversation.
+		const navigation = resolvePostDeleteNavigation({
+			deletedThreadId: threadIdToDelete,
+			activeThreadId: threadId,
+			remainingThreadCount: snapshot.threads.length,
+		});
+		if (navigation.remount) {
+			// Remount drops stale SDK memory for the deleted active thread.
+			// Keep history open when other saved conversations remain.
 			localStorage.removeItem('warp_docs_kapa_thread_id');
-			onNewConversation();
+			onNewConversation({ openHistory: navigation.openHistory });
 			return;
 		}
 		window.requestAnimationFrame(() => {
@@ -822,18 +840,10 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 		});
 	};
 
-	const clearSavedConversations = () => {
-		clearConversationHistory();
-		clearStoredConversationHistory();
-		localStorage.removeItem('warp_docs_kapa_thread_id');
-		setHistoryThreads([]);
-		setTitleOverrides({});
-		setHistoryStatusMessage(null);
-		cancelRename();
-		setPendingDeleteThreadId(null);
+	const startFreshConversation = () => {
+		onNewConversation({ openHistory: false });
 	};
 
-
 	const openPanel = () => {
 		// If the Pagefind search dialog is open with a query typed in, hand
 		// that query off to Kapa's input. Both entry points (the ⌘+I / Ctrl+I
@@ -945,8 +955,8 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 							<button
 								type="button"
 								className="sl-kapa-icon-button sl-kapa-icon-button--ghost"
-								onClick={onNewConversation}
-								disabled={!hasStartedConversation}
+								onClick={startFreshConversation}
+								disabled={!canStartNewConversation}
 								aria-label="New conversation"
 								data-tooltip="New conversation"
 							>
@@ -1068,15 +1078,6 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 										<h2 id="sl-kapa-conversation-history-title">{conversationHistory.title}</h2>
 										<p>{conversationHistory.privacy}</p>
 									</div>
-									{conversationHistory.canClear ? (
-										<button
-											type="button"
-											className="sl-kapa-history__clear"
-											onClick={clearSavedConversations}
-										>
-											{conversationHistory.clear}
-										</button>
-									) : null}
 								</div>
 								{historyStatusMessage ? (
 									<p className="sl-kapa-history__status" role="status" aria-live="polite">
@@ -1406,13 +1407,16 @@ function ChatSurface({ title, welcomeMessage, autoOpen = false, onNewConversatio
 export default function KapaChatLauncher({ autoOpen = false }: { autoOpen?: boolean } = {}) {
 	const [chatSessionKey, setChatSessionKey] = useState(0);
 	const [sessionAutoOpen, setSessionAutoOpen] = useState(autoOpen);
+	const [sessionOpenHistory, setSessionOpenHistory] = useState(false);
 	if (!integrationId) {
 		return null;
 	}
-	const startNewConversation = () => {
-		// `autoOpen` is read once by each keyed `ChatSurface` remount so the
-		// fresh conversation opens immediately without controlling later renders.
+	const startNewConversation = (options?: NewConversationOptions) => {
+		// `autoOpen` / `initialHistoryOpen` are read once by each keyed
+		// `ChatSurface` remount so the fresh session opens immediately without
+		// controlling later renders.
 		setSessionAutoOpen(true);
+		setSessionOpenHistory(options?.openHistory === true);
 		setChatSessionKey((key) => key + 1);
 	};
 
@@ -1430,6 +1434,7 @@ export default function KapaChatLauncher({ autoOpen = false }: { autoOpen?: bool
 				title={title}
 				welcomeMessage={welcomeMessage}
 				autoOpen={sessionAutoOpen}
+				initialHistoryOpen={sessionOpenHistory}
 				onNewConversation={startNewConversation}
 			/>
 		</KapaProvider>
diff --git a/src/lib/kapa-conversation-history.mjs b/src/lib/kapa-conversation-history.mjs
index 388135489..9f2393708 100644
--- a/src/lib/kapa-conversation-history.mjs
+++ b/src/lib/kapa-conversation-history.mjs
@@ -10,9 +10,7 @@ export const KAPA_CONVERSATION_HISTORY_OPTIONS = Object.freeze({
 export const KAPA_CONVERSATION_HISTORY_COPY = Object.freeze({
 	title: 'Conversation history',
 	empty: 'No saved conversations yet.',
-	privacy:
-		'Saved only in this browser. Renaming or deleting updates this device only. Clearing removes all saved conversations.',
-	clear: 'Clear saved conversations',
+	privacy: 'Saved only in this browser. Renaming or deleting updates this device only.',
 	untitled: 'Untitled conversation',
 	rename: 'Rename conversation',
 	delete: 'Delete conversation',
@@ -345,6 +343,58 @@ export function shouldPersistThreadId(threadId, storageKey = KAPA_CONVERSATION_H
 	return canRestoreThread(threadId, storageKey);
 }
 
+/**
+ * Decide whether deleting a thread requires a keyed ChatSurface remount and
+ * whether that remount should land in history (remaining threads) or a fresh chat.
+ *
+ * @param {{ deletedThreadId?: string | null, activeThreadId?: string | null, remainingThreadCount?: number }} [input]
+ * @returns {{ remount: boolean, openHistory: boolean, reason: string }}
+ */
+export function resolvePostDeleteNavigation({
+	deletedThreadId,
+	activeThreadId = null,
+	remainingThreadCount = 0,
+} = {}) {
+	const deletedActive =
+		typeof deletedThreadId === 'string' &&
+		deletedThreadId.length > 0 &&
+		deletedThreadId === activeThreadId;
+	if (!deletedActive) {
+		return {
+			remount: false,
+			openHistory: false,
+			reason: 'inactive-delete',
+		};
+	}
+	if (remainingThreadCount > 0) {
+		return {
+			remount: true,
+			openHistory: true,
+			reason: 'active-delete-with-remaining',
+		};
+	}
+	return {
+		remount: true,
+		openHistory: false,
+		reason: 'active-delete-empty',
+	};
+}
+
+/**
+ * True when "+" should start a fresh conversation instead of staying disabled.
+ *
+ * @param {{ hasCurrentConversation?: boolean, isHistoryOpen?: boolean, historyItemCount?: number }} [input]
+ * @returns {boolean}
+ */
+export function isNewConversationActionEnabled({
+	hasCurrentConversation = false,
+	isHistoryOpen = false,
+	historyItemCount = 0,
+} = {}) {
+	if (hasCurrentConversation) return true;
+	return isHistoryOpen === true && historyItemCount > 0;
+}
+
 export function getConversationHistoryView(threads, activeThreadId, titleOverrides = {}) {
 	const items = threads.map((thread) => {
 		const override = titleOverrides[thread.threadId];
@@ -359,7 +409,6 @@ export function getConversationHistoryView(threads, activeThreadId, titleOverrid
 
 	return {
 		...KAPA_CONVERSATION_HISTORY_COPY,
-		canClear: items.length > 0,
 		isEmpty: items.length === 0,
 		items,
 	};
diff --git a/src/lib/kapa-conversation-history.test.mjs b/src/lib/kapa-conversation-history.test.mjs
index d1ffb6e63..4eedc456c 100644
--- a/src/lib/kapa-conversation-history.test.mjs
+++ b/src/lib/kapa-conversation-history.test.mjs
@@ -15,6 +15,7 @@ import {
 	getConversationHistoryView,
 	getRestorableThread,
 	hasOwnedHistoryStore,
+	isNewConversationActionEnabled,
 	isOwnedHistoryStorageEvent,
 	normalizeStoredThread,
 	pruneTitleOverrides,
@@ -22,6 +23,7 @@ import {
 	readStoredHistoryThreads,
 	readTitleOverrides,
 	renameStoredConversation,
+	resolvePostDeleteNavigation,
 	resolveRestoreAttempt,
 	shouldPersistThreadId,
 	validateRenameTitle,
@@ -82,7 +84,7 @@ test('uses native SDK threads in recency order and exposes their restore IDs', (
 	);
 
 	assert.equal(view.isEmpty, false);
-	assert.equal(view.canClear, true);
+	assert.equal('canClear' in view, false);
 	assert.deepEqual(
 		view.items.map((item) => item.threadId),
 		['most-recent', 'older']
@@ -94,9 +96,11 @@ test('renders the empty state and local-storage disclosure without creating a du
 	const view = getConversationHistoryView([], null, {});
 
 	assert.equal(view.isEmpty, true);
-	assert.equal(view.canClear, false);
+	assert.equal('canClear' in view, false);
+	assert.equal('clear' in KAPA_CONVERSATION_HISTORY_COPY, false);
 	assert.deepEqual(view.items, []);
 	assert.match(view.privacy, /this browser/i);
+	assert.doesNotMatch(view.privacy, /clearing/i);
 	assert.deepEqual(KAPA_CONVERSATION_HISTORY_OPTIONS, {
 		enabled: true,
 		maxThreads: 50,
@@ -292,6 +296,85 @@ test('overlay pruning drops titles for threads removed by delete eviction or cle
 	assert.deepEqual(readTitleOverrides(), {});
 });
 
+test('post-delete navigation remounts active deletes and reopens history when threads remain', () => {
+	assert.deepEqual(
+		resolvePostDeleteNavigation({
+			deletedThreadId: 'inactive',
+			activeThreadId: 'active',
+			remainingThreadCount: 3,
+		}),
+		{ remount: false, openHistory: false, reason: 'inactive-delete' }
+	);
+	assert.deepEqual(
+		resolvePostDeleteNavigation({
+			deletedThreadId: 'active',
+			activeThreadId: 'active',
+			remainingThreadCount: 2,
+		}),
+		{ remount: true, openHistory: true, reason: 'active-delete-with-remaining' }
+	);
+	assert.deepEqual(
+		resolvePostDeleteNavigation({
+			deletedThreadId: 'active',
+			activeThreadId: 'active',
+			remainingThreadCount: 0,
+		}),
+		{ remount: true, openHistory: false, reason: 'active-delete-empty' }
+	);
+});
+
+test('new conversation action stays disabled only on an empty fresh chat', () => {
+	assert.equal(
+		isNewConversationActionEnabled({
+			hasCurrentConversation: false,
+			isHistoryOpen: false,
+			historyItemCount: 0,
+		}),
+		false
+	);
+	assert.equal(
+		isNewConversationActionEnabled({
+			hasCurrentConversation: true,
+			isHistoryOpen: false,
+			historyItemCount: 0,
+		}),
+		true
+	);
+	assert.equal(
+		isNewConversationActionEnabled({
+			hasCurrentConversation: false,
+			isHistoryOpen: true,
+			historyItemCount: 2,
+		}),
+		true
+	);
+	assert.equal(
+		isNewConversationActionEnabled({
+			hasCurrentConversation: false,
+			isHistoryOpen: true,
+			historyItemCount: 0,
+		}),
+		false
+	);
+});
+
+test('component wires history remount intent and drops bulk clear UI', () => {
+	const componentPath = join(
+		dirname(fileURLToPath(import.meta.url)),
+		'../components/KapaChatLauncher.tsx'
+	);
+	const source = readFileSync(componentPath, 'utf8');
+	assert.match(source, /initialHistoryOpen/);
+	assert.match(source, /resolvePostDeleteNavigation/);
+	assert.match(source, /isNewConversationActionEnabled/);
+	assert.match(source, /openHistory:\s*navigation\.openHistory/);
+	assert.match(source, /startFreshConversation/);
+	assert.doesNotMatch(source, /clearSavedConversations/);
+	assert.doesNotMatch(source, /sl-kapa-history__clear/);
+	assert.doesNotMatch(source, /Clear saved conversations/);
+	assert.doesNotMatch(source, /canClear/);
+});
+
 test('active-row style contract stays lightened with readable text tokens', () => {
 	assert.match(KAPA_HISTORY_ACTIVE_ROW_STYLE.darkBackground, /78%/);
 	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.darkText, 'var(--sl-color-white)');

From 5949e199475497a2c7374da7562aa2c52264c84f Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Thu, 29 Oct 2026 16:22:59 -0400
Subject: [PATCH 12/18] Keep Kapa new conversation action enabled

Remove conditional gating from the + action so users can always start a fresh conversation, including after deleting all saved history.

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.tsx        | 10 -----
 src/lib/kapa-conversation-history.mjs      | 15 --------
 src/lib/kapa-conversation-history.test.mjs | 43 +++-------------------
 3 files changed, 6 insertions(+), 62 deletions(-)

diff --git a/src/components/KapaChatLauncher.tsx b/src/components/KapaChatLauncher.tsx
index 9306e56d4..3b6420707 100644
--- a/src/components/KapaChatLauncher.tsx
+++ b/src/components/KapaChatLauncher.tsx
@@ -19,7 +19,6 @@ import {
 	KAPA_CONVERSATION_HISTORY_OPTIONS,
 	deleteStoredConversation,
 	getConversationHistoryView,
-	isNewConversationActionEnabled,
 	isOwnedHistoryStorageEvent,
 	readHistoryUiSnapshot,
 	renameStoredConversation,
@@ -522,7 +521,6 @@ function ChatSurface({
 }) {
 	const [isOpen, setIsOpen] = useState(autoOpen);
 	const [query, setQuery] = useState('');
-	const [hasStartedConversation, setHasStartedConversation] = useState(false);
 	const [isAppleDevice, setIsAppleDevice] = useState(false);
 	const [isHistoryOpen, setIsHistoryOpen] = useState(initialHistoryOpen);
 	const [historyThreads, setHistoryThreads] = useState<
@@ -717,11 +715,6 @@ function ChatSurface({
 		threadId,
 		titleOverrides
 	) as ConversationHistoryView;
-	const canStartNewConversation = isNewConversationActionEnabled({
-		hasCurrentConversation: hasStartedConversation || hasConversation || Boolean(threadId),
-		isHistoryOpen,
-		historyItemCount: conversationHistory.items.length,
-	});
 
 	const refreshHistoryFromDisk = () => applyHistorySnapshot({ allowActiveRemount: false });
 
@@ -729,7 +722,6 @@ function ChatSurface({
 		const value = query.trim();
 		if (!value || isBusy) return;
 		submitQuery(value);
-		setHasStartedConversation(true);
 		setQuery('');
 	};
 
@@ -772,7 +764,6 @@ function ChatSurface({
 		setHistoryStatusMessage(null);
 		// Disk already proved the thread is restorable; native restore keeps backend continuity.
 		restoreThread(savedThreadId);
-		setHasStartedConversation(true);
 		setIsHistoryOpen(false);
 	};
 
@@ -956,7 +947,6 @@ function ChatSurface({
 								type="button"
 								className="sl-kapa-icon-button sl-kapa-icon-button--ghost"
 								onClick={startFreshConversation}
-								disabled={!canStartNewConversation}
 								aria-label="New conversation"
 								data-tooltip="New conversation"
 							>
diff --git a/src/lib/kapa-conversation-history.mjs b/src/lib/kapa-conversation-history.mjs
index 9f2393708..02b8212ad 100644
--- a/src/lib/kapa-conversation-history.mjs
+++ b/src/lib/kapa-conversation-history.mjs
@@ -380,21 +380,6 @@ export function resolvePostDeleteNavigation({
 	};
 }
 
-/**
- * True when "+" should start a fresh conversation instead of staying disabled.
- *
- * @param {{ hasCurrentConversation?: boolean, isHistoryOpen?: boolean, historyItemCount?: number }} [input]
- * @returns {boolean}
- */
-export function isNewConversationActionEnabled({
-	hasCurrentConversation = false,
-	isHistoryOpen = false,
-	historyItemCount = 0,
-} = {}) {
-	if (hasCurrentConversation) return true;
-	return isHistoryOpen === true && historyItemCount > 0;
-}
-
 export function getConversationHistoryView(threads, activeThreadId, titleOverrides = {}) {
 	const items = threads.map((thread) => {
 		const override = titleOverrides[thread.threadId];
diff --git a/src/lib/kapa-conversation-history.test.mjs b/src/lib/kapa-conversation-history.test.mjs
index 4eedc456c..e5635f46a 100644
--- a/src/lib/kapa-conversation-history.test.mjs
+++ b/src/lib/kapa-conversation-history.test.mjs
@@ -15,7 +15,6 @@ import {
 	getConversationHistoryView,
 	getRestorableThread,
 	hasOwnedHistoryStore,
-	isNewConversationActionEnabled,
 	isOwnedHistoryStorageEvent,
 	normalizeStoredThread,
 	pruneTitleOverrides,
@@ -323,41 +322,6 @@ test('post-delete navigation remounts active deletes and reopens history when th
 	);
 });
 
-test('new conversation action stays disabled only on an empty fresh chat', () => {
-	assert.equal(
-		isNewConversationActionEnabled({
-			hasCurrentConversation: false,
-			isHistoryOpen: false,
-			historyItemCount: 0,
-		}),
-		false
-	);
-	assert.equal(
-		isNewConversationActionEnabled({
-			hasCurrentConversation: true,
-			isHistoryOpen: false,
-			historyItemCount: 0,
-		}),
-		true
-	);
-	assert.equal(
-		isNewConversationActionEnabled({
-			hasCurrentConversation: false,
-			isHistoryOpen: true,
-			historyItemCount: 2,
-		}),
-		true
-	);
-	assert.equal(
-		isNewConversationActionEnabled({
-			hasCurrentConversation: false,
-			isHistoryOpen: true,
-			historyItemCount: 0,
-		}),
-		false
-	);
-});
-
 test('component wires history remount intent and drops bulk clear UI', () => {
 	const componentPath = join(
 		dirname(fileURLToPath(import.meta.url)),
@@ -366,9 +330,14 @@ test('component wires history remount intent and drops bulk clear UI', () => {
 	const source = readFileSync(componentPath, 'utf8');
 	assert.match(source, /initialHistoryOpen/);
 	assert.match(source, /resolvePostDeleteNavigation/);
-	assert.match(source, /isNewConversationActionEnabled/);
 	assert.match(source, /openHistory:\s*navigation\.openHistory/);
 	assert.match(source, /startFreshConversation/);
+	assert.doesNotMatch(source, /isNewConversationActionEnabled/);
+	assert.match(
+		source,
+		/onClick=\{startFreshConversation\}\s+aria-label="New conversation"/,
+		'new conversation button must not have a disabled condition'
+	);
 	assert.doesNotMatch(source, /clearSavedConversations/);
 	assert.doesNotMatch(source, /sl-kapa-history__clear/);
 	assert.doesNotMatch(source, /Clear saved conversations/);

From 7e2dc2228b8079438b776620002bdd0321007751 Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Fri, 30 Oct 2026 10:12:52 -0400
Subject: [PATCH 13/18] Fix Kapa history mount restore and active-thread
 lifecycle

Restore the saved active thread on mount via resolveMountRestore +
restoreThread, clear the active-thread key on fresh conversation, use a
trash icon for delete, and wire shouldPersistThreadId through
writeActiveThreadId so deleted IDs cannot be re-persisted.

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.tsx        | 38 +++++++--
 src/lib/kapa-conversation-history.mjs      | 93 +++++++++++++++++++++
 src/lib/kapa-conversation-history.test.mjs | 94 ++++++++++++++++++++++
 3 files changed, 217 insertions(+), 8 deletions(-)

diff --git a/src/components/KapaChatLauncher.tsx b/src/components/KapaChatLauncher.tsx
index 3b6420707..e1df9371b 100644
--- a/src/components/KapaChatLauncher.tsx
+++ b/src/components/KapaChatLauncher.tsx
@@ -17,14 +17,18 @@ import { isMac, keymatch } from 'keymatch';
 import ReactMarkdown from 'react-markdown';
 import {
 	KAPA_CONVERSATION_HISTORY_OPTIONS,
+	clearActiveThreadId,
 	deleteStoredConversation,
 	getConversationHistoryView,
 	isOwnedHistoryStorageEvent,
+	readActiveThreadId,
 	readHistoryUiSnapshot,
 	renameStoredConversation,
+	resolveMountRestore,
 	resolvePostDeleteNavigation,
 	resolveRestoreAttempt,
 	validateRenameTitle,
+	writeActiveThreadId,
 } from '../lib/kapa-conversation-history.mjs';
 import {
 	LuExternalLink,
@@ -39,6 +43,7 @@ import {
 	LuSend,
 	LuThumbsDown,
 	LuThumbsUp,
+	LuTrash2,
 	LuX,
 } from 'react-icons/lu';
 import './KapaChatLauncher.css';
@@ -536,6 +541,8 @@ function ChatSurface({
 	const deleteConfirmRef = useRef<HTMLButtonElement | null>(null);
 	const deleteTriggerRef = useRef<HTMLButtonElement | null>(null);
 	const threadIdRef = useRef<string | null>(null);
+	/** Guards StrictMode double-invoke so mount restore runs once per surface. */
+	const mountRestoreAttemptedRef = useRef(false);
 	const [downvotedAnswerIds, setDownvotedAnswerIds] = useState<Record<string, true>>({});
 	const [copiedMcpValue, setCopiedMcpValue] = useState<McpCopyTarget | null>(null);
 	const messagesRef = useRef<HTMLDivElement | null>(null);
@@ -604,7 +611,7 @@ function ChatSurface({
 		}
 
 		if (options?.allowActiveRemount !== false && snapshot.activeThreadMissing) {
-			localStorage.removeItem('warp_docs_kapa_thread_id');
+			clearActiveThreadId();
 			setHistoryStatusMessage(snapshot.view.missingThread);
 			onNewConversation({ openHistory: snapshot.threads.length > 0 });
 			return snapshot;
@@ -613,11 +620,23 @@ function ChatSurface({
 	};
 
 	useEffect(() => {
-		const savedThreadId = localStorage.getItem('warp_docs_kapa_thread_id');
-		if (savedThreadId) {
-		}
 		applyHistorySnapshot({ allowActiveRemount: false });
-	}, []);
+
+		if (!isConversationHistoryEnabled || mountRestoreAttemptedRef.current) return;
+		mountRestoreAttemptedRef.current = true;
+
+		const decision = resolveMountRestore(readActiveThreadId(), {
+			currentThreadId: threadIdRef.current,
+		});
+		if (decision.action === 'none' || decision.action === 'already-active') return;
+		if (decision.action === 'clear-stale') {
+			clearActiveThreadId();
+			if (decision.message) setHistoryStatusMessage(decision.message);
+			return;
+		}
+		// Disk proved the thread is restorable; native restore keeps backend continuity.
+		restoreThread(decision.threadId as string);
+	}, [isConversationHistoryEnabled, restoreThread]);
 
 	useEffect(() => {
 		applyHistorySnapshot({ allowActiveRemount: false });
@@ -626,7 +645,8 @@ function ChatSurface({
 	useEffect(() => {
 		threadIdRef.current = threadId;
 		if (!threadId) return;
-		localStorage.setItem('warp_docs_kapa_thread_id', threadId);
+		// shouldPersistThreadId runs inside writeActiveThreadId so deleted IDs stay gone.
+		writeActiveThreadId(threadId);
 	}, [threadId]);
 
 	useEffect(() => {
@@ -822,7 +842,7 @@ function ChatSurface({
 		if (navigation.remount) {
 			// Remount drops stale SDK memory for the deleted active thread.
 			// Keep history open when other saved conversations remain.
-			localStorage.removeItem('warp_docs_kapa_thread_id');
+			clearActiveThreadId();
 			onNewConversation({ openHistory: navigation.openHistory });
 			return;
 		}
@@ -832,6 +852,8 @@ function ChatSurface({
 	};
 
 	const startFreshConversation = () => {
+		// Clear before remount so the next surface cannot restore the prior thread.
+		clearActiveThreadId();
 		onNewConversation({ openHistory: false });
 	};
 
@@ -1212,7 +1234,7 @@ function ChatSurface({
 																		aria-label={conversationHistory.delete}
 																		data-tooltip={conversationHistory.delete}
 																	>
-																		<LuX aria-hidden="true" />
+																		<LuTrash2 aria-hidden="true" />
 																	</button>
 																</div>
 															</>
diff --git a/src/lib/kapa-conversation-history.mjs b/src/lib/kapa-conversation-history.mjs
index 02b8212ad..b3c402786 100644
--- a/src/lib/kapa-conversation-history.mjs
+++ b/src/lib/kapa-conversation-history.mjs
@@ -1,5 +1,7 @@
 export const KAPA_CONVERSATION_HISTORY_STORAGE_KEY = 'warp_docs_kapa_conversation_history';
 export const KAPA_CONVERSATION_TITLE_OVERRIDES_KEY = 'warp_docs_kapa_conversation_titles';
+/** Last active thread id for reload continuity (separate from the history store). */
+export const KAPA_ACTIVE_THREAD_STORAGE_KEY = 'warp_docs_kapa_thread_id';
 
 export const KAPA_CONVERSATION_HISTORY_OPTIONS = Object.freeze({
 	enabled: true,
@@ -343,6 +345,97 @@ export function shouldPersistThreadId(threadId, storageKey = KAPA_CONVERSATION_H
 	return canRestoreThread(threadId, storageKey);
 }
 
+export function readActiveThreadId(key = KAPA_ACTIVE_THREAD_STORAGE_KEY) {
+	const value = readStorage(key);
+	return typeof value === 'string' && value.length > 0 ? value : null;
+}
+
+/**
+ * Persist the live thread id only when the owned history store still allows it.
+ * Deleted IDs are cleared instead of rewritten so reload cannot resurrect them.
+ */
+export function writeActiveThreadId(
+	threadId,
+	{
+		activeKey = KAPA_ACTIVE_THREAD_STORAGE_KEY,
+		storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY,
+	} = {}
+) {
+	if (typeof threadId !== 'string' || threadId.length === 0) {
+		removeStorage(activeKey);
+		return false;
+	}
+	if (!shouldPersistThreadId(threadId, storageKey)) {
+		removeStorage(activeKey);
+		return false;
+	}
+	return writeStorage(activeKey, threadId);
+}
+
+export function clearActiveThreadId(key = KAPA_ACTIVE_THREAD_STORAGE_KEY) {
+	removeStorage(key);
+}
+
+/**
+ * Pure mount-time restore decision.
+ * Handles missing/stale keys, already-active sessions (StrictMode re-entry),
+ * and the shouldPersistThreadId invariant before any SDK restore call.
+ *
+ * @param {string | null | undefined} savedThreadId
+ * @param {{
+ *   currentThreadId?: string | null,
+ *   storageKey?: string
+ * }} [options]
+ * @returns {{
+ *   action: 'none' | 'already-active' | 'clear-stale' | 'restore',
+ *   threadId: string | null,
+ *   message: string | null,
+ *   reason: string | null
+ * }}
+ */
+export function resolveMountRestore(
+	savedThreadId,
+	{
+		currentThreadId = null,
+		storageKey = KAPA_CONVERSATION_HISTORY_STORAGE_KEY,
+	} = {}
+) {
+	if (typeof savedThreadId !== 'string' || savedThreadId.length === 0) {
+		return { action: 'none', threadId: null, message: null, reason: 'no-saved-id' };
+	}
+	if (currentThreadId === savedThreadId) {
+		return {
+			action: 'already-active',
+			threadId: savedThreadId,
+			message: null,
+			reason: 'already-restored',
+		};
+	}
+	const attempt = resolveRestoreAttempt(savedThreadId, storageKey);
+	if (!attempt.ok) {
+		return {
+			action: 'clear-stale',
+			threadId: savedThreadId,
+			message: attempt.message,
+			reason: attempt.reason,
+		};
+	}
+	if (!shouldPersistThreadId(savedThreadId, storageKey)) {
+		return {
+			action: 'clear-stale',
+			threadId: savedThreadId,
+			message: KAPA_CONVERSATION_HISTORY_COPY.missingThread,
+			reason: 'deleted-owned-id',
+		};
+	}
+	return {
+		action: 'restore',
+		threadId: savedThreadId,
+		message: null,
+		reason: null,
+	};
+}
+
 /**
  * Decide whether deleting a thread requires a keyed ChatSurface remount and
  * whether that remount should land in history (remaining threads) or a fresh chat.
diff --git a/src/lib/kapa-conversation-history.test.mjs b/src/lib/kapa-conversation-history.test.mjs
index e5635f46a..d18a996ec 100644
--- a/src/lib/kapa-conversation-history.test.mjs
+++ b/src/lib/kapa-conversation-history.test.mjs
@@ -4,12 +4,14 @@ import { dirname, join } from 'node:path';
 import test from 'node:test';
 import { fileURLToPath } from 'node:url';
 import {
+	KAPA_ACTIVE_THREAD_STORAGE_KEY,
 	KAPA_CONVERSATION_HISTORY_COPY,
 	KAPA_CONVERSATION_HISTORY_OPTIONS,
 	KAPA_CONVERSATION_HISTORY_STORAGE_KEY,
 	KAPA_CONVERSATION_TITLE_OVERRIDES_KEY,
 	KAPA_HISTORY_ACTIVE_ROW_STYLE,
 	canRestoreThread,
+	clearActiveThreadId,
 	clearStoredConversationHistory,
 	deleteStoredConversation,
 	getConversationHistoryView,
@@ -18,14 +20,17 @@ import {
 	isOwnedHistoryStorageEvent,
 	normalizeStoredThread,
 	pruneTitleOverrides,
+	readActiveThreadId,
 	readHistoryUiSnapshot,
 	readStoredHistoryThreads,
 	readTitleOverrides,
 	renameStoredConversation,
+	resolveMountRestore,
 	resolvePostDeleteNavigation,
 	resolveRestoreAttempt,
 	shouldPersistThreadId,
 	validateRenameTitle,
+	writeActiveThreadId,
 	writeStoredHistoryThreads,
 	writeTitleOverrides,
 } from './kapa-conversation-history.mjs';
@@ -229,6 +234,64 @@ test('deleted thread cannot be re-persisted once owned store exists', () => {
 	assert.equal(shouldPersistThreadId('drop'), false);
 	assert.equal(shouldPersistThreadId('keep'), true);
 	assert.equal(resolveRestoreAttempt('drop').ok, false);
+	// Production write path must honor the same guard.
+	assert.equal(writeActiveThreadId('drop'), false);
+	assert.equal(readActiveThreadId(), null);
+	assert.equal(writeActiveThreadId('keep'), true);
+	assert.equal(readActiveThreadId(), 'keep');
+});
+
+test('active thread id helpers clear on fresh start and reject empty values', () => {
+	installLocalStorageMock();
+	seedThreads([validThread('live', 'Live')]);
+	assert.equal(writeActiveThreadId('live'), true);
+	assert.equal(readActiveThreadId(), 'live');
+	assert.equal(memory.get(KAPA_ACTIVE_THREAD_STORAGE_KEY), 'live');
+
+	clearActiveThreadId();
+	assert.equal(readActiveThreadId(), null);
+	assert.equal(memory.get(KAPA_ACTIVE_THREAD_STORAGE_KEY), undefined);
+
+	assert.equal(writeActiveThreadId(''), false);
+	assert.equal(writeActiveThreadId(null), false);
+	assert.equal(readActiveThreadId(), null);
+});
+
+test('mount restore decides restore, already-active, and clear-stale paths', () => {
+	installLocalStorageMock();
+	seedThreads([validThread('live', 'Live')]);
+
+	assert.deepEqual(resolveMountRestore(null), {
+		action: 'none',
+		threadId: null,
+		message: null,
+		reason: 'no-saved-id',
+	});
+	assert.deepEqual(resolveMountRestore('live', { currentThreadId: 'live' }), {
+		action: 'already-active',
+		threadId: 'live',
+		message: null,
+		reason: 'already-restored',
+	});
+	assert.deepEqual(resolveMountRestore('live', { currentThreadId: null }), {
+		action: 'restore',
+		threadId: 'live',
+		message: null,
+		reason: null,
+	});
+
+	assert.equal(resolveMountRestore('missing').action, 'clear-stale');
+	assert.equal(
+		resolveMountRestore('missing').message,
+		KAPA_CONVERSATION_HISTORY_COPY.missingThread
+	);
+
+	deleteStoredConversation('live');
+	writeActiveThreadId('live'); // rejected by shouldPersistThreadId, but simulate stale key
+	memory.set(KAPA_ACTIVE_THREAD_STORAGE_KEY, 'live');
+	const deleted = resolveMountRestore('live');
+	assert.equal(deleted.action, 'clear-stale');
+	assert.equal(deleted.reason, 'missing-or-invalid');
 });
 
 test('storage-event helper recognizes history and title-overlay keys', () => {
@@ -344,6 +407,37 @@ test('component wires history remount intent and drops bulk clear UI', () => {
 	assert.doesNotMatch(source, /canClear/);
 });
 
+test('component restores saved thread on mount and clears active id on fresh conversation', () => {
+	const componentPath = join(
+		dirname(fileURLToPath(import.meta.url)),
+		'../components/KapaChatLauncher.tsx'
+	);
+	const source = readFileSync(componentPath, 'utf8');
+
+	assert.match(source, /resolveMountRestore/);
+	assert.match(source, /readActiveThreadId/);
+	assert.match(source, /writeActiveThreadId/);
+	assert.match(source, /clearActiveThreadId/);
+	assert.match(source, /mountRestoreAttemptedRef/);
+	assert.match(
+		source,
+		/restoreThread\(decision\.threadId/
+	);
+	assert.match(
+		source,
+		/const startFreshConversation = \(\) => \{[\s\S]*?clearActiveThreadId\(\);[\s\S]*?onNewConversation\(\{ openHistory: false \}\);/,
+		'fresh conversation must clear the active thread key before remount'
+	);
+	// No leftover empty if (savedThreadId) body or raw localStorage thread-id access.
+	assert.doesNotMatch(source, /if \(savedThreadId\) \{\s*\}/);
+	assert.doesNotMatch(source, /localStorage\.(get|set|remove)Item\(['"]warp_docs_kapa_thread_id['"]\)/);
+	assert.match(source, /LuTrash2/);
+	assert.doesNotMatch(
+		source,
+		/onClick=\{\(\) => requestDelete\([\s\S]*?<LuX/
+	);
+});
+
 test('active-row style contract stays lightened with readable text tokens', () => {
 	assert.match(KAPA_HISTORY_ACTIVE_ROW_STYLE.darkBackground, /78%/);
 	assert.equal(KAPA_HISTORY_ACTIVE_ROW_STYLE.darkText, 'var(--sl-color-white)');

From 7f53f21a66a4835f9c12ed4c67bc22046c73968c Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Fri, 30 Oct 2026 10:48:14 -0400
Subject: [PATCH 14/18] Make full Kapa history row clickable

Stretch the open control across the whole conversation row while keeping
rename/delete stacked above with stopPropagation so actions stay separate.

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.css | 32 ++++++++++++++++++++++-------
 src/components/KapaChatLauncher.tsx | 12 +++++++++--
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/components/KapaChatLauncher.css b/src/components/KapaChatLauncher.css
index a4123a280..ff6e2503b 100644
--- a/src/components/KapaChatLauncher.css
+++ b/src/components/KapaChatLauncher.css
@@ -372,15 +372,15 @@
 
 .sl-kapa-history__row {
 	display: grid;
-	grid-template-columns: minmax(0, 1fr) auto;
+	grid-template-columns: minmax(0, 1fr);
 	align-items: center;
-	gap: 0.5rem;
 	min-height: 3rem;
-	padding: 0.5rem 0.625rem;
+	padding: 0;
 	border: 1px solid var(--sl-color-gray-5);
 	border-radius: var(--sl-radius-sm);
 	background: color-mix(in srgb, var(--sl-color-black), var(--sl-color-gray-6) 28%);
 	color: var(--sl-color-gray-1);
+	overflow: hidden;
 }
 
 .sl-kapa-history__row:hover {
@@ -395,18 +395,26 @@
 }
 
 .sl-kapa-history__row[data-pending-delete='true'] {
-	grid-template-columns: 1fr;
+	padding: 0.5rem 0.625rem;
 }
 
-.sl-kapa-history__open {
+/* Full-row hit target stacked under rename/delete in the same grid cell.
+   Only direct children of the row — rename/confirm keep their own layout. */
+.sl-kapa-history__row > .sl-kapa-history__open {
+	grid-column: 1;
+	grid-row: 1;
+	z-index: 0;
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
 	gap: 0.75rem;
+	width: 100%;
 	min-width: 0;
-	padding: 0.125rem 0.25rem;
+	min-height: 3rem;
+	/* Leave room on the right so title does not run under action buttons. */
+	padding: 0.5rem 4.25rem 0.5rem 0.625rem;
 	border: 0;
-	border-radius: var(--sl-radius-sm);
+	border-radius: inherit;
 	background: transparent;
 	color: inherit;
 	font: inherit;
@@ -437,6 +445,16 @@
 	flex: none;
 }
 
+.sl-kapa-history__row > .sl-kapa-history__row-actions {
+	grid-column: 1;
+	grid-row: 1;
+	justify-self: end;
+	align-self: center;
+	position: relative;
+	z-index: 1;
+	margin-right: 0.375rem;
+}
+
 .sl-kapa-history__icon-button {
 	position: relative;
 	display: inline-flex;
diff --git a/src/components/KapaChatLauncher.tsx b/src/components/KapaChatLauncher.tsx
index e1df9371b..36a9837f5 100644
--- a/src/components/KapaChatLauncher.tsx
+++ b/src/components/KapaChatLauncher.tsx
@@ -1210,6 +1210,7 @@ function ChatSurface({
 																	type="button"
 																	className="sl-kapa-history__open"
 																	onClick={() => restoreSavedConversation(savedConversation.threadId)}
+																	aria-label={savedConversation.title}
 																	aria-current={savedConversation.isActive ? 'page' : undefined}
 																>
 																	<span className="sl-kapa-history__open-title">{savedConversation.title}</span>
@@ -1217,11 +1218,15 @@ function ChatSurface({
 																		<span className="sl-kapa-history__active">{conversationHistory.current}</span>
 																	) : null}
 																</button>
+																{/* z-index above full-row open control; stopPropagation keeps restore from firing. */}
 																<div className="sl-kapa-history__row-actions">
 																	<button
 																		type="button"
 																		className="sl-kapa-history__icon-button"
-																		onClick={() => beginRename(savedConversation)}
+																		onClick={(event) => {
+																			event.stopPropagation();
+																			beginRename(savedConversation);
+																		}}
 																		aria-label={conversationHistory.rename}
 																		data-tooltip={conversationHistory.rename}
 																	>
@@ -1230,7 +1235,10 @@ function ChatSurface({
 																	<button
 																		type="button"
 																		className="sl-kapa-history__icon-button"
-																		onClick={() => requestDelete(savedConversation.threadId)}
+																		onClick={(event) => {
+																			event.stopPropagation();
+																			requestDelete(savedConversation.threadId);
+																		}}
 																		aria-label={conversationHistory.delete}
 																		data-tooltip={conversationHistory.delete}
 																	>

From d547fc5f93255266487758d6f963c8915fa21041 Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Fri, 30 Oct 2026 11:57:07 -0400
Subject: [PATCH 15/18] Unclip Kapa history rename/delete tooltips

Remove overflow clipping on history rows so ::after tooltips can paint
outside the card, lift the hovered row for stacking, and anchor tooltips
above the controls. Add a static CSS regression for the overflow contract.

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.css        | 18 +++++++++++----
 src/lib/kapa-conversation-history.test.mjs | 27 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/components/KapaChatLauncher.css b/src/components/KapaChatLauncher.css
index ff6e2503b..5acde5b11 100644
--- a/src/components/KapaChatLauncher.css
+++ b/src/components/KapaChatLauncher.css
@@ -371,6 +371,9 @@
 }
 
 .sl-kapa-history__row {
+	/* relative so hovered-row z-index can lift tooltips above neighbors.
+	   Keep overflow visible so rename/delete tooltips are not clipped. */
+	position: relative;
 	display: grid;
 	grid-template-columns: minmax(0, 1fr);
 	align-items: center;
@@ -380,7 +383,12 @@
 	border-radius: var(--sl-radius-sm);
 	background: color-mix(in srgb, var(--sl-color-black), var(--sl-color-gray-6) 28%);
 	color: var(--sl-color-gray-1);
-	overflow: hidden;
+}
+
+/* Lift the active action row so tooltips paint above the next card. */
+.sl-kapa-history__row:has(.sl-kapa-history__icon-button:hover),
+.sl-kapa-history__row:has(.sl-kapa-history__icon-button:focus-visible) {
+	z-index: 3;
 }
 
 .sl-kapa-history__row:hover {
@@ -483,7 +491,9 @@
 .sl-kapa-history__icon-button[data-tooltip]::after {
 	content: attr(data-tooltip);
 	position: absolute;
-	top: calc(100% + 0.35rem);
+	/* Prefer above the control so scroll-panel bottoms clip less often. */
+	bottom: calc(100% + 0.35rem);
+	top: auto;
 	right: 0;
 	padding: 0.3rem 0.45rem;
 	border: 1px solid var(--warp-control-border-hover);
@@ -497,12 +507,12 @@
 	white-space: nowrap;
 	pointer-events: none;
 	opacity: 0;
-	transform: translateY(-2px);
+	transform: translateY(2px);
 	transition:
 		opacity 0.15s ease,
 		transform 0.15s ease;
 	transition-delay: 0.35s;
-	z-index: 10;
+	z-index: 20;
 	box-shadow: 0 4px 12px rgba(0, 0, 0, 0.25);
 }
 
diff --git a/src/lib/kapa-conversation-history.test.mjs b/src/lib/kapa-conversation-history.test.mjs
index d18a996ec..2b346a9fc 100644
--- a/src/lib/kapa-conversation-history.test.mjs
+++ b/src/lib/kapa-conversation-history.test.mjs
@@ -478,3 +478,30 @@ test('active-row style contract stays lightened with readable text tokens', () =
 		/:root\[data-theme='light'\]\s*\.sl-kapa-history__rename input\s*\{[^}]*-webkit-text-fill-color:\s*var\(--sl-color-gray-1\)/s
 	);
 });
+
+test('history row action tooltips are not clipped by row overflow', () => {
+	const cssPath = join(dirname(fileURLToPath(import.meta.url)), '../components/KapaChatLauncher.css');
+	const css = readFileSync(cssPath, 'utf8');
+	const rowBlockMatch = css.match(/\.sl-kapa-history__row\s*\{[\s\S]*?\n\}/);
+	assert.ok(rowBlockMatch, 'expected .sl-kapa-history__row rule');
+	const rowBlock = rowBlockMatch[0].replace(/\/\*[\s\S]*?\*\//g, '');
+
+	// Row must keep tooltips unclipped (no overflow clipping on the card itself).
+	assert.match(rowBlock, /position:\s*relative/);
+	assert.doesNotMatch(
+		rowBlock,
+		/overflow\s*:\s*hidden/,
+		'history row overflow clipping cuts action tooltips outside the card'
+	);
+	// Title ellipsis may still overflow:hidden on the title span only.
+	assert.match(css, /\.sl-kapa-history__open-title\s*\{[^}]*overflow:\s*hidden/s);
+	// Tooltip pseudo-elements must exist for both rename and delete icon buttons.
+	assert.match(
+		css,
+		/\.sl-kapa-history__icon-button\[data-tooltip\]::after\s*\{[^}]*content:\s*attr\(data-tooltip\)/s
+	);
+	assert.match(
+		css,
+		/\.sl-kapa-history__icon-button\[data-tooltip\]::after\s*\{[^}]*bottom:\s*calc\(100%/s
+	);
+});

From 3acdd246424636830755d47a62de6e99e68d1f92 Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Fri, 30 Oct 2026 12:34:46 -0400
Subject: [PATCH 16/18] Scope support CTA to triggering response and
 auto-reveal

Pin the third-turn support CTA to response #3 only, keep thumbs-down CTAs
on the specifically downvoted cards, and auto-scroll when a new CTA
appears on the last assistant response so it clears the fixed input.

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.tsx      |  94 ++++++++++--
 src/lib/kapa-support-escalation.js       | 102 ++++++++++++-
 src/lib/kapa-support-escalation.test.mjs | 177 ++++++++++++++++++++++-
 3 files changed, 348 insertions(+), 25 deletions(-)

diff --git a/src/components/KapaChatLauncher.tsx b/src/components/KapaChatLauncher.tsx
index 36a9837f5..985df1085 100644
--- a/src/components/KapaChatLauncher.tsx
+++ b/src/components/KapaChatLauncher.tsx
@@ -47,7 +47,12 @@ import {
 	LuX,
 } from 'react-icons/lu';
 import './KapaChatLauncher.css';
-import { shouldShowSupportEscalation } from '../lib/kapa-support-escalation.js';
+import {
+	getSupportCtaRevealKey,
+	getSupportCtaScrollBehavior,
+	shouldAutoRevealSupportCta,
+	shouldShowSupportEscalation,
+} from '../lib/kapa-support-escalation.js';
 
 const integrationId = PUBLIC_KAPA_INTEGRATION_ID;
 const title = 'Ask Warp';
@@ -543,6 +548,8 @@ function ChatSurface({
 	const threadIdRef = useRef<string | null>(null);
 	/** Guards StrictMode double-invoke so mount restore runs once per surface. */
 	const mountRestoreAttemptedRef = useRef(false);
+	/** Last support CTA reveal key we already scrolled into view. */
+	const revealedSupportCtaKeyRef = useRef<string | null>(null);
 	const [downvotedAnswerIds, setDownvotedAnswerIds] = useState<Record<string, true>>({});
 	const [copiedMcpValue, setCopiedMcpValue] = useState<McpCopyTarget | null>(null);
 	const messagesRef = useRef<HTMLDivElement | null>(null);
@@ -672,15 +679,74 @@ function ChatSurface({
 	}, [pendingDeleteThreadId]);
 
 	useEffect(() => {
-		if (!isOpen || !messagesRef.current) return;
+		if (!isOpen || !messagesRef.current || isHistoryOpen) return;
 		messagesRef.current.scrollTop = messagesRef.current.scrollHeight;
-	}, [conversation.length, isOpen]);
+	}, [conversation.length, isOpen, isHistoryOpen]);
 
 	useEffect(() => {
-		if (!isOpen || !messagesRef.current) return;
+		if (!isOpen || !messagesRef.current || isHistoryOpen) return;
 		if (!isGeneratingAnswer && !isPreparingAnswer) return;
 		messagesRef.current.scrollTop = messagesRef.current.scrollHeight;
-	}, [conversation, isGeneratingAnswer, isOpen, isPreparingAnswer]);
+	}, [conversation, isGeneratingAnswer, isOpen, isHistoryOpen, isPreparingAnswer]);
+
+	// When a support CTA newly appears on the last assistant response, scroll it
+	// fully above the fixed footer input. Older CTAs must not steal scroll.
+	useEffect(() => {
+		if (!isOpen || isHistoryOpen || isGeneratingAnswer || isPreparingAnswer) return;
+		const lastIndex = conversation.length - 1;
+		if (lastIndex < 0) return;
+		const lastQa = conversation[lastIndex];
+		const downvoted = Boolean(
+			lastQa?.id &&
+				(lastQa.reaction === 'downvote' || downvotedAnswerIds[lastQa.id] === true)
+		);
+		const revealKey = getSupportCtaRevealKey({
+			answer: lastQa?.answer ?? null,
+			responseIndex: lastIndex,
+			conversationLength: conversation.length,
+			isDownvoted: downvoted,
+			responseId: lastQa?.id ?? null,
+		});
+		if (
+			!shouldAutoRevealSupportCta({
+				isLastResponse: true,
+				revealKey,
+				lastRevealedKey: revealedSupportCtaKeyRef.current,
+			})
+		) {
+			return;
+		}
+
+		let cancelled = false;
+		let innerFrame = 0;
+		const behavior = getSupportCtaScrollBehavior(window);
+		const reveal = () => {
+			if (cancelled || !messagesRef.current) return;
+			const groups = messagesRef.current.querySelectorAll('.sl-kapa-message-group');
+			const lastGroup = groups[groups.length - 1];
+			const cta = lastGroup?.querySelector('.sl-kapa-support');
+			if (!(cta instanceof HTMLElement)) return;
+			revealedSupportCtaKeyRef.current = revealKey;
+			cta.scrollIntoView({ behavior, block: 'nearest' });
+		};
+
+		// Double rAF: wait until the CTA is committed to layout after React paint.
+		const outerFrame = window.requestAnimationFrame(() => {
+			innerFrame = window.requestAnimationFrame(reveal);
+		});
+		return () => {
+			cancelled = true;
+			window.cancelAnimationFrame(outerFrame);
+			if (innerFrame) window.cancelAnimationFrame(innerFrame);
+		};
+	}, [
+		conversation,
+		downvotedAnswerIds,
+		isGeneratingAnswer,
+		isHistoryOpen,
+		isOpen,
+		isPreparingAnswer,
+	]);
 
 	useEffect(() => {
 		const dialog = dialogRef.current;
@@ -762,13 +828,17 @@ function ChatSurface({
 		return reaction === 'downvote' || downvotedAnswerIds[qaId] === true;
 	};
 
-	const shouldShowSupportForAnswer = (qa: {
-		id?: string | null;
-		answer?: string | null;
-		reaction?: string | null;
-	}) =>
+	const shouldShowSupportForAnswer = (
+		qa: {
+			id?: string | null;
+			answer?: string | null;
+			reaction?: string | null;
+		},
+		responseIndex: number
+	) =>
 		shouldShowSupportEscalation({
 			answer: qa.answer,
+			responseIndex,
 			conversationLength: conversation.length,
 			isDownvoted: isDownvoted(qa.id ?? null, qa.reaction ?? null),
 		});
@@ -1263,7 +1333,7 @@ function ChatSurface({
 							</div>
 						)}
 
-						{conversation.map((qa) => (
+						{conversation.map((qa, responseIndex) => (
 							<div className="sl-kapa-message-group" key={qa.id ?? `temp-${qa.question}`}>
 								<div className="sl-kapa-message sl-kapa-message--user">{qa.question}</div>
 								<div className="sl-kapa-message sl-kapa-message--assistant">
@@ -1345,7 +1415,7 @@ function ChatSurface({
 											</button>
 										</div>
 									) : null}
-									{shouldShowSupportForAnswer(qa) ? (
+									{shouldShowSupportForAnswer(qa, responseIndex) ? (
 										<p className="sl-kapa-support">
 											Need more help?{' '}
 											<a href="/support-and-community/troubleshooting-and-support/sending-us-feedback/">
diff --git a/src/lib/kapa-support-escalation.js b/src/lib/kapa-support-escalation.js
index ea2cb5f02..dd53f76fd 100644
--- a/src/lib/kapa-support-escalation.js
+++ b/src/lib/kapa-support-escalation.js
@@ -1,20 +1,108 @@
-/** Show the support CTA after this many Q&A turns. */
+/** Show the support CTA on this 1-based response ordinal (the third assistant reply). */
 export const SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD = 3;
 
 /**
- * Whether the Kapa chat support CTA should appear for an answer.
- * Escalation is limited to long conversations or an explicit thumbs-down.
+ * Whether the Kapa chat support CTA should appear for a specific answer card.
+ *
+ * Rules:
+ * - Empty answers never show a CTA.
+ * - A thumbs-down shows the CTA only on that downvoted response.
+ * - The conversation-length threshold pins a CTA only on response #3
+ *   (0-based index threshold - 1), not on later responses.
  *
  * @param {{
  *   answer?: string | null;
+ *   responseIndex: number;
  *   conversationLength: number;
  *   isDownvoted: boolean;
  * }} options
  * @returns {boolean}
  */
-export function shouldShowSupportEscalation({ answer, conversationLength, isDownvoted }) {
+export function shouldShowSupportEscalation({
+	answer,
+	responseIndex,
+	conversationLength,
+	isDownvoted,
+}) {
 	if (typeof answer !== 'string' || !answer.trim()) return false;
-	return (
-		conversationLength >= SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD || isDownvoted === true
-	);
+	if (isDownvoted === true) return true;
+	if (typeof responseIndex !== 'number' || responseIndex < 0) return false;
+	if (conversationLength < SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD) return false;
+	// Threshold CTA stays on response #3 only — never propagates to #4+.
+	return responseIndex === SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD - 1;
+}
+
+/**
+ * Stable key for a newly revealed support CTA on a response.
+ *
+ * @param {{
+ *   answer?: string | null;
+ *   responseIndex: number;
+ *   conversationLength: number;
+ *   isDownvoted: boolean;
+ *   responseId?: string | null;
+ * }} options
+ * @returns {string | null}
+ */
+export function getSupportCtaRevealKey({
+	answer,
+	responseIndex,
+	conversationLength,
+	isDownvoted,
+	responseId = null,
+}) {
+	if (
+		!shouldShowSupportEscalation({
+			answer,
+			responseIndex,
+			conversationLength,
+			isDownvoted,
+		})
+	) {
+		return null;
+	}
+	const idPart =
+		typeof responseId === 'string' && responseId.length > 0
+			? responseId
+			: `idx:${responseIndex}`;
+	if (isDownvoted === true) return `down:${idPart}`;
+	return `threshold:${idPart}`;
+}
+
+/**
+ * Whether to auto-scroll so a newly appeared CTA on the last response is visible.
+ * Older responses and already-revealed keys must not steal scroll.
+ *
+ * @param {{
+ *   isLastResponse: boolean;
+ *   revealKey: string | null;
+ *   lastRevealedKey?: string | null;
+ * }} options
+ * @returns {boolean}
+ */
+export function shouldAutoRevealSupportCta({
+	isLastResponse,
+	revealKey,
+	lastRevealedKey = null,
+}) {
+	if (!isLastResponse) return false;
+	if (typeof revealKey !== 'string' || revealKey.length === 0) return false;
+	if (revealKey === lastRevealedKey) return false;
+	return true;
+}
+
+/**
+ * Scroll behavior for support CTA reveal. Honors prefers-reduced-motion when available.
+ * @param {Pick<Window, 'matchMedia'> | null | undefined} [media]
+ * @returns {'auto' | 'smooth'}
+ */
+export function getSupportCtaScrollBehavior(media = typeof window !== 'undefined' ? window : null) {
+	try {
+		if (media?.matchMedia?.('(prefers-reduced-motion: reduce)')?.matches) {
+			return 'auto';
+		}
+	} catch {
+		// ignore
+	}
+	return 'smooth';
 }
diff --git a/src/lib/kapa-support-escalation.test.mjs b/src/lib/kapa-support-escalation.test.mjs
index 4d8d88296..3796f0c52 100644
--- a/src/lib/kapa-support-escalation.test.mjs
+++ b/src/lib/kapa-support-escalation.test.mjs
@@ -2,6 +2,9 @@ import assert from 'node:assert/strict';
 import test from 'node:test';
 import {
 	SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD,
+	getSupportCtaRevealKey,
+	getSupportCtaScrollBehavior,
+	shouldAutoRevealSupportCta,
 	shouldShowSupportEscalation,
 } from './kapa-support-escalation.js';
 
@@ -9,6 +12,7 @@ test('hides the CTA when the answer is empty', () => {
 	assert.equal(
 		shouldShowSupportEscalation({
 			answer: '',
+			responseIndex: SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD - 1,
 			conversationLength: SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD,
 			isDownvoted: true,
 		}),
@@ -17,6 +21,7 @@ test('hides the CTA when the answer is empty', () => {
 	assert.equal(
 		shouldShowSupportEscalation({
 			answer: '   ',
+			responseIndex: SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD - 1,
 			conversationLength: SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD,
 			isDownvoted: true,
 		}),
@@ -25,6 +30,7 @@ test('hides the CTA when the answer is empty', () => {
 	assert.equal(
 		shouldShowSupportEscalation({
 			answer: null,
+			responseIndex: SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD - 1,
 			conversationLength: SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD,
 			isDownvoted: true,
 		}),
@@ -32,40 +38,139 @@ test('hides the CTA when the answer is empty', () => {
 	);
 });
 
-test('shows the CTA after three conversation turns', () => {
+test('pins the conversation-length CTA only to response #3', () => {
+	const answer = 'Here is an answer.';
+	const threshold = SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD;
+
 	assert.equal(
 		shouldShowSupportEscalation({
-			answer: 'Here is an answer.',
-			conversationLength: SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD - 1,
+			answer,
+			responseIndex: threshold - 2,
+			conversationLength: threshold - 1,
 			isDownvoted: false,
 		}),
 		false
 	);
+
+	// At exactly three turns, only the third response owns the threshold CTA.
 	assert.equal(
 		shouldShowSupportEscalation({
-			answer: 'Here is an answer.',
-			conversationLength: SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD,
+			answer,
+			responseIndex: 0,
+			conversationLength: threshold,
+			isDownvoted: false,
+		}),
+		false
+	);
+	assert.equal(
+		shouldShowSupportEscalation({
+			answer,
+			responseIndex: 1,
+			conversationLength: threshold,
+			isDownvoted: false,
+		}),
+		false
+	);
+	assert.equal(
+		shouldShowSupportEscalation({
+			answer,
+			responseIndex: threshold - 1,
+			conversationLength: threshold,
+			isDownvoted: false,
+		}),
+		true
+	);
+
+	// Later responses must not inherit the threshold CTA.
+	assert.equal(
+		shouldShowSupportEscalation({
+			answer,
+			responseIndex: threshold,
+			conversationLength: threshold + 2,
+			isDownvoted: false,
+		}),
+		false
+	);
+	assert.equal(
+		shouldShowSupportEscalation({
+			answer,
+			responseIndex: threshold + 1,
+			conversationLength: threshold + 2,
+			isDownvoted: false,
+		}),
+		false
+	);
+	// Response #3 still keeps its threshold CTA after the conversation continues.
+	assert.equal(
+		shouldShowSupportEscalation({
+			answer,
+			responseIndex: threshold - 1,
+			conversationLength: threshold + 2,
 			isDownvoted: false,
 		}),
 		true
 	);
 });
 
-test('shows the CTA immediately after a thumbs-down', () => {
+test('shows the CTA on each specifically thumbs-downed response', () => {
 	assert.equal(
 		shouldShowSupportEscalation({
 			answer: 'Here is an answer.',
+			responseIndex: 0,
 			conversationLength: 1,
 			isDownvoted: true,
 		}),
 		true
 	);
+	assert.equal(
+		shouldShowSupportEscalation({
+			answer: 'Here is an answer.',
+			responseIndex: 1,
+			conversationLength: 2,
+			isDownvoted: false,
+		}),
+		false
+	);
+	assert.equal(
+		shouldShowSupportEscalation({
+			answer: 'Here is an answer.',
+			responseIndex: 1,
+			conversationLength: 2,
+			isDownvoted: true,
+		}),
+		true
+	);
+});
+
+test('dedupes threshold + downvote on response #3 into a single CTA owner', () => {
+	const answer = 'Here is an answer.';
+	const index = SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD - 1;
+	assert.equal(
+		shouldShowSupportEscalation({
+			answer,
+			responseIndex: index,
+			conversationLength: SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD,
+			isDownvoted: true,
+		}),
+		true
+	);
+	assert.equal(
+		getSupportCtaRevealKey({
+			answer,
+			responseIndex: index,
+			conversationLength: SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD,
+			isDownvoted: true,
+			responseId: 'qa-3',
+		}),
+		'down:qa-3'
+	);
 });
 
 test('does not show the CTA for uncertain answers alone', () => {
 	assert.equal(
 		shouldShowSupportEscalation({
 			answer: 'Here is an answer.',
+			responseIndex: 0,
 			conversationLength: 1,
 			isDownvoted: false,
 			// Uncertainty metadata must not influence escalation.
@@ -74,3 +179,63 @@ test('does not show the CTA for uncertain answers alone', () => {
 		false
 	);
 });
+
+test('auto-reveal only fires for a new CTA on the last response', () => {
+	assert.equal(
+		shouldAutoRevealSupportCta({
+			isLastResponse: true,
+			revealKey: 'threshold:qa-3',
+			lastRevealedKey: null,
+		}),
+		true
+	);
+	assert.equal(
+		shouldAutoRevealSupportCta({
+			isLastResponse: true,
+			revealKey: 'threshold:qa-3',
+			lastRevealedKey: 'threshold:qa-3',
+		}),
+		false
+	);
+	assert.equal(
+		shouldAutoRevealSupportCta({
+			isLastResponse: false,
+			revealKey: 'down:qa-1',
+			lastRevealedKey: null,
+		}),
+		false
+	);
+	assert.equal(
+		shouldAutoRevealSupportCta({
+			isLastResponse: true,
+			revealKey: null,
+			lastRevealedKey: null,
+		}),
+		false
+	);
+	// Downvote on the latest response is a new reveal even if threshold already scrolled.
+	assert.equal(
+		shouldAutoRevealSupportCta({
+			isLastResponse: true,
+			revealKey: 'down:qa-4',
+			lastRevealedKey: 'threshold:qa-3',
+		}),
+		true
+	);
+});
+
+test('scroll behavior respects prefers-reduced-motion when available', () => {
+	assert.equal(getSupportCtaScrollBehavior(null), 'smooth');
+	assert.equal(
+		getSupportCtaScrollBehavior({
+			matchMedia: () => ({ matches: true }),
+		}),
+		'auto'
+	);
+	assert.equal(
+		getSupportCtaScrollBehavior({
+			matchMedia: () => ({ matches: false }),
+		}),
+		'smooth'
+	);
+});

From 4e4b17b824fd8e8746de0306768689a2c9b2fd18 Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Fri, 30 Oct 2026 13:40:06 -0400
Subject: [PATCH 17/18] Scroll latest completed response to true bottom

Replace CTA-only scrollIntoView(nearest) with a completion-keyed
container bottom scroll so the full latest card, feedback controls, and
optional support CTA clear the composer after streaming ends.

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.css      |   3 +
 src/components/KapaChatLauncher.tsx      |  63 +++++-----
 src/lib/kapa-support-escalation.js       |  92 +++++++++++++-
 src/lib/kapa-support-escalation.test.mjs | 154 +++++++++++++++++++++++
 4 files changed, 282 insertions(+), 30 deletions(-)

diff --git a/src/components/KapaChatLauncher.css b/src/components/KapaChatLauncher.css
index 5acde5b11..1409d85e4 100644
--- a/src/components/KapaChatLauncher.css
+++ b/src/components/KapaChatLauncher.css
@@ -296,6 +296,9 @@
 	flex: 1 1 auto;
 	overflow-y: auto;
 	padding: 1rem;
+	/* Keep the latest card frame/controls/CTA clear of the composer edge. */
+	padding-bottom: 1.5rem;
+	scroll-padding-bottom: 1.5rem;
 	display: flex;
 	flex-direction: column;
 	gap: 1rem;
diff --git a/src/components/KapaChatLauncher.tsx b/src/components/KapaChatLauncher.tsx
index 985df1085..3f30a0c8a 100644
--- a/src/components/KapaChatLauncher.tsx
+++ b/src/components/KapaChatLauncher.tsx
@@ -48,9 +48,10 @@ import {
 } from 'react-icons/lu';
 import './KapaChatLauncher.css';
 import {
-	getSupportCtaRevealKey,
-	getSupportCtaScrollBehavior,
-	shouldAutoRevealSupportCta,
+	getConversationScrollBehavior,
+	getLatestResponseCompletionKey,
+	scrollMessageContainerToBottom,
+	shouldScrollLatestResponseToBottom,
 	shouldShowSupportEscalation,
 } from '../lib/kapa-support-escalation.js';
 
@@ -548,8 +549,8 @@ function ChatSurface({
 	const threadIdRef = useRef<string | null>(null);
 	/** Guards StrictMode double-invoke so mount restore runs once per surface. */
 	const mountRestoreAttemptedRef = useRef(false);
-	/** Last support CTA reveal key we already scrolled into view. */
-	const revealedSupportCtaKeyRef = useRef<string | null>(null);
+	/** Last latest-response completion key we already scrolled to bottom for. */
+	const scrolledCompletionKeyRef = useRef<string | null>(null);
 	const [downvotedAnswerIds, setDownvotedAnswerIds] = useState<Record<string, true>>({});
 	const [copiedMcpValue, setCopiedMcpValue] = useState<McpCopyTarget | null>(null);
 	const messagesRef = useRef<HTMLDivElement | null>(null);
@@ -689,29 +690,31 @@ function ChatSurface({
 		messagesRef.current.scrollTop = messagesRef.current.scrollHeight;
 	}, [conversation, isGeneratingAnswer, isOpen, isHistoryOpen, isPreparingAnswer]);
 
-	// When a support CTA newly appears on the last assistant response, scroll it
-	// fully above the fixed footer input. Older CTAs must not steal scroll.
+	// After the latest assistant response completes (and when its CTA/controls
+	// appear), scroll the message container to its true bottom so the full card
+	// clears the composer. Avoid scrollIntoView(nearest) — it can stop early.
 	useEffect(() => {
-		if (!isOpen || isHistoryOpen || isGeneratingAnswer || isPreparingAnswer) return;
+		const isBusy = isGeneratingAnswer || isPreparingAnswer;
 		const lastIndex = conversation.length - 1;
-		if (lastIndex < 0) return;
-		const lastQa = conversation[lastIndex];
+		const lastQa = lastIndex >= 0 ? conversation[lastIndex] : null;
 		const downvoted = Boolean(
 			lastQa?.id &&
 				(lastQa.reaction === 'downvote' || downvotedAnswerIds[lastQa.id] === true)
 		);
-		const revealKey = getSupportCtaRevealKey({
-			answer: lastQa?.answer ?? null,
-			responseIndex: lastIndex,
+		const completionKey = getLatestResponseCompletionKey({
 			conversationLength: conversation.length,
-			isDownvoted: downvoted,
+			responseIndex: lastIndex,
 			responseId: lastQa?.id ?? null,
+			answer: lastQa?.answer ?? null,
+			isDownvoted: downvoted,
 		});
 		if (
-			!shouldAutoRevealSupportCta({
-				isLastResponse: true,
-				revealKey,
-				lastRevealedKey: revealedSupportCtaKeyRef.current,
+			!shouldScrollLatestResponseToBottom({
+				isOpen,
+				isHistoryOpen,
+				isBusy,
+				completionKey,
+				lastScrolledKey: scrolledCompletionKeyRef.current,
 			})
 		) {
 			return;
@@ -719,25 +722,27 @@ function ChatSurface({
 
 		let cancelled = false;
 		let innerFrame = 0;
-		const behavior = getSupportCtaScrollBehavior(window);
-		const reveal = () => {
-			if (cancelled || !messagesRef.current) return;
-			const groups = messagesRef.current.querySelectorAll('.sl-kapa-message-group');
-			const lastGroup = groups[groups.length - 1];
-			const cta = lastGroup?.querySelector('.sl-kapa-support');
-			if (!(cta instanceof HTMLElement)) return;
-			revealedSupportCtaKeyRef.current = revealKey;
-			cta.scrollIntoView({ behavior, block: 'nearest' });
+		let settleFrame = 0;
+		const behavior = getConversationScrollBehavior(window);
+		const scrollToBottom = () => {
+			if (cancelled || !messagesRef.current || !completionKey) return;
+			scrolledCompletionKeyRef.current = completionKey;
+			scrollMessageContainerToBottom(messagesRef.current, { behavior });
+			// Second settle pass after feedback/CTA layout commits.
+			settleFrame = window.requestAnimationFrame(() => {
+				if (cancelled || !messagesRef.current) return;
+				messagesRef.current.scrollTop = messagesRef.current.scrollHeight;
+			});
 		};
 
-		// Double rAF: wait until the CTA is committed to layout after React paint.
 		const outerFrame = window.requestAnimationFrame(() => {
-			innerFrame = window.requestAnimationFrame(reveal);
+			innerFrame = window.requestAnimationFrame(scrollToBottom);
 		});
 		return () => {
 			cancelled = true;
 			window.cancelAnimationFrame(outerFrame);
 			if (innerFrame) window.cancelAnimationFrame(innerFrame);
+			if (settleFrame) window.cancelAnimationFrame(settleFrame);
 		};
 	}, [
 		conversation,
diff --git a/src/lib/kapa-support-escalation.js b/src/lib/kapa-support-escalation.js
index dd53f76fd..bfda89e63 100644
--- a/src/lib/kapa-support-escalation.js
+++ b/src/lib/kapa-support-escalation.js
@@ -92,7 +92,94 @@ export function shouldAutoRevealSupportCta({
 }
 
 /**
- * Scroll behavior for support CTA reveal. Honors prefers-reduced-motion when available.
+ * Stable key for the completed latest-response layout (answer + controls + optional CTA).
+ * Changes when the last card finishes, gains a CTA, or is thumbs-downed.
+ *
+ * @param {{
+ *   conversationLength: number;
+ *   responseIndex: number;
+ *   responseId?: string | null;
+ *   answer?: string | null;
+ *   isDownvoted?: boolean;
+ * }} options
+ * @returns {string | null}
+ */
+export function getLatestResponseCompletionKey({
+	conversationLength,
+	responseIndex,
+	responseId = null,
+	answer = null,
+	isDownvoted = false,
+}) {
+	if (typeof conversationLength !== 'number' || conversationLength <= 0) return null;
+	if (typeof responseIndex !== 'number' || responseIndex !== conversationLength - 1) return null;
+	if (typeof answer !== 'string' || !answer.trim()) return null;
+	const idPart =
+		typeof responseId === 'string' && responseId.length > 0
+			? responseId
+			: `idx:${responseIndex}`;
+	const showCta = shouldShowSupportEscalation({
+		answer,
+		responseIndex,
+		conversationLength,
+		isDownvoted: isDownvoted === true,
+	});
+	return [
+		`len:${conversationLength}`,
+		`id:${idPart}`,
+		showCta ? 'cta' : 'nocta',
+		isDownvoted === true ? 'down' : 'nodown',
+	].join('|');
+}
+
+/**
+ * Whether to scroll the message list to the true bottom after the latest response completes.
+ * Skips closed chat, history view, in-flight generation, incomplete answers, and repeats.
+ *
+ * @param {{
+ *   isOpen: boolean;
+ *   isHistoryOpen: boolean;
+ *   isBusy: boolean;
+ *   completionKey: string | null;
+ *   lastScrolledKey?: string | null;
+ * }} options
+ * @returns {boolean}
+ */
+export function shouldScrollLatestResponseToBottom({
+	isOpen,
+	isHistoryOpen,
+	isBusy,
+	completionKey,
+	lastScrolledKey = null,
+}) {
+	if (!isOpen || isHistoryOpen || isBusy) return false;
+	if (typeof completionKey !== 'string' || completionKey.length === 0) return false;
+	if (completionKey === lastScrolledKey) return false;
+	return true;
+}
+
+/**
+ * Scroll a message container to its true bottom so the full latest card
+ * (frame, feedback controls, optional support CTA) clears the composer.
+ * Prefer this over scrollIntoView({ block: 'nearest' }), which can stop early.
+ *
+ * @param {Pick<HTMLElement, 'scrollHeight' | 'clientHeight' | 'scrollTop' | 'scrollTo'> | null | undefined} container
+ * @param {{ behavior?: 'auto' | 'smooth' }} [options]
+ * @returns {boolean}
+ */
+export function scrollMessageContainerToBottom(container, { behavior = 'auto' } = {}) {
+	if (!container) return false;
+	const top = Math.max(0, container.scrollHeight - container.clientHeight);
+	if (behavior === 'smooth' && typeof container.scrollTo === 'function') {
+		container.scrollTo({ top, behavior: 'smooth' });
+	} else {
+		container.scrollTop = container.scrollHeight;
+	}
+	return true;
+}
+
+/**
+ * Scroll behavior for conversation auto-scroll. Honors prefers-reduced-motion when available.
  * @param {Pick<Window, 'matchMedia'> | null | undefined} [media]
  * @returns {'auto' | 'smooth'}
  */
@@ -106,3 +193,6 @@ export function getSupportCtaScrollBehavior(media = typeof window !== 'undefined
 	}
 	return 'smooth';
 }
+
+/** Alias kept for call sites that talk about completion scroll rather than CTA-only reveal. */
+export const getConversationScrollBehavior = getSupportCtaScrollBehavior;
diff --git a/src/lib/kapa-support-escalation.test.mjs b/src/lib/kapa-support-escalation.test.mjs
index 3796f0c52..a123f2fb2 100644
--- a/src/lib/kapa-support-escalation.test.mjs
+++ b/src/lib/kapa-support-escalation.test.mjs
@@ -1,10 +1,17 @@
 import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
 import test from 'node:test';
+import { fileURLToPath } from 'node:url';
 import {
 	SUPPORT_ESCALATION_CONVERSATION_LENGTH_THRESHOLD,
+	getConversationScrollBehavior,
+	getLatestResponseCompletionKey,
 	getSupportCtaRevealKey,
 	getSupportCtaScrollBehavior,
+	scrollMessageContainerToBottom,
 	shouldAutoRevealSupportCta,
+	shouldScrollLatestResponseToBottom,
 	shouldShowSupportEscalation,
 } from './kapa-support-escalation.js';
 
@@ -226,6 +233,7 @@ test('auto-reveal only fires for a new CTA on the last response', () => {
 
 test('scroll behavior respects prefers-reduced-motion when available', () => {
 	assert.equal(getSupportCtaScrollBehavior(null), 'smooth');
+	assert.equal(getConversationScrollBehavior(null), 'smooth');
 	assert.equal(
 		getSupportCtaScrollBehavior({
 			matchMedia: () => ({ matches: true }),
@@ -239,3 +247,149 @@ test('scroll behavior respects prefers-reduced-motion when available', () => {
 		'smooth'
 	);
 });
+
+test('completion key tracks latest finished response layout including CTA/downvote', () => {
+	assert.equal(
+		getLatestResponseCompletionKey({
+			conversationLength: 2,
+			responseIndex: 1,
+			responseId: 'qa-2',
+			answer: '',
+			isDownvoted: false,
+		}),
+		null
+	);
+	assert.equal(
+		getLatestResponseCompletionKey({
+			conversationLength: 3,
+			responseIndex: 1,
+			responseId: 'qa-2',
+			answer: 'Done',
+			isDownvoted: false,
+		}),
+		null,
+		'non-last response must not own the completion key'
+	);
+	assert.equal(
+		getLatestResponseCompletionKey({
+			conversationLength: 2,
+			responseIndex: 1,
+			responseId: 'qa-2',
+			answer: 'Done',
+			isDownvoted: false,
+		}),
+		'len:2|id:qa-2|nocta|nodown'
+	);
+	assert.equal(
+		getLatestResponseCompletionKey({
+			conversationLength: 3,
+			responseIndex: 2,
+			responseId: 'qa-3',
+			answer: 'Done',
+			isDownvoted: false,
+		}),
+		'len:3|id:qa-3|cta|nodown'
+	);
+	assert.equal(
+		getLatestResponseCompletionKey({
+			conversationLength: 2,
+			responseIndex: 1,
+			responseId: 'qa-2',
+			answer: 'Done',
+			isDownvoted: true,
+		}),
+		'len:2|id:qa-2|cta|down'
+	);
+});
+
+test('completion bottom-scroll fires once per finished latest layout', () => {
+	assert.equal(
+		shouldScrollLatestResponseToBottom({
+			isOpen: true,
+			isHistoryOpen: false,
+			isBusy: false,
+			completionKey: 'len:3|id:qa-3|cta|nodown',
+			lastScrolledKey: null,
+		}),
+		true
+	);
+	assert.equal(
+		shouldScrollLatestResponseToBottom({
+			isOpen: true,
+			isHistoryOpen: false,
+			isBusy: false,
+			completionKey: 'len:3|id:qa-3|cta|nodown',
+			lastScrolledKey: 'len:3|id:qa-3|cta|nodown',
+		}),
+		false
+	);
+	assert.equal(
+		shouldScrollLatestResponseToBottom({
+			isOpen: true,
+			isHistoryOpen: false,
+			isBusy: true,
+			completionKey: 'len:3|id:qa-3|cta|nodown',
+			lastScrolledKey: null,
+		}),
+		false
+	);
+	assert.equal(
+		shouldScrollLatestResponseToBottom({
+			isOpen: false,
+			isHistoryOpen: false,
+			isBusy: false,
+			completionKey: 'len:3|id:qa-3|cta|nodown',
+			lastScrolledKey: null,
+		}),
+		false
+	);
+	assert.equal(
+		shouldScrollLatestResponseToBottom({
+			isOpen: true,
+			isHistoryOpen: true,
+			isBusy: false,
+			completionKey: 'len:3|id:qa-3|cta|nodown',
+			lastScrolledKey: null,
+		}),
+		false
+	);
+});
+
+test('scrollMessageContainerToBottom writes true bottom scrollTop', () => {
+	const calls = [];
+	const container = {
+		scrollHeight: 1200,
+		clientHeight: 400,
+		scrollTop: 0,
+		scrollTo(opts) {
+			calls.push(opts);
+			this.scrollTop = opts.top;
+		},
+	};
+	assert.equal(scrollMessageContainerToBottom(null), false);
+	assert.equal(scrollMessageContainerToBottom(container, { behavior: 'auto' }), true);
+	assert.equal(container.scrollTop, 1200);
+	assert.equal(scrollMessageContainerToBottom(container, { behavior: 'smooth' }), true);
+	assert.deepEqual(calls.at(-1), { top: 800, behavior: 'smooth' });
+});
+
+test('component wires completion bottom-scroll instead of CTA-only nearest reveal', () => {
+	const componentPath = join(
+		dirname(fileURLToPath(import.meta.url)),
+		'../components/KapaChatLauncher.tsx'
+	);
+	const cssPath = join(
+		dirname(fileURLToPath(import.meta.url)),
+		'../components/KapaChatLauncher.css'
+	);
+	const source = readFileSync(componentPath, 'utf8');
+	const css = readFileSync(cssPath, 'utf8');
+	assert.match(source, /getLatestResponseCompletionKey/);
+	assert.match(source, /shouldScrollLatestResponseToBottom/);
+	assert.match(source, /scrollMessageContainerToBottom/);
+	assert.match(source, /scrolledCompletionKeyRef/);
+	assert.doesNotMatch(source, /scrollIntoView\(\{\s*behavior,\s*block:\s*'nearest'/);
+	assert.doesNotMatch(source, /revealedSupportCtaKeyRef/);
+	assert.match(css, /\.sl-kapa-panel__body\s*\{[^}]*scroll-padding-bottom:\s*1\.5rem/s);
+	assert.match(css, /\.sl-kapa-panel__body\s*\{[^}]*padding-bottom:\s*1\.5rem/s);
+});

From d68b56fb6be368306cc959726dbe379c38b72374 Mon Sep 17 00:00:00 2001
From: Danny Neira <16809145+dannyneira@users.noreply.github.com>
Date: Fri, 30 Oct 2026 16:15:51 -0400
Subject: [PATCH 18/18] Contain Kapa history rename field inside row bounds

Inset rename mode with row padding and keep the input/focus ring within
the card radius so the black field no longer spills past the left edge.

Co-Authored-By: Warp <agent@warp.dev>
---
 src/components/KapaChatLauncher.css | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/components/KapaChatLauncher.css b/src/components/KapaChatLauncher.css
index 1409d85e4..980487b43 100644
--- a/src/components/KapaChatLauncher.css
+++ b/src/components/KapaChatLauncher.css
@@ -340,12 +340,17 @@
 
 .sl-kapa-history__open:focus-visible,
 .sl-kapa-history__icon-button:focus-visible,
-.sl-kapa-history__text-button:focus-visible,
-.sl-kapa-history__rename input:focus-visible {
+.sl-kapa-history__text-button:focus-visible {
 	outline: 2px solid var(--sl-color-accent-high);
 	outline-offset: 2px;
 }
 
+.sl-kapa-history__rename input:focus-visible {
+	outline: 2px solid var(--sl-color-accent-high);
+	/* Keep the focus ring inside the row instead of spilling past the left edge. */
+	outline-offset: -2px;
+}
+
 .sl-kapa-history__empty {
 	margin: auto 0;
 	padding: 1rem;
@@ -405,8 +410,11 @@
 	color: var(--sl-color-white);
 }
 
-.sl-kapa-history__row[data-pending-delete='true'] {
+.sl-kapa-history__row[data-pending-delete='true'],
+.sl-kapa-history__row:has(> .sl-kapa-history__rename) {
+	/* Inset rename/confirm chrome so the field stays inside the card radius. */
 	padding: 0.5rem 0.625rem;
+	box-sizing: border-box;
 }
 
 /* Full-row hit target stacked under rename/delete in the same grid cell.
@@ -531,10 +539,16 @@
 	gap: 0.5rem;
 	align-items: center;
 	width: 100%;
+	min-width: 0;
+	max-width: 100%;
+	box-sizing: border-box;
 }
 
 .sl-kapa-history__rename input {
+	box-sizing: border-box;
 	min-width: 0;
+	max-width: 100%;
+	width: 100%;
 	height: 2rem;
 	padding: 0 0.5rem;
 	border: 1px solid var(--sl-color-gray-5);