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

package/src/client/l2_biz/workbench/hooks/l2-workbench-branch-picker.ts

@@ -23,7 +23,10 @@ interface L2WorkbenchBranchPickerSource {
 }
 
 export type L2WorkbenchBranchIntent =
-  { action: 'tree'; entryId: string } | { action: 'fork'; entryId: string } | { action: 'clone' }
+  | { action: 'tree'; entryId: string }
+  | { action: 'fork'; entryId: string }
+  | { action: 'resend'; entryId: string }
+  | { action: 'clone' }
 
 interface L2WorkbenchRunningConfirmation {
   intent: L2WorkbenchBranchIntent
@@ -57,6 +60,7 @@ interface UseL2WorkbenchBranchPickerResult {
   selectEntry: (entryId: string) => void
   requestAction: (entryId: string, action: 'tree' | 'fork') => void
   clone: (workId: string) => void
+  resend: (source: L2WorkbenchBranchPickerSource, entryId: string) => void
   confirmRunning: () => void
   cancelRunning: () => void
   pendingWorkId: string | null
@@ -92,6 +96,8 @@ function branchRequest(
       return { ...binding, action: 'tree', entryId: intent.entryId }
     case 'fork':
       return { ...binding, action: 'fork', entryId: intent.entryId }
+    case 'resend':
+      return { ...binding, action: 'resend', entryId: intent.entryId }
     case 'clone':
       return { ...binding, action: 'clone' }
   }
@@ -123,6 +129,7 @@ export function useL2WorkbenchBranchPicker({
   const detailAbortControllerRef = useRef<AbortController | null>(null)
   const detailCacheRef = useRef(new Map<string, L2WorkSessionTreeEntryGetResponse>())
   const operationStartRef = useRef<string | null>(null)
+  const executingRef = useRef(false)
 
   const resetPicker = useCallback((): void => {
     treeRequestIdRef.current += 1
@@ -270,12 +277,18 @@ export function useL2WorkbenchBranchPicker({
       operationSource: L2WorkbenchBranchPickerSource,
       intent: L2WorkbenchBranchIntent
     ): Promise<void> => {
-      if (disabled) return
+      if (disabled || executingRef.current) return
+      executingRef.current = true
+      let releaseDraft: (() => void) | undefined
       const preservedTreeText =
         intent.action === 'tree' ? chatInputRuntime.getState(operationSource).text : null
       setOperation({ source: operationSource, intent, phase: 'executing' })
       setError(null)
       try {
+        if (intent.action === 'resend') {
+          await chatInputRuntime.loadSource(operationSource)
+          releaseDraft = chatInputRuntime.preserveDraftOnBranch(operationSource)
+        }
         const response = await workbenchBiz.branchWorkSession(
           branchRequest(operationSource, intent)
         )
@@ -290,7 +303,9 @@ export function useL2WorkbenchBranchPicker({
         if (!target) throw new Error(l2WorkbenchText('branchTargetMissing'))
 
         const targetSource = sourceFor(target)
-        if (intent.action === 'tree') {
+        if (intent.action === 'resend') {
+          focusWorkSession(target.workId)
+        } else if (intent.action === 'tree') {
           focusWorkSession(target.workId)
           await chatInputRuntime.loadSource(targetSource)
           chatInputRuntime.setText(
@@ -312,6 +327,9 @@ export function useL2WorkbenchBranchPicker({
         operationStartRef.current = null
         setConfirmation((current) => (current ? { ...current, waiting: false } : null))
         reportOperationError(errorMessage(cause, l2WorkbenchText('branchOperationFailed')))
+      } finally {
+        releaseDraft?.()
+        executingRef.current = false
       }
     },
     [
@@ -347,7 +365,7 @@ export function useL2WorkbenchBranchPicker({
 
   const requestIntent = useCallback(
     (operationSource: L2WorkbenchBranchPickerSource, intent: L2WorkbenchBranchIntent): void => {
-      if (disabled || operation) return
+      if (disabled || operation || confirmation || executingRef.current) return
       operationStartRef.current = null
       const current = workSessions.find(
         (workSession) => workSession.workId === operationSource.workId
@@ -374,7 +392,16 @@ export function useL2WorkbenchBranchPicker({
       setSource(operationSource)
       setError(null)
     },
-    [disabled, execute, mobile, operation, reportOperationError, startAfterRunning, workSessions]
+    [
+      confirmation,
+      disabled,
+      execute,
+      mobile,
+      operation,
+      reportOperationError,
+      startAfterRunning,
+      workSessions
+    ]
   )
 
   const requestAction = useCallback(
@@ -385,6 +412,13 @@ export function useL2WorkbenchBranchPicker({
     [requestIntent, source]
   )
 
+  const resend = useCallback(
+    (messageSource: L2WorkbenchBranchPickerSource, entryId: string): void => {
+      requestIntent(messageSource, { action: 'resend', entryId })
+    },
+    [requestIntent]
+  )
+
   const clone = useCallback(
     (workId: string): void => {
       const current = workSessions.find((workSession) => workSession.workId === workId)
@@ -422,9 +456,9 @@ export function useL2WorkbenchBranchPicker({
 
   const cancelRunning = useCallback((): void => {
     if (confirmation?.waiting || operation) return
-    const cloneOnly = confirmation?.intent.action === 'clone' && tree === null
+    const confirmationOnly = tree === null
     setConfirmation(null)
-    if (cloneOnly) resetPicker()
+    if (confirmationOnly) resetPicker()
   }, [confirmation, operation, resetPicker, tree])
 
   useEffect(() => {
@@ -531,6 +565,7 @@ export function useL2WorkbenchBranchPicker({
     selectEntry,
     requestAction,
     clone,
+    resend,
     confirmRunning,
     cancelRunning,
     pendingWorkId: operation?.source.workId ?? null

package/src/client/l2_biz/workbench/hooks/l2-workbench-session-history.ts

@@ -1,153 +1,165 @@
 'use client'
 
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import type {
   L2PiSessionHistoryResponse,
-  L2PiSessionHistorySearchScope
+  L2PiSessionUserMessageListResponse
 } from '@common/l2_biz/pi-session/l2-pi-session-contract'
+import type {
+  L3PiSessionSearchQuery,
+  L3PiSessionSearchScope
+} from '@common/l3_modules/pi/l3-pi-session-search-contract'
 import type { L2WorkbenchBiz } from '../l2-workbench-biz'
+import { useL2WorkbenchSessionSearch } from './l2-workbench-session-search'
 
-const DEFAULT_SEARCH_IN: readonly L2PiSessionHistorySearchScope[] = ['title', 'user']
-const CACHE_CWD_LIMIT = 8
-
-type HistorySessions = L2PiSessionHistoryResponse['sessions']
-
-interface HistorySessionCache {
-  base: HistorySessions | null
-  recent: {
-    query: string
-    searchIn: readonly L2PiSessionHistorySearchScope[]
-    sessions: HistorySessions
-  } | null
+interface L2ExpandedHistoryMessages {
+  sessionId: string
+  query: string
+  messages: L2PiSessionUserMessageListResponse['messages']
+  page: L2PiSessionUserMessageListResponse['page'] | null
+  loading: boolean
+  error: string | null
 }
 
-interface SessionHistoryResult {
-  sessions: HistorySessions
+interface L2WorkbenchSessionHistoryResult {
+  sessions: L2PiSessionHistoryResponse['sessions']
   loading: boolean
-  load: (
-    cwd: string,
-    query?: string,
-    searchIn?: readonly L2PiSessionHistorySearchScope[],
-    forceRefresh?: boolean
+  error: string | null
+  refresh: () => void
+  expandedHistory: L2ExpandedHistoryMessages | null
+  toggleUserMessages: (session: L2PiSessionHistoryResponse['sessions'][number]) => void
+  loadUserMessages: (
+    sessionId: string,
+    query: string,
+    pageIndex: number,
+    append: boolean
   ) => Promise<void>
-  cancel: () => void
-  showCached: (cwd: string) => void
 }
 
-function isDefaultSearchIn(searchIn: readonly L2PiSessionHistorySearchScope[]): boolean {
-  return (
-    searchIn.length === DEFAULT_SEARCH_IN.length &&
-    DEFAULT_SEARCH_IN.every((scope) => searchIn.includes(scope))
+export function useL2WorkbenchSessionHistory({
+  active,
+  cwd,
+  query,
+  searchIn,
+  listSessionHistory,
+  listSessionUserMessages
+}: {
+  active: boolean
+  cwd: string | null
+  query: string
+  searchIn: readonly L3PiSessionSearchScope[]
+  listSessionHistory: L2WorkbenchBiz['listSessionHistory']
+  listSessionUserMessages: L2WorkbenchBiz['listSessionUserMessages']
+}): L2WorkbenchSessionHistoryResult {
+  const { t } = useTranslation('workbenchPicker')
+  const request = useCallback(
+    (input: L3PiSessionSearchQuery, signal: AbortSignal, forceRefresh: boolean) =>
+      listSessionHistory({ ...input, cwd: cwd!, forceRefresh }, signal),
+    [cwd, listSessionHistory]
   )
-}
-
-export function useL2WorkbenchSessionHistory(
-  workbenchBiz: L2WorkbenchBiz,
-  setError: (error: string | null) => void
-): SessionHistoryResult {
-  const { t } = useTranslation('workbench')
-  const [sessions, setSessions] = useState<HistorySessions>([])
-  const [loading, setLoading] = useState(false)
-  const requestIdRef = useRef(0)
-  const abortControllerRef = useRef<AbortController | null>(null)
-  const cacheRef = useRef(new Map<string, HistorySessionCache>())
-
-  useEffect(
-    () => () => {
-      requestIdRef.current += 1
-      abortControllerRef.current?.abort()
-      abortControllerRef.current = null
-    },
-    []
+  const search = useL2WorkbenchSessionSearch({
+    active: active && cwd !== null,
+    scope: cwd,
+    query,
+    searchIn,
+    request,
+    failureMessage: t('loadHistoryFailed')
+  })
+  const [expandedHistory, setExpandedHistory] = useState<L2ExpandedHistoryMessages | null>(null)
+  const messageContext = useMemo(
+    () => ({ active, cwd, query, searchIn }),
+    [active, cwd, query, searchIn]
   )
-
-  const cancel = useCallback((): void => {
-    requestIdRef.current += 1
-    abortControllerRef.current?.abort()
-    abortControllerRef.current = null
-    setLoading(false)
-  }, [])
-
-  const showCached = useCallback((cwd: string): void => {
-    setSessions(cacheRef.current.get(cwd)?.base ?? [])
+  const [previousMessageContext, setPreviousMessageContext] = useState(messageContext)
+  if (previousMessageContext !== messageContext) {
+    setPreviousMessageContext(messageContext)
+    setExpandedHistory(null)
+  }
+  const messageControllerRef = useRef<AbortController | null>(null)
+  const clearUserMessages = useCallback((): void => {
+    messageControllerRef.current?.abort()
+    messageControllerRef.current = null
+    setExpandedHistory(null)
   }, [])
 
-  const load = useCallback(
-    async (
-      cwd: string,
-      query = '',
-      searchIn: readonly L2PiSessionHistorySearchScope[] = DEFAULT_SEARCH_IN,
-      forceRefresh = false
-    ): Promise<void> => {
-      const requestId = ++requestIdRef.current
-      abortControllerRef.current?.abort()
-      abortControllerRef.current = null
-      const normalizedQuery = query.trim()
-      const cached = cacheRef.current.get(cwd)
-      const cachedSessions =
-        isDefaultSearchIn(searchIn) && !normalizedQuery
-          ? cached?.base
-          : cached?.recent?.query === normalizedQuery &&
-              cached.recent.searchIn.length === searchIn.length &&
-              cached.recent.searchIn.every((scope) => searchIn.includes(scope))
-            ? cached.recent.sessions
-            : null
-      if (cachedSessions && !forceRefresh) {
-        setSessions(cachedSessions)
-        setLoading(false)
-        setError(null)
-        return
-      }
-      if (cachedSessions) setSessions(cachedSessions)
-
-      const controller = new AbortController()
-      abortControllerRef.current = controller
-      setLoading(true)
-      setError(null)
-      try {
-        const response = await workbenchBiz.listSessionHistory(
-          { cwd, query: normalizedQuery, forceRefresh, searchIn: [...searchIn] },
-          controller.signal
-        )
-        if (requestIdRef.current !== requestId) return
-        const current = cacheRef.current.get(cwd) ?? { base: null, recent: null }
-        if (isDefaultSearchIn(searchIn) && !normalizedQuery) {
-          current.base = response.sessions
-        } else {
-          current.recent = {
-            query: normalizedQuery,
-            searchIn: [...searchIn],
-            sessions: response.sessions
-          }
-        }
-        cacheRef.current.delete(cwd)
-        cacheRef.current.set(cwd, current)
-        while (cacheRef.current.size > CACHE_CWD_LIMIT) {
-          const oldestCwd = cacheRef.current.keys().next().value
-          if (!oldestCwd) break
-          cacheRef.current.delete(oldestCwd)
-        }
-        setSessions(response.sessions)
-      } catch (cause) {
-        if (
-          requestIdRef.current !== requestId ||
-          (cause instanceof Error && cause.name === 'AbortError')
-        ) {
-          return
-        }
-        setError(cause instanceof Error ? cause.message : t('historyFailed'))
-      } finally {
-        if (requestIdRef.current === requestId) {
-          if (abortControllerRef.current === controller) {
-            abortControllerRef.current = null
-          }
-          setLoading(false)
-        }
-      }
+  useLayoutEffect(
+    () => () => {
+      messageControllerRef.current?.abort()
+      messageControllerRef.current = null
     },
-    [setError, workbenchBiz, t]
+    [active, cwd, query, searchIn]
   )
 
-  return { sessions, loading, load, cancel, showCached }
+  const loadUserMessages = async (
+    sessionId: string,
+    messageQuery: string,
+    pageIndex: number,
+    append: boolean
+  ): Promise<void> => {
+    if (!active || !cwd) return
+    messageControllerRef.current?.abort()
+    const controller = new AbortController()
+    messageControllerRef.current = controller
+    setExpandedHistory((current) => ({
+      sessionId,
+      query: messageQuery,
+      messages: append && current?.sessionId === sessionId ? current.messages : [],
+      page: append && current?.sessionId === sessionId ? current.page : null,
+      loading: true,
+      error: null
+    }))
+    try {
+      const response = await listSessionUserMessages(
+        { cwd, sessionId, query: messageQuery, page: { index: pageIndex, size: 20 } },
+        controller.signal
+      )
+      if (controller.signal.aborted) return
+      setExpandedHistory((current) => ({
+        sessionId,
+        query: messageQuery,
+        messages:
+          append && current?.sessionId === sessionId
+            ? [...current.messages, ...response.messages]
+            : response.messages,
+        page: response.page,
+        loading: false,
+        error: null
+      }))
+    } catch (cause) {
+      if (controller.signal.aborted) return
+      setExpandedHistory((current) => ({
+        sessionId,
+        query: messageQuery,
+        messages: current?.sessionId === sessionId ? current.messages : [],
+        page: current?.sessionId === sessionId ? current.page : null,
+        loading: false,
+        error: cause instanceof Error ? cause.message : t('loadUserFailed')
+      }))
+    } finally {
+      if (messageControllerRef.current === controller) messageControllerRef.current = null
+    }
+  }
+
+  const toggleUserMessages = (session: L2PiSessionHistoryResponse['sessions'][number]): void => {
+    if (expandedHistory?.sessionId === session.sessionId) {
+      clearUserMessages()
+      return
+    }
+    const messageQuery = session.matches?.some((match) => match.scope === 'user') ? query : ''
+    void loadUserMessages(session.sessionId, messageQuery, 1, false)
+  }
+  const refresh = (): void => {
+    clearUserMessages()
+    search.refresh()
+  }
+  return {
+    sessions: search.data?.sessions ?? [],
+    loading: search.loading,
+    error: search.error,
+    refresh,
+    expandedHistory: active ? expandedHistory : null,
+    toggleUserMessages,
+    loadUserMessages
+  }
 }

package/src/client/l2_biz/workbench/hooks/l2-workbench-session-search.ts

@@ -0,0 +1,97 @@
+'use client'
+
+import { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react'
+import type {
+  L3PiSessionSearchQuery,
+  L3PiSessionSearchScope
+} from '@common/l3_modules/pi/l3-pi-session-search-contract'
+
+export const L2_WORKBENCH_DEFAULT_SEARCH_IN: readonly L3PiSessionSearchScope[] = ['title', 'user']
+
+export interface L2WorkbenchSessionSearchResult<T> {
+  data: T | null
+  loading: boolean
+  error: string | null
+  refresh: () => void
+}
+
+export function useL2WorkbenchSessionSearch<T>({
+  active,
+  scope,
+  query,
+  searchIn,
+  request,
+  failureMessage
+}: {
+  active: boolean
+  scope: unknown
+  query: string
+  searchIn: readonly L3PiSessionSearchScope[]
+  request: (input: L3PiSessionSearchQuery, signal: AbortSignal, forceRefresh: boolean) => Promise<T>
+  failureMessage: string
+}): L2WorkbenchSessionSearchResult<T> {
+  const [attempt, setAttempt] = useState(0)
+  const forceRefreshRef = useRef(false)
+  const normalizedQuery = query.trim()
+  const key = useMemo(
+    () => ({ active, scope, query: normalizedQuery, searchIn, request, attempt, failureMessage }),
+    [active, scope, normalizedQuery, searchIn, request, attempt, failureMessage]
+  )
+  const [state, setState] = useState<{
+    key: typeof key
+    data: T | null
+    loading: boolean
+    error: string | null
+  } | null>(null)
+  if (state?.key !== key) {
+    setState({ key, data: null, loading: key.active, error: null })
+  }
+
+  useLayoutEffect(() => {
+    const forceRefresh = forceRefreshRef.current
+    forceRefreshRef.current = false
+    if (!key.active) return
+
+    const controller = new AbortController()
+    const timer = window.setTimeout(
+      () => {
+        void request(
+          { query: key.query, searchIn: [...key.searchIn] },
+          controller.signal,
+          forceRefresh
+        ).then(
+          (data) => {
+            if (!controller.signal.aborted) setState({ key, data, loading: false, error: null })
+          },
+          (cause: unknown) => {
+            if (controller.signal.aborted) return
+            setState({
+              key,
+              data: null,
+              loading: false,
+              error: cause instanceof Error ? cause.message : key.failureMessage
+            })
+          }
+        )
+      },
+      key.query && !forceRefresh ? 300 : 0
+    )
+
+    return () => {
+      window.clearTimeout(timer)
+      controller.abort()
+    }
+  }, [key, request])
+
+  const refresh = useCallback((): void => {
+    forceRefreshRef.current = true
+    setAttempt((current) => current + 1)
+  }, [])
+  const current = state?.key === key ? state : null
+  return {
+    data: current?.data ?? null,
+    loading: active && (current?.loading ?? true),
+    error: current?.error ?? null,
+    refresh
+  }
+}

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

@@ -77,6 +77,7 @@ interface L2WorkSessionColumnsProps
   setChatCapabilityMode: L2WorkbenchBiz['setChatCapabilityMode']
   branchPicker: L2WorkbenchBranchPickerModel | null
   branchPendingWorkId: string | null
+  onResendMessage: (source: L2ChatSource, entryId: string) => void
   fileRuntime: L2FileWorkspaceRuntime
   onOpenFileSidebar: (workId: string) => void
   onPreviewFile: (source: L2ChatSource, path: string) => void
@@ -148,6 +149,7 @@ interface WorkSessionColumnProps extends L2WorkbenchComposerSlots, L2WorkbenchPl
   setChatCapabilityMode: L2WorkbenchBiz['setChatCapabilityMode']
   branchPicker: L2WorkbenchBranchPickerModel | null
   branchPending: boolean
+  onResendMessage: (source: L2ChatSource, entryId: string) => void
   mobile: boolean
   fileRuntime: L2FileWorkspaceRuntime
   onOpenFileSidebar: (workId: string) => void
@@ -193,6 +195,7 @@ const WorkSessionColumn = memo(function WorkSessionColumn({
   setChatCapabilityMode,
   branchPicker,
   branchPending,
+  onResendMessage,
   mobile,
   fileRuntime,
   onOpenFileSidebar,
@@ -360,6 +363,8 @@ const WorkSessionColumn = memo(function WorkSessionColumn({
               chatRuntime={chatRuntime}
               inputRuntime={chatInputRuntime}
               onPreviewFile={onPreviewFile}
+              onResend={onResendMessage}
+              resendDisabled={replacementDisabled || branchPending || branchPicker !== null}
             />
             <footer className="bg-background pt-3" data-carousel-swipe-lock>
               <L2WorkbenchChatComposer
@@ -516,6 +521,7 @@ export function L2WorkSessionColumns({
   setChatCapabilityMode,
   branchPicker,
   branchPendingWorkId,
+  onResendMessage,
   fileRuntime,
   onOpenFileSidebar,
   onPreviewFile,
@@ -705,6 +711,7 @@ export function L2WorkSessionColumns({
               setChatCapabilityMode={setChatCapabilityMode}
               branchPicker={branchPicker?.workId === workSession.workId ? branchPicker : null}
               branchPending={branchPendingWorkId === workSession.workId}
+              onResendMessage={onResendMessage}
               mobile
               fileRuntime={fileRuntime}
               onOpenFileSidebar={onOpenFileSidebar}
@@ -805,6 +812,7 @@ export function L2WorkSessionColumns({
                   setChatCapabilityMode={setChatCapabilityMode}
                   branchPicker={branchPicker?.workId === workSession.workId ? branchPicker : null}
                   branchPending={branchPendingWorkId === workSession.workId}
+                  onResendMessage={onResendMessage}
                   mobile={mobile}
                   fileRuntime={fileRuntime}
                   onOpenFileSidebar={onOpenFileSidebar}