From c5b62f31a8b5f954185a09658a1c7f681e0cc7db Mon Sep 17 00:00:00 2001
From: Gemini AI <gemini@google.com>
Date: Sat, 27 Dec 2025 12:36:25 +0400
Subject: [PATCH] feat(ui): add back button to session view and auto-clear
 active session on instance stop

---
 packages/ui/src/App.tsx                       | 45 ++++++++++---------
 .../components/instance/instance-shell2.tsx   | 10 ++++-
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/packages/ui/src/App.tsx b/packages/ui/src/App.tsx
index d16d90e..65dc973 100644
--- a/packages/ui/src/App.tsx
+++ b/packages/ui/src/App.tsx
@@ -217,6 +217,7 @@ const App: Component = () => {
 
     if (!confirmed) return
 
+    clearActiveParentSession(instanceId)
     await stopInstance(instanceId)
   }
 
@@ -303,7 +304,7 @@ const App: Component = () => {
       const tauriBridge = (window as { __TAURI__?: { event?: { listen: (event: string, handler: (event: { payload: unknown }) => void) => Promise<() => void> } } }).__TAURI__
       if (tauriBridge?.event) {
         let unlistenMenu: (() => void) | null = null
-        
+
         tauriBridge.event.listen("menu:newInstance", () => {
           handleNewInstanceRequest()
         }).then((unlisten) => {
@@ -321,7 +322,7 @@ const App: Component = () => {
 
   // Check if this is OAuth callback
   const isOAuthCallback = window.location.pathname === '/auth/qwen/callback'
-  
+
   if (isOAuthCallback) {
     return <QwenOAuthCallback />
   }
@@ -391,29 +392,29 @@ const App: Component = () => {
                 onNew={handleNewInstanceRequest}
                 onOpenRemoteAccess={() => setRemoteAccessOpen(true)}
               />
- 
+
               <For each={Array.from(instances().values())}>
                 {(instance) => {
                   const isActiveInstance = () => activeInstanceId() === instance.id
                   const isVisible = () => isActiveInstance() && !showFolderSelection()
-                    return (
-                      <div class="flex-1 min-h-0 overflow-hidden" style={{ display: isVisible() ? "flex" : "none" }}>
-                        <InstanceMetadataProvider instance={instance}>
-                          <InstanceShell
-                            instance={instance}
-                            escapeInDebounce={escapeInDebounce()}
-                            paletteCommands={paletteCommands}
-                            onCloseSession={(sessionId) => handleCloseSession(instance.id, sessionId)}
-                            onNewSession={() => handleNewSession(instance.id)}
-                            handleSidebarAgentChange={(sessionId, agent) => handleSidebarAgentChange(instance.id, sessionId, agent)}
-                            handleSidebarModelChange={(sessionId, model) => handleSidebarModelChange(instance.id, sessionId, model)}
-                            onExecuteCommand={executeCommand}
-                            tabBarOffset={instanceTabBarHeight()}
-                          />
-                        </InstanceMetadataProvider>
+                  return (
+                    <div class="flex-1 min-h-0 overflow-hidden" style={{ display: isVisible() ? "flex" : "none" }}>
+                      <InstanceMetadataProvider instance={instance}>
+                        <InstanceShell
+                          instance={instance}
+                          escapeInDebounce={escapeInDebounce()}
+                          paletteCommands={paletteCommands}
+                          onCloseSession={(sessionId) => handleCloseSession(instance.id, sessionId)}
+                          onNewSession={() => handleNewSession(instance.id)}
+                          handleSidebarAgentChange={(sessionId, agent) => handleSidebarAgentChange(instance.id, sessionId, agent)}
+                          handleSidebarModelChange={(sessionId, model) => handleSidebarModelChange(instance.id, sessionId, model)}
+                          onExecuteCommand={executeCommand}
+                          tabBarOffset={instanceTabBarHeight()}
+                        />
+                      </InstanceMetadataProvider>
 
-                      </div>
-                    )
+                    </div>
+                  )
 
                 }}
               </For>
@@ -458,9 +459,9 @@ const App: Component = () => {
             </div>
           </div>
         </Show>
- 
+
         <RemoteAccessOverlay open={remoteAccessOpen()} onClose={() => setRemoteAccessOpen(false)} />
- 
+
         <AlertDialog />
 
         <Toaster
diff --git a/packages/ui/src/components/instance/instance-shell2.tsx b/packages/ui/src/components/instance/instance-shell2.tsx
index 7281644..36c37bf 100644
--- a/packages/ui/src/components/instance/instance-shell2.tsx
+++ b/packages/ui/src/components/instance/instance-shell2.tsx
@@ -66,7 +66,7 @@ import SessionView from "../session/session-view"
 import { Sidebar, type FileNode } from "./sidebar"
 import { Editor } from "./editor"
 import { serverApi } from "../../lib/api-client"
-import { Sparkles, Layout as LayoutIcon, Terminal as TerminalIcon, Search, Loader2, Zap, Shield, Settings, FileArchive } from "lucide-solid"
+import { Sparkles, Layout as LayoutIcon, Terminal as TerminalIcon, Search, Loader2, Zap, Shield, Settings, FileArchive, ArrowLeft } from "lucide-solid"
 import { formatTokenTotal } from "../../lib/formatters"
 import { sseManager } from "../../lib/sse-manager"
 import { getLogger } from "../../lib/logger"
@@ -1342,6 +1342,14 @@ Now analyze the project and report your findings.`
           <div class="flex items-center space-x-4">
             <Show when={activeSessionIdForInstance() && activeSessionIdForInstance() !== "info"}>
               <div class="flex items-center space-x-2">
+                <button
+                  onClick={() => props.onCloseSession(activeSessionIdForInstance()!)}
+                  class="flex items-center gap-1.5 px-2.5 py-1 text-[11px] font-semibold text-zinc-400 hover:text-white hover:bg-white/10 border border-transparent hover:border-white/10 transition-all rounded-full"
+                  title="Back to Sessions"
+                >
+                  <ArrowLeft size={14} strokeWidth={2} />
+                  <span>Back</span>
+                </button>
                 {/* Compact Button */}
                 <button
                   onClick={handleCompact}