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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetcrab/pi-desk",
-  "version": "1.1.28-dev",
+  "version": "1.1.29-dev",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

package/src/app/api/work-sessions/search/route.ts

@@ -0,0 +1 @@
+export { POST } from '@server/l1_entry/api/l1-work-session-search-route'

package/src/app/project-preview/page.tsx

@@ -2,7 +2,6 @@ import { Suspense } from 'react'
 import type { Metadata } from 'next'
 import { L1ProjectPreviewPage } from '@client/l1_entry/pages/l1-project-preview-page'
 import { buildL2ProjectPreviewTitle } from '@common/l2_biz/project-preview/l2-project-preview-navigation'
-import { getL4HostSettingsStore } from '@server/l4_foundation/l4-host-settings-store'
 
 export async function generateMetadata({
   searchParams
@@ -10,8 +9,7 @@ export async function generateMetadata({
   searchParams: Promise<{ cwd?: string | string[] }>
 }): Promise<Metadata> {
   const { cwd } = await searchParams
-  const { region } = getL4HostSettingsStore().getSnapshot()
-  return { title: buildL2ProjectPreviewTitle(Array.isArray(cwd) ? cwd[0] : cwd, region.locale) }
+  return { title: buildL2ProjectPreviewTitle(Array.isArray(cwd) ? cwd[0] : cwd) }
 }
 
 export default function ProjectPreview(): React.JSX.Element {

package/src/client/l2_biz/project-preview/hooks/l2-use-project-preview.ts

@@ -45,7 +45,6 @@ interface PreviewState extends Pick<L2ProjectPreviewOwner, 'files' | 'git' | 'hi
 export function useL2ProjectPreview(
   clientId: string,
   cwd: string,
-  refreshOnFocus: boolean,
   onUnauthorized?: () => void
 ): PreviewState {
   const toast = useL4AppToast()
@@ -63,7 +62,7 @@ export function useL2ProjectPreview(
       (text) => toast.show({ level: 'info', title: text }),
       saved,
       initialGlobal,
-      { lazyHistory: !refreshOnFocus, onUnauthorized }
+      { lazyHistory: true, onUnauthorized }
     )
   )
   const { files, git, history } = owner
@@ -155,18 +154,6 @@ export function useL2ProjectPreview(
     }
   }, [cwd, files, git, owner])
 
-  useEffect(() => {
-    if (!refreshOnFocus) return
-    let lastFocus = Date.now()
-    const focus = (): void => {
-      if (Date.now() - lastFocus < 5000) return
-      lastFocus = Date.now()
-      void git.refreshSnapshot(cwd)
-    }
-    window.addEventListener('focus', focus)
-    return () => window.removeEventListener('focus', focus)
-  }, [cwd, git, refreshOnFocus])
-
   useEffect(() => {
     if (!container) return
     const measure = (): void =>

package/src/client/l2_biz/project-preview/l2-project-preview-dialog.tsx

@@ -51,7 +51,6 @@ export function L2ProjectPreviewDialog({
         <L2ProjectPreview
           clientId={clientId}
           cwd={cwd}
-          refreshOnFocus
           onEscape={onClose}
           title={
             <L4AppDialogTitle className="truncate text-sm" title={cwd}>

package/src/client/l2_biz/project-preview/l2-project-preview-page.tsx

@@ -42,7 +42,6 @@ export function L2ProjectPreviewPage({
           key={cwd}
           clientId={clientId}
           cwd={cwd}
-          refreshOnFocus={false}
           onUnauthorized={onUnauthorized}
           actions={
             <Button size="sm" variant="ghost" onClick={() => onSelect(null)}>

package/src/client/l2_biz/project-preview/l2-project-preview.tsx

@@ -33,7 +33,6 @@ const ignoreEscape = (): void => {}
 export function L2ProjectPreview({
   clientId,
   cwd,
-  refreshOnFocus,
   title,
   actions,
   onEscape = ignoreEscape,
@@ -41,7 +40,6 @@ export function L2ProjectPreview({
 }: {
   clientId: string
   cwd: string
-  refreshOnFocus: boolean
   title?: ReactNode
   actions?: ReactNode
   onEscape?: () => void
@@ -66,7 +64,7 @@ export function L2ProjectPreview({
     changeRowHeight,
     openGit,
     refresh
-  } = useL2ProjectPreview(clientId, cwd, refreshOnFocus, onUnauthorized)
+  } = useL2ProjectPreview(clientId, cwd, onUnauthorized)
   const { directoryOpen, gitOpen, gitMaximized } = global
   const projectName = cwd.replaceAll('\\', '/').split('/').filter(Boolean).at(-1) ?? cwd
   const gitState = git.getWorkspace(cwd)!
@@ -88,7 +86,6 @@ export function L2ProjectPreview({
       runtime={files}
       gitRuntime={git}
       compact={width < 1100}
-      refreshOnFocus={refreshOnFocus}
       onEscape={onEscape}
       renderHeader={(actions) => (
         <L3ProjectFileTabs

package/src/client/l2_biz/project-preview/views/l2-project-branch-select.tsx

@@ -2,7 +2,16 @@
 
 import { useId, useMemo, useRef, useState, type KeyboardEvent } from 'react'
 import { useTranslation } from 'react-i18next'
-import { CheckIcon, ChevronDownIcon, ChevronRightIcon, ChevronsUpDownIcon } from 'lucide-react'
+import {
+  CheckIcon,
+  ChevronDownIcon,
+  ChevronRightIcon,
+  ChevronsUpDownIcon,
+  FolderIcon,
+  FolderOpenIcon,
+  GitBranchIcon,
+  GitCommitHorizontalIcon
+} from 'lucide-react'
 import type { L4GitReadBranches } from '@common/l4_foundation/git/l4-git-history-contract'
 import {
   buildL3GitBranchTree,
@@ -239,8 +248,26 @@ export function L2ProjectBranchSelect({
               className
             )}
           >
-            <span className={cn('min-w-0 truncate', !value && 'text-muted-foreground')}>
-              {selectedLabel || placeholder || common('selectPlaceholder')}
+            <span
+              className={cn(
+                'flex min-w-0 flex-1 items-center gap-2',
+                !value && 'text-muted-foreground'
+              )}
+            >
+              {value === 'HEAD' ? (
+                <GitCommitHorizontalIcon
+                  aria-hidden="true"
+                  className="size-4 shrink-0 text-muted-foreground"
+                />
+              ) : (
+                <GitBranchIcon
+                  aria-hidden="true"
+                  className="size-4 shrink-0 text-muted-foreground"
+                />
+              )}
+              <span className="min-w-0 truncate">
+                {selectedLabel || placeholder || common('selectPlaceholder')}
+              </span>
             </span>
             <ChevronsUpDownIcon className="text-muted-foreground" />
           </Button>
@@ -282,6 +309,15 @@ export function L2ProjectBranchSelect({
           {rows.map((row) => {
             const selected = !row.expandable && row.key === value
             const expandedRow = row.expandable ? expanded.has(row.key) : undefined
+            const RowIcon = row.expandable
+              ? row.level === 1
+                ? null
+                : expandedRow
+                  ? FolderOpenIcon
+                  : FolderIcon
+              : row.key === 'HEAD'
+                ? GitCommitHorizontalIcon
+                : GitBranchIcon
             return (
               <button
                 key={row.key}
@@ -325,6 +361,9 @@ export function L2ProjectBranchSelect({
                 ) : (
                   <span aria-hidden="true" className="size-3.5 shrink-0" />
                 )}
+                {RowIcon ? (
+                  <RowIcon aria-hidden="true" className="size-4 shrink-0 text-muted-foreground" />
+                ) : null}
                 <span className="min-w-0 flex-1 break-all">{row.label}</span>
                 {selected ? <CheckIcon aria-hidden="true" className="size-3.5 shrink-0" /> : null}
               </button>

package/src/client/l2_biz/workbench/git-workspace/l2-git-workspace-runtime.ts

@@ -147,11 +147,11 @@ export class L2GitWorkspaceRuntime {
     if (workspace.snapshot.status === 'ready' || workspace.snapshot.status === 'loading') {
       return Promise.resolve()
     }
-    return this.loadSnapshot(cwd, false)
+    return this.loadSnapshot(cwd)
   }
 
   refreshSnapshot(cwd: string): Promise<void> {
-    return this.loadSnapshot(cwd, true)
+    return this.loadSnapshot(cwd)
   }
 
   async refreshHeads(cwd: string): Promise<void> {
@@ -332,9 +332,9 @@ export class L2GitWorkspaceRuntime {
     this.listeners.clear()
   }
 
-  private async loadSnapshot(cwd: string, force: boolean): Promise<void> {
+  private async loadSnapshot(cwd: string): Promise<void> {
     const workspace = this.workspaceFor(cwd)
-    if (workspace.snapshotRequest && !force) return
+    if (workspace.snapshotRequest) return
     const project = this.projectRefs.get(cwd)
     if (!project) {
       workspace.snapshot = {
@@ -346,16 +346,17 @@ export class L2GitWorkspaceRuntime {
       return
     }
 
-    workspace.snapshotRequest?.controller.abort()
     const controller = new AbortController()
     const token = {}
     workspace.snapshotRequest = { controller, token }
-    workspace.snapshot = {
-      status: 'loading',
-      repositories: workspace.snapshot.repositories,
-      error: null
+    if (workspace.snapshot.status !== 'ready') {
+      workspace.snapshot = {
+        status: 'loading',
+        repositories: workspace.snapshot.repositories,
+        error: null
+      }
+      this.publish()
     }
-    this.publish()
 
     try {
       const result = await this.biz.get({ workId: project.workId, cwd }, controller.signal)

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

@@ -0,0 +1,52 @@
+'use client'
+
+import { useCallback, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import type { L2WorkSessionListItem } from '@common/l2_biz/work-session/l2-work-session-contract'
+import type { L2WorkSessionSearchResponse } from '@common/l2_biz/work-session/l2-work-session-search-contract'
+import type {
+  L3PiSessionSearchQuery,
+  L3PiSessionSearchScope
+} from '@common/l3_modules/pi/l3-pi-session-search-contract'
+import type { L2WorkbenchBiz } from '../l2-workbench-biz'
+import {
+  L2_WORKBENCH_DEFAULT_SEARCH_IN,
+  useL2WorkbenchSessionSearch,
+  type L2WorkbenchSessionSearchResult
+} from './l2-workbench-session-search'
+
+export interface L2WorkSessionSearch extends L2WorkbenchSessionSearchResult<L2WorkSessionSearchResponse> {
+  query: string
+  searchIn: readonly L3PiSessionSearchScope[]
+  setQuery: (query: string) => void
+  setSearchIn: (searchIn: readonly L3PiSessionSearchScope[]) => void
+}
+
+export function useL2WorkSessionSearch({
+  active,
+  workSessions,
+  searchWorkSessions
+}: {
+  active: boolean
+  workSessions: readonly L2WorkSessionListItem[]
+  searchWorkSessions: L2WorkbenchBiz['searchWorkSessions']
+}): L2WorkSessionSearch {
+  const { t } = useTranslation('workbench')
+  const [query, setQuery] = useState('')
+  const [searchIn, setSearchIn] = useState<readonly L3PiSessionSearchScope[]>(
+    L2_WORKBENCH_DEFAULT_SEARCH_IN
+  )
+  const request = useCallback(
+    (input: L3PiSessionSearchQuery, signal: AbortSignal) => searchWorkSessions(input, signal),
+    [searchWorkSessions]
+  )
+  const search = useL2WorkbenchSessionSearch({
+    active: active && query.trim().length > 0,
+    scope: workSessions,
+    query,
+    searchIn,
+    request,
+    failureMessage: t('sessionSearchFailed')
+  })
+  return { ...search, query, searchIn, setQuery, setSearchIn }
+}

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