@vibe-forge/client 0.10.1 → 0.11.1

package/src/hooks/chat/use-chat-session-messages.ts

@@ -1,18 +1,27 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
+import type { SetStateAction } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useSWRConfig } from 'swr'
 
-import { getSessionMessages } from '#~/api.js'
-import { connectionManager } from '#~/connectionManager.js'
 import type { AskUserQuestionParams, ChatMessage, Session, WSEvent } from '@vibe-forge/core'
 import type { SessionInfo } from '@vibe-forge/types'
-import type { ChatErrorBannerState } from './interaction-state'
+
+import { getSessionMessages } from '#~/api.js'
+import { connectionManager } from '#~/connectionManager.js'
+
+import type { ChatErrorState, InteractionRequestState } from './interaction-state'
 import {
   applyInteractionStateEvent,
   findLatestFatalError,
   getFatalSessionError,
   restoreInteractionStateFromHistory
 } from './interaction-state'
+import {
+  deleteChatSessionViewSnapshot,
+  restoreChatSessionViewSnapshot,
+  setChatSessionViewSnapshot
+} from './session-view-cache'
+import type { ChatSessionViewSnapshot } from './session-view-cache'
 import type { ChatEffort } from './use-chat-effort'
 import type { PermissionMode } from './use-chat-permission-mode'
 
@@ -60,10 +69,10 @@ export function useChatSessionMessages({
 }) {
   const { t } = useTranslation()
   const { mutate } = useSWRConfig()
-  const [messages, setMessages] = useState<ChatMessage[]>([])
+  const [messagesState, setMessagesState] = useState<ChatMessage[]>([])
   const [sessionInfo, setSessionInfo] = useState<SessionInfo | null>(null)
   const [isReady, setIsReady] = useState(false)
-  const [errorBanner, setErrorBanner] = useState<ChatErrorBannerState | null>(null)
+  const [errorState, setErrorState] = useState<ChatErrorState | null>(null)
   const [retryCount, setRetryCount] = useState(0)
   const isInitialLoadRef = useRef<boolean>(true)
   const lastConnectedModelRef = useRef<string | undefined>(undefined)
@@ -72,13 +81,50 @@ export function useChatSessionMessages({
   const lastConnectedAdapterRef = useRef<string | undefined>(undefined)
   const lastObservedSessionStatusRef = useRef<Session['status'] | undefined>(session?.status)
   const expectedCloseRef = useRef(false)
-  const interactionRequestRef = useRef<{ id: string; payload: AskUserQuestionParams } | null>(null)
+  const interactionRequestRef = useRef<InteractionRequestState | null>(null)
   const activeSessionIdRef = useRef<string | undefined>(session?.id)
   const historyRequestSeqRef = useRef(0)
   const reconcileTimersRef = useRef<Array<ReturnType<typeof setTimeout>>>([])
+  const sessionViewCacheRef = useRef(new Map<string, ChatSessionViewSnapshot>())
 
   activeSessionIdRef.current = session?.id
 
+  const updateSessionViewCache = useCallback((
+    sessionId: string,
+    patch: Partial<{
+      messages: ChatMessage[]
+      sessionInfo: SessionInfo | null
+      errorState: ChatErrorState | null
+      interactionRequest: InteractionRequestState | null
+      isHydrated: boolean
+    }>
+  ) => {
+    return setChatSessionViewSnapshot(sessionViewCacheRef.current, sessionId, patch)
+  }, [])
+
+  const removeSessionViewCache = useCallback((sessionId: string) => {
+    deleteChatSessionViewSnapshot(sessionViewCacheRef.current, sessionId)
+  }, [])
+
+  const setMessages = useCallback((value: SetStateAction<ChatMessage[]>) => {
+    setMessagesState((current) => {
+      const next = typeof value === 'function'
+        ? value(current)
+        : value
+      const sessionId = activeSessionIdRef.current
+
+      if (sessionId != null && sessionId !== '') {
+        const currentSnapshot = sessionViewCacheRef.current.get(sessionId)
+        updateSessionViewCache(sessionId, {
+          messages: next,
+          isHydrated: currentSnapshot?.isHydrated === true
+        })
+      }
+
+      return next
+    })
+  }, [updateSessionViewCache])
+
   const clearScheduledReconciles = useCallback(() => {
     for (const timer of reconcileTimersRef.current) {
       clearTimeout(timer)
@@ -121,17 +167,17 @@ export function useChatSessionMessages({
         res.session?.status
       )
       const latestFatalError = findLatestFatalError(events)
+      const nextErrorState = restoredInteraction == null && res.session?.status === 'failed' && latestFatalError != null
+        ? {
+          kind: 'session' as const,
+          message: latestFatalError.message,
+          code: latestFatalError.code
+        }
+        : null
 
       interactionRequestRef.current = restoredInteraction
       setInteractionRequest(restoredInteraction)
-      setErrorBanner(
-        restoredInteraction == null && res.session?.status === 'failed' && latestFatalError != null
-          ? {
-            kind: 'session',
-            message: latestFatalError.message
-          }
-          : null
-      )
+      setErrorState(nextErrorState)
 
       for (const data of events) {
         currentMessages = applyMessageEvent(currentMessages, data)
@@ -143,6 +189,14 @@ export function useChatSessionMessages({
         }
       }
 
+      updateSessionViewCache(sessionId, {
+        messages: currentMessages,
+        sessionInfo: currentSessionInfo,
+        errorState: nextErrorState,
+        interactionRequest: restoredInteraction,
+        isHydrated: true
+      })
+
       setMessages(currentMessages)
       setSessionInfo(currentSessionInfo)
 
@@ -158,7 +212,7 @@ export function useChatSessionMessages({
     } catch (err) {
       console.error('Failed to fetch history messages:', err)
     }
-  }, [mutate, setInteractionRequest])
+  }, [mutate, setInteractionRequest, setMessages, updateSessionViewCache])
 
   const reconcileAfterInteraction = useCallback(() => {
     clearScheduledReconciles()
@@ -174,22 +228,21 @@ export function useChatSessionMessages({
   const retryConnection = useCallback(() => {
     if (session?.id == null || session.id === '') return
     expectedCloseRef.current = true
-    setErrorBanner(null)
+    setErrorState(null)
+    updateSessionViewCache(session.id, { errorState: null })
     connectionManager.close(session.id)
     setRetryCount((count) => count + 1)
-  }, [session?.id])
+  }, [session?.id, updateSessionViewCache])
 
   useEffect(() => {
-    setMessages([])
-    setSessionInfo(null)
-    setIsReady(false)
-    setErrorBanner(null)
-    setInteractionRequest(null)
-    interactionRequestRef.current = null
-    isInitialLoadRef.current = true
-
     if (session?.id == null || session.id === '') {
+      setMessagesState([])
+      setSessionInfo(null)
       setIsReady(true)
+      setErrorState(null)
+      setInteractionRequest(null)
+      interactionRequestRef.current = null
+      isInitialLoadRef.current = true
       lastConnectedModelRef.current = undefined
       lastConnectedEffortRef.current = undefined
       lastConnectedPermissionModeRef.current = undefined
@@ -198,6 +251,16 @@ export function useChatSessionMessages({
       return
     }
 
+    const restoredState = restoreChatSessionViewSnapshot(sessionViewCacheRef.current.get(session.id))
+
+    setMessagesState(restoredState.messages)
+    setSessionInfo(restoredState.sessionInfo)
+    setErrorState(restoredState.errorState)
+    setInteractionRequest(restoredState.interactionRequest)
+    interactionRequestRef.current = restoredState.interactionRequest
+    setIsReady(restoredState.isReady)
+    isInitialLoadRef.current = !restoredState.isReady
+
     void refreshHistory()
 
     return () => {
@@ -249,7 +312,7 @@ export function useChatSessionMessages({
       session?.status !== 'running'
     if (modelChanged || effortChanged || permissionModeChanged || adapterChanged) {
       expectedCloseRef.current = true
-      setErrorBanner(null)
+      setErrorState(null)
       connectionManager.send(session.id, { type: 'terminate_session' })
       connectionManager.close(session.id)
     }
@@ -278,7 +341,13 @@ export function useChatSessionMessages({
       cleanup = connectionManager.connect(session.id, {
         onOpen() {
           expectedCloseRef.current = false
-          setErrorBanner((current) => current?.kind === 'session' ? current : null)
+          setErrorState((current) => {
+            const next = current?.kind === 'session' ? current : null
+            updateSessionViewCache(session.id, {
+              errorState: next
+            })
+            return next
+          })
         },
         onMessage(data: WSEvent) {
           if (isDisposed) return
@@ -286,8 +355,14 @@ export function useChatSessionMessages({
           if (nextInteraction !== interactionRequestRef.current) {
             interactionRequestRef.current = nextInteraction
             setInteractionRequest(nextInteraction)
+            updateSessionViewCache(session.id, {
+              interactionRequest: nextInteraction
+            })
             if (nextInteraction != null) {
-              setErrorBanner(null)
+              setErrorState(null)
+              updateSessionViewCache(session.id, {
+                errorState: null
+              })
             }
           }
           if (data.type === 'interaction_response') {
@@ -297,9 +372,14 @@ export function useChatSessionMessages({
           if (data.type === 'error') {
             const fatalError = getFatalSessionError(data)
             if (fatalError != null) {
-              setErrorBanner({
+              const nextErrorState = {
                 kind: 'session',
-                message: fatalError.message
+                message: fatalError.message,
+                code: fatalError.code
+              } satisfies ChatErrorState
+              setErrorState(nextErrorState)
+              updateSessionViewCache(session.id, {
+                errorState: nextErrorState
               })
             }
             return
@@ -311,6 +391,7 @@ export function useChatSessionMessages({
               const updatedSession = data.session as Session | { id: string; isDeleted: boolean }
 
               if ('isDeleted' in updatedSession && updatedSession.isDeleted) {
+                removeSessionViewCache(updatedSession.id)
                 return {
                   ...prev,
                   sessions: prev.sessions.filter((s: Session) => s.id !== updatedSession.id)
@@ -343,6 +424,9 @@ export function useChatSessionMessages({
               void mutate('/api/sessions')
             } else {
               setSessionInfo(data.info ?? null)
+              updateSessionViewCache(session.id, {
+                sessionInfo: data.info ?? null
+              })
               if (isInitialLoadRef.current) {
                 setTimeout(() => {
                   if (isDisposed) return
@@ -362,14 +446,23 @@ export function useChatSessionMessages({
           }
 
           if (data.type === 'interaction_request') {
+            interactionRequestRef.current = data
             setInteractionRequest(data)
+            updateSessionViewCache(session.id, {
+              interactionRequest: data
+            })
           }
         },
         onError() {
           if (isDisposed) return
-          setErrorBanner({
+          const nextErrorState = {
             kind: 'connection',
-            message: t('chat.connectionError')
+            message: t('chat.connectionError'),
+            reason: 'error'
+          } satisfies ChatErrorState
+          setErrorState(nextErrorState)
+          updateSessionViewCache(session.id, {
+            errorState: nextErrorState
           })
         },
         onClose() {
@@ -378,12 +471,17 @@ export function useChatSessionMessages({
             expectedCloseRef.current = false
             return
           }
-          setErrorBanner((current) =>
-            current ?? {
+          setErrorState((current) => {
+            const next = current ?? {
               kind: 'connection',
-              message: t('chat.connectionClosed')
+              message: t('chat.connectionClosed'),
+              reason: 'closed'
             }
-          )
+            updateSessionViewCache(session.id, {
+              errorState: next
+            })
+            return next
+          })
         }
       }, Object.keys(connectionParams).length > 0 ? connectionParams : undefined)
     }, (modelChanged || effortChanged || permissionModeChanged || adapterChanged) ? 200 : 100)
@@ -406,15 +504,17 @@ export function useChatSessionMessages({
     session?.id,
     session?.status,
     setInteractionRequest,
-    t
+    t,
+    removeSessionViewCache,
+    updateSessionViewCache
   ])
 
   return {
-    messages,
+    messages: messagesState,
     setMessages,
     sessionInfo,
     isReady,
-    errorBanner,
+    errorState,
     retryConnection,
     reconcileAfterInteraction
   }

package/src/hooks/chat/use-chat-session.ts

@@ -45,7 +45,7 @@ export function useChatSession({
     setMessages,
     sessionInfo,
     isReady,
-    errorBanner,
+    errorState,
     retryConnection,
     reconcileAfterInteraction
   } = useChatSessionMessages({
@@ -112,7 +112,7 @@ export function useChatSession({
     sessionInfo,
     interactionRequest,
     isReady,
-    errorBanner,
+    errorState,
     retryConnection,
     isThinking,
     activeView,

package/src/resources/locales/en.json

@@ -24,6 +24,7 @@
     "batchRestoreSuccess": "Batch restored successfully",
     "batchRestoreFailed": "Failed to restore some sessions",
     "cancel": "Cancel",
+    "continue": "Continue",
     "confirm": "Confirm",
     "confirmAction": "Confirm {{action}}",
     "startNewChat": "No active sessions found. Start a new chat!",
@@ -324,11 +325,22 @@
     "modelSearchPlaceholder": "Search models or services",
     "modelUnavailable": "No models available",
     "modelConfigRequired": "Add a model service in config before starting a session",
+    "modelConfigRequiredTitle": "Model setup required",
+    "modelConfigRequiredHelp": "Add at least one model service, then retry sending from the composer.",
     "connectionErrorTitle": "Connection error",
+    "connectionClosedTitle": "Connection closed",
     "sessionErrorTitle": "Task failed",
     "connectionError": "WebSocket connection failed. Check the server and try again.",
     "connectionClosed": "WebSocket connection closed. Try reconnecting.",
+    "connectionErrorHelp": "Streaming updates stopped before the session could recover. Retry to resubscribe to the running session.",
+    "connectionClosedHelp": "The current stream has ended unexpectedly. Retry to reconnect and continue receiving new messages.",
+    "sessionErrorHelp": "Check the latest tool output or terminal logs, then continue from the most recent user message if needed.",
+    "sessionErrorCode": "Error code: {{code}}",
     "retryConnection": "Retry",
+    "debugMockLabel": "Debug Preview",
+    "debugMockConnectionErrorMessage": "Unable to reach the session stream. The websocket handshake timed out before any updates arrived.",
+    "debugMockConnectionClosedMessage": "The connection dropped after the assistant started responding. No further tokens will arrive until you reconnect.",
+    "debugMockSessionErrorMessage": "The runtime hit its session timeout while waiting for a downstream tool result and stopped this turn.",
     "permissionRequestBadge": "Permission request",
     "permissionRequestTitleWithTool": "Requesting permission to use 【{{tool}}】. Choose how to proceed.",
     "permissionSubject": "Scope",
@@ -427,6 +439,73 @@
     "viewTimeline": "Timeline",
     "viewTerminal": "Terminal",
     "viewSettings": "Settings",
+    "gitBranchSwitcher": "Switch branch",
+    "gitOperations": "Git actions",
+    "gitWorktree": "Worktree",
+    "gitDetachedHead": "DETACHED",
+    "gitSearchBranches": "Search local or remote branches",
+    "gitBranchesLocal": "Local branches",
+    "gitBranchesWorktrees": "Other worktrees",
+    "gitBranchesRemote": "Remote branches",
+    "gitBranchCheckedOutInOtherWorktree": "Checked out in {{path}}",
+    "gitRemoteBranchCheckedOutInOtherWorktree": "Local branch already checked out in {{path}}",
+    "gitNoBranches": "No matching branches",
+    "gitCreateBranch": "Create branch",
+    "gitCreateBranchWithName": "Create branch {{branch}}",
+    "gitSwitchBranchSuccess": "Switched to {{branch}}",
+    "gitCreateBranchSuccess": "Created and switched to {{branch}}",
+    "gitCommitShort": "Commit",
+    "gitCommitAllChanges": "Commit all changes",
+    "gitCommitDialogTitle": "Commit all changes",
+    "gitCommitDescription": "This stages all current repository changes before committing.",
+    "gitCommitPanelTitle": "Commit changes",
+    "gitCommitPanelBranch": "Branch",
+    "gitCommitPanelChanges": "Changes",
+    "gitChangedFilesCount": "{{count}} files",
+    "gitCommitIncludeUnstagedChanges": "Include unstaged changes",
+    "gitCommitIncludeUnstagedChangesDescription": "Include unstaged and untracked files.",
+    "gitCommitOnlyStagedChangesDescription": "Commit staged changes only.",
+    "gitCommitSkipHooks": "Skip Git hooks",
+    "gitCommitSkipHooksDescription": "Skip pre-commit and commit-msg hooks.",
+    "gitCommitAmend": "Amend latest commit",
+    "gitCommitAmendDescription": "Fold into the latest commit. Current: {{subject}}",
+    "gitCommitAmendUnavailableDescription": "There is no existing commit to amend in this repository.",
+    "gitCommitMessageLabel": "Commit message",
+    "gitCommitMessageOptional": "Optional",
+    "gitCommitMessagePlaceholder": "Enter a commit message",
+    "gitCommitMessagePlaceholderAmend": "Leave blank to keep the latest commit message",
+    "gitCommitMessageAmendHint": "Leave it blank to reuse the latest commit message.",
+    "gitCommitMessageRequired": "Enter a commit message",
+    "gitCommitSuccess": "Commit created",
+    "gitCommitNoChanges": "There are no changes to commit",
+    "gitCommitNoStagedChanges": "There are no staged changes to commit",
+    "gitCommitNextStep": "Next step",
+    "gitCommitAndPush": "Commit and push",
+    "gitCommitAndPushSuccess": "Commit and push completed",
+    "gitCommitPushFailedAfterCommit": "Commit completed, but push failed: {{error}}",
+    "gitAmendSuccess": "Amend completed",
+    "gitAmendAndPushSuccess": "Amend and push completed",
+    "gitAmendUnavailable": "There is no commit available to amend",
+    "gitForcePush": "Force push",
+    "gitForcePushDescription": "Use force-with-lease for the remote branch.",
+    "gitForcePushHint": "Only replaces it when the remote has no newer commits.",
+    "gitPushNeedsSyncOrForce": "This branch is behind upstream. Sync first or enable force push.",
+    "gitPushShort": "Push",
+    "gitPush": "Push current branch",
+    "gitPushPanelTitle": "Push changes",
+    "gitPushPanelUpstream": "Upstream",
+    "gitPushPanelUpstreamHint": "The first push sets the upstream automatically.",
+    "gitForcePushSuccess": "Force push completed",
+    "gitPushSuccess": "Push completed",
+    "gitSyncShort": "Sync",
+    "gitSync": "Sync current branch",
+    "gitSyncSuccess": "Sync completed",
+    "gitStatusDirty": "Uncommitted changes",
+    "gitStatusClean": "Working tree clean",
+    "gitUpstreamStatus": "Ahead {{ahead}} / behind {{behind}}",
+    "gitNoUpstream": "No upstream configured",
+    "gitLocalBranch": "Local",
+    "gitRemoteBranch": "Remote · {{remote}}",
     "deleteSessionTitle": "Delete session",
     "deleteSessionDesc": "This will permanently remove the session and all messages. Proceed carefully.",
     "timelineEmpty": "No events yet",
@@ -547,9 +626,30 @@
       "startTasksFailed": "Failed",
       "startTasksLogs": "Task Logs",
       "task": "Task",
+      "taskCount": "{{count}} tasks",
       "taskExitCode": "Exit: {{code}}",
       "writeSuccess": "Write Success",
       "writeFailed": "Write Failed",
+      "askUserQuestion": "Ask User Question",
+      "globTool": "Glob",
+      "grepTool": "Grep",
+      "editTool": "Edit File",
+      "lsTool": "List Directory",
+      "notebookEdit": "Notebook Edit",
+      "webFetch": "Web Fetch",
+      "webSearch": "Web Search",
+      "booleanOn": "On",
+      "booleanOff": "Off",
+      "diffSplit": "Split",
+      "diffInline": "Inline",
+      "skill": "Skill",
+      "enterPlanMode": "Enter Plan Mode",
+      "exitPlanMode": "Exit Plan Mode",
+      "taskCreate": "Create Task",
+      "taskGet": "Get Task",
+      "taskUpdate": "Update Task",
+      "taskList": "List Tasks",
+      "claudeTask": "Claude Task",
       "todo": "Task Planning",
       "call": "call",
       "reading": "Reading file...",
@@ -559,6 +659,55 @@
       "runInBackground": "run in background",
       "dangerouslyDisableSandbox": "sandbox disabled",
       "viewCommand": "View command",
+      "noParameters": "No parameters",
+      "groupSummaryCount": "{{name}} {{count}}x",
+      "groupSummaryMoreCount": "+{{count}}x",
+      "singleSelect": "single",
+      "multiSelect": "multi",
+      "fields": {
+        "activeForm": "Active Form",
+        "addBlockedBy": "Add Blocked By",
+        "addBlocks": "Add Blocks",
+        "allowedDomains": "Allowed Domains",
+        "allowedPrompts": "Allowed Prompts",
+        "answers": "Answers",
+        "args": "Args",
+        "blockedDomains": "Blocked Domains",
+        "cellId": "Cell ID",
+        "cellType": "Cell Type",
+        "command": "Command",
+        "content": "Content",
+        "description": "Description",
+        "disableSandbox": "Disable Sandbox",
+        "details": "Details",
+        "editMode": "Edit Mode",
+        "glob": "Glob",
+        "ignore": "Ignore",
+        "limit": "Limit",
+        "maxTurns": "Max Turns",
+        "metadata": "Metadata",
+        "model": "Model",
+        "mode": "Mode",
+        "newSource": "New Source",
+        "newString": "New String",
+        "oldString": "Old String",
+        "owner": "Owner",
+        "offset": "Offset",
+        "path": "Path",
+        "prompt": "Prompt",
+        "pushToRemote": "Push To Remote",
+        "questions": "Questions",
+        "remoteSession": "Remote Session",
+        "remoteSessionUrl": "Remote Session URL",
+        "replaceAll": "Replace All",
+        "resume": "Resume",
+        "runInBackground": "Run In Background",
+        "status": "Status",
+        "subagentType": "Subagent Type",
+        "subject": "Subject",
+        "timeout": "Timeout",
+        "todos": "Todos"
+      },
       "unknown": "Unknown tool"
     },
     "terminal": {