diff --git a/package.json b/package.json
index 1395f72..000b9e7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@four-bytes/four-opencode-brain",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "Unified brain plugin — single SQLite DB for RAG search, memory, and knowledge base",
   "license": "Apache-2.0",
   "type": "module",
diff --git a/src/status.ts b/src/status.ts
index b03d036..24873f5 100644
--- a/src/status.ts
+++ b/src/status.ts
@@ -125,7 +125,7 @@ export function updateStatus(state: StatusState, opts?: StatusOpts): void {
         ingesting: false,
       });
       if (opts?.toast && _client) {
-        _client.tui.showToast({ body: { title: "Brain 🧠", message: opts.toast, variant: opts.toastVariant ?? "success", duration: 5000 } });
+        _client?.tui.showToast({ body: { title: "Brain 🧠", message: opts.toast, variant: opts.toastVariant ?? "success", duration: 5000 } });
       }
       break;
 
@@ -139,7 +139,7 @@ export function updateStatus(state: StatusState, opts?: StatusOpts): void {
         ingesting: false,
       });
       if (opts?.toast && _client) {
-        _client.tui.showToast({ body: { title: "Brain 🧠", message: opts.toast, variant: opts.toastVariant ?? "warning", duration: 5000 } });
+        _client?.tui.showToast({ body: { title: "Brain 🧠", message: opts.toast, variant: opts.toastVariant ?? "warning", duration: 5000 } });
       }
       break;
 
@@ -153,7 +153,7 @@ export function updateStatus(state: StatusState, opts?: StatusOpts): void {
         ingesting: false,
       });
       if (opts?.toast && _client) {
-        _client.tui.showToast({ body: { title: "Brain 🧠", message: opts.toast, variant: "error", duration: 7000 } });
+        _client?.tui.showToast({ body: { title: "Brain 🧠", message: opts.toast, variant: "error", duration: 7000 } });
       }
       break;
 
diff --git a/src/tui.tsx b/src/tui.tsx
index 4f00205..f1aa442 100644
--- a/src/tui.tsx
+++ b/src/tui.tsx
@@ -144,7 +144,7 @@ function BrainStatusBar(props: { centered?: boolean; api: TuiPluginApi }) {
             <text fg={theme().textMuted}> 🧠 {version()}</text>
           </box>
           <box flexDirection="row">
-            <text fg={fg()}>{indicator()}</text>
+            {busy() ? <Spinner fg={fg()} /> : <text fg={fg()}>{indicator()}</text>}
             <text fg={theme().textMuted}> {status()}</text>
           </box>
         </box>