@@ -154,6 +154,13 @@ type ShellModeContextValue = {
154154 isMutable ?: boolean ;
155155 isCreateAgent ?: boolean ;
156156 } ) => void ;
157+ /**
158+ * Keep `/sessions/:id` in place and surface a full-pane load failure
159+ * (no toast / redirect). Cleared when opening another session or draft.
160+ */
161+ openInaccessibleSession : ( req : { sessionId : string ; message : string } ) => void ;
162+ /** Backend/access message when the current pending session could not be opened. */
163+ sessionAccessError : string | null ;
157164 /** Reset current chat; no-op when idle. */
158165 clearChat : ( ) => void ;
159166 /** Return library-only mode to its idle landing; no-op in other modes. */
@@ -278,6 +285,7 @@ export function ShellModeProvider({
278285 const [ historyAgentFilter , setHistoryAgentFilter ] = useState < HistoryAgentFilter | null > ( null ) ;
279286 const [ pendingSessionId , setPendingSessionId ] = useState < string | undefined > ( undefined ) ;
280287 const [ pendingSessionEpoch , setPendingSessionEpoch ] = useState ( 0 ) ;
288+ const [ sessionAccessError , setSessionAccessError ] = useState < string | null > ( null ) ;
281289 const settingsEnabled = isSettingsChromeEnabled ( { catalog, capabilities } ) ;
282290 const settingsOpen = settingsEnabled && settingsOpenState ;
283291 const sessionsEnabled = isSessionsChromeEnabled ( { sessions : sessionsServer } ) ;
@@ -491,6 +499,7 @@ export function ShellModeProvider({
491499 setSessionsOpen ( false ) ;
492500 setSchedulesOpen ( false ) ;
493501 setEnvironmentsOpen ( false ) ;
502+ setSessionAccessError ( null ) ;
494503 setPendingSessionId ( undefined ) ;
495504 const isCreateAgent = resolveMutableIsCreateAgent ( req ) ;
496505 const kind : DraftPreferenceKind = isCreateAgent ? 'agent' : 'chat' ;
@@ -517,6 +526,7 @@ export function ShellModeProvider({
517526 setSessionsOpen ( false ) ;
518527 setSchedulesOpen ( false ) ;
519528 setEnvironmentsOpen ( false ) ;
529+ setSessionAccessError ( null ) ;
520530 setPendingSessionId ( undefined ) ;
521531 setAgentConfigOpenState ( false ) ;
522532 setMode ( {
@@ -612,6 +622,7 @@ export function ShellModeProvider({
612622 setSessionsOpen ( false ) ;
613623 setSchedulesOpen ( false ) ;
614624 setEnvironmentsOpen ( false ) ;
625+ setSessionAccessError ( null ) ;
615626 setAgentConfigOpenState ( true ) ;
616627 return ;
617628 }
@@ -722,6 +733,7 @@ export function ShellModeProvider({
722733 setSessionsOpen ( false ) ;
723734 setSchedulesOpen ( false ) ;
724735 setEnvironmentsOpen ( false ) ;
736+ setSessionAccessError ( null ) ;
725737 setPendingSessionId ( sessionId ) ;
726738 setPendingSessionEpoch ( n => n + 1 ) ;
727739 if ( isMutable ) {
@@ -757,8 +769,42 @@ export function ShellModeProvider({
757769 ] ,
758770 ) ;
759771
772+ const openInaccessibleSession = useCallback (
773+ ( { sessionId, message } : { sessionId : string ; message : string } ) => {
774+ setSettingsOpen ( false ) ;
775+ setLibraryOpenState ( false ) ;
776+ setLibraryAgentId ( null ) ;
777+ setSessionsOpen ( false ) ;
778+ setSchedulesOpen ( false ) ;
779+ setEnvironmentsOpen ( false ) ;
780+ setAgentConfigOpenState ( false ) ;
781+ setSessionAccessError ( message ) ;
782+ setPendingSessionId ( sessionId ) ;
783+ setPendingSessionEpoch ( n => n + 1 ) ;
784+ // Keep chrome non-idle so layouts render the thread slot (gated by sessionAccessError).
785+ if ( isComposerEnabled ) {
786+ setMode ( {
787+ status : 'active' ,
788+ isMutable : true ,
789+ isCreateAgent : false ,
790+ agentSpec : chatSeedRef . current ,
791+ locked : false ,
792+ } ) ;
793+ return ;
794+ }
795+ setMode ( {
796+ status : 'active' ,
797+ isMutable : false ,
798+ isCreateAgent : false ,
799+ locked : false ,
800+ } ) ;
801+ } ,
802+ [ isComposerEnabled , setSettingsOpen , setSessionsOpen , setSchedulesOpen , setEnvironmentsOpen ] ,
803+ ) ;
804+
760805 const clearChat = useCallback ( ( ) => {
761806 if ( effectiveMode . status === 'idle' ) return ;
807+ setSessionAccessError ( null ) ;
762808 setPendingSessionId ( undefined ) ;
763809 if ( effectiveMode . isMutable ) {
764810 // Preserve Edit / builder vs chat intent. New Chat must use the latest
@@ -791,6 +837,7 @@ export function ShellModeProvider({
791837 const openLibraryHome = useCallback ( ( ) => {
792838 // Only library-only mode has an idle landing; other modes root via openDraft / clearChat.
793839 if ( ! isLibraryEnabled || isComposerEnabled ) return ;
840+ setSessionAccessError ( null ) ;
794841 setPendingSessionId ( undefined ) ;
795842 setSettingsOpen ( false ) ;
796843 setLibraryOpenState ( false ) ;
@@ -842,6 +889,8 @@ export function ShellModeProvider({
842889 resetAgentBuilder,
843890 rememberDraftSpec,
844891 openHistorySession,
892+ openInaccessibleSession,
893+ sessionAccessError,
845894 clearChat,
846895 openLibraryHome,
847896 runtimeKey,
@@ -888,6 +937,8 @@ export function ShellModeProvider({
888937 resetAgentBuilder ,
889938 rememberDraftSpec ,
890939 openHistorySession ,
940+ openInaccessibleSession ,
941+ sessionAccessError ,
891942 clearChat ,
892943 openLibraryHome ,
893944 runtimeKey ,
0 commit comments