From f40aa33b844b8fd7376c0835869f71f3cdcb9c56 Mon Sep 17 00:00:00 2001
From: Chirag Bangera <cbepic2@gmail.com>
Date: Tue, 8 Sep 2026 15:57:59 -0400
Subject: [PATCH 1/7] fix: compact mobile assistant chat chrome

---
 src/features/assistant/assistant-panel.tsx | 16 ++++++++--------
 src/features/assistant/composer.tsx        |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/features/assistant/assistant-panel.tsx b/src/features/assistant/assistant-panel.tsx
index 16d2e59..39c1eac 100644
--- a/src/features/assistant/assistant-panel.tsx
+++ b/src/features/assistant/assistant-panel.tsx
@@ -1316,7 +1316,7 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
           onPointerMove={moveResizeDrag}
           onPointerUp={stopResizeDrag}
           onPointerCancel={stopResizeDrag}
-          className="absolute top-0 left-0 z-20 grid size-7 cursor-nwse-resize touch-none place-items-center rounded-br-xl text-muted-foreground opacity-60 hover:bg-accent hover:opacity-100"
+          className="absolute top-0 left-0 z-20 hidden size-7 cursor-nwse-resize touch-none place-items-center rounded-br-xl text-muted-foreground opacity-60 hover:bg-accent hover:opacity-100 [@media(pointer:fine)]:grid"
         >
           <span aria-hidden="true" className="flex flex-col items-start gap-[3px] p-1.5">
             <span className="block h-px w-3 rotate-[-45deg] bg-current" />
@@ -1324,9 +1324,9 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
           </span>
         </button>
       )}
-      <header className="flex items-center gap-3 border-b px-4 py-3">
-        <span className="grid size-9 shrink-0 place-items-center rounded-full bg-primary text-primary-foreground">
-          <Bot className="size-5" aria-hidden="true" />
+      <header className="flex items-center gap-1.5 border-b px-3 py-2.5 sm:gap-3 sm:px-4 sm:py-3">
+        <span className="grid size-8 shrink-0 place-items-center rounded-full bg-primary text-primary-foreground sm:size-9">
+          <Bot className="size-4 sm:size-5" aria-hidden="true" />
         </span>
         <div className="min-w-0 flex-1">
           <p className="flex items-center gap-2 truncate text-sm font-semibold">
@@ -1337,7 +1337,7 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
               </span>
             )}
           </p>
-          <p className="flex items-center gap-1.5 text-xs text-muted-foreground">
+          <p className="flex items-center gap-1.5 truncate text-xs text-muted-foreground">
             <span
               aria-hidden="true"
               className={`size-1.5 rounded-full ${busy ? "animate-pulse bg-amber-500" : "bg-emerald-500"}`}
@@ -1775,7 +1775,7 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
         ref={logRef}
         role="log"
         aria-label="Assistant conversation"
-        className="min-h-0 flex-1 space-y-4 overflow-y-auto px-4 py-4"
+        className="min-h-0 flex-1 space-y-4 overflow-y-auto px-3 py-4 sm:px-4"
       >
         {messages.length === 0 && !busy && (
           <div className="flex h-full flex-col items-center justify-center gap-4 text-center">
@@ -1809,13 +1809,13 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
         {messages.map((item) =>
           item.role === "user" ? (
             <div key={item.id} className="flex justify-end">
-              <p className="max-w-[85%] rounded-2xl rounded-br-md bg-primary px-3.5 py-2 text-sm text-primary-foreground">
+              <p className="max-w-[92%] rounded-2xl rounded-br-md bg-primary px-3.5 py-2 text-sm text-primary-foreground sm:max-w-[85%]">
                 {item.content}
               </p>
             </div>
           ) : (
             <div key={item.id} className="flex justify-start">
-              <div className="max-w-[92%] space-y-2 rounded-2xl rounded-bl-md bg-muted px-3.5 py-2.5 text-sm">
+              <div className="max-w-[97%] space-y-2 rounded-2xl rounded-bl-md bg-muted px-3.5 py-2.5 text-sm sm:max-w-[92%]">
                 <Markdown
                   text={item.citedText ?? item.content}
                   id={item.id}
diff --git a/src/features/assistant/composer.tsx b/src/features/assistant/composer.tsx
index 1e6f45c..1863cd0 100644
--- a/src/features/assistant/composer.tsx
+++ b/src/features/assistant/composer.tsx
@@ -88,7 +88,7 @@ export function Composer({
           </Button>
         )}
       </div>
-      <p className="px-4 pt-1 text-[11px] text-muted-foreground">
+      <p className="hidden px-4 pt-1 text-[11px] text-muted-foreground [@media(pointer:fine)]:block">
         Enter to send · Shift+Enter newline
       </p>
     </div>

From 8e79be26ee5eaad17b2871d6f1b41843f9d80767 Mon Sep 17 00:00:00 2001
From: Chirag Bangera <cbepic2@gmail.com>
Date: Tue, 8 Sep 2026 17:43:00 -0400
Subject: [PATCH 2/7] feat: fullscreen assistant by default on touch devices

---
 .../assistant/assistant-layout.test.ts        | 59 +++++++++++++++++++
 src/features/assistant/assistant-panel.tsx    | 39 +++++++++---
 2 files changed, 89 insertions(+), 9 deletions(-)
 create mode 100644 src/features/assistant/assistant-layout.test.ts

diff --git a/src/features/assistant/assistant-layout.test.ts b/src/features/assistant/assistant-layout.test.ts
new file mode 100644
index 0000000..2490cac
--- /dev/null
+++ b/src/features/assistant/assistant-layout.test.ts
@@ -0,0 +1,59 @@
+import { afterEach, describe, expect, it, vi } from "vitest"
+
+import { defaultAssistantLayout } from "./assistant-panel"
+
+const LAYOUT_KEY = "budgetlens.assistant.layout.v1"
+
+function stubMatchMedia(matchesCoarse: boolean): void {
+  const factory = (query: string): MediaQueryList => {
+    const listeners = new Set<() => void>()
+    return {
+      matches: query.includes("coarse") ? matchesCoarse : false,
+      media: query,
+      onchange: null,
+      addListener: () => undefined,
+      removeListener: () => undefined,
+      addEventListener: () => undefined,
+      removeEventListener: () => undefined,
+      dispatchEvent: () => {
+        listeners.forEach((listener) => listener())
+        return false
+      },
+    } as MediaQueryList
+  }
+  vi.stubGlobal("matchMedia", factory)
+  Object.defineProperty(window, "matchMedia", { configurable: true, value: factory })
+}
+
+afterEach(() => {
+  window.localStorage.clear()
+  vi.unstubAllGlobals()
+})
+
+describe("defaultAssistantLayout", () => {
+  it("opens windowed on fine pointers with nothing stored", () => {
+    stubMatchMedia(false)
+    expect(defaultAssistantLayout().fullscreen).toBe(false)
+  })
+
+  it("opens fullscreen on touch-first devices with nothing stored", () => {
+    stubMatchMedia(true)
+    const layout = defaultAssistantLayout()
+    expect(layout.fullscreen).toBe(true)
+    expect(layout.size).toBe("m")
+  })
+
+  it("respects a stored opt-out on touch devices", () => {
+    stubMatchMedia(true)
+    window.localStorage.setItem(LAYOUT_KEY, JSON.stringify({ fullscreen: false, size: "m" }))
+    expect(defaultAssistantLayout().fullscreen).toBe(false)
+  })
+
+  it("respects a stored fullscreen choice on desktop", () => {
+    stubMatchMedia(false)
+    window.localStorage.setItem(LAYOUT_KEY, JSON.stringify({ fullscreen: true, size: "l" }))
+    const layout = defaultAssistantLayout()
+    expect(layout.fullscreen).toBe(true)
+    expect(layout.size).toBe("l")
+  })
+})
diff --git a/src/features/assistant/assistant-panel.tsx b/src/features/assistant/assistant-panel.tsx
index 39c1eac..8e99d32 100644
--- a/src/features/assistant/assistant-panel.tsx
+++ b/src/features/assistant/assistant-panel.tsx
@@ -19,6 +19,7 @@ import { useCallback, useEffect, useRef, useState } from "react"
 
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
+import { COARSE_POINTER_QUERY } from "@/components/mobile/use-media-query"
 import { repositories } from "@/db/repositories"
 import {
   extractCitations,
@@ -194,6 +195,28 @@ function isThinkingLevel(value: string): value is ThinkingLevel {
   return THINKING_LEVELS.some((level) => level === value)
 }
 
+/**
+ * First-run layout: touch-first devices open fullscreen (a floating card
+ * covers the whole phone screen anyway, so it buys nothing). Applies only
+ * when nothing is stored — once the user toggles, their choice persists.
+ */
+export function defaultAssistantLayout(): AssistantWindowLayout {
+  if (
+    typeof window !== "undefined" &&
+    typeof window.matchMedia === "function" &&
+    window.matchMedia(COARSE_POINTER_QUERY).matches
+  ) {
+    try {
+      if (window.localStorage.getItem(ASSISTANT_LAYOUT_KEY) === null) {
+        return { ...DEFAULT_ASSISTANT_LAYOUT, fullscreen: true }
+      }
+    } catch {
+      // Private-mode storage failure: fall through to stored/default layout.
+    }
+  }
+  return readAssistantLayout(window.localStorage)
+}
+
 function messageId(): string {
   return globalThis.crypto.randomUUID()
 }
@@ -321,9 +344,7 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
   const [isNative] = useState(() => isNativeCapacitorSync())
   const keychainCapable = isDesktop || isNative
   const [showSettings, setShowSettings] = useState(false)
-  const [layout, setLayout] = useState<AssistantWindowLayout>(() =>
-    readAssistantLayout(window.localStorage),
-  )
+  const [layout, setLayout] = useState<AssistantWindowLayout>(() => defaultAssistantLayout())
   const [messages, setMessages] = useState<PanelMessage[]>([])
   const [harnessSessionId, setHarnessSessionId] = useState<string | undefined>(undefined)
   const [harnessModels, setHarnessModels] = useState<HarnessModelOption[] | null>(null)
@@ -1324,7 +1345,7 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
           </span>
         </button>
       )}
-      <header className="flex items-center gap-1.5 border-b px-3 py-2.5 sm:gap-3 sm:px-4 sm:py-3">
+      <header className="flex items-center gap-1 border-b px-3 py-2.5 sm:gap-3 sm:px-4 sm:py-3">
         <span className="grid size-8 shrink-0 place-items-center rounded-full bg-primary text-primary-foreground sm:size-9">
           <Bot className="size-4 sm:size-5" aria-hidden="true" />
         </span>
@@ -1348,7 +1369,7 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
         <Button
           variant="ghost"
           size="icon"
-          className="size-8"
+          className="size-7 sm:size-8"
           aria-label="Chat history"
           title="Chat history"
           aria-expanded={showHistory}
@@ -1359,7 +1380,7 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
         <Button
           variant="ghost"
           size="icon"
-          className="size-8"
+          className="size-7 sm:size-8"
           aria-label="Assistant settings"
           title="Assistant settings"
           aria-expanded={showSettings}
@@ -1370,7 +1391,7 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
         <Button
           variant="ghost"
           size="icon"
-          className="size-8"
+          className="size-7 sm:size-8"
           aria-label="New chat"
           title="New chat"
           onClick={() => {
@@ -1382,7 +1403,7 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
         <Button
           variant="ghost"
           size="icon"
-          className="size-8"
+          className="size-7 sm:size-8"
           aria-label={layout.fullscreen ? "Exit fullscreen" : "Expand to fullscreen"}
           title={layout.fullscreen ? "Exit fullscreen" : "Expand to fullscreen"}
           aria-pressed={layout.fullscreen}
@@ -1399,7 +1420,7 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
         <Button
           variant="ghost"
           size="icon"
-          className="size-8"
+          className="size-7 sm:size-8"
           aria-label="Close assistant"
           onClick={onClose}
         >

From 0630eca6aee505e0aa189a06195c11ec66a232f3 Mon Sep 17 00:00:00 2001
From: Chirag Bangera <cbepic2@gmail.com>
Date: Tue, 8 Sep 2026 17:48:45 -0400
Subject: [PATCH 3/7] fix: oxfmt assistant panel

---
 src/features/assistant/assistant-panel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/assistant/assistant-panel.tsx b/src/features/assistant/assistant-panel.tsx
index 8e99d32..3b1aa3a 100644
--- a/src/features/assistant/assistant-panel.tsx
+++ b/src/features/assistant/assistant-panel.tsx
@@ -17,9 +17,9 @@ import {
 } from "lucide-react"
 import { useCallback, useEffect, useRef, useState } from "react"
 
+import { COARSE_POINTER_QUERY } from "@/components/mobile/use-media-query"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
-import { COARSE_POINTER_QUERY } from "@/components/mobile/use-media-query"
 import { repositories } from "@/db/repositories"
 import {
   extractCitations,

From 4342ee3cd26fb6cabaab42a8c26d7cec2c500ea1 Mon Sep 17 00:00:00 2001
From: Chirag Bangera <cbepic2@gmail.com>
Date: Tue, 8 Sep 2026 18:01:17 -0400
Subject: [PATCH 4/7] revert: fullscreen default conflicts with mobile
 bottom-sheet contract

---
 .../assistant/assistant-layout.test.ts        | 59 -------------------
 src/features/assistant/assistant-panel.tsx    | 26 +-------
 2 files changed, 3 insertions(+), 82 deletions(-)
 delete mode 100644 src/features/assistant/assistant-layout.test.ts

diff --git a/src/features/assistant/assistant-layout.test.ts b/src/features/assistant/assistant-layout.test.ts
deleted file mode 100644
index 2490cac..0000000
--- a/src/features/assistant/assistant-layout.test.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { afterEach, describe, expect, it, vi } from "vitest"
-
-import { defaultAssistantLayout } from "./assistant-panel"
-
-const LAYOUT_KEY = "budgetlens.assistant.layout.v1"
-
-function stubMatchMedia(matchesCoarse: boolean): void {
-  const factory = (query: string): MediaQueryList => {
-    const listeners = new Set<() => void>()
-    return {
-      matches: query.includes("coarse") ? matchesCoarse : false,
-      media: query,
-      onchange: null,
-      addListener: () => undefined,
-      removeListener: () => undefined,
-      addEventListener: () => undefined,
-      removeEventListener: () => undefined,
-      dispatchEvent: () => {
-        listeners.forEach((listener) => listener())
-        return false
-      },
-    } as MediaQueryList
-  }
-  vi.stubGlobal("matchMedia", factory)
-  Object.defineProperty(window, "matchMedia", { configurable: true, value: factory })
-}
-
-afterEach(() => {
-  window.localStorage.clear()
-  vi.unstubAllGlobals()
-})
-
-describe("defaultAssistantLayout", () => {
-  it("opens windowed on fine pointers with nothing stored", () => {
-    stubMatchMedia(false)
-    expect(defaultAssistantLayout().fullscreen).toBe(false)
-  })
-
-  it("opens fullscreen on touch-first devices with nothing stored", () => {
-    stubMatchMedia(true)
-    const layout = defaultAssistantLayout()
-    expect(layout.fullscreen).toBe(true)
-    expect(layout.size).toBe("m")
-  })
-
-  it("respects a stored opt-out on touch devices", () => {
-    stubMatchMedia(true)
-    window.localStorage.setItem(LAYOUT_KEY, JSON.stringify({ fullscreen: false, size: "m" }))
-    expect(defaultAssistantLayout().fullscreen).toBe(false)
-  })
-
-  it("respects a stored fullscreen choice on desktop", () => {
-    stubMatchMedia(false)
-    window.localStorage.setItem(LAYOUT_KEY, JSON.stringify({ fullscreen: true, size: "l" }))
-    const layout = defaultAssistantLayout()
-    expect(layout.fullscreen).toBe(true)
-    expect(layout.size).toBe("l")
-  })
-})
diff --git a/src/features/assistant/assistant-panel.tsx b/src/features/assistant/assistant-panel.tsx
index 3b1aa3a..6159f18 100644
--- a/src/features/assistant/assistant-panel.tsx
+++ b/src/features/assistant/assistant-panel.tsx
@@ -195,28 +195,6 @@ function isThinkingLevel(value: string): value is ThinkingLevel {
   return THINKING_LEVELS.some((level) => level === value)
 }
 
-/**
- * First-run layout: touch-first devices open fullscreen (a floating card
- * covers the whole phone screen anyway, so it buys nothing). Applies only
- * when nothing is stored — once the user toggles, their choice persists.
- */
-export function defaultAssistantLayout(): AssistantWindowLayout {
-  if (
-    typeof window !== "undefined" &&
-    typeof window.matchMedia === "function" &&
-    window.matchMedia(COARSE_POINTER_QUERY).matches
-  ) {
-    try {
-      if (window.localStorage.getItem(ASSISTANT_LAYOUT_KEY) === null) {
-        return { ...DEFAULT_ASSISTANT_LAYOUT, fullscreen: true }
-      }
-    } catch {
-      // Private-mode storage failure: fall through to stored/default layout.
-    }
-  }
-  return readAssistantLayout(window.localStorage)
-}
-
 function messageId(): string {
   return globalThis.crypto.randomUUID()
 }
@@ -344,7 +322,9 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
   const [isNative] = useState(() => isNativeCapacitorSync())
   const keychainCapable = isDesktop || isNative
   const [showSettings, setShowSettings] = useState(false)
-  const [layout, setLayout] = useState<AssistantWindowLayout>(() => defaultAssistantLayout())
+  const [layout, setLayout] = useState<AssistantWindowLayout>(() =>
+    readAssistantLayout(window.localStorage),
+  )
   const [messages, setMessages] = useState<PanelMessage[]>([])
   const [harnessSessionId, setHarnessSessionId] = useState<string | undefined>(undefined)
   const [harnessModels, setHarnessModels] = useState<HarnessModelOption[] | null>(null)

From 59d7a4a90de1b7fe277243dadacb9048d3b7cd5c Mon Sep 17 00:00:00 2001
From: Chirag Bangera <cbepic2@gmail.com>
Date: Tue, 8 Sep 2026 18:03:50 -0400
Subject: [PATCH 5/7] fix: drop unused coarse-pointer import

---
 src/features/assistant/assistant-panel.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/features/assistant/assistant-panel.tsx b/src/features/assistant/assistant-panel.tsx
index 6159f18..e5a7b22 100644
--- a/src/features/assistant/assistant-panel.tsx
+++ b/src/features/assistant/assistant-panel.tsx
@@ -17,7 +17,6 @@ import {
 } from "lucide-react"
 import { useCallback, useEffect, useRef, useState } from "react"
 
-import { COARSE_POINTER_QUERY } from "@/components/mobile/use-media-query"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { repositories } from "@/db/repositories"

From 81aacddcf1025df560379bca16d9c087041ac241 Mon Sep 17 00:00:00 2001
From: Chirag Bangera <cbepic2@gmail.com>
Date: Tue, 8 Sep 2026 18:54:18 -0400
Subject: [PATCH 6/7] fix: execute text-format tool calls instead of showing
 raw syntax

---
 src/features/assistant/assistant-panel.tsx    |  25 +++++
 src/features/assistant/data-tools.ts          |   1 +
 .../assistant/provider-transport.test.ts      |  60 ++++++++++
 src/features/assistant/provider.ts            | 104 ++++++++++++++++++
 4 files changed, 190 insertions(+)

diff --git a/src/features/assistant/assistant-panel.tsx b/src/features/assistant/assistant-panel.tsx
index e5a7b22..2e39267 100644
--- a/src/features/assistant/assistant-panel.tsx
+++ b/src/features/assistant/assistant-panel.tsx
@@ -70,9 +70,11 @@ import {
   isLocalBaseURL,
   listProviderModels,
   needsHostedConsent,
+  parseTextToolCalls,
   readAssistantSettings,
   requestChatTurn,
   sendToolResults,
+  stripTextToolCalls,
   toPersistableSettings,
   visibleAssistantPresets,
   type AssistantProviderId,
@@ -919,6 +921,29 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
       throw caught
     }
 
+    if (turn.toolCalls.length === 0 && turn.content) {
+      // Fallback for models that emit `<function=name>` blocks as text
+      // instead of native tool_calls: parse and execute them through the same
+      // pipeline. Anything unparseable is stripped so raw syntax never
+      // reaches the user.
+      const parsed = parseTextToolCalls(
+        turn.content,
+        ASSISTANT_TOOL_SCHEMAS.map((tool) => tool.function.name),
+      )
+      if (parsed.length > 0) {
+        turn = {
+          content: stripTextToolCalls(turn.content).trim(),
+          toolCalls: parsed.map((call, index) => ({
+            id: `text-${index}`,
+            name: call.name,
+            args: call.args,
+          })),
+        }
+      } else {
+        turn = { content: stripTextToolCalls(turn.content).trim(), toolCalls: [] }
+      }
+    }
+
     if (turn.toolCalls.length === 0) {
       setStreamingContent(null)
       setMessages((current) => [
diff --git a/src/features/assistant/data-tools.ts b/src/features/assistant/data-tools.ts
index 393d80a..cb5805e 100644
--- a/src/features/assistant/data-tools.ts
+++ b/src/features/assistant/data-tools.ts
@@ -604,6 +604,7 @@ export const ASSISTANT_SYSTEM_PROMPT = [
   "Rules:",
   "- Prefer spending_by_category / budget_status aggregates over raw rows.",
   "- Never invent transactions, balances, or budget numbers; call a tool first.",
+  "- Always call tools through native function calling; never emit <function>, <tool_call>, or JSON tool-call blocks as text.",
   "- Amounts are in minor units in tool I/O; show formatted currency to the user.",
   "- propose_budget_change, propose_recategorize, create_transaction, delete_transaction, propose_transaction, save_chart only draft; the UI applies them after explicit approval.",
   "- propose_transaction parses natural-language adds (e.g. 'spent $12 on coffee yesterday'); save_chart persists the current answer's chart spec to the dashboard.",
diff --git a/src/features/assistant/provider-transport.test.ts b/src/features/assistant/provider-transport.test.ts
index 8b16b80..38540f2 100644
--- a/src/features/assistant/provider-transport.test.ts
+++ b/src/features/assistant/provider-transport.test.ts
@@ -3,8 +3,10 @@ import { afterEach, describe, expect, it, vi } from "vitest"
 import {
   isLocalBaseURL,
   listProviderModels,
+  parseTextToolCalls,
   readAssistantSettings,
   requestChatTurn,
+  stripTextToolCalls,
 } from "@/features/assistant/provider"
 
 interface StubResponse {
@@ -253,3 +255,61 @@ describe("requestChatTurn abort compatibility (no AbortSignal.any)", () => {
     ).rejects.toThrow(DOMException)
   })
 })
+
+describe("parseTextToolCalls", () => {
+  const valid = ["spending_by_category", "budget_status"]
+
+  it("parses the reported <function=> shape, unclosed", () => {
+    const content = [
+      "Make a graph of my spending",
+      "<function=spending_by_category>",
+      "<parameter=startDate>",
+      "2025-08-01",
+      "</parameter>",
+      "<parameter=endDate>",
+      "2025-08-31",
+      "</parameter>",
+    ].join("\n")
+    expect(parseTextToolCalls(content, valid)).toEqual([
+      {
+        name: "spending_by_category",
+        args: { startDate: "2025-08-01", endDate: "2025-08-31" },
+      },
+    ])
+  })
+
+  it("handles closed blocks, quoted attrs, and multiple calls in order", () => {
+    const content = [
+      '<function="budget_status"><parameter="period">month</parameter></function>',
+      "between",
+      "<function=spending_by_category><parameter=startDate>2025-01-01</parameter></function>",
+    ].join("\n")
+    expect(parseTextToolCalls(content, valid)).toEqual([
+      { name: "budget_status", args: { period: "month" } },
+      { name: "spending_by_category", args: { startDate: "2025-01-01" } },
+    ])
+  })
+
+  it("ignores unknown tool names and prose without blocks", () => {
+    expect(parseTextToolCalls("Just a plain answer.", valid)).toEqual([])
+    expect(
+      parseTextToolCalls(
+        "<function=delete_everything><parameter=x>1</parameter></function>",
+        valid,
+      ),
+    ).toEqual([])
+    expect(parseTextToolCalls("", valid)).toEqual([])
+  })
+})
+
+describe("stripTextToolCalls", () => {
+  it("removes blocks but keeps surrounding prose", () => {
+    const content =
+      "Here you go:\n<function=spending_by_category>\n<parameter=startDate>2025-08-01</parameter>\nDone!"
+    expect(stripTextToolCalls(content)).toBe("Here you go:\n\nDone!")
+  })
+
+  it("leaves prose without blocks untouched", () => {
+    expect(stripTextToolCalls("Plain answer.")).toBe("Plain answer.")
+  })
+})
diff --git a/src/features/assistant/provider.ts b/src/features/assistant/provider.ts
index cb19053..2faa41a 100644
--- a/src/features/assistant/provider.ts
+++ b/src/features/assistant/provider.ts
@@ -289,6 +289,110 @@ function parseToolArgs(raw: unknown): unknown {
   }
 }
 
+const TEXT_FUNCTION_PATTERN = "<function\\s*=\\s*[\"']?([\\w-]+)[\"']?\\s*>"
+const TEXT_FUNCTION_CLOSE_PATTERN = "</function\\s*>"
+const TEXT_PARAMETER_PATTERN = "<parameter\\s*=\\s*[\"']?([\\w-]+)[\"']?\\s*>"
+const TEXT_PARAMETER_CLOSE_PATTERN = "</parameter\\s*>"
+
+export interface TextToolCall {
+  name: string
+  args: Record<string, string>
+}
+
+function collectOpens(
+  text: string,
+  pattern: string,
+): Array<{ name: string; start: number; end: number }> {
+  const found: Array<{ name: string; start: number; end: number }> = []
+  for (const match of text.matchAll(new RegExp(pattern, "gi"))) {
+    if (match.index === undefined || !match[1]) continue
+    found.push({ name: match[1], start: match.index, end: match.index + match[0].length })
+  }
+  return found
+}
+
+/** Index just past the first closer at/after `from`, or null when unclosed. */
+function findCloser(text: string, pattern: string, from: number): number | null {
+  const closer = new RegExp(pattern, "gi")
+  closer.lastIndex = from
+  const match = closer.exec(text)
+  return match && match.index !== undefined ? match.index + match[0].length : null
+}
+
+/**
+ * Fallback for models that emit tool calls as text (`<function=name>` blocks)
+ * instead of native `tool_calls`. Only names in `validNames` are accepted;
+ * everything else is ignored so prose is never executed. Returns the calls
+ * in document order.
+ */
+export function parseTextToolCalls(content: string, validNames: readonly string[]): TextToolCall[] {
+  if (!content || validNames.length === 0) return []
+  const valid = new Set(validNames)
+  const calls: TextToolCall[] = []
+  const opens = collectOpens(content, TEXT_FUNCTION_PATTERN)
+  for (const [index, open] of opens.entries()) {
+    if (!valid.has(open.name)) continue
+    const nextStart =
+      index + 1 < opens.length ? (opens[index + 1]?.start ?? content.length) : content.length
+    // A block ends at its own closer; without one it runs to the next block
+    // (an unclosed trailing block still yields its params).
+    const ownClose = findCloser(content, TEXT_FUNCTION_CLOSE_PATTERN, open.end)
+    const bodyEnd = ownClose !== null && ownClose <= nextStart ? ownClose : nextStart
+    const body = content.slice(open.end, bodyEnd)
+    const args: Record<string, string> = {}
+    const params = collectOpens(body, TEXT_PARAMETER_PATTERN)
+    for (const [paramIndex, param] of params.entries()) {
+      const paramNext =
+        paramIndex + 1 < params.length
+          ? (params[paramIndex + 1]?.start ?? body.length)
+          : body.length
+      const paramClose = findCloser(body, TEXT_PARAMETER_CLOSE_PATTERN, param.end)
+      const valueEnd = paramClose !== null && paramClose <= paramNext ? paramClose : paramNext
+      // Cut the closer tag itself out of the value.
+      const raw = body
+        .slice(param.end, valueEnd)
+        .replace(new RegExp(TEXT_PARAMETER_CLOSE_PATTERN, "gi"), "")
+      args[param.name] = raw.trim()
+    }
+    calls.push({ name: open.name, args })
+  }
+  return calls
+}
+
+/** Remove text-format tool-call blocks so raw syntax never reaches the user. */
+export function stripTextToolCalls(content: string): string {
+  if (!content) return content
+  const opens = collectOpens(content, TEXT_FUNCTION_PATTERN)
+  if (opens.length === 0) return content
+  let out = ""
+  let cursor = 0
+  for (const [index, open] of opens.entries()) {
+    out += content.slice(cursor, open.start)
+    const nextStart =
+      index + 1 < opens.length ? (opens[index + 1]?.start ?? content.length) : content.length
+    const ownClose = findCloser(content, TEXT_FUNCTION_CLOSE_PATTERN, open.end)
+    if (ownClose !== null && ownClose <= nextStart) {
+      cursor = ownClose
+      continue
+    }
+    // Unclosed block: drop through its last parameter so trailing prose survives.
+    const params = collectOpens(content.slice(open.end, nextStart), TEXT_PARAMETER_PATTERN)
+    if (params.length === 0) {
+      cursor = nextStart
+      continue
+    }
+    const last = params[params.length - 1]
+    if (!last) {
+      cursor = nextStart
+      continue
+    }
+    const lastClose = findCloser(content, TEXT_PARAMETER_CLOSE_PATTERN, open.end + last.end)
+    cursor = lastClose !== null && lastClose <= nextStart ? lastClose : nextStart
+  }
+  out += content.slice(cursor)
+  return out
+}
+
 function extractTurnMessage(payload: unknown): ProviderTurnResult {
   if (!isRecord(payload)) return { content: "", toolCalls: [] }
   const choices = payload.choices

From b5568f6148f8f8185087e698553bec3db6458a14 Mon Sep 17 00:00:00 2001
From: Chirag Bangera <cbepic2@gmail.com>
Date: Tue, 8 Sep 2026 20:22:48 -0400
Subject: [PATCH 7/7] feat: fullscreen assistant on mobile, drop header toggle

---
 src/app/app-shell.tsx                      | 17 --------
 src/features/assistant/assistant-panel.tsx | 47 +++++++++++++---------
 tests/browser/mobile-shell.spec.ts         | 15 ++++---
 3 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/src/app/app-shell.tsx b/src/app/app-shell.tsx
index 6c15e08..6c4dcb8 100644
--- a/src/app/app-shell.tsx
+++ b/src/app/app-shell.tsx
@@ -8,8 +8,6 @@ import {
   Moon,
   PanelLeftClose,
   PanelLeftOpen,
-  PanelRightClose,
-  PanelRightOpen,
   ReceiptText,
   Settings,
   Sun,
@@ -110,7 +108,6 @@ export function AppShell() {
   }, [])
 
   const sidebarToggleLabel = sidebarCollapsed ? "Expand navigation" : "Collapse navigation"
-  const assistantToggleLabel = assistantOpen ? "Close assistant" : "Open assistant"
 
   return (
     <AppLockGate>
@@ -124,20 +121,6 @@ export function AppShell() {
               <span>BudgetLens</span>
             </Link>
             <div className="flex items-center gap-1">
-              <Button
-                variant={assistantOpen ? "secondary" : "ghost"}
-                size="icon"
-                aria-label={assistantToggleLabel}
-                title={assistantToggleLabel}
-                aria-expanded={assistantOpen}
-                onClick={() => setAssistantOpen((open) => !open)}
-              >
-                {assistantOpen ? (
-                  <PanelRightClose className="size-5" aria-hidden="true" />
-                ) : (
-                  <PanelRightOpen className="size-5" aria-hidden="true" />
-                )}
-              </Button>
               <Button
                 variant="ghost"
                 size="icon"
diff --git a/src/features/assistant/assistant-panel.tsx b/src/features/assistant/assistant-panel.tsx
index 2e39267..91d7565 100644
--- a/src/features/assistant/assistant-panel.tsx
+++ b/src/features/assistant/assistant-panel.tsx
@@ -19,6 +19,7 @@ import { useCallback, useEffect, useRef, useState } from "react"
 
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
+import { useIsMobileLayout } from "@/components/mobile/use-media-query"
 import { repositories } from "@/db/repositories"
 import {
   extractCitations,
@@ -1275,8 +1276,12 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
 
   const sizeWidthClass =
     layout.size === "s" ? "sm:w-[22rem]" : layout.size === "l" ? "sm:w-[32rem]" : "sm:w-[26rem]"
-  const useCustomSize = !layout.fullscreen && layout.custom !== null
-  const windowClassName = layout.fullscreen
+  // Small viewports always use the fullscreen sheet: the collapsed card is
+  // unusable at phone widths, so there is no toggle there.
+  const isMobileLayout = useIsMobileLayout()
+  const fullscreenActive = layout.fullscreen || isMobileLayout
+  const useCustomSize = !fullscreenActive && layout.custom !== null
+  const windowClassName = fullscreenActive
     ? "assistant-window fixed inset-3 z-40 flex h-auto max-h-none min-h-0 w-auto flex-col overflow-hidden rounded-3xl border bg-card text-card-foreground shadow-2xl sm:inset-6"
     : `assistant-window fixed inset-x-4 bottom-4 z-40 flex h-[min(40rem,calc(100dvh-6rem))] max-h-[calc(100dvh-3rem)] min-h-[22rem] flex-col overflow-hidden rounded-3xl border bg-card text-card-foreground shadow-2xl sm:inset-x-auto sm:right-6 sm:bottom-6 ${sizeWidthClass} sm:max-w-[calc(100vw-2rem)] sm:min-w-[20rem]`
   const windowStyle =
@@ -1332,7 +1337,7 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
       className={windowClassName}
       style={windowStyle}
     >
-      {!layout.fullscreen && (
+      {!fullscreenActive && (
         <button
           type="button"
           aria-label="Resize assistant window"
@@ -1404,23 +1409,25 @@ export function AssistantPanel({ onClose }: { onClose: () => void }) {
         >
           <Plus className="size-4" aria-hidden="true" />
         </Button>
-        <Button
-          variant="ghost"
-          size="icon"
-          className="size-7 sm:size-8"
-          aria-label={layout.fullscreen ? "Exit fullscreen" : "Expand to fullscreen"}
-          title={layout.fullscreen ? "Exit fullscreen" : "Expand to fullscreen"}
-          aria-pressed={layout.fullscreen}
-          onClick={() => {
-            setLayout((current) => ({ ...current, fullscreen: !current.fullscreen }))
-          }}
-        >
-          {layout.fullscreen ? (
-            <Minimize2 className="size-4" aria-hidden="true" />
-          ) : (
-            <Maximize2 className="size-4" aria-hidden="true" />
-          )}
-        </Button>
+        {!isMobileLayout && (
+          <Button
+            variant="ghost"
+            size="icon"
+            className="size-7 sm:size-8"
+            aria-label={layout.fullscreen ? "Exit fullscreen" : "Expand to fullscreen"}
+            title={layout.fullscreen ? "Exit fullscreen" : "Expand to fullscreen"}
+            aria-pressed={layout.fullscreen}
+            onClick={() => {
+              setLayout((current) => ({ ...current, fullscreen: !current.fullscreen }))
+            }}
+          >
+            {layout.fullscreen ? (
+              <Minimize2 className="size-4" aria-hidden="true" />
+            ) : (
+              <Maximize2 className="size-4" aria-hidden="true" />
+            )}
+          </Button>
+        )}
         <Button
           variant="ghost"
           size="icon"
diff --git a/tests/browser/mobile-shell.spec.ts b/tests/browser/mobile-shell.spec.ts
index 35fc324..987bbb8 100644
--- a/tests/browser/mobile-shell.spec.ts
+++ b/tests/browser/mobile-shell.spec.ts
@@ -65,7 +65,7 @@ test("tab bar navigates tabs and More-sheet destinations", async ({ page }) => {
   await expect(page.getByRole("dialog", { name: "More destinations" })).toBeHidden()
 })
 
-test("assistant panel docks as a bottom sheet on small viewports", async ({ page }) => {
+test("assistant panel opens fullscreen on small viewports", async ({ page }) => {
   test.skip(!isMobileLayout(page), "mobile layout only")
   await startBeyondOnboarding(page, "/")
 
@@ -81,11 +81,16 @@ test("assistant panel docks as a bottom sheet on small viewports", async ({ page
   expect(box).not.toBeNull()
   expect(viewport).not.toBeNull()
   if (box && viewport) {
-    // Bottom-anchored, full-bleed sheet rather than a floating card.
-    expect(box.y + box.height).toBeGreaterThanOrEqual(viewport.height - 2)
-    expect(box.x).toBeLessThanOrEqual(2)
-    expect(box.width).toBeGreaterThanOrEqual(viewport.width - 4)
+    // Fullscreen sheet with small insets rather than a floating card, and no
+    // expand toggle (collapsed mode is unusable at phone widths).
+    expect(box.x).toBeLessThanOrEqual(20)
+    expect(box.y).toBeLessThanOrEqual(20)
+    expect(box.width).toBeGreaterThanOrEqual(viewport.width - 40)
+    expect(box.y + box.height).toBeGreaterThanOrEqual(viewport.height - 40)
   }
+  await expect(
+    panel.getByRole("button", { name: "Expand to fullscreen" }),
+  ).toHaveCount(0)
 
   await panel.getByRole("button", { name: "Close assistant" }).click()
   await expect(panel).toBeHidden()