@jetcrab/pi-desk 1.1.28-dev → 1.1.30-dev

package/src/client/l2_biz/workbench/l2-work-session-sidebar.tsx

@@ -30,6 +30,8 @@ import {
   PlusIcon,
   RefreshCwIcon,
   Repeat2Icon,
+  SearchIcon,
+  XIcon,
   SettingsIcon,
   TerminalIcon,
   Trash2Icon
@@ -58,6 +60,13 @@ import { L4PluginIcon } from '@client/l4_foundation/plugin-host/l4-plugin-icon'
 import { L4ScrollArea } from '@client/l4_foundation/ui/l4-scroll-area'
 import { useL4AppToast } from '@client/l4_foundation/ui/l4-app-toast'
 import { buttonVariants } from '@client/l4_foundation/ui/shadcn/button'
+import { Input } from '@client/l4_foundation/ui/shadcn/input'
+import type { L3PiSessionSearchMatch } from '@common/l3_modules/pi/l3-pi-session-search-contract'
+import type { L2WorkSessionSearch } from './hooks/l2-work-session-search'
+import {
+  highlightL2WorkbenchSessionSearchText,
+  L2WorkbenchSessionSearchScopes
+} from './views/l2-workbench-session-search'
 import {
   ContextMenu,
   ContextMenuContent,
@@ -110,6 +119,7 @@ export function getL2PluginSessionSidebarMode(
 
 interface L2WorkSessionSidebarProps {
   mode: L2WorkSessionSidebarMode
+  search: L2WorkSessionSearch
   mobile: boolean
   fileBrowser: ReactNode
   pluginTabContent: ReactNode
@@ -349,7 +359,10 @@ const SortableWorkSessionRow = memo(function SortableWorkSessionRow({
   onDelete,
   onRename,
   syncing,
-  onReloadChat
+  onReloadChat,
+  searchQuery,
+  searchMatches,
+  dragDisabled
 }: {
   workSession: L2WorkSessionListItem
   mobile: boolean
@@ -365,6 +378,9 @@ const SortableWorkSessionRow = memo(function SortableWorkSessionRow({
   onRename: (workSession: L2WorkSessionListItem) => void
   syncing: boolean
   onReloadChat: (workSession: L2WorkSessionListItem) => void
+  searchQuery: string
+  searchMatches: readonly L3PiSessionSearchMatch[]
+  dragDisabled: boolean
 }): React.JSX.Element {
   const suppressTouchClick = useRef(false)
   const lastPointer = useRef('')
@@ -377,9 +393,10 @@ const SortableWorkSessionRow = memo(function SortableWorkSessionRow({
     transform,
     transition,
     isDragging
-  } = useSortable({ id: workSession.workId, disabled: actionsDisabled })
+  } = useSortable({ id: workSession.workId, disabled: actionsDisabled || dragDisabled })
   const toast = useL4AppToast()
   const { t } = useTranslation('workbench')
+  const { t: searchT } = useTranslation('workbenchPicker')
   const { locale, timeZone } = useL4Region()
   const statusLabel = t(workSessionStatusLabel(workSession))
   const sessionTitle = workSession.sessionTitle ?? t('newSession')
@@ -468,7 +485,7 @@ const SortableWorkSessionRow = memo(function SortableWorkSessionRow({
           event.stopPropagation()
         }}
         onClick={(event) => event.stopPropagation()}
-        disabled={actionsDisabled}
+        disabled={actionsDisabled || dragDisabled}
         aria-label={t('dragSession', { name: sessionTitle })}
         title={`${statusLabel} · ${t('dragOrder')}`}
         className={cn(
@@ -518,7 +535,7 @@ const SortableWorkSessionRow = memo(function SortableWorkSessionRow({
             )}
             title={sessionTitle}
           >
-            {sessionTitle}
+            {highlightL2WorkbenchSessionSearchText(sessionTitle, searchQuery)}
           </p>
           <div className={cn(styles.rowActions, 'flex shrink-0 items-center')}>
             <button
@@ -558,6 +575,25 @@ const SortableWorkSessionRow = memo(function SortableWorkSessionRow({
             </button>
           </div>
         </div>
+        {searchMatches
+          .filter((match) => match.scope !== 'title')
+          .slice(0, 2)
+          .map((match) => (
+            <p
+              key={match.scope}
+              data-testid={`work-session-search-match-${workSession.workId}-${match.scope}`}
+              className="truncate text-xs leading-5 text-muted-foreground"
+              title={match.preview}
+            >
+              <span className="font-medium">
+                {match.scope === 'sessionId'
+                  ? 'Session ID'
+                  : searchT(match.scope === 'user' ? 'scopeUser' : 'scopeAssistant')}
+                {': '}
+              </span>
+              {highlightL2WorkbenchSessionSearchText(match.preview, searchQuery)}
+            </p>
+          ))}
       </div>
     </div>
   )
@@ -660,6 +696,7 @@ function WorkSessionGroupBoundary({ id, label }: { id: string; label: string }):
 
 function L2WorkSessionSidebarComponent({
   mode,
+  search,
   mobile,
   fileBrowser,
   pluginTabContent,
@@ -849,10 +886,22 @@ function L2WorkSessionSidebarComponent({
     () => workSessions.map((workSession) => workSession.workId),
     [workSessions]
   )
-  const sortableIds = useMemo(
-    () => getL2WorkSessionVisualSortableIds(workIds, pinnedCount),
-    [pinnedCount, workIds]
+  const searching = search.query.trim().length > 0
+  const searchMatchesByWorkId = useMemo(
+    () => new Map(search.data?.sessions.map((session) => [session.workId, session.matches]) ?? []),
+    [search.data]
   )
+  const sortableIds = useMemo(() => {
+    const ids = getL2WorkSessionVisualSortableIds(workIds, pinnedCount)
+    if (!searching) return ids
+    const ordinaryMatches = workIds.slice(pinnedCount).some((id) => searchMatchesByWorkId.has(id))
+    const pinnedMatches = workIds.slice(0, pinnedCount).some((id) => searchMatchesByWorkId.has(id))
+    return ids.filter((id) =>
+      id === L2_WORK_SESSION_PIN_BOUNDARY_ID
+        ? ordinaryMatches && pinnedMatches
+        : searchMatchesByWorkId.has(id)
+    )
+  }, [pinnedCount, workIds, searching, searchMatchesByWorkId])
   const workSessionById = useMemo(
     () => new Map(workSessions.map((workSession) => [workSession.workId, workSession])),
     [workSessions]
@@ -879,7 +928,7 @@ function L2WorkSessionSidebarComponent({
 
   const handleDragEnd = useCallback(
     (event: DragEndEvent): void => {
-      if (ordering || !event.over || event.active.id === event.over.id) return
+      if (searching || ordering || !event.over || event.active.id === event.over.id) return
 
       const activeId = String(event.active.id)
       const arrangement = moveL2WorkSessionVisual(
@@ -890,7 +939,7 @@ function L2WorkSessionSidebarComponent({
       )
       if (arrangement) onArrangementChange(arrangement, activeId)
     },
-    [onArrangementChange, ordering, pinnedCount, workIds]
+    [onArrangementChange, ordering, pinnedCount, workIds, searching]
   )
 
   const rows = sortableIds.map((id) => {
@@ -917,6 +966,9 @@ function L2WorkSessionSidebarComponent({
         onRename={onRename}
         syncing={syncingWorkIds.includes(workSession.workId)}
         onReloadChat={onReloadChat}
+        dragDisabled={searching}
+        searchQuery={searching ? search.query : ''}
+        searchMatches={searchMatchesByWorkId.get(workSession.workId) ?? []}
       />
     )
   })
@@ -1005,12 +1057,79 @@ function L2WorkSessionSidebarComponent({
   return (
     <aside className="flex h-full w-full min-w-0 flex-col bg-sidebar text-sidebar-foreground">
       <SidebarHeader modeItems={modeItems} actionItems={actionItems} />
+      {mode === 'sessions' ? (
+        <div className="flex shrink-0 items-center gap-1 px-2 pb-1">
+          <div className="relative min-w-0 flex-1">
+            <SearchIcon className="pointer-events-none absolute left-2.5 top-1/2 size-4 -translate-y-1/2 text-muted-foreground" />
+            <Input
+              data-testid="work-session-search-input"
+              value={search.query}
+              maxLength={120}
+              aria-label={t('searchWorkSessions')}
+              placeholder={t('searchWorkSessions')}
+              onChange={(event) => search.setQuery(event.target.value)}
+              onKeyDown={(event) => {
+                if (event.key !== 'Escape' || event.nativeEvent.isComposing || !search.query) return
+                event.preventDefault()
+                event.stopPropagation()
+                search.setQuery('')
+              }}
+              className="h-8 pl-8 pr-8"
+            />
+            {search.query ? (
+              <button
+                data-testid="work-session-search-clear"
+                type="button"
+                aria-label={t('clearSessionSearch')}
+                title={t('clearSessionSearch')}
+                onClick={() => search.setQuery('')}
+                className="absolute right-0.5 top-1/2 flex size-7 -translate-y-1/2 items-center justify-center rounded-md text-muted-foreground hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring"
+              >
+                <XIcon className="size-4" />
+              </button>
+            ) : null}
+          </div>
+          <L2WorkbenchSessionSearchScopes
+            compact
+            value={search.searchIn}
+            onChange={search.setSearchIn}
+          />
+        </div>
+      ) : null}
       <L4ScrollArea
         data-testid="work-session-list"
         className={cn('min-h-0 flex-1', mode !== 'sessions' && 'hidden')}
         viewportClassName="p-2 data-[has-overflow-y]:pr-4"
       >
-        {workSessions.length === 0 ? (
+        {searching && (search.loading || search.error || sortableIds.length === 0) ? (
+          <div
+            data-testid="work-session-search-status"
+            role="status"
+            className="px-2 py-5 text-center text-sm leading-6 text-muted-foreground"
+          >
+            {search.loading ? (
+              <p className="flex items-center justify-center gap-2">
+                <LoaderCircleIcon className="size-4 animate-spin" />
+                {t('searchingSessions')}
+              </p>
+            ) : search.error ? (
+              <>
+                <p role="alert" className="break-words text-destructive">
+                  {search.error}
+                </p>
+                <button
+                  type="button"
+                  onClick={search.refresh}
+                  className={buttonVariants({ variant: 'ghost', size: 'sm' })}
+                >
+                  {t('retrySessionSearch')}
+                </button>
+              </>
+            ) : (
+              <p>{t('noSessionSearchMatches')}</p>
+            )}
+          </div>
+        ) : workSessions.length === 0 ? (
           <p className="px-2 py-5 text-center text-sm leading-6 text-muted-foreground">
             {t('noSessions')}
           </p>

package/src/client/l2_biz/workbench/l2-workbench-biz.ts

@@ -44,6 +44,12 @@ import type {
   L2SortWorkSessionsRequest,
   L2WorkSessionListResponse
 } from '@common/l2_biz/work-session/l2-work-session-contract'
+import {
+  L2WorkSessionSearchResponseSchema,
+  type L2WorkSessionSearchRequest,
+  type L2WorkSessionSearchResponse
+} from '@common/l2_biz/work-session/l2-work-session-search-contract'
+import { L2PiSessionHistoryResponseSchema } from '@common/l2_biz/pi-session/l2-pi-session-contract'
 import type {
   L2WorkSessionBranchRequest,
   L2WorkSessionBranchResponse,
@@ -108,6 +114,10 @@ export interface L2WorkbenchBiz {
   setChatCapabilityMode: (input: L2ChatCapabilityModeSetRequest) => Promise<void>
   invokePluginMethod: (input: L2PluginInvokeRequest) => Promise<L2PluginInvokeResponse>
   listWorkSessions: () => Promise<L2AppBootstrapResponse>
+  searchWorkSessions: (
+    input: L2WorkSessionSearchRequest,
+    signal?: AbortSignal
+  ) => Promise<L2WorkSessionSearchResponse>
   applyAppRuntimeUpdate: (input: L3AppRuntimeApplyRequest) => Promise<void>
   sortWorkSessions: (input: L2SortWorkSessionsRequest) => Promise<L2WorkSessionListResponse>
   deleteWorkSession: (workId: string) => Promise<L2WorkSessionListResponse>
@@ -200,6 +210,11 @@ export function createL2WorkbenchBiz(
     },
     invokePluginMethod: (input) => appSocket.request(L2PluginSocketContracts.invoke, input),
     listWorkSessions: () => appSocket.request(L2WorkSessionSocketContracts.list, {}),
+    async searchWorkSessions(input, signal): Promise<L2WorkSessionSearchResponse> {
+      return L2WorkSessionSearchResponseSchema.parse(
+        await request<unknown>('/api/work-sessions/search', input, signal)
+      )
+    },
     async applyAppRuntimeUpdate(input): Promise<void> {
       await appSocket.request(L3AppRuntimeSocketContracts.apply, input)
     },
@@ -236,8 +251,11 @@ export function createL2WorkbenchBiz(
       saveL4PiDirectoryEntriesCache(response)
       return response
     },
-    listSessionHistory: (input, signal) =>
-      request<L2PiSessionHistoryResponse>('/api/pi/sessions/list', input, signal),
+    async listSessionHistory(input, signal): Promise<L2PiSessionHistoryResponse> {
+      return L2PiSessionHistoryResponseSchema.parse(
+        await request<unknown>('/api/pi/sessions/list', input, signal)
+      )
+    },
     listSessionUserMessages: (input, signal) =>
       request<L2PiSessionUserMessageListResponse>(
         '/api/pi/session-user-messages/list',

package/src/client/l2_biz/workbench/l2-workbench-branch-filter-preferences.ts

@@ -0,0 +1,34 @@
+import type { L2WorkbenchBranchTreeFilter } from './l2-workbench-branch-tree'
+
+const STORAGE_KEY = 'pi-desk:workbench-branch-filter'
+
+export const L2_WORKBENCH_BRANCH_FILTER_OPTIONS: ReadonlyArray<{
+  value: L2WorkbenchBranchTreeFilter
+  label: string
+}> = [
+  { value: 'default', label: 'filterDefault' },
+  { value: 'no-tools', label: 'filterNoTools' },
+  { value: 'user-only', label: 'filterUserOnly' },
+  { value: 'labeled-only', label: 'filterLabeled' },
+  { value: 'all', label: 'filterAll' }
+]
+
+export function loadL2WorkbenchBranchFilter(): L2WorkbenchBranchTreeFilter {
+  try {
+    const saved = window.localStorage.getItem(STORAGE_KEY)
+    return (
+      L2_WORKBENCH_BRANCH_FILTER_OPTIONS.find((option) => option.value === saved)?.value ??
+      'default'
+    )
+  } catch {
+    return 'default'
+  }
+}
+
+export function saveL2WorkbenchBranchFilter(filter: L2WorkbenchBranchTreeFilter): void {
+  try {
+    window.localStorage.setItem(STORAGE_KEY, filter)
+  } catch (error) {
+    console.warn('[Pi Desk][Workbench] 保存分支筛选失败，仅当前选择器生效', error)
+  }
+}

package/src/client/l2_biz/workbench/l2-workbench-branch-picker.tsx

@@ -1,12 +1,6 @@
 'use client'
 
-import {
-  ChevronDownIcon,
-  ChevronRightIcon,
-  LoaderCircleIcon,
-  SearchIcon,
-  XIcon
-} from 'lucide-react'
+import { CheckIcon, ChevronRightIcon, LoaderCircleIcon, SearchIcon, XIcon } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 import { motion, useIsPresent, useReducedMotion } from 'motion/react'
 import {
@@ -27,12 +21,6 @@ import type {
 import { cn } from '@client/l4_foundation/lib/l4-utils'
 import { useL4Region } from '@client/l4_foundation/locale/l4-region-provider'
 import { Button, buttonVariants } from '@client/l4_foundation/ui/shadcn/button'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger
-} from '@client/l4_foundation/ui/shadcn/dropdown-menu'
 import { Input } from '@client/l4_foundation/ui/shadcn/input'
 import {
   buildL2WorkbenchBranchTreeRows,
@@ -40,6 +28,11 @@ import {
   type L2WorkbenchBranchTreeFilter
 } from './l2-workbench-branch-tree'
 import type { L2WorkbenchBranchIntent } from './hooks/l2-workbench-branch-picker'
+import {
+  L2_WORKBENCH_BRANCH_FILTER_OPTIONS as FILTER_OPTIONS,
+  loadL2WorkbenchBranchFilter,
+  saveL2WorkbenchBranchFilter
+} from './l2-workbench-branch-filter-preferences'
 
 export interface L2WorkbenchBranchPickerModel {
   workId: string
@@ -81,17 +74,6 @@ interface KindAppearance {
 const EMPTY_TREE_NODES: readonly L2WorkSessionTreeNode[] = []
 const OVERSCAN_ROWS = 8
 
-const FILTER_OPTIONS: ReadonlyArray<{
-  value: L2WorkbenchBranchTreeFilter
-  label: string
-}> = [
-  { value: 'default', label: 'filterDefault' },
-  { value: 'no-tools', label: 'filterNoTools' },
-  { value: 'user-only', label: 'filterUserOnly' },
-  { value: 'labeled-only', label: 'filterLabeled' },
-  { value: 'all', label: 'filterAll' }
-]
-
 const KIND_APPEARANCE: Record<L2WorkSessionTreeNodeKind, KindAppearance> = {
   user: {
     label: 'kindUser',
@@ -171,6 +153,8 @@ function intentLabel(intent: L2WorkbenchBranchIntent): string {
   switch (intent.action) {
     case 'tree':
       return 'treeIntent'
+    case 'resend':
+      return 'resendIntent'
     case 'fork':
       return 'forkIntent'
     case 'clone':
@@ -309,8 +293,7 @@ export function L2WorkbenchBranchPicker({
     [locale, timeZone]
   )
   const [query, setQuery] = useState('')
-  const [filter, setFilter] = useState<L2WorkbenchBranchTreeFilter>('default')
-  const [filterOpen, setFilterOpen] = useState(false)
+  const [filter, setFilter] = useState(loadL2WorkbenchBranchFilter)
   const [foldedEntryIds, setFoldedEntryIds] = useState<Set<string>>(() => new Set())
   const [selectedEntryId, setSelectedEntryId] = useState<string | null>(null)
   const [scrollTop, setScrollTop] = useState(0)
@@ -348,9 +331,6 @@ export function L2WorkbenchBranchPicker({
   const renderEndIndex = Math.min(rows.length, Math.max(endIndex, startIndex + OVERSCAN_ROWS))
   const visibleRows = rows.slice(startIndex, renderEndIndex)
   const selectedDetail = model.detail?.entryId === effectiveSelectedEntryId ? model.detail : null
-  const filterLabel = t(
-    FILTER_OPTIONS.find((option) => option.value === filter)?.label ?? 'filterDefault'
-  )
   const confirmation = model.runningConfirmation
   const treeId = `work-session-branch-tree-${model.workId}`
   const selectedRowId = effectiveSelectedEntryId
@@ -395,12 +375,6 @@ export function L2WorkbenchBranchPicker({
       const target = event.target
       if (!(target instanceof Node)) return
       if (panelRef.current?.contains(target)) return
-      if (
-        target instanceof Element &&
-        target.closest('[data-workbench-branch-picker-popup="true"]')
-      ) {
-        return
-      }
       requestClose(false)
     }
     document.addEventListener('pointerdown', handlePointerDown, true)
@@ -471,6 +445,7 @@ export function L2WorkbenchBranchPicker({
   const applyFilter = useCallback(
     (nextFilter: L2WorkbenchBranchTreeFilter): void => {
       setFilter(nextFilter)
+      saveL2WorkbenchBranchFilter(nextFilter)
       setFoldedEntryIds(new Set())
       scrollListTo(0)
       queueMicrotask(focusPickerInput)
@@ -693,42 +668,6 @@ export function L2WorkbenchBranchPicker({
                   onKeyDown={handleSearchKeyDown}
                 />
               </div>
-              <DropdownMenu
-                open={filterOpen}
-                onOpenChange={setFilterOpen}
-                onOpenChangeComplete={(open) => {
-                  if (!open) queueMicrotask(focusPickerInput)
-                }}
-              >
-                <DropdownMenuTrigger
-                  render={
-                    <button
-                      type="button"
-                      aria-label={t('branchFilter', { filter: filterLabel })}
-                      className={buttonVariants({ variant: 'outline' })}
-                    />
-                  }
-                >
-                  {filterLabel}
-                  <ChevronDownIcon className="size-3.5" />
-                </DropdownMenuTrigger>
-                <DropdownMenuContent
-                  data-workbench-branch-picker-popup="true"
-                  align="end"
-                  side="bottom"
-                  className="w-32"
-                  finalFocus={() => (mobile ? panelRef.current : searchRef.current)}
-                >
-                  {FILTER_OPTIONS.map((option) => (
-                    <DropdownMenuItem key={option.value} onClick={() => applyFilter(option.value)}>
-                      <span className="min-w-0 flex-1">{t(option.label)}</span>
-                      {filter === option.value ? (
-                        <span className="text-xs text-primary">●</span>
-                      ) : null}
-                    </DropdownMenuItem>
-                  ))}
-                </DropdownMenuContent>
-              </DropdownMenu>
             </div>
           ) : null}
         </header>
@@ -813,6 +752,30 @@ export function L2WorkbenchBranchPicker({
               )}
             </div>
 
+            <div
+              role="group"
+              aria-label={t('branchFilters')}
+              className="flex shrink-0 flex-wrap items-center gap-1 border-b bg-muted/25 px-2 py-2"
+            >
+              <span className="px-1 text-sm font-medium text-muted-foreground">
+                {t('branchFilters')}
+              </span>
+              {FILTER_OPTIONS.map((option) => (
+                <Button
+                  key={option.value}
+                  type="button"
+                  size="sm"
+                  variant="ghost"
+                  aria-pressed={filter === option.value}
+                  className="aria-pressed:bg-primary aria-pressed:text-primary-foreground aria-pressed:hover:bg-[color-mix(in_oklab,var(--primary),var(--primary-foreground)_8%)]"
+                  onClick={() => applyFilter(option.value)}
+                >
+                  {filter === option.value ? <CheckIcon className="size-3.5" /> : null}
+                  {t(option.label)}
+                </Button>
+              ))}
+            </div>
+
             {model.pending && !model.runningConfirmation ? (
               <div className="flex shrink-0 items-center gap-2 border-b bg-primary/8 px-2.5 py-1.5 text-xs text-muted-foreground">
                 <LoaderCircleIcon className="size-3.5 animate-spin text-primary" />

package/src/client/l2_biz/workbench/l2-workbench-chat-input-runtime.ts

@@ -65,6 +65,7 @@ export interface L2WorkbenchChatInputRuntime {
   getState: (source: L2ChatSource) => L2WorkbenchChatInputState
   loadSource: (source: L2ChatSource) => Promise<void>
   setText: (source: L2ChatSource, text: string) => void
+  preserveDraftOnBranch: (source: L2ChatSource) => () => void
   dismissFeedback: (source: L2ChatSource) => void
   addFiles: (source: L2ChatSource, files: readonly File[]) => Promise<void>
   removeImage: (source: L2ChatSource, localId: string) => void
@@ -171,6 +172,7 @@ export function createL2WorkbenchChatInputRuntime(
   const persistenceFailures = new Set<string>()
   let draftWriteRevision = 0
   const loadPromises = new Map<string, Promise<void>>()
+  const preservedDraftSources = new Set<string>()
   const optimizeQueue: Array<() => Promise<void>> = []
   const messageImages = new Map<string, CachedMessageImage>()
   const imageLoads = new Map<string, Promise<CachedMessageImage>>()
@@ -412,7 +414,7 @@ export function createL2WorkbenchChatInputRuntime(
         replaceState(source, (state) => ({ ...state, loading: true, error: null }))
         try {
           const recovered = await repository.recoverOutbox(source)
-          if (disposed || !sourcesByKey.has(key)) return
+          if (disposed || !sourcesByKey.has(key) || statesBySource.get(key)?.loaded) return
           const images = hydrateImages(recovered.input.images, workbenchText('draftImage'))
           statesBySource.set(key, {
             ...ensureState(source),
@@ -449,6 +451,12 @@ export function createL2WorkbenchChatInputRuntime(
       enqueueDraftWrite(source, storedInput(next))
     },
 
+    preserveDraftOnBranch(source): () => void {
+      const key = sourceKey(source)
+      preservedDraftSources.add(key)
+      return () => preservedDraftSources.delete(key)
+    },
+
     async addFiles(source, files): Promise<void> {
       const current = ensureState(source)
       const available = MAX_IMAGE_COUNT - current.images.length
@@ -813,6 +821,34 @@ export function createL2WorkbenchChatInputRuntime(
       )
       for (const [key, source] of [...sourcesByKey]) {
         if (valid.has(key)) continue
+        const state = statesBySource.get(key)
+        const target = preservedDraftSources.has(key)
+          ? workSessions.find(
+              (item) => item.workId === source.workId && item.sessionId === source.sessionId
+            )
+          : undefined
+        if (state && target) {
+          const nextSource = {
+            workId: target.workId,
+            sessionId: target.sessionId,
+            branchId: target.branchId
+          }
+          const images = hydrateImages(storedImages(state.images), workbenchText('draftImage'))
+          const next = ensureState(nextSource)
+          releaseAttachments(next.images)
+          statesBySource.set(sourceKey(nextSource), {
+            ...next,
+            loaded: true,
+            loading: false,
+            text: state.text,
+            images
+          })
+          enqueueDraftWrite(nextSource, { text: state.text, images: storedImages(images) })
+          for (const image of images) {
+            if (!image.optimized) enqueueOptimization(nextSource, image.localId)
+          }
+        }
+        preservedDraftSources.delete(key)
         const persistenceTail = persistenceTails.get(key) ?? Promise.resolve()
         releaseSourceMemory(source)
         void persistenceTail
@@ -839,6 +875,7 @@ export function createL2WorkbenchChatInputRuntime(
       for (const image of messageImages.values()) URL.revokeObjectURL(image.url)
       messageImages.clear()
       imageLoads.clear()
+      preservedDraftSources.clear()
       persistenceFailures.clear()
       listeners.clear()
     }

package/src/client/l2_biz/workbench/l2-workbench-chat-view.tsx

@@ -31,6 +31,8 @@ interface L2WorkbenchChatViewProps {
   chatRuntime: L2WorkbenchChatRuntime
   inputRuntime: L2WorkbenchChatInputRuntime
   onPreviewFile: (source: L2ChatSource, path: string) => void
+  onResend: (source: L2ChatSource, entryId: string) => void
+  resendDisabled: boolean
 }
 
 function L2WorkbenchChatViewComponent({
@@ -39,7 +41,9 @@ function L2WorkbenchChatViewComponent({
   workSession,
   chatRuntime,
   inputRuntime,
-  onPreviewFile
+  onPreviewFile,
+  onResend,
+  resendDisabled
 }: L2WorkbenchChatViewProps): React.JSX.Element {
   const { t } = useTranslation('workbench')
   const source = useMemo(
@@ -104,6 +108,10 @@ function L2WorkbenchChatViewComponent({
     (path: string): void => onPreviewFile(source, path),
     [onPreviewFile, source]
   )
+  const resend = useCallback(
+    (entryId: string): void => onResend(source, entryId),
+    [onResend, source]
+  )
   const saveViewportSnapshot = useCallback(
     (snapshot: L2WorkbenchChatViewportSnapshot): void => {
       chatRuntime.saveViewportSnapshot(source, snapshot)
@@ -156,6 +164,8 @@ function L2WorkbenchChatViewComponent({
                         onLoadDetail={loadDetail}
                         onAcquireImage={acquireImage}
                         onPreviewFile={previewFile}
+                        onResend={resend}
+                        resendDisabled={resendDisabled || state.syncStatus !== 'ready'}
                       />
                     )
                   })}