1 files changed, 8 insertions, 1 deletions
diff --git a/packages/cli/src/ui/App.tsx b/packages/cli/src/ui/App.tsx
index 365266f8..b458a822 100644
--- a/packages/cli/src/ui/App.tsx
+++ b/packages/cli/src/ui/App.tsx
@@ -48,6 +48,7 @@ import {
 } from '@gemini-cli/core';
 import { useLogger } from './hooks/useLogger.js';
 import { StreamingContext } from './contexts/StreamingContext.js';
+import { SessionProvider } from './contexts/SessionContext.js';
 import { useGitBranchName } from './hooks/useGitBranchName.js';
 
 const CTRL_C_PROMPT_DURATION_MS = 1000;
@@ -58,7 +59,13 @@ interface AppProps {
   startupWarnings?: string[];
 }
 
-export const App = ({ config, settings, startupWarnings = [] }: AppProps) => {
+export const AppWrapper = (props: AppProps) => (
+  <SessionProvider>
+    <App {...props} />
+  </SessionProvider>
+);
+
+const App = ({ config, settings, startupWarnings = [] }: AppProps) => {
   const { history, addItem, clearItems } = useHistory();
   const {
     consoleMessages,