`: keeps paragraph spacing without the nesting violation. */
-function ReasoningParagraphSafe({ children }: { children: ReactNode }) {
- return
-}
import { normalizeMathDelimiters } from "./message"
import { remarkTrimCjkAutolinkTail } from "./remark-cjk-autolink-tail"
import { remarkRewriteFileUriLinks } from "./remark-file-uri-links"
@@ -263,15 +257,8 @@ export const ReasoningContent = memo(
plugins={plugins}
remarkPlugins={remarkPlugins}
{...props}
- // Enforce the link icon + safety override after spreading props,
- // and render paragraphs as
: reasoning text frequently
- // embeds raw HTML/SVG, and Streamdown's default
for the
- // wrapper plus a nested element rendered as
trips React's
- // nested-paragraph hydration error.
- components={{
- ...markdownLinkComponents,
- p: ReasoningParagraphSafe as Components["p"],
- }}
+ // Enforce the link icon + safety override after spreading props.
+ components={markdownLinkComponents}
>
{normalized}
diff --git a/src/components/chat/composer/composer-add-menu.tsx b/src/components/chat/composer/composer-add-menu.tsx
index 8c5110a75..4c51a8a5a 100644
--- a/src/components/chat/composer/composer-add-menu.tsx
+++ b/src/components/chat/composer/composer-add-menu.tsx
@@ -14,7 +14,6 @@ import {
Plus,
Search,
Sparkles,
- Swords,
Upload,
} from "lucide-react"
@@ -32,8 +31,6 @@ import { DropdownRadioItemContent } from "@/components/chat/dropdown-radio-item-
import { rankByTextMatch } from "@/lib/fuzzy-text-match"
import { isImeCompositionKey } from "@/lib/ime-composition"
import { cn } from "@/lib/utils"
-import { usePkArenaStore } from "@/stores/pk-arena-store"
-import { useTabStore } from "@/stores/tab-store"
import type { AvailableCommandInfo } from "@/lib/types"
import { commandInvocationToken } from "@/components/chat/composer/invocation-reference"
@@ -399,29 +396,6 @@ export function ComposerAddMenu({
)}
- {
- const state = usePkArenaStore.getState()
- // With history to revisit, the menu reopens the ARENA directly
- // (the dialog otherwise has no way back after it closes);
- // "新一局" inside the arena opens the launcher.
- if (state.rounds.length > 0 && state.activeRoundId) {
- const round = state.rounds.find(
- (item) => item.id === state.activeRoundId
- )
- if (round) {
- useTabStore
- .getState()
- .openPkRoundTab(round.id, round.folderId, round.task)
- }
- } else {
- state.setLauncherOpen(true)
- }
- }}
- >
-
- {t("startPk")}
-
)
diff --git a/src/components/chat/conversation-context-bar.test.tsx b/src/components/chat/conversation-context-bar.test.tsx
index 469a8c9ac..2c0b5c84a 100644
--- a/src/components/chat/conversation-context-bar.test.tsx
+++ b/src/components/chat/conversation-context-bar.test.tsx
@@ -28,7 +28,6 @@ vi.mock("sonner", () => ({
// branches) is seeded into the real zustand store in beforeEach.
let tabs: Array<{
id: string
- kind: "conversation"
folderId: number
conversationId: number | null
isChat?: boolean
@@ -94,14 +93,7 @@ describe("ConversationHeaderFolderPicker", () => {
folders: [repo, other],
allFolders: [repo, other],
})
- tabs = [
- {
- id: "tab-draft",
- kind: "conversation",
- folderId: 1,
- conversationId: null,
- },
- ]
+ tabs = [{ id: "tab-draft", folderId: 1, conversationId: null }]
activeTabId = "tab-draft"
const user = userEvent.setup()
@@ -119,14 +111,7 @@ describe("ConversationHeaderFolderPicker", () => {
folders: [repo, other],
allFolders: [repo, other],
})
- tabs = [
- {
- id: "tab-1",
- kind: "conversation",
- folderId: 1,
- conversationId: 42,
- },
- ]
+ tabs = [{ id: "tab-1", folderId: 1, conversationId: 42 }]
activeTabId = "tab-1"
const user = userEvent.setup()
@@ -140,13 +125,7 @@ describe("ConversationHeaderFolderPicker", () => {
it("shows the chat-mode label for a folderless chat tab", () => {
tabs = [
- {
- id: "tab-chat",
- kind: "conversation",
- folderId: 999,
- conversationId: null,
- isChat: true,
- },
+ { id: "tab-chat", folderId: 999, conversationId: null, isChat: true },
]
activeTabId = "tab-chat"
diff --git a/src/components/chat/conversation-context-bar.tsx b/src/components/chat/conversation-context-bar.tsx
index 98a8dbf20..e9d11424b 100644
--- a/src/components/chat/conversation-context-bar.tsx
+++ b/src/components/chat/conversation-context-bar.tsx
@@ -7,7 +7,6 @@ import { Check, ChevronDown, Folder, MessageSquare } from "lucide-react"
import type { OverlayScrollbarsComponentRef } from "overlayscrollbars-react"
import { useAppWorkspaceStore } from "@/stores/app-workspace-store"
import { useTabActions, useTabStore } from "@/contexts/tab-context"
-import { isConversationWorkspaceTab } from "@/lib/workspace-tab"
import { Button } from "@/components/ui/button"
import {
Popover,
@@ -126,8 +125,7 @@ export const ConversationHeaderFolderPicker = memo(
const ownTab = useMemo(() => {
const lookupId = tabId ?? activeTabId
- const tab = tabs.find((x) => x.id === lookupId)
- return tab && isConversationWorkspaceTab(tab) ? tab : null
+ return tabs.find((x) => x.id === lookupId) ?? null
}, [tabs, tabId, activeTabId])
const ownFolder = useMemo(
@@ -252,8 +250,7 @@ export const ConversationFolderBranchPicker = memo(
const ownTab = useMemo(() => {
const lookupId = tabId ?? activeTabId
- const tab = tabs.find((x) => x.id === lookupId)
- return tab && isConversationWorkspaceTab(tab) ? tab : null
+ return tabs.find((x) => x.id === lookupId) ?? null
}, [tabs, tabId, activeTabId])
const ownFolder = useMemo(
@@ -372,9 +369,7 @@ export function useConversationFolderBranchPickerVisible(
const activeTabId = useTabStore((s) => s.activeTabId)
const allFolders = useAppWorkspaceStore((s) => s.allFolders)
const lookupId = tabId ?? activeTabId
- const matchedTab = tabs.find((x) => x.id === lookupId)
- const ownTab =
- matchedTab && isConversationWorkspaceTab(matchedTab) ? matchedTab : null
+ const ownTab = tabs.find((x) => x.id === lookupId) ?? null
const ownFolder = ownTab
? (allFolders.find((f) => f.id === ownTab.folderId) ?? null)
: null
diff --git a/src/components/chunk-load-recovery.test.tsx b/src/components/chunk-load-recovery.test.tsx
deleted file mode 100644
index 5bf1e437f..000000000
--- a/src/components/chunk-load-recovery.test.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { render } from "@testing-library/react"
-import { afterEach, describe, expect, it, vi } from "vitest"
-import { ChunkLoadRecovery, isChunkLoadError } from "./chunk-load-recovery"
-
-afterEach(() => {
- window.sessionStorage.clear()
-})
-
-describe("ChunkLoadRecovery", () => {
- it("recognizes async chunk failures without matching unrelated errors", () => {
- expect(
- isChunkLoadError(
- new Error(
- "Failed to load chunk http://localhost:3000/_next/static/chunks/opener.js"
- )
- )
- ).toBe(true)
- expect(isChunkLoadError(new Error("Permission denied"))).toBe(false)
- })
-
- it("reloads once when a lazy chunk is stale", () => {
- const reloadPage = vi.fn()
- render()
-
- const rejection = new Event("unhandledrejection")
- Object.defineProperty(rejection, "reason", {
- value: Object.assign(new Error("Failed to load chunk /opener.js"), {
- name: "ChunkLoadError",
- }),
- })
- window.dispatchEvent(rejection)
- window.dispatchEvent(rejection)
-
- expect(reloadPage).toHaveBeenCalledTimes(1)
- })
-})
diff --git a/src/components/chunk-load-recovery.tsx b/src/components/chunk-load-recovery.tsx
deleted file mode 100644
index a5721ed73..000000000
--- a/src/components/chunk-load-recovery.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-"use client"
-
-import { useEffect, useRef } from "react"
-
-const RECOVERY_MARKER = "codeg:chunk-load-recovery"
-const HEALTHY_WINDOW_MS = 10_000
-const CHUNK_LOAD_PATTERN =
- /chunkloaderror|failed to load chunk|loading chunk .+ failed|failed to fetch dynamically imported module|importing a module script failed/i
-
-function errorText(value: unknown): string {
- if (typeof value === "string") return value
- if (value == null || typeof value !== "object") return ""
- const record = value as { name?: unknown; message?: unknown }
- return [record.name, record.message]
- .filter((part): part is string => typeof part === "string")
- .join(": ")
-}
-
-export function isChunkLoadError(value: unknown): boolean {
- return CHUNK_LOAD_PATTERN.test(errorText(value))
-}
-
-function reloadWindow(): void {
- window.location.reload()
-}
-
-/**
- * Recover from a stale Next.js runtime after a deploy or dev-server rebuild.
- * Lazy chunks surface only when their feature is first used (for example,
- * opening a generated file), so the initial page can look healthy while its
- * chunk graph is already invalid. One guarded reload obtains a coherent graph;
- * sessionStorage prevents a broken deployment from entering a reload loop.
- */
-export function ChunkLoadRecovery({
- reloadPage = reloadWindow,
-}: {
- reloadPage?: () => void
-}) {
- const attemptedRef = useRef(false)
-
- useEffect(() => {
- const pageKey = `${window.location.pathname}${window.location.search}`
-
- const recover = (reason: unknown) => {
- if (attemptedRef.current || !isChunkLoadError(reason)) return
-
- try {
- if (window.sessionStorage.getItem(RECOVERY_MARKER) === pageKey) return
- window.sessionStorage.setItem(RECOVERY_MARKER, pageKey)
- } catch {
- // A local in-memory guard still prevents repeated reload attempts in
- // this document when storage is unavailable.
- }
-
- attemptedRef.current = true
- reloadPage()
- }
-
- const onError = (event: ErrorEvent) => {
- recover(event.error ?? event.message)
- }
- const onUnhandledRejection = (event: PromiseRejectionEvent) => {
- recover(event.reason)
- }
-
- window.addEventListener("error", onError)
- window.addEventListener("unhandledrejection", onUnhandledRejection)
- const healthyTimer = window.setTimeout(() => {
- try {
- if (window.sessionStorage.getItem(RECOVERY_MARKER) === pageKey) {
- window.sessionStorage.removeItem(RECOVERY_MARKER)
- }
- } catch {
- // Storage is optional; there is nothing to clear when it is blocked.
- }
- }, HEALTHY_WINDOW_MS)
-
- return () => {
- window.removeEventListener("error", onError)
- window.removeEventListener("unhandledrejection", onUnhandledRejection)
- window.clearTimeout(healthyTimer)
- }
- }, [reloadPage])
-
- return null
-}
diff --git a/src/components/conversations/conversation-detail-panel-layout.test.ts b/src/components/conversations/conversation-detail-panel-layout.test.ts
index 6bb7748bf..f55ee8700 100644
--- a/src/components/conversations/conversation-detail-panel-layout.test.ts
+++ b/src/components/conversations/conversation-detail-panel-layout.test.ts
@@ -284,12 +284,10 @@ describe("ConversationDetailPanel split-group render model", () => {
it("pairs every split group with its own title bar and gates the global one", () => {
const shellStart = source.indexOf("const renderGroupShell = (groupId")
const shellBody = source.slice(shellStart, shellStart + 6000)
- expect(shellBody).toContain("{isSplit && selConversationTab && (")
+ expect(shellBody).toContain("{isSplit && selTab && (")
expect(shellBody).toContain(" {
- const tab = s.tabs.find((item) => item.id === tabId)
- return tab && isConversationWorkspaceTab(tab) ? tab : null
- })
+ const ownTab = useTabStore(
+ (s) => s.tabs.find((tab) => tab.id === tabId) ?? null
+ )
// Resolve this panel's folder from ITS OWN tab, not the global active folder.
// A keep-alive panel for a background tab must NOT re-render when the active
// tab switches to a different folder. For the active tab this equals the old
@@ -2231,8 +2228,7 @@ export function ConversationDetailPanel() {
} = useTabActions()
const newConversation = useMemo(() => {
const activeTab = tabs.find((tab) => tab.id === activeTabId)
- if (!activeTab || !isConversationWorkspaceTab(activeTab)) return null
- if (activeTab.conversationId != null) return null
+ if (!activeTab || activeTab.conversationId != null) return null
const workingDir = activeTab.workingDir ?? folder?.path
if (!workingDir) return null
return { workingDir, folderId: activeTab.folderId }
@@ -2298,10 +2294,9 @@ export function ConversationDetailPanel() {
const dbId2 = summary?.id
const isOpenInTabs = tabs.some(
(tab) =>
- isConversationWorkspaceTab(tab) &&
- (tab.conversationId === matchedConversationId ||
- tab.runtimeConversationId === matchedConversationId ||
- (dbId2 != null && tab.conversationId === dbId2))
+ tab.conversationId === matchedConversationId ||
+ tab.runtimeConversationId === matchedConversationId ||
+ (dbId2 != null && tab.conversationId === dbId2)
)
if (isOpenInTabs) return
@@ -2320,12 +2315,13 @@ export function ConversationDetailPanel() {
)
const hasNoTabs = tabs.length === 0 && !activeTabId
- const activeConversationTab = useMemo(() => {
- const tab = tabs.find((item) => item.id === activeTabId)
- return tab && isConversationWorkspaceTab(tab) && tab.conversationId != null
- ? tab
- : null
- }, [tabs, activeTabId])
+ const activeConversationTab = useMemo(
+ () =>
+ tabs.find(
+ (tab) => tab.id === activeTabId && tab.conversationId != null
+ ) ?? null,
+ [tabs, activeTabId]
+ )
const canReloadActiveConversation = activeConversationTab != null
const handleReloadActiveConversation = useCallback(() => {
if (!activeConversationTab) return
@@ -2551,21 +2547,18 @@ export function ConversationDetailPanel() {
// Visible = tiled (all group members shown) or the group's selected tab.
const visible = canTileG || tab.id === groupSelection[groupId]
const folderPath = allFolders.find((f) => f.id === tab.folderId)?.path
- const view =
- tab.kind === "pk" ? (
-
- ) : (
-
- )
+ const view = (
+
+ )
return (
tab.id === groupSelection[groupId]) ??
groupTabs[0] ??
null
- const selConversationTab =
- selTab && isConversationWorkspaceTab(selTab) ? selTab : null
- const selTabFolder = selConversationTab
- ? allFolders.find((f) => f.id === selConversationTab.folderId)
+ const selTabFolder = selTab
+ ? allFolders.find((f) => f.id === selTab.folderId)
: undefined
// NOTE: the strip / header / content stay PLAIN SIBLING SLOTS (no fragment
// around any pair) — a `false` conditional is a reconciliation hole, so the
@@ -2659,7 +2650,7 @@ export function ConversationDetailPanel() {
{touchesRight && }
)}
- {isSplit && selConversationTab && (
+ {isSplit && selTab && (
)}
@@ -2723,7 +2710,7 @@ export function ConversationDetailPanel() {
return (
<>
- {!isSplit && activeTab && isConversationWorkspaceTab(activeTab) && (
+ {!isSplit && activeTab && (
{
expect(shellStart).toBeGreaterThan(-1)
const shellBody = source.slice(shellStart, shellStart + 6000)
const stripIdx = shellBody.indexOf("{isSplit && (")
- const headerIdx = shellBody.indexOf("{isSplit && selConversationTab && (")
+ const headerIdx = shellBody.indexOf("{isSplit && selTab && (")
const contentIdx = shellBody.indexOf(
''
)
diff --git a/src/components/conversations/sidebar-conversation-grouping.ts b/src/components/conversations/sidebar-conversation-grouping.ts
index 78dc8650f..18882b924 100644
--- a/src/components/conversations/sidebar-conversation-grouping.ts
+++ b/src/components/conversations/sidebar-conversation-grouping.ts
@@ -262,54 +262,6 @@ export function selectChatConversationsWithReuse(
return arraysShallowEqual(prev, next) ? prev : next
}
-/**
- * Select PK-arena contestant conversations (`kind === "pk"`), grouped by their
- * `pk_round_id`. Returns a Map keyed by round id → conversations (newest-first
- * within each round). Excludes pinned conversations (they surface in the
- * Pinned section). `prev` is the Map returned last call for reference reuse.
- *
- * Each round's conversations are sorted newest-first; the rounds themselves are
- * ordered by their newest conversation's `updated_at` (hottest round first) so
- * the active PK sits at the top.
- */
-export function selectPkConversationsWithReuse(
- conversations: readonly DbConversationSummary[],
- prev: Map
-): Map {
- const grouped = new Map()
- for (const conv of conversations) {
- if (conv.pinned_at != null) continue
- if (conv.kind !== "pk") continue
- const rid = conv.pk_round_id
- if (rid == null) continue
- const bucket = grouped.get(rid)
- if (bucket) bucket.push(conv)
- else grouped.set(rid, [conv])
- }
- // Sort conversations within each round newest-first.
- for (const bucket of grouped.values()) {
- bucket.sort(compareByUpdatedAtDesc)
- }
- // Sort rounds by hottest conversation (newest updated_at among their
- // conversations) first.
- const sortedEntries = [...grouped.entries()].sort((a, b) => {
- const aMax = a[1][0]?.updated_at ?? ""
- const bMax = b[1][0]?.updated_at ?? ""
- return bMax.localeCompare(aMax)
- })
- const next = new Map(sortedEntries)
- return mapsShallowEqual(prev, next) ? prev : next
-}
-
-/** Shallow-equal for Map — same keys and same array refs. */
-function mapsShallowEqual(a: Map, b: Map): boolean {
- if (a.size !== b.size) return false
- for (const [k, v] of a) {
- if (b.get(k) !== v) return false
- }
- return true
-}
-
/**
* Select the flat "Recent" bucket: every conversation the sidebar can reach,
* folder-bound and chat alike, newest first — the whole point of the section is
@@ -345,7 +297,6 @@ export function selectRecentConversationsWithReuse(
for (const conv of conversations) {
if (conv.pinned_at != null) continue
if (!showCompleted && conv.status === "completed") continue
- if (conv.kind === "pk") continue
if (conv.kind !== "chat" && !openFolderIds.has(conv.folder_id)) continue
next.push(conv)
}
@@ -543,33 +494,13 @@ export interface RecentMoreRow {
}
/**
- * A PK-arena round sub-group heading inside the "pk" section: shows the round's
- * task summary and gates its contestant conversations. Follows the section
- * header; each round is one collapsible group.
- */
-export interface PkRoundHeaderRow {
- kind: "pk-round"
- roundId: number
- /** Task preview (truncated for the header) — identifies the round. */
- task: string
- /** Number of contestant conversations in this round. */
- count: number
-}
-
-/** Empty hint for the PK section (no PK arena conversations at all). */
-export interface PkEmptyRow {
- kind: "pk-empty"
-}
-
-/**
- * A collapsible section heading. Five exist: "pinned" and "pk" (always on top,
- * shown only when conversations of that kind exist) plus the three
- * user-reorderable ones — "folders" (wraps the whole folder list), "chats" (a
- * flat list of folderless chat-mode conversations), and "recent" (a flat,
- * folder-agnostic list of the newest conversations, shown only when the user
- * keeps it enabled). All live in the same flat row array so the single
- * Virtualizer windows them like any other row — there is no separate,
- * un-virtualized list.
+ * A collapsible section heading. Four exist: "pinned" (always on top, shown only
+ * when there are pinned conversations) plus the three user-reorderable ones —
+ * "folders" (wraps the whole folder list), "chats" (a flat list of folderless
+ * chat-mode conversations), and "recent" (a flat, folder-agnostic list of the
+ * newest conversations, shown only when the user keeps it enabled). All live in
+ * the same flat row array so the single Virtualizer windows them like any other
+ * row — there is no separate, un-virtualized list.
*/
export interface SectionHeaderRow {
kind: "section"
@@ -607,8 +538,6 @@ export type SidebarRow =
| RecentEmptyRow
| RecentMoreRow
| SubsessionLoadingRow
- | PkRoundHeaderRow
- | PkEmptyRow
const MAX_RENDER_DEPTH = 32
@@ -626,9 +555,6 @@ const EMPTY_CONTAINER_CHILDREN: ReadonlyMap =
// the row output stays identical to the pre-Recent model for callers that don't
// pass it.
const EMPTY_CONVERSATIONS: readonly DbConversationSummary[] = []
-const EMPTY_PK_MAP: ReadonlyMap =
- new Map()
-const EMPTY_ROUND_TASKS: ReadonlyMap = new Map()
/**
* Merge a freshly-fetched children snapshot with child summaries already applied
@@ -758,16 +684,6 @@ function pushConversationRow(
export function buildRows(args: {
pinned: readonly DbConversationSummary[]
pinnedExpanded: boolean
- /** PK-arena conversations grouped by round id (hottest round first). Empty
- * Map = no PK section. */
- pkConversations?: Map
- /** Whether the PK section's rows are shown. Optional — defaults to expanded. */
- pkExpanded?: boolean
- /** Round metadata for the PK section headers: id → task preview. Absent
- * entries fall back to a generic "Round N" label. */
- pkRoundTasks?: ReadonlyMap
- /** Ids whose PK round sub-group is collapsed. Absent = expanded. */
- pkRoundCollapsed?: ReadonlySet
orderedFolderIds: readonly number[]
byFolder: Map
folderExpanded: Record
@@ -824,10 +740,6 @@ export function buildRows(args: {
const {
pinned,
pinnedExpanded,
- pkConversations = EMPTY_PK_MAP,
- pkExpanded = true,
- pkRoundTasks = EMPTY_ROUND_TASKS,
- pkRoundCollapsed = EMPTY_EXPANDED,
orderedFolderIds,
byFolder,
folderExpanded,
@@ -900,41 +812,6 @@ export function buildRows(args: {
}
}
- const pushPk = () => {
- if (pkConversations.size === 0) return
- const totalConvs = [...pkConversations.values()].reduce(
- (n, bucket) => n + bucket.length,
- 0
- )
- rows.push({
- kind: "section",
- section: "pk",
- expanded: pkExpanded,
- count: totalConvs,
- })
- if (!pkExpanded) return
- for (const [roundId, convs] of pkConversations) {
- const task = pkRoundTasks.get(roundId) ?? `Round #${roundId}`
- rows.push({
- kind: "pk-round",
- roundId,
- task,
- count: convs.length,
- })
- if (pkRoundCollapsed.has(roundId)) continue
- for (const conv of convs) {
- pushConversationRow(
- rows,
- conv,
- 0,
- conversationExpanded,
- childrenByParent,
- childrenLoading
- )
- }
- }
- }
-
const pushFolders = () => {
// The Folders section header is always present (a permanent entry point),
// mirroring the Chat section — so a workspace with chats but no open folders
@@ -1039,11 +916,6 @@ export function buildRows(args: {
if (remaining > 0) rows.push({ kind: "recent-more", remaining })
}
- // The PK section sits right below Pinned (above the reorderable sections).
- // It is not part of `sectionOrder` — it is always-on-top like Pinned, shown
- // only when PK arena conversations exist.
- pushPk()
-
// Normalized (not consumed raw) so a truncated / repeated / unknown-entry
// order can never drop a section off the sidebar or emit one twice.
for (const section of normalizeSectionOrder(sectionOrder)) {
diff --git a/src/components/conversations/sidebar-conversation-list.test.tsx b/src/components/conversations/sidebar-conversation-list.test.tsx
index ad041db3c..8b4ede4ef 100644
--- a/src/components/conversations/sidebar-conversation-list.test.tsx
+++ b/src/components/conversations/sidebar-conversation-list.test.tsx
@@ -36,7 +36,6 @@ const store = vi.hoisted(() => ({
activeTabId: null as string | null,
tabSpec: [] as Array<{
id: string
- kind?: string
conversationId: number | null
agentType: string
folderId: number
@@ -736,7 +735,6 @@ describe("SidebarConversationList — scrollToActive across a worktree merge", (
store.activeTabId = "tab-21"
store.tabSpec = [
{
- kind: "conversation",
id: "tab-21",
conversationId: 21,
agentType: "claude_code",
diff --git a/src/components/conversations/sidebar-conversation-list.tsx b/src/components/conversations/sidebar-conversation-list.tsx
index de0d784f2..8aa06f888 100644
--- a/src/components/conversations/sidebar-conversation-list.tsx
+++ b/src/components/conversations/sidebar-conversation-list.tsx
@@ -21,7 +21,6 @@ import {
ChevronDown,
ChevronRight,
Download,
- Archive,
ExternalLink,
FolderClosed,
FolderGit2,
@@ -42,9 +41,7 @@ import {
} from "lucide-react"
import { useActiveFolder } from "@/contexts/active-folder-context"
import { useAppWorkspaceStore } from "@/stores/app-workspace-store"
-import { usePkArenaStore } from "@/stores/pk-arena-store"
import { useTabActions, useTabStore } from "@/contexts/tab-context"
-import { isConversationWorkspaceTab } from "@/lib/workspace-tab"
import { useWorkbenchRoute } from "@/contexts/workbench-route-context"
import { useTerminalContext } from "@/contexts/terminal-context"
import { useThemeColor, useZoomLevel } from "@/hooks/use-appearance"
@@ -114,7 +111,6 @@ import {
reuseSet,
selectChatConversationsWithReuse,
selectPinnedWithReuse,
- selectPkConversationsWithReuse,
selectRecentConversationsWithReuse,
worktreeChildrenByParent,
worktreeHeaderAlias,
@@ -801,8 +797,6 @@ export function SidebarConversationList({
const tabs = useTabStore((s) => s.tabs)
const {
openTab,
- openPkRoundTab,
- closePkRoundTab,
closeConversationTab,
closeTabsByFolder,
openNewConversationTab,
@@ -843,9 +837,7 @@ export function SidebarConversationList({
const selectedConversation = useMemo(() => {
const activeTab = tabs.find((tab) => tab.id === activeTabId)
const next =
- !activeTab ||
- !isConversationWorkspaceTab(activeTab) ||
- activeTab.conversationId == null
+ !activeTab || activeTab.conversationId == null
? null
: { id: activeTab.conversationId, agentType: activeTab.agentType }
const reused = reuseSelected(selectedConvRef.current, next)
@@ -857,7 +849,7 @@ export function SidebarConversationList({
const openTabKeys = useMemo(() => {
const next = new Set()
for (const tab of tabs) {
- if (isConversationWorkspaceTab(tab) && tab.conversationId != null) {
+ if (tab.conversationId != null) {
next.add(`${tab.agentType}:${tab.conversationId}`)
}
}
@@ -884,7 +876,6 @@ export function SidebarConversationList({
const [sectionCollapsed, setSectionCollapsed] =
useState({})
const pinnedExpanded = !sectionCollapsed.pinned
- const pkExpanded = !sectionCollapsed.pk
const foldersExpanded = !sectionCollapsed.folders
const chatsExpanded = !sectionCollapsed.chats
const recentExpanded = !sectionCollapsed.recent
@@ -1109,7 +1100,7 @@ export function SidebarConversationList({
// section, so exclude both here; then apply the completed filter as before.
const folderConversations = useMemo(() => {
const base = conversations.filter(
- (c) => c.pinned_at == null && c.kind !== "chat" && c.kind !== "pk"
+ (c) => c.pinned_at == null && c.kind !== "chat"
)
if (showCompleted) return base
return base.filter((c) => c.status !== "completed")
@@ -1129,84 +1120,6 @@ export function SidebarConversationList({
return next
}, [conversations, showCompleted])
- // PK-arena conversations grouped by round (hottest round first). Each round
- // renders as a collapsible sub-group under the "PK" section header. The round
- // task labels come from the PK arena store; a round not yet hydrated shows a
- // generic "Round #N" fallback.
- const pkConvsRef = useRef>(new Map())
- const pkConversations = useMemo(() => {
- const next = selectPkConversationsWithReuse(
- conversations,
- pkConvsRef.current
- )
- pkConvsRef.current = next
- return next
- }, [conversations])
- const pkRounds = usePkArenaStore((s) => s.rounds)
- const [pkRoundCollapsed, setPkRoundCollapsed] = useState>(
- new Set()
- )
- const pkRoundTasks = useMemo(() => {
- const map = new Map()
- for (const r of pkRounds) {
- map.set(Number(r.id), r.task)
- }
- return map
- }, [pkRounds])
- const togglePkRound = useCallback((roundId: number) => {
- setPkRoundCollapsed((prev) => {
- const next = new Set(prev)
- if (next.has(roundId)) next.delete(roundId)
- else next.add(roundId)
- return next
- })
- }, [])
- const openPkRound = useCallback(
- (roundId: number) => {
- const store = usePkArenaStore.getState()
- const round = store.rounds.find((item) => Number(item.id) === roundId)
- if (!round) return
- store.setActiveRound(round.id)
- openPkRoundTab(round.id, round.folderId, round.task)
- },
- [openPkRoundTab]
- )
- const archivePkRound = useCallback(
- async (roundId: number) => {
- const round = usePkArenaStore
- .getState()
- .rounds.find((item) => Number(item.id) === roundId)
- if (
- !round ||
- !window.confirm(t("pkArchiveConfirm", { task: round.task }))
- ) {
- return
- }
- try {
- await usePkArenaStore.getState().archiveRound(String(roundId))
- closePkRoundTab(String(roundId))
- for (const conversation of pkConversations.get(roundId) ?? []) {
- closeConversationTab(
- conversation.folder_id,
- conversation.id,
- conversation.agent_type
- )
- }
- await refreshConversations()
- toast.success(t("pkArchiveSuccess"))
- } catch (error) {
- toast.error(t("pkArchiveFailed", { message: String(error) }))
- }
- },
- [
- closeConversationTab,
- closePkRoundTab,
- pkConversations,
- refreshConversations,
- t,
- ]
- )
-
// Pinned bucket: the FULL conversation list (ignores "Show completed" — a
// pinned conversation stays visible regardless), sorted most-recently-pinned
// first, with reference reuse so an unrelated status event doesn't rebuild it.
@@ -1390,10 +1303,6 @@ export function SidebarConversationList({
buildRows({
pinned,
pinnedExpanded,
- pkConversations,
- pkExpanded,
- pkRoundTasks,
- pkRoundCollapsed,
// Top-level (reorderable) folders drive the outer order; buildRows nests
// each container's root sub-group + worktrees via `containerChildren`.
orderedFolderIds: reorderableFolderIds,
@@ -1417,10 +1326,6 @@ export function SidebarConversationList({
[
pinned,
pinnedExpanded,
- pkConversations,
- pkExpanded,
- pkRoundTasks,
- pkRoundCollapsed,
reorderableFolderIds,
byFolder,
folderExpanded,
@@ -2500,62 +2405,6 @@ export function SidebarConversationList({
)
}
- if (row.kind === "pk-empty") {
- return (
-
- {t("noPk")}
-
- )
- }
- if (row.kind === "pk-round") {
- const collapsed = pkRoundCollapsed.has(row.roundId)
- const roundStatus = pkRounds.find(
- (round) => Number(round.id) === row.roundId
- )?.status
- const canArchive = roundStatus !== "running" && roundStatus !== "ready"
- return (
-
-
-
- {canArchive ? (
-
- ) : null}
-
- {round ? (
-
-
-
- PK
-
-
-
- {round.task}
-
-
- {roundStatusLabel[round.status]} ·{" "}
- {new Date(round.createdAt).toLocaleString()}
-
-
-
- {round.status === "ready" || roundLive ? (
-
- ) : round.contestants.some((c) => c.worktreePath) ? (
-
- ) : null}
-
-
-
-
-
-
- {persistenceError ? (
-
- {t("persistenceFailed")}
-
-
- ) : null}
-
- {round.status === "ready" ? (
-
-
- {t("readyNote")}
-
-
-
- ) : null}
-
-
-
- {/* Judge verdict panel — shown when a judge is configured. */}
- {round.judgeAgent ? (
-
void runJudge(round)
- : undefined
- }
- />
- ) : null}
-
-
-
- {(["battle", "diff"] as const).map((key) => (
-
- ))}
-
-
-
-
- {tab === "battle"
- ? round.contestants.map((contestant) =>
- round.status === "ready" ? (
-
- ) : (
-
- void sendFollowUp(round, contestant, message)
- }
- />
- )
- )
- : round.contestants.map((contestant) => (
-
- ))}
-
-
-
- ) : (
-
- {t("noRound")}
-
- )}
-
- {conversationId != null ? (
-
- ) : (
-
- {statusDetail ?? preparingLabel}
-
- )}
- {canFollowUp ? (
-