chore: release v0.6.10

default to reading the note; edit opens the form alone without a
side preview since the rich text editor already shows live content.

.dockerignore

@@ -1,5 +1,6 @@
 node_modules
 .next
+.worktrees
 .git
 deploy
 docs

.env.example

@@ -55,3 +55,7 @@ LLM_PROVIDER=openai
 LLM_BASE_URL=
 LLM_API_KEY=
 LLM_MODEL=llama3.2
+# IANA timezone for assistant relative dates ("Thursday at 2"). Falls back to TZ, then America/Chicago.
+HOUSEHOLD_TIMEZONE=America/Chicago
+# Optional override for agent tool → /api/v1 self-calls (defaults to http://127.0.0.1:$PORT).
+# INTERNAL_API_BASE_URL=http://127.0.0.1:3000

.gitea/workflows/release.yml

@@ -31,15 +31,31 @@ jobs:
             echo "image=registry.ginnoir.com/ginnoir/famapp"
           } >> "$GITHUB_OUTPUT"
 
-      - name: Ensure docker CLI
+      - name: Ensure docker CLI + buildx
         run: |
-          if command -v docker >/dev/null 2>&1; then
+          # Debian's docker.io package ships no buildx plugin, which the
-            echo "docker already available"
+          # registry-cache build below requires. Install Docker's official
+          # CLI + buildx plugin so the build works regardless of what the
+          # runner image happens to provide.
+          if docker buildx version >/dev/null 2>&1; then
+            echo "docker + buildx already available"
             docker version
+            docker buildx version
             exit 0
           fi
-          apt-get update -qq && apt-get install -y -qq docker.io
+
+          export DEBIAN_FRONTEND=noninteractive
+          apt-get update -qq
+          apt-get install -y -qq ca-certificates curl gnupg
+          install -m 0755 -d /etc/apt/keyrings
+          curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
+          chmod a+r /etc/apt/keyrings/docker.asc
+          echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" \
+            > /etc/apt/sources.list.d/docker.list
+          apt-get update -qq
+          apt-get install -y -qq docker-ce-cli docker-buildx-plugin
           docker version
+          docker buildx version
 
       - name: Login to registry
         run: |

CHANGELOG.md

@@ -1,5 +1,79 @@
 # Changelog
 
+## [0.6.10](https://github.com/ginnoir/famapp/compare/v0.6.9...v0.6.10) (2026-07-18)
+
+### Features
+
+- open notes in view mode with optional editor ([9b3bd02](https://github.com/ginnoir/famapp/commit/9b3bd02b0bafc89a514ca8fd4434f9659b9ee4c2))
+
+## [0.6.9](https://github.com/ginnoir/famapp/compare/v0.6.8...v0.6.9) (2026-07-18)
+
+### Bug Fixes
+
+- build share urls from auth_url instead of localhost ([832e726](https://github.com/ginnoir/famapp/commit/832e7265c9354edf86f28f72f129ee34da8c3d04))
+
+## [0.6.8](https://github.com/ginnoir/famapp/compare/v0.6.7...v0.6.8) (2026-07-18)
+
+### Bug Fixes
+
+- restore share and note scrolling on ios pwa ([969521a](https://github.com/ginnoir/famapp/commit/969521ac3f527a939988053b453881ed3560eb61))
+
+## [0.6.7](https://github.com/ginnoir/famapp/compare/v0.6.6...v0.6.7) (2026-07-13)
+
+### Bug Fixes
+
+- **garden:** add ikea cabinet and acrylic case container types ([043d285](https://github.com/ginnoir/famapp/commit/043d28539ec08dd46a097970b4e876bfb1ba7aa1))
+
+## [0.6.6](https://github.com/ginnoir/famapp/compare/v0.6.5...v0.6.6) (2026-07-13)
+
+### Bug Fixes
+
+- **garden:** add carnivore plant category ([b8229eb](https://github.com/ginnoir/famapp/commit/b8229eb9b5550cde98e5446615873e727ead05a8))
+
+## [0.6.5](https://github.com/ginnoir/famapp/compare/v0.6.4...v0.6.5) (2026-07-09)
+
+### Bug Fixes
+
+- **agent:** call api v1 via loopback instead of public url ([3e8fe2d](https://github.com/ginnoir/famapp/commit/3e8fe2d06dc31d3a1058b4b8942c46b1220a6b4c))
+
+## [0.6.4](https://github.com/ginnoir/famapp/compare/v0.6.3...v0.6.4) (2026-07-09)
+
+### Bug Fixes
+
+- **agent:** stop tool thrash after writes and log rounds ([72d123b](https://github.com/ginnoir/famapp/commit/72d123b9a0f67589d92614a8d2138912585b0d79))
+
+## [0.6.3](https://github.com/ginnoir/famapp/compare/v0.6.2...v0.6.3) (2026-07-09)
+
+### Bug Fixes
+
+- **agent:** raise tool rounds and ease calendar creates ([d3e79ed](https://github.com/ginnoir/famapp/commit/d3e79edb9ef0b931fa9d6e6629dad2677d661741))
+
+## [0.6.2](https://github.com/ginnoir/famapp/compare/v0.6.1...v0.6.2) (2026-07-09)
+
+### Features
+
+- **agent:** add assistant model selector ([4c82d55](https://github.com/ginnoir/famapp/commit/4c82d551ea1f0c8091a3ffc31935a8d22855bbc0))
+- **agent:** add llm model discovery helper ([0bf63cf](https://github.com/ginnoir/famapp/commit/0bf63cf8a83a1adca58fa9e8bf42f16dac60687b))
+- **agent:** expose available assistant models ([27db599](https://github.com/ginnoir/famapp/commit/27db599444fc0bb80d5a1650e2f5b5ba4f695c8e))
+- **agent:** let users choose model route ([ec3f96d](https://github.com/ginnoir/famapp/commit/ec3f96dab170fb2333780438bdec3628cfc58116))
+- **agent:** persist assistant model preference ([bf7e07e](https://github.com/ginnoir/famapp/commit/bf7e07ead91dd8c428f06551afb2113ce838cc82))
+- **agent:** refresh assistant model catalog ([b279f16](https://github.com/ginnoir/famapp/commit/b279f16ba0e1537d2752d30bf5e565f4ede400af))
+- **agent:** route chat through selected model ([9b7a044](https://github.com/ginnoir/famapp/commit/9b7a04431cb12609cbcd766e05fbc411599e0b34))
+
+### Bug Fixes
+
+- **agent:** hide unrelated models for alias fallback ([4dc04b2](https://github.com/ginnoir/famapp/commit/4dc04b21d63aaef7c773f238602f06edbbf03509))
+- **agent:** improve model selector legibility ([bb679d0](https://github.com/ginnoir/famapp/commit/bb679d02be28440acbc860146cbcb3809224aa09))
+- **agent:** move route selector to settings ([49732b0](https://github.com/ginnoir/famapp/commit/49732b02f31cbef57e6cd3b577bee6dbd998e029))
+- **agent:** reject padded assistant model ids ([3983c30](https://github.com/ginnoir/famapp/commit/3983c30fe1b8a324f7d5826df0b24506fe054e50))
+- **agent:** use native model selector ([716bca0](https://github.com/ginnoir/famapp/commit/716bca0fcba8f2026c814f668bf873cf61a0ad16))
+- **agent:** validate assistant model requests ([876e726](https://github.com/ginnoir/famapp/commit/876e72671a0b82b579a9783eb86f452a4a026a52))
+
+### Documentation
+
+- plan assistant model selector ([eb8e562](https://github.com/ginnoir/famapp/commit/eb8e5625656a1e3fe97e19b0bb2514660cf0c5f6))
+- specify assistant model selector ([1a58ef9](https://github.com/ginnoir/famapp/commit/1a58ef993e62ea2855d7d5aafc17446a0e91c33c))
+
 ## [0.6.1](https://github.com/ginnoir/famapp/compare/v0.6.0...v0.6.1) (2026-07-05)
 
 ### Features

Dockerfile

@@ -16,7 +16,9 @@ ENV CI=true
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV DATABASE_URL=postgres://build:build@localhost:5432/build
 ENV AUTH_SECRET=build-time-placeholder
+# Build-only placeholder. Runtime public URL is AUTH_URL from stack.env — never prefer this.
 ENV NEXT_PUBLIC_APP_URL=http://localhost:3000
+ENV AUTH_URL=http://localhost:3000
 COPY . .
 RUN pnpm install --offline --frozen-lockfile
 RUN --mount=type=cache,id=famapp-nextjs,target=/app/.next/cache \

STATUS.md

@@ -111,5 +111,6 @@ P2/P3 backlog is filed on Gitea only (no task briefs yet) — see `docs/issues-m
 - Repo: https://github.com/ginnoir/famapp (HTTPS remote on `origin`).
 - Local dev tooling installed: Node 22+, pnpm 10.33.3.
 - `.env` is **not** committed; copy `.env.example` → `.env` when needed.
+- Assistant relative dates use `HOUSEHOLD_TIMEZONE` (default `America/Chicago` if unset).
 - VS Code recommended extensions in `.vscode/extensions.json`; copy `.vscode/settings.json.example` → `.vscode/settings.json` for the workspace defaults.
 - Memory files (cross-session, only seen by Claude): `C:\Users\MattC\.claude\projects\C--Users-MattC-Documents-famapp\memory\`.

docs/superpowers/specs/2026-07-08-assistant-model-selector-design.md

@@ -0,0 +1,151 @@
+# Assistant model selector design
+
+Date: 2026-07-08
+Status: approved for planning
+
+## Context
+
+The AI assistant chat currently uses one environment-configured model through `LLM_MODEL`.
+The chat UI posts messages to `/api/agent/chat`, and the server creates the OpenAI-compatible
+client without any request-time model choice.
+
+ginnoir wants a model selector in the assistant chat. The selector should discover available
+models from the configured OpenAI-compatible provider and save the selected model as the user's
+default.
+
+## Goals
+
+- Show a compact model selector in the assistant chat panel.
+- Discover models from the provider's `/models` endpoint server-side.
+- Persist the selected model per user so it works across browser sessions and devices.
+- Keep `LLM_MODEL` as the fallback when discovery fails, no model is saved, or the saved model
+  is no longer available.
+- Preserve mock-provider behavior in CI and local setups without `LLM_BASE_URL`.
+
+## Non-goals
+
+- Model hosting, training, or fine-tuning.
+- Multiple LLM providers in the same deployment.
+- Per-message experimental settings beyond selecting the model ID.
+- Exposing arbitrary browser-supplied model IDs to the provider.
+
+## User experience
+
+When the assistant bubble opens, the chat panel loads available model IDs from the server.
+The selector appears near the existing assistant status and clear-chat controls. It should be
+visible but compact enough not to reduce the message area materially.
+
+Changing the selector immediately saves the user's default model. The next message uses that
+model, and future assistant sessions start with the saved selection when it is still available.
+
+If model discovery fails, the panel remains usable with the `LLM_MODEL` fallback and shows a
+muted status that model discovery is unavailable. If the saved model has disappeared from the
+provider, the server and UI fall back to `LLM_MODEL`.
+
+## Architecture
+
+### Configuration
+
+`getLlmConfig()` remains the source for provider, base URL, API key, and fallback model.
+No additional allowlist environment variable is required because model IDs come from the
+provider's OpenAI-compatible `/models` endpoint.
+
+### Persistence
+
+Add nullable `assistant_model` storage to `users`.
+
+The existing assistant preference loader should return:
+
+- assistant enabled state
+- assistant display name
+- assistant system prompt
+- saved assistant model ID
+
+The value is nullable. `null` means "use the environment fallback model."
+
+### Model discovery API
+
+Add `GET /api/agent/models`.
+
+Behavior:
+
+- Require the same authenticated user/session or API auth shape as the chat endpoint.
+- Require assistant access to be enabled for the user.
+- If `LLM_BASE_URL` is missing or the provider is mock, return the fallback model as the only
+  available model.
+- Fetch `${LLM_BASE_URL}/models` with `Authorization: Bearer ${LLM_API_KEY}` when configured.
+- Accept OpenAI-style payloads with a top-level `data` array.
+- Normalize each model to `{ id: string, label: string }`, using the ID as the label.
+- Deduplicate, sort consistently, and include the fallback model if the provider omitted it.
+- If discovery fails, return the fallback model plus a degraded status instead of failing the
+  chat UI.
+
+The response should include enough metadata for the UI:
+
+```json
+{
+  "models": [{ "id": "llama3.2", "label": "llama3.2" }],
+  "selectedModel": "llama3.2",
+  "fallbackModel": "llama3.2",
+  "degraded": false
+}
+```
+
+### Saving the default model
+
+Add a server action for updating the user's assistant model, matching the existing assistant
+settings actions. The update path must:
+
+- Accept a model ID string or `null`.
+- Validate length and basic shape before touching the database.
+- Validate the requested model against the current discovered model list.
+- Save `null` when the selected model matches the fallback so `LLM_MODEL` changes take effect for
+  users who have not chosen a non-default model.
+- Revalidate assistant surfaces after saving.
+
+### Chat request flow
+
+Extend `clientChatInputSchema` with optional `model`.
+
+The chat route should:
+
+- Parse `model` from the request body.
+- Resolve the effective model from request model, saved user default, and fallback model.
+- Validate request model and saved user default against discovered models.
+- Reject an invalid request model with `400`.
+- Silently fall back when the saved user default is no longer available.
+- Pass the effective model into `runAgentChat`.
+
+`runAgentChat` should accept an optional model override. `createLlmClient` should support an
+override object or equivalent path that replaces only the model while preserving the configured
+provider, base URL, and API key.
+
+## Error handling
+
+- Missing auth: `401`.
+- Assistant disabled: `403`.
+- Invalid posted model: `400`.
+- Provider `/models` failure: return fallback model from the model-discovery API with
+  `degraded: true`; do not block chat startup.
+- LLM completion failure after a valid model is selected: keep the existing chat error behavior.
+
+## Testing
+
+Unit tests:
+
+- Model discovery normalizes OpenAI-compatible `/models` responses.
+- Discovery falls back to `LLM_MODEL` for mock or failed provider states.
+- Chat input schema accepts an optional valid model string and rejects invalid shapes.
+- Chat route rejects a model not returned by discovery.
+- `runAgentChat` passes the effective model override into the LLM client path.
+
+E2E smoke:
+
+- After assistant opt-in, opening the assistant shows the model selector.
+- Sending a message still renders the user message and assistant response with the mock provider.
+
+## Rollout notes
+
+This is additive. Existing deployments without a provider `/models` endpoint continue to use
+`LLM_MODEL`. The database migration is nullable, so existing users keep current behavior until
+they choose a model.

drizzle/0025_assistant_model.sql

@@ -0,0 +1 @@
+ALTER TABLE "users" ADD COLUMN "assistant_model" text;

drizzle/0026_assistant_model_route.sql

@@ -0,0 +1,5 @@
+ALTER TABLE "users" ADD COLUMN "assistant_model_route" text;--> statement-breakpoint
+UPDATE "users"
+SET "assistant_model_route" = "assistant_model",
+    "assistant_model" = NULL
+WHERE "assistant_model" IN ('auto', 'uncensored');

drizzle/meta/_journal.json

@@ -176,6 +176,20 @@
       "when": 1780394000000,
       "tag": "0024_user_assistant_customization",
       "breakpoints": true
+    },
+    {
+      "idx": 25,
+      "version": "7",
+      "when": 1783560000000,
+      "tag": "0025_assistant_model",
+      "breakpoints": true
+    },
+    {
+      "idx": 26,
+      "version": "7",
+      "when": 1783561000000,
+      "tag": "0026_assistant_model_route",
+      "breakpoints": true
     }
   ]
-}
+}

eslint.config.mjs

@@ -8,6 +8,7 @@ export default tseslint.config(
     ignores: [
       "node_modules/**",
       ".next/**",
+      ".worktrees/**",
       ".claude/**",
       ".design-tmp/**",
       "dist/**",

next.config.ts

@@ -178,7 +178,14 @@ const nextConfig: NextConfig = {
   output: "standalone",
   // Keep pino and pino-pretty as native Node.js requires so their worker-thread
   // transport and stream internals work correctly inside the standalone bundle.
-  serverExternalPackages: ["pino", "pino-pretty", "drizzle-orm", "postgres"],
+  serverExternalPackages: [
+    "pino",
+    "pino-pretty",
+    "drizzle-orm",
+    "postgres",
+    "isomorphic-dompurify",
+    "jsdom",
+  ],
 };
 
 export default nextConfig;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "famapp",
-  "version": "0.6.1",
+  "version": "0.6.10",
   "private": true,
   "type": "module",
   "packageManager": "pnpm@10.33.3",

src/app/api/agent/chat/route.ts

@@ -2,6 +2,7 @@ import { apiError, apiJson } from "@/lib/api-handler";
 import { resolveApiAuth } from "@/lib/api-auth";
 import { getAssistantPreferences, resolveAssistantSystemPrompt } from "@/lib/assistant-preference";
 import { isLlmConfigured } from "@/lib/llm";
+import { listLlmModels, resolveAssistantModel } from "@/lib/llm/models";
 import { clientChatInputSchema } from "@/modules/agent/messages";
 import { encodeSseEvent } from "@/modules/agent/server/progress";
 import { runAgentChat } from "@/modules/agent/server/run";
@@ -31,6 +32,18 @@ export async function POST(request: Request) {
     return apiError(parsed.error.issues[0]?.message ?? "Validation error", 400);
   }
 
+  const modelList = await listLlmModels({ route: assistant.modelRoute });
+  const modelResolution = resolveAssistantModel({
+    requestedModel: parsed.data.model,
+    savedModel: assistant.model,
+    fallbackModel: modelList.fallbackModel,
+    models: modelList.models,
+  });
+
+  if (!modelResolution.ok) {
+    return apiError(modelResolution.error, 400);
+  }
+
   if (parsed.data.stream) {
     const stream = new ReadableStream<Uint8Array>({
       async start(controller) {
@@ -44,6 +57,7 @@ export async function POST(request: Request) {
             messages: parsed.data.messages,
             request,
             systemPrompt,
+            model: modelResolution.model,
             onProgress: send,
           });
 
@@ -78,6 +92,7 @@ export async function POST(request: Request) {
       messages: parsed.data.messages,
       request,
       systemPrompt,
+      model: modelResolution.model,
     });
 
     return apiJson({

src/app/api/agent/models/route.ts

@@ -0,0 +1,47 @@
+import { apiError, apiJson } from "@/lib/api-handler";
+import { resolveApiAuth } from "@/lib/api-auth";
+import { getAssistantPreferences } from "@/lib/assistant-preference";
+import { isValidAssistantModelRoute, listLlmModels, resolveAssistantModel } from "@/lib/llm/models";
+
+export const dynamic = "force-dynamic";
+
+function noStore(response: Response): Response {
+  response.headers.set("Cache-Control", "no-store");
+  return response;
+}
+
+export async function GET(request: Request) {
+  const auth = await resolveApiAuth(request);
+  if (!auth?.userId) {
+    return noStore(apiError("Unauthorized", 401));
+  }
+
+  const assistant = await getAssistantPreferences(auth.userId);
+  if (!assistant.enabled) {
+    return noStore(apiError("Assistant not enabled", 403));
+  }
+
+  const requestedRoute = new URL(request.url).searchParams.get("route");
+  if (requestedRoute !== null && !isValidAssistantModelRoute(requestedRoute)) {
+    return noStore(apiError("Invalid assistant model route", 400));
+  }
+
+  const modelRoute = requestedRoute ?? assistant.modelRoute;
+  const modelList = await listLlmModels({ route: modelRoute });
+  const resolved = resolveAssistantModel({
+    requestedModel: null,
+    savedModel: requestedRoute === null ? assistant.model : null,
+    fallbackModel: modelList.fallbackModel,
+    models: modelList.models,
+  });
+
+  return noStore(
+    apiJson({
+      models: modelList.models,
+      selectedModel: resolved.model,
+      fallbackModel: modelList.fallbackModel,
+      route: modelList.route,
+      degraded: modelList.degraded,
+    }),
+  );
+}

src/app/globals.css

@@ -725,9 +725,19 @@
 
 .scroll-area {
   flex: 1;
-  overflow: auto;
+  overflow-x: hidden;
+  overflow-y: auto;
   padding: 20px 24px 60px;
 }
+
+/* Bare routes (/s/*, /login, signed-out) — same scrollport as .scroll-area
+   without app chrome padding. Needed because html/body are overflow:hidden. */
+.bare-scroll {
+  height: 100%;
+  height: 100dvh;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
 :where(html[data-nav="bottom"]) .scroll-area,
 :where(html[data-nav="fab"]) .scroll-area {
   padding: 12px 14px 74px;
@@ -1617,7 +1627,8 @@ select {
   }
 
   /* Momentum scrolling + prevent page bounce fighting in-app scroll */
-  .scroll-area {
+  .scroll-area,
+  .bare-scroll {
     -webkit-overflow-scrolling: touch;
     overscroll-behavior-y: contain;
   }

src/app/layout.tsx

@@ -1,4 +1,5 @@
 import type { Metadata, Viewport } from "next";
+import { headers } from "next/headers";
 import "./globals.css";
 import { Inter, Source_Serif_4, Newsreader, Fraunces, JetBrains_Mono } from "next/font/google";
 import { cn } from "@/lib/utils";
@@ -71,9 +72,13 @@ export const metadata: Metadata = {
 
 // Pre-paint: read user's theme prefs from localStorage and apply data-* + .dark.
 // Falls back to clay/serif-sans/regular/sidebar/system if nothing is stored.
+// Public share pages always use ink so guests get a neutral, consistent look.
 const prePaintScript = `(function(){
   try {
-    var palette = localStorage.getItem('themePalette') || localStorage.getItem('theme') || 'clay';
+    var isShare = location.pathname.indexOf('/s/') === 0;
+    var palette = isShare
+      ? 'ink'
+      : (localStorage.getItem('themePalette') || localStorage.getItem('theme') || 'clay');
     var mode = localStorage.getItem('themeMode') || 'system';
     var fontPair = localStorage.getItem('themeFontPair') || 'serif-sans';
     var density = localStorage.getItem('themeDensity') || 'regular';
@@ -104,6 +109,11 @@ export default async function RootLayout({ children }: { children: React.ReactNo
   let signedIn = false;
   let assistantEnabled = false;
   let assistantName = DEFAULT_ASSISTANT_NAME;
+  let assistantModel: string | null = null;
+
+  const headersList = await headers();
+  const pathname = headersList.get("x-pathname") ?? "";
+  const isSharePage = pathname === "/s" || pathname.startsWith("/s/");
 
   const session = await auth();
   if (session?.user?.id) {
@@ -117,6 +127,7 @@ export default async function RootLayout({ children }: { children: React.ReactNo
         themeNavStyle: users.themeNavStyle,
         assistantEnabled: users.assistantEnabled,
         assistantName: users.assistantName,
+        assistantModel: users.assistantModel,
       })
       .from(users)
       .where(eq(users.id, session.user.id))
@@ -129,6 +140,7 @@ export default async function RootLayout({ children }: { children: React.ReactNo
       navStyle = row.themeNavStyle as NavStyle;
       assistantEnabled = row.assistantEnabled;
       assistantName = row.assistantName?.trim() || DEFAULT_ASSISTANT_NAME;
+      assistantModel = row.assistantModel?.trim() || null;
     }
     userDashboards = await db
       .select({
@@ -143,6 +155,10 @@ export default async function RootLayout({ children }: { children: React.ReactNo
       .orderBy(asc(dashboards.position), asc(dashboards.createdAt));
   }
 
+  if (isSharePage) {
+    palette = "ink";
+  }
+
   // Server-side initial dark guess: only for `dark` mode (system mode is corrected
   // before paint by the inline script). Avoids a flash on signed-in users.
   const isDark = mode === "dark";
@@ -186,6 +202,7 @@ export default async function RootLayout({ children }: { children: React.ReactNo
               configured={isLlmConfigured()}
               userId={session.user.id}
               assistantName={assistantName}
+              assistantModel={assistantModel}
             />
           ) : null}
           <AppToaster position="bottom-right" />

src/app/settings/assistant-actions.ts

@@ -9,8 +9,15 @@ import {
   MAX_ASSISTANT_NAME_LENGTH,
   MAX_ASSISTANT_SYSTEM_PROMPT_LENGTH,
 } from "@/lib/assistant-config";
+import {
+  isValidAssistantModelRoute,
+  isValidLlmModelId,
+  listLlmModels,
+  type AssistantModelRoute,
+} from "@/lib/llm/models";
 import { users } from "@/modules/_core/schema";
 import { getCurrentSession } from "@/lib/session";
+import { getAssistantPreferences } from "@/lib/assistant-preference";
 
 const assistantNameSchema = z
   .string()
@@ -50,6 +57,39 @@ export async function setAssistantSystemPrompt(prompt: string | null): Promise<v
   revalidateAssistantSurfaces();
 }
 
+export async function setAssistantModelRoute(route: AssistantModelRoute): Promise<void> {
+  if (!isValidAssistantModelRoute(route)) {
+    throw new Error("Invalid assistant model route");
+  }
+
+  const { user } = await getCurrentSession();
+  await db
+    .update(users)
+    .set({ assistantModelRoute: route, assistantModel: null })
+    .where(eq(users.id, user.id));
+  revalidateAssistantSurfaces();
+}
+
+export async function setAssistantModel(model: string | null): Promise<void> {
+  const { user } = await getCurrentSession();
+  const normalized = model?.trim() || null;
+
+  if (normalized !== null && !isValidLlmModelId(normalized)) {
+    throw new Error("Invalid assistant model");
+  }
+
+  const assistant = await getAssistantPreferences(user.id);
+  const available = await listLlmModels({ route: assistant.modelRoute });
+  const requested = normalized === available.fallbackModel ? null : normalized;
+
+  if (requested !== null && !available.models.some((option) => option.id === requested)) {
+    throw new Error("Invalid assistant model");
+  }
+
+  await db.update(users).set({ assistantModel: requested }).where(eq(users.id, user.id));
+  revalidateAssistantSurfaces();
+}
+
 export async function resetAssistantName(): Promise<void> {
   await setAssistantName(DEFAULT_ASSISTANT_NAME);
 }

src/app/settings/page.tsx

@@ -324,6 +324,7 @@ function AppearanceSection({
     themeNavStyle: string;
     assistantEnabled: boolean;
     assistantName: string;
+    assistantModelRoute: string | null;
     assistantSystemPrompt: string | null;
   };
 }) {
@@ -361,6 +362,7 @@ function AppearanceSection({
           <AssistantSettings
             enabled={user.assistantEnabled}
             name={user.assistantName}
+            modelRoute={user.assistantModelRoute}
             systemPrompt={user.assistantSystemPrompt}
             defaultSystemPrompt={AGENT_SYSTEM_PROMPT}
           />

src/components/app-shell.tsx

@@ -24,7 +24,8 @@ export async function AppShell({ signedIn, navStyle, children }: Props) {
 
   if (bare || !signedIn) {
     // No shell — share viewer and signed-out pages render bare.
-    return <>{children}</>;
+    // html/body are overflow:hidden for the app grid; bare pages need their own scroller.
+    return <div className="bare-scroll">{children}</div>;
   }
 
   const useTopVariant = navStyle === "top-nav";

src/components/assistant-settings.tsx

@@ -7,9 +7,11 @@ import {
   resetAssistantSystemPrompt,
   setAssistantEnabled,
   setAssistantName,
+  setAssistantModelRoute,
   setAssistantSystemPrompt,
 } from "@/app/settings/assistant-actions";
 import { DEFAULT_ASSISTANT_NAME, MAX_ASSISTANT_NAME_LENGTH } from "@/lib/assistant-config";
+import type { AssistantModelRoute } from "@/lib/llm/models";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Switch } from "@/components/ui/switch";
@@ -17,15 +19,29 @@ import { Switch } from "@/components/ui/switch";
 type Props = {
   enabled: boolean;
   name: string;
+  modelRoute: string | null;
   systemPrompt: string | null;
   defaultSystemPrompt: string;
 };
 
-export function AssistantSettings({ enabled, name, systemPrompt, defaultSystemPrompt }: Props) {
+function normalizeAssistantModelRoute(value: string | null): AssistantModelRoute {
+  return value === "uncensored" ? "uncensored" : "auto";
+}
+
+export function AssistantSettings({
+  enabled,
+  name,
+  modelRoute,
+  systemPrompt,
+  defaultSystemPrompt,
+}: Props) {
   const [isPending, startTransition] = useTransition();
   const router = useRouter();
 
   const effectivePrompt = systemPrompt ?? defaultSystemPrompt;
+  const [selectedRoute, setSelectedRoute] = useState<AssistantModelRoute>(() =>
+    normalizeAssistantModelRoute(modelRoute),
+  );
   const [savedName, setSavedName] = useState(name);
   const [draftName, setDraftName] = useState(name);
   const [savedPrompt, setSavedPrompt] = useState(systemPrompt);
@@ -45,6 +61,16 @@ export function AssistantSettings({ enabled, name, systemPrompt, defaultSystemPr
     });
   }
 
+  function changeModelRoute(nextRoute: string) {
+    const route = normalizeAssistantModelRoute(nextRoute);
+    setSelectedRoute(route);
+
+    startTransition(async () => {
+      await setAssistantModelRoute(route);
+      router.refresh();
+    });
+  }
+
   function saveName() {
     const next = draftName.trim();
     if (!next) return;
@@ -105,6 +131,29 @@ export function AssistantSettings({ enabled, name, systemPrompt, defaultSystemPr
         />
       </label>
 
+      <div className="flex flex-col gap-2">
+        <div className="min-w-0">
+          <label htmlFor="assistant-model-route" className="text-sm font-medium">
+            Model route
+          </label>
+          <p className="muted text-[12px] mt-0.5">
+            Choose the default router family for your assistant. Individual models can still be
+            picked from the chat panel.
+          </p>
+        </div>
+        <select
+          id="assistant-model-route"
+          aria-label="Assistant model route"
+          value={selectedRoute}
+          disabled={isPending}
+          onChange={(event) => changeModelRoute(event.target.value)}
+          className="input h-10"
+        >
+          <option value="auto">Auto</option>
+          <option value="uncensored">Uncensored</option>
+        </select>
+      </div>
+
       <div className="flex flex-col gap-2">
         <div className="flex items-end justify-between gap-3">
           <div className="min-w-0 flex-1">

src/components/rich-text/rich-text.css

@@ -64,6 +64,9 @@
   margin: 0.8em 0;
   max-width: 100%;
   overflow-x: auto;
+  overflow-y: hidden;
+  -webkit-overflow-scrolling: touch;
+  overscroll-behavior-x: contain;
   padding: 0.75rem 0.9rem;
 }
 
@@ -91,7 +94,12 @@
   display: block;
   margin: 0.8em 0;
   max-width: 100%;
+  /* overflow-x alone computes overflow-y to auto, which traps vertical
+     touch scrolling on iOS when a wide table fills the viewport. */
   overflow-x: auto;
+  overflow-y: hidden;
+  -webkit-overflow-scrolling: touch;
+  overscroll-behavior-x: contain;
   width: max-content;
 }
 

src/lib/app-url.ts

@@ -0,0 +1,8 @@
+/** Public origin for absolute links. AUTH_URL wins — Docker build sets NEXT_PUBLIC to localhost. */
+export function getAppPublicUrl(): string {
+  const raw =
+    process.env.AUTH_URL?.trim() ||
+    process.env.NEXT_PUBLIC_APP_URL?.trim() ||
+    "http://localhost:3000";
+  return raw.replace(/\/$/, "");
+}

src/lib/assistant-preference.ts

@@ -1,6 +1,7 @@
 import { eq } from "drizzle-orm";
 import { db } from "@/lib/db";
 import { DEFAULT_ASSISTANT_NAME } from "@/lib/assistant-config";
+import { isValidAssistantModelRoute, type AssistantModelRoute } from "@/lib/llm/models";
 import { users } from "@/modules/_core/schema";
 
 export {
@@ -14,6 +15,8 @@ export type AssistantPreferences = {
   enabled: boolean;
   name: string;
   systemPrompt: string | null;
+  modelRoute: AssistantModelRoute | null;
+  model: string | null;
 };
 
 export async function getAssistantPreferences(userId: string): Promise<AssistantPreferences> {
@@ -22,6 +25,8 @@ export async function getAssistantPreferences(userId: string): Promise<Assistant
       assistantEnabled: users.assistantEnabled,
       assistantName: users.assistantName,
       assistantSystemPrompt: users.assistantSystemPrompt,
+      assistantModelRoute: users.assistantModelRoute,
+      assistantModel: users.assistantModel,
     })
     .from(users)
     .where(eq(users.id, userId))
@@ -31,6 +36,11 @@ export async function getAssistantPreferences(userId: string): Promise<Assistant
     enabled: row?.assistantEnabled ?? false,
     name: row?.assistantName?.trim() || DEFAULT_ASSISTANT_NAME,
     systemPrompt: row?.assistantSystemPrompt ?? null,
+    modelRoute:
+      row?.assistantModelRoute && isValidAssistantModelRoute(row.assistantModelRoute)
+        ? row.assistantModelRoute
+        : null,
+    model: row?.assistantModel?.trim() || null,
   };
 }
 

src/lib/llm/index.ts

@@ -13,8 +13,8 @@ export type {
 export { getLlmConfig, isLlmConfigured } from "./config";
 export { createMockLlmClient } from "./mock";
 
-export function createLlmClient(override?: LlmClient): LlmClient {
+export function createLlmClient(options?: { model?: string; override?: LlmClient }): LlmClient {
-  if (override) return override;
+  if (options?.override) return options.override;
 
   const config = getLlmConfig();
   if (config.provider === "mock" || !config.baseUrl) {
@@ -24,6 +24,6 @@ export function createLlmClient(override?: LlmClient): LlmClient {
   return createOpenAiCompatibleClient({
     baseUrl: config.baseUrl,
     apiKey: config.apiKey,
-    model: config.model,
+    model: options?.model ?? config.model,
   });
 }

src/lib/llm/models.ts

@@ -0,0 +1,148 @@
+import { getLlmConfig, type LlmConfig } from "./config";
+
+export type LlmModelOption = {
+  id: string;
+  label: string;
+};
+
+export const ASSISTANT_MODEL_ROUTES = ["auto", "uncensored"] as const;
+
+export type AssistantModelRoute = (typeof ASSISTANT_MODEL_ROUTES)[number];
+
+export type LlmModelsResult = {
+  models: LlmModelOption[];
+  fallbackModel: string;
+  route: AssistantModelRoute;
+  degraded: boolean;
+};
+
+export type AssistantModelResolution =
+  | { ok: true; model: string }
+  | { ok: false; model: string; error: string };
+
+const MODEL_ID_PATTERN = /^[A-Za-z0-9._:/-]+$/;
+const MAX_MODEL_ID_LENGTH = 128;
+
+export function isValidLlmModelId(value: string): boolean {
+  const trimmed = value.trim();
+  return (
+    trimmed.length > 0 &&
+    trimmed.length <= MAX_MODEL_ID_LENGTH &&
+    trimmed === value &&
+    MODEL_ID_PATTERN.test(trimmed)
+  );
+}
+
+export function isValidAssistantModelRoute(value: string): value is AssistantModelRoute {
+  return ASSISTANT_MODEL_ROUTES.some((route) => route === value);
+}
+
+function resolveModelRoute(
+  route: AssistantModelRoute | null | undefined,
+  config: LlmConfig,
+): { route: AssistantModelRoute; fallbackModel: string } {
+  if (route) {
+    return { route, fallbackModel: route };
+  }
+
+  const defaultRoute: AssistantModelRoute = config.model === "uncensored" ? "uncensored" : "auto";
+  return { route: defaultRoute, fallbackModel: config.model };
+}
+
+export function normalizeLlmModelsPayload(payload: unknown): LlmModelOption[] {
+  const data =
+    typeof payload === "object" && payload !== null && "data" in payload
+      ? (payload as { data?: unknown }).data
+      : null;
+
+  if (!Array.isArray(data)) return [];
+
+  const ids = new Set<string>();
+  for (const row of data) {
+    if (typeof row !== "object" || row === null || !("id" in row)) continue;
+    const id = (row as { id?: unknown }).id;
+    if (typeof id !== "string") continue;
+    if (!isValidLlmModelId(id)) continue;
+    ids.add(id);
+  }
+
+  return [...ids].sort((a, b) => a.localeCompare(b)).map((id) => ({ id, label: id }));
+}
+
+export async function listLlmModels(options?: {
+  config?: LlmConfig;
+  fetchImpl?: typeof fetch;
+  route?: AssistantModelRoute | null;
+}): Promise<LlmModelsResult> {
+  const config = options?.config ?? getLlmConfig();
+  const fetchImpl = options?.fetchImpl ?? fetch;
+  const { route, fallbackModel } = resolveModelRoute(options?.route, config);
+  const fallbackOption = { id: fallbackModel, label: fallbackModel };
+
+  if (config.provider === "mock" || !config.baseUrl) {
+    return { models: [fallbackOption], fallbackModel, route, degraded: false };
+  }
+
+  try {
+    const headers: Record<string, string> = {};
+    if (config.apiKey) headers.Authorization = `Bearer ${config.apiKey}`;
+
+    const modelsUrl = new URL(`${config.baseUrl.replace(/\/$/, "")}/models`);
+    if (route === "uncensored") {
+      modelsUrl.searchParams.set("type", "uncensored");
+    }
+
+    const response = await fetchImpl(modelsUrl, {
+      method: "GET",
+      headers,
+    });
+
+    if (!response.ok) {
+      return { models: [fallbackOption], fallbackModel, route, degraded: true };
+    }
+
+    const models = normalizeLlmModelsPayload(await response.json());
+
+    if (models.length === 0) {
+      return { models: [fallbackOption], fallbackModel, route, degraded: true };
+    }
+
+    if (!models.some((model) => model.id === fallbackModel)) {
+      return { models: [fallbackOption], fallbackModel, route, degraded: false };
+    }
+
+    return {
+      models,
+      fallbackModel,
+      route,
+      degraded: false,
+    };
+  } catch {
+    return { models: [fallbackOption], fallbackModel, route, degraded: true };
+  }
+}
+
+export function resolveAssistantModel(options: {
+  requestedModel: string | null | undefined;
+  savedModel: string | null | undefined;
+  fallbackModel: string;
+  models: LlmModelOption[];
+}): AssistantModelResolution {
+  const available = new Set(options.models.map((model) => model.id));
+  const fallback = available.has(options.fallbackModel)
+    ? options.fallbackModel
+    : (options.models[0]?.id ?? options.fallbackModel);
+
+  if (options.requestedModel !== null && options.requestedModel !== undefined) {
+    if (!isValidLlmModelId(options.requestedModel) || !available.has(options.requestedModel)) {
+      return { ok: false, model: fallback, error: "Invalid assistant model" };
+    }
+    return { ok: true, model: options.requestedModel };
+  }
+
+  if (options.savedModel && available.has(options.savedModel)) {
+    return { ok: true, model: options.savedModel };
+  }
+
+  return { ok: true, model: fallback };
+}

src/modules/_core/schema.ts

@@ -38,6 +38,8 @@ export const users = pgTable("users", {
   assistantEnabled: boolean("assistant_enabled").notNull().default(false),
   assistantName: text("assistant_name").notNull().default("Assistant"),
   assistantSystemPrompt: text("assistant_system_prompt"),
+  assistantModelRoute: text("assistant_model_route"),
+  assistantModel: text("assistant_model"),
   defaultEventReminderOffsets: jsonb("default_event_reminder_offsets")
     .notNull()
     .$type<number[]>()

src/modules/_core/share-api.ts

@@ -1,6 +1,7 @@
 import { createHash, randomBytes } from "crypto";
 import { and, eq, isNull } from "drizzle-orm";
 import type { ApiAuthContext } from "@/lib/api-auth";
+import { getAppPublicUrl } from "@/lib/app-url";
 import { db } from "@/lib/db";
 import { getEntityType, getRegistry } from "./registry";
 import { shareLinks } from "./schema";
@@ -27,9 +28,7 @@ function hashToken(raw: string): string {
 }
 
 function buildUrl(token: string): string {
-  const base =
+  return `${getAppPublicUrl()}/s/${token}`;
-    process.env["NEXT_PUBLIC_APP_URL"] ?? process.env["AUTH_URL"] ?? "http://localhost:3000";
-  return `${base}/s/${token}`;
 }
 
 export function listShareableEntityTypes() {

src/modules/_core/share.ts

@@ -2,6 +2,7 @@
 
 import { createHash, randomBytes } from "crypto";
 import { and, eq, isNull } from "drizzle-orm";
+import { getAppPublicUrl } from "@/lib/app-url";
 import { db } from "@/lib/db";
 import { getCurrentSession } from "@/lib/session";
 import { getEntityType } from "./registry";
@@ -21,9 +22,7 @@ function hashToken(raw: string): string {
 }
 
 function buildUrl(token: string): string {
-  const base =
+  return `${getAppPublicUrl()}/s/${token}`;
-    process.env["NEXT_PUBLIC_APP_URL"] ?? process.env["AUTH_URL"] ?? "http://localhost:3000";
-  return `${base}/s/${token}`;
 }
 
 export async function createShareLink(

src/modules/agent/assistant-chat-storage.ts

@@ -4,6 +4,7 @@ export type AssistantChatMessage = {
   role: "user" | "assistant";
   content: string;
   imageUrl?: string;
+  toolCalls?: Array<{ name: string; status: number }>;
 };
 
 const STORAGE_VERSION = "v2";
@@ -19,6 +20,14 @@ function isValidMessage(value: unknown): value is AssistantChatMessage {
   if (row.role !== "user" && row.role !== "assistant") return false;
   if (typeof row.content !== "string" || row.content.trim().length === 0) return false;
   if (row.imageUrl !== undefined && typeof row.imageUrl !== "string") return false;
+  if (row.toolCalls !== undefined) {
+    if (!Array.isArray(row.toolCalls)) return false;
+    for (const call of row.toolCalls) {
+      if (!call || typeof call !== "object") return false;
+      const entry = call as Record<string, unknown>;
+      if (typeof entry.name !== "string" || typeof entry.status !== "number") return false;
+    }
+  }
   return true;
 }
 

src/modules/agent/components/assistant-bubble.tsx

@@ -8,9 +8,10 @@ type Props = {
   configured: boolean;
   userId: string;
   assistantName: string;
+  assistantModel: string | null;
 };
 
-export function AssistantBubble({ configured, userId, assistantName }: Props) {
+export function AssistantBubble({ configured, userId, assistantName, assistantModel }: Props) {
   const [open, setOpen] = useState(false);
 
   return (
@@ -41,6 +42,7 @@ export function AssistantBubble({ configured, userId, assistantName }: Props) {
             configured={configured}
             userId={userId}
             assistantName={assistantName}
+            assistantModel={assistantModel}
           />
         </div>
       ) : null}

src/modules/agent/components/assistant-panel.tsx

@@ -1,7 +1,8 @@
 "use client";
 
-import { useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState, useTransition } from "react";
-import { ImagePlus, Loader2, Mic, Send, Square } from "lucide-react";
+import { ChevronDown, ImagePlus, Loader2, Mic, RefreshCw, Send, Square } from "lucide-react";
+import { setAssistantModel } from "@/app/settings/assistant-actions";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { consumeAgentChatStream } from "../assistant-chat-stream";
@@ -18,12 +19,25 @@ type Props = {
   configured: boolean;
   userId: string;
   assistantName: string;
+  assistantModel: string | null;
 };
 
 type PendingImage = {
   url: string;
 };
 
+type LlmModelOption = {
+  id: string;
+  label: string;
+};
+
+type ModelsResponse = {
+  models: LlmModelOption[];
+  selectedModel: string;
+  fallbackModel: string;
+  degraded: boolean;
+};
+
 async function uploadAssistantImage(file: File): Promise<string> {
   const formData = new FormData();
   formData.append("file", file);
@@ -36,7 +50,7 @@ async function uploadAssistantImage(file: File): Promise<string> {
   return payload.url;
 }
 
-export function AssistantPanel({ configured, userId, assistantName }: Props) {
+export function AssistantPanel({ configured, userId, assistantName, assistantModel }: Props) {
   const [messages, setMessages] = useState<AssistantChatMessage[]>(() => loadAssistantChat(userId));
   const [input, setInput] = useState("");
   const [pendingImage, setPendingImage] = useState<PendingImage | null>(null);
@@ -44,6 +58,12 @@ export function AssistantPanel({ configured, userId, assistantName }: Props) {
   const [error, setError] = useState<string | null>(null);
   const [isPending, setIsPending] = useState(false);
   const [activityLabel, setActivityLabel] = useState<string | null>(null);
+  const [modelOptions, setModelOptions] = useState<LlmModelOption[]>([]);
+  const [selectedModel, setSelectedModel] = useState(assistantModel ?? "");
+  const [fallbackModel, setFallbackModel] = useState("");
+  const [modelsDegraded, setModelsDegraded] = useState(false);
+  const [modelsLoading, setModelsLoading] = useState(true);
+  const [savingModel, startTransition] = useTransition();
   const listRef = useRef<HTMLDivElement>(null);
   const abortRef = useRef<AbortController | null>(null);
   const imageInputRef = useRef<HTMLInputElement>(null);
@@ -67,6 +87,48 @@ export function AssistantPanel({ configured, userId, assistantName }: Props) {
     };
   }, []);
 
+  const loadModels = useCallback(async (options?: { refresh?: boolean; signal?: AbortSignal }) => {
+    if (options?.signal?.aborted) return;
+
+    setModelsLoading(true);
+    try {
+      const params = new URLSearchParams();
+      if (options?.refresh) params.set("refresh", "1");
+      const query = params.size > 0 ? `?${params.toString()}` : "";
+
+      const response = await fetch(`/api/agent/models${query}`, {
+        cache: "no-store",
+        signal: options?.signal,
+      });
+      if (!response.ok) throw new Error("Model discovery unavailable");
+      const payload = (await response.json()) as ModelsResponse;
+      if (options?.signal?.aborted) return;
+      setModelOptions(payload.models);
+      setSelectedModel(payload.selectedModel);
+      setFallbackModel(payload.fallbackModel);
+      setModelsDegraded(payload.degraded);
+      setError(null);
+    } catch (err) {
+      if (err instanceof Error && err.name === "AbortError") return;
+      setModelsDegraded(true);
+      setError("Model discovery unavailable");
+    } finally {
+      if (!options?.signal?.aborted) setModelsLoading(false);
+    }
+  }, []);
+
+  useEffect(() => {
+    const controller = new AbortController();
+
+    queueMicrotask(() => {
+      void loadModels({ signal: controller.signal });
+    });
+
+    return () => {
+      controller.abort();
+    };
+  }, [loadModels]);
+
   function scrollToBottom() {
     requestAnimationFrame(() => {
       const node = listRef.current;
@@ -102,6 +164,21 @@ export function AssistantPanel({ configured, userId, assistantName }: Props) {
     }
   }
 
+  function changeModel(nextModel: string | null) {
+    if (!nextModel) return;
+
+    setSelectedModel(nextModel);
+    setError(null);
+
+    startTransition(async () => {
+      try {
+        await setAssistantModel(nextModel === fallbackModel ? null : nextModel);
+      } catch (err) {
+        setError(err instanceof Error ? err.message : "Could not save assistant model");
+      }
+    });
+  }
+
   async function sendMessage() {
     const text = input.trim();
     const hasImage = pendingImage !== null;
@@ -133,6 +210,7 @@ export function AssistantPanel({ configured, userId, assistantName }: Props) {
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({
           messages: nextMessages.map(toClientChatMessage),
+          model: selectedModel || undefined,
           stream: true,
         }),
         signal: controller.signal,
@@ -151,7 +229,11 @@ export function AssistantPanel({ configured, userId, assistantName }: Props) {
 
       setMessages((current) => [
         ...current,
-        { role: "assistant", content: result.message.content },
+        {
+          role: "assistant",
+          content: result.message.content,
+          ...(result.toolCalls.length > 0 ? { toolCalls: result.toolCalls } : {}),
+        },
       ]);
       scrollToBottom();
     } catch (err) {
@@ -168,6 +250,7 @@ export function AssistantPanel({ configured, userId, assistantName }: Props) {
   const inputDisabled = isPending || voiceState === "transcribing" || uploadingImage;
   const canSend =
     !isPending &&
+    !savingModel &&
     voiceState === "idle" &&
     !uploadingImage &&
     (input.trim().length > 0 || pendingImage !== null);
@@ -175,21 +258,63 @@ export function AssistantPanel({ configured, userId, assistantName }: Props) {
   return (
     <div className="flex min-h-0 flex-1 flex-col gap-3">
       <div className="flex items-start justify-between gap-3">
-        <p className="muted min-w-0 text-[12px] leading-relaxed">
+        <div className="min-w-0 flex-1">
-          {configured
+          <p className="muted text-[12px] leading-relaxed">
-            ? "Type, talk, or send a photo — I can update lists, calendar, notes, and more."
+            {configured
-            : "Mock provider active — set LLM_BASE_URL for your homelab model."}
+              ? "Type, talk, or send a photo — I can update lists, calendar, notes, and more."
-        </p>
+              : "Mock provider active — set LLM_BASE_URL for your homelab model."}
-        {messages.length > 0 ? (
+          </p>
-          <button
+          {modelsDegraded ? (
+            <p className="muted mt-1 text-[11px]">Model discovery unavailable; using fallback.</p>
+          ) : null}
+        </div>
+        <div className="flex shrink-0 items-center gap-2">
+          {modelOptions.length > 0 ? (
+            <div className="relative max-w-36">
+              <select
+                aria-label="Assistant model"
+                value={selectedModel}
+                onChange={(event) => changeModel(event.target.value)}
+                disabled={modelsLoading || savingModel || isPending}
+                className="h-9 w-full max-w-36 appearance-none truncate rounded-[min(var(--radius-md),10px)] border border-input bg-[var(--card)] py-0 pr-8 pl-3 text-[13px] leading-9 text-[var(--ink)] outline-none transition-colors focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50"
+              >
+                {modelOptions.map((model) => (
+                  <option key={model.id} value={model.id}>
+                    {model.label}
+                  </option>
+                ))}
+              </select>
+              <ChevronDown
+                className="pointer-events-none absolute top-1/2 right-2 size-4 -translate-y-1/2 text-muted-foreground"
+                aria-hidden="true"
+              />
+            </div>
+          ) : null}
+          <Button
             type="button"
-            onClick={clearChat}
+            size="sm"
-            disabled={isPending}
+            variant="outline"
-            className="shrink-0 text-[11px] text-muted-foreground transition-colors hover:text-foreground disabled:opacity-50"
+            aria-label="Refresh assistant models"
+            disabled={modelsLoading || savingModel || isPending}
+            onClick={() => void loadModels({ refresh: true })}
           >
-            Clear
+            {modelsLoading ? (
-          </button>
+              <Loader2 className="size-4 animate-spin" />
-        ) : null}
+            ) : (
+              <RefreshCw className="size-4" />
+            )}
+          </Button>
+          {messages.length > 0 ? (
+            <button
+              type="button"
+              onClick={clearChat}
+              disabled={isPending}
+              className="shrink-0 text-[11px] text-muted-foreground transition-colors hover:text-foreground disabled:opacity-50"
+            >
+              Clear
+            </button>
+          ) : null}
+        </div>
       </div>
 
       <div
@@ -226,6 +351,13 @@ export function AssistantPanel({ configured, userId, assistantName }: Props) {
                   />
                 ) : null}
                 {message.content}
+                {message.role === "assistant" &&
+                message.toolCalls &&
+                message.toolCalls.length > 0 ? (
+                  <p className="mt-1 text-[10px] text-muted-foreground">
+                    {message.toolCalls.map((call) => `${call.name}→${call.status}`).join(" · ")}
+                  </p>
+                ) : null}
               </div>
             ))}
 

src/modules/agent/messages.ts

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { isValidLlmModelId } from "@/lib/llm/models";
 
 export const clientChatAttachmentSchema = z.object({
   type: z.literal("image"),
@@ -11,8 +12,13 @@ export const clientChatMessageSchema = z.object({
   attachments: z.array(clientChatAttachmentSchema).max(3).optional(),
 });
 
+export const clientChatModelSchema = z
+  .string()
+  .refine((value) => isValidLlmModelId(value), "Invalid assistant model");
+
 export const clientChatInputSchema = z.object({
   stream: z.boolean().optional(),
+  model: clientChatModelSchema.optional(),
   messages: z.array(clientChatMessageSchema).min(1).max(40),
 });
 

src/modules/agent/server/loop-guards.ts

@@ -0,0 +1,85 @@
+const MUTATION_TOOLS = new Set([
+  "add_list_item",
+  "update_list_item",
+  "delete_list_item",
+  "create_list",
+  "update_list",
+  "delete_list",
+  "create_event",
+  "update_event",
+  "delete_event",
+  "create_calendar",
+  "create_note",
+  "update_note",
+  "delete_note",
+  "create_journal_entry",
+  "update_journal_entry",
+  "delete_journal_entry",
+  "create_garden_plant",
+  "update_garden_plant",
+  "delete_garden_plant",
+  "create_garden_container",
+  "update_garden_container",
+  "delete_garden_container",
+  "log_garden_care",
+  "create_garden_care_schedule",
+  "update_garden_care_schedule",
+  "delete_garden_care_schedule",
+  "schedule_garden_care_on_calendar",
+  "create_bang",
+  "update_bang",
+  "delete_bang",
+  "create_share_link",
+  "revoke_share_link",
+]);
+
+export function isMutationTool(name: string): boolean {
+  return MUTATION_TOOLS.has(name);
+}
+
+export function isSuccessfulWrite(name: string, status: number, argsJson = ""): boolean {
+  if (!isSuccessfulStatus(status)) return false;
+  if (isMutationTool(name)) return true;
+  if (name !== "call_api") return false;
+  try {
+    const args = JSON.parse(argsJson || "{}") as { method?: string };
+    const method = typeof args.method === "string" ? args.method.toUpperCase() : "";
+    return method === "POST" || method === "PATCH" || method === "DELETE";
+  } catch {
+    return false;
+  }
+}
+
+export function isSuccessfulStatus(status: number): boolean {
+  return status >= 200 && status < 300;
+}
+
+export function fingerprintToolCalls(calls: Array<{ name: string; arguments: string }>): string {
+  return calls.map((call) => `${call.name}:${normalizeArgs(call.arguments)}`).join("|");
+}
+
+export function truncateToolResult(result: string, maxChars = 6000): string {
+  if (result.length <= maxChars) return result;
+  return `${result.slice(0, maxChars)}\n…[truncated ${result.length - maxChars} chars]`;
+}
+
+export function summarizeToolTrace(toolCalls: Array<{ name: string; status: number }>): string {
+  if (toolCalls.length === 0) return "No tools were called.";
+  return toolCalls.map((call) => `${call.name}→${call.status}`).join(", ");
+}
+
+function normalizeArgs(argsJson: string): string {
+  try {
+    const parsed: unknown = JSON.parse(argsJson || "{}");
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+      return JSON.stringify(parsed);
+    }
+    const sorted: Record<string, unknown> = {};
+    for (const key of Object.keys(parsed as Record<string, unknown>).sort()) {
+      sorted[key] = (parsed as Record<string, unknown>)[key];
+    }
+    return JSON.stringify(sorted);
+  } catch {
+    return argsJson.trim();
+  }
+}

src/modules/agent/server/run.ts

@@ -1,13 +1,20 @@
+import logger from "@/lib/logger";
 import { createLlmClient, type ChatMessage, type LlmClient } from "@/lib/llm";
 import { buildVisionContentParts, textFromMessageContent } from "@/lib/llm/content";
-import { AGENT_SYSTEM_PROMPT, AGENT_TOOLS } from "../tools";
+import { AGENT_SYSTEM_PROMPT, AGENT_TOOLS, appendAgentRuntimeContext } from "../tools";
 import type { ClientChatMessage } from "../messages";
 import { describeToolActivity } from "../tool-labels";
 import { createApiToolExecutor, type ToolExecutor } from "../tool-executor";
+import {
+  fingerprintToolCalls,
+  isSuccessfulWrite,
+  summarizeToolTrace,
+  truncateToolResult,
+} from "./loop-guards";
 import { resolveAssistantImageDataUrls } from "./resolve-images";
 import { thinkingLabel, type AgentProgressEvent } from "./progress";
 
-const MAX_TOOL_ROUNDS = 8;
+const MAX_TOOL_ROUNDS = 24;
 
 export type AgentToolCallSummary = {
   name: string;
@@ -41,18 +48,34 @@ async function toLlmUserMessage(message: ClientChatMessage): Promise<ChatMessage
   };
 }
 
+function forceReplyAfterWrite(writeNames: string[]): ChatMessage {
+  return {
+    role: "user",
+    content: `The write already succeeded (${writeNames.join(", ")}). Stop calling tools and reply to the user in one short sentence confirming what you did.`,
+  };
+}
+
+function forceReplyAfterRepeat(): ChatMessage {
+  return {
+    role: "user",
+    content:
+      "You repeated the same tool call. Stop calling tools and reply with what you already know, or ask one clarifying question.",
+  };
+}
+
 export async function runAgentChat(options: {
   messages: ClientChatMessage[];
   request: Request;
   systemPrompt?: string;
+  model?: string;
   llm?: LlmClient;
   executeTool?: ToolExecutor;
   onProgress?: AgentProgressHandler;
 }): Promise<AgentChatResult> {
-  const llm = options.llm ?? createLlmClient();
+  const llm = options.llm ?? createLlmClient({ model: options.model });
   const executeTool = options.executeTool ?? createApiToolExecutor(options.request);
   const onProgress = options.onProgress;
-  const systemPrompt = options.systemPrompt ?? AGENT_SYSTEM_PROMPT;
+  const systemPrompt = appendAgentRuntimeContext(options.systemPrompt ?? AGENT_SYSTEM_PROMPT);
 
   const userMessages = await Promise.all(
     options.messages.map((message) => toLlmUserMessage(message)),
@@ -61,13 +84,16 @@ export async function runAgentChat(options: {
   const transcript: ChatMessage[] = [{ role: "system", content: systemPrompt }, ...userMessages];
 
   const toolCalls: AgentToolCallSummary[] = [];
+  const seenFingerprints = new Set<string>();
+  const successfulWriteNames: string[] = [];
+  let forceReply = false;
 
   for (let round = 0; round < MAX_TOOL_ROUNDS; round += 1) {
     onProgress?.({ type: "thinking", label: thinkingLabel(round), round });
 
     const completion = await llm.chatCompletion({
       messages: transcript,
-      tools: AGENT_TOOLS,
+      tools: forceReply ? undefined : AGENT_TOOLS,
     });
 
     const assistantMessage = completion.message;
@@ -75,6 +101,15 @@ export async function runAgentChat(options: {
 
     if (!assistantMessage.tool_calls?.length) {
       onProgress?.({ type: "responding", label: "Writing a reply…" });
+      logger.info(
+        {
+          msg: "agent.chat.done",
+          rounds: round + 1,
+          toolCalls: toolCalls.map((call) => `${call.name}:${call.status}`),
+          forcedReply: forceReply,
+        },
+        "agent chat completed",
+      );
       return {
         message: {
           role: "assistant",
@@ -86,6 +121,36 @@ export async function runAgentChat(options: {
       };
     }
 
+    if (forceReply) {
+      logger.warn(
+        {
+          msg: "agent.chat.forced_tools_ignored",
+          round,
+          names: assistantMessage.tool_calls.map((c) => c.function.name),
+        },
+        "model kept calling tools after force-reply",
+      );
+      break;
+    }
+
+    const fingerprint = fingerprintToolCalls(
+      assistantMessage.tool_calls.map((call) => ({
+        name: call.function.name,
+        arguments: call.function.arguments,
+      })),
+    );
+
+    if (seenFingerprints.has(fingerprint)) {
+      logger.warn(
+        { msg: "agent.chat.duplicate_tools", round, fingerprint, toolCalls: fingerprint },
+        "duplicate tool round detected",
+      );
+      transcript.push(forceReplyAfterRepeat());
+      forceReply = true;
+      continue;
+    }
+    seenFingerprints.add(fingerprint);
+
     for (const toolCall of assistantMessage.tool_calls) {
       const label = describeToolActivity(toolCall.function.name, toolCall.function.arguments);
       onProgress?.({ type: "tool", name: toolCall.function.name, label });
@@ -95,8 +160,20 @@ export async function runAgentChat(options: {
 
       try {
         result = await executeTool(toolCall.function.name, toolCall.function.arguments);
-        const parsed = JSON.parse(result) as { status?: number };
+        const parsed = JSON.parse(result) as { status?: number; body?: unknown };
         status = typeof parsed.status === "number" ? parsed.status : 200;
+        if (status >= 400) {
+          logger.warn(
+            {
+              msg: "agent.chat.tool_error",
+              round,
+              name: toolCall.function.name,
+              status,
+              body: parsed.body,
+            },
+            "agent tool returned error",
+          );
+        }
       } catch (err) {
         status = 500;
         result = JSON.stringify({
@@ -106,21 +183,69 @@ export async function runAgentChat(options: {
       }
 
       toolCalls.push({ name: toolCall.function.name, status });
+      logger.info(
+        {
+          msg: "agent.chat.tool",
+          round,
+          name: toolCall.function.name,
+          status,
+          args: toolCall.function.arguments.slice(0, 300),
+        },
+        "agent tool call",
+      );
+
+      if (isSuccessfulWrite(toolCall.function.name, status, toolCall.function.arguments)) {
+        successfulWriteNames.push(toolCall.function.name);
+      }
 
       transcript.push({
         role: "tool",
         tool_call_id: toolCall.id,
         name: toolCall.function.name,
-        content: result,
+        content: truncateToolResult(result),
       });
     }
+
+    if (successfulWriteNames.length > 0) {
+      transcript.push(forceReplyAfterWrite(successfulWriteNames));
+      forceReply = true;
+    }
   }
 
   onProgress?.({ type: "responding", label: "Wrapping up…" });
+  const trace = summarizeToolTrace(toolCalls);
+
+  if (successfulWriteNames.length > 0) {
+    logger.warn(
+      {
+        msg: "agent.chat.forced_summary",
+        rounds: MAX_TOOL_ROUNDS,
+        toolCalls: toolCalls.map((call) => `${call.name}:${call.status}`),
+      },
+      "agent summarizing after write without clean stop",
+    );
+    return {
+      message: {
+        role: "assistant",
+        content: `Done. Completed: ${[...new Set(successfulWriteNames)].join(", ")}.`,
+      },
+      toolCalls,
+    };
+  }
+
+  logger.warn(
+    {
+      msg: "agent.chat.tool_limit",
+      rounds: MAX_TOOL_ROUNDS,
+      toolCalls: toolCalls.map((call) => `${call.name}:${call.status}`),
+      forcedReply: forceReply,
+    },
+    "agent hit tool-call limit",
+  );
   return {
     message: {
       role: "assistant",
-      content: "I hit the tool-call limit for this request. Please try a simpler question.",
+      content: `I hit the tool-call limit for this request. Tools used: ${trace}.`,
     },
     toolCalls,
   };

src/modules/agent/tool-executor.ts

@@ -1,3 +1,5 @@
+import logger from "@/lib/logger";
+
 type ApiCallResult = {
   status: number;
   body: unknown;
@@ -5,8 +7,22 @@ type ApiCallResult = {
 
 export type ToolExecutor = (name: string, argsJson: string) => Promise<string>;
 
+/** Loopback base for in-process tool → /api/v1 calls. Avoids hairpinning to the public URL. */
+export function resolveInternalApiBase(request: Request): string {
+  const configured = process.env.INTERNAL_API_BASE_URL?.trim();
+  if (configured) return configured.replace(/\/$/, "");
+
+  const port = process.env.PORT?.trim() || "3000";
+  const requestUrl = new URL(request.url);
+  if (requestUrl.hostname === "localhost" || requestUrl.hostname === "127.0.0.1") {
+    return requestUrl.origin;
+  }
+
+  return `http://127.0.0.1:${port}`;
+}
+
 export function createApiToolExecutor(request: Request): ToolExecutor {
-  const origin = new URL(request.url).origin;
+  const origin = resolveInternalApiBase(request);
 
   return async (name: string, argsJson: string) => {
     const args = parseArgs(argsJson);
@@ -111,8 +127,11 @@ async function dispatchTool(
       return callApi(request, origin, "GET", `/api/v1/events?${qs.toString()}`);
     }
     case "create_event": {
+      const resolved = await resolveCalendarId(args, request, origin);
+      if ("error" in resolved) return resolved.error;
+
       const body: Record<string, unknown> = {
-        calendarId: requireString(args, "calendarId"),
+        calendarId: resolved.calendarId,
         title: requireString(args, "title"),
         startAt: requireString(args, "startAt"),
         endAt: requireString(args, "endAt"),
@@ -375,6 +394,49 @@ async function dispatchTool(
   }
 }
 
+async function resolveCalendarId(
+  args: Record<string, unknown>,
+  request: Request,
+  origin: string,
+): Promise<{ calendarId: string } | { error: ApiCallResult }> {
+  const calendarId = typeof args.calendarId === "string" ? args.calendarId.trim() : "";
+  if (calendarId) return { calendarId };
+
+  const calendarsResult = await callApi(request, origin, "GET", "/api/v1/calendars");
+  if (calendarsResult.status !== 200 || !Array.isArray(calendarsResult.body)) {
+    return { error: calendarsResult };
+  }
+
+  const calendars = calendarsResult.body as Array<{ id?: string; name?: string }>;
+  const calendarName =
+    typeof args.calendarName === "string" ? args.calendarName.trim().toLowerCase() : "";
+
+  if (calendarName) {
+    const match = calendars.find(
+      (calendar) =>
+        typeof calendar.name === "string" && calendar.name.toLowerCase() === calendarName,
+    );
+    if (!match?.id) {
+      return {
+        error: {
+          status: 404,
+          body: {
+            error: `No calendar named "${args.calendarName}"`,
+            calendars: calendars.map((calendar) => ({ id: calendar.id, name: calendar.name })),
+          },
+        },
+      };
+    }
+    return { calendarId: match.id };
+  }
+
+  const first = calendars[0];
+  if (!first?.id) {
+    return { error: { status: 404, body: { error: "No calendars found" } } };
+  }
+  return { calendarId: first.id };
+}
+
 function requireString(args: Record<string, unknown>, key: string): string {
   const value = args[key];
   if (typeof value !== "string" || value.trim().length === 0) {
@@ -405,13 +467,18 @@ async function getApiDocs(args: Record<string, unknown>): Promise<ApiCallResult>
   const specPath = path.join(process.cwd(), "docs", "api", "openapi.yaml");
   const spec = await readFile(specPath, "utf8");
   const search = typeof args.search === "string" ? args.search.trim().toLowerCase() : "";
+  const pathLines = spec
+    .split("\n")
+    .map((line) => line.trim())
+    .filter((line) => line.startsWith("/api/v1/"));
 
   if (!search) {
     return {
       status: 200,
       body: {
-        spec,
+        paths: pathLines.slice(0, 80),
-        hint: "Pass search to filter paths, or use call_api with a /api/v1/* path.",
+        pathCount: pathLines.length,
+        hint: "Pass search (e.g. calendar, events, lists) to get matching lines. Do not request the full OpenAPI dump.",
       },
     };
   }
@@ -423,8 +490,8 @@ async function getApiDocs(args: Record<string, unknown>): Promise<ApiCallResult>
     body: {
       search,
       matchCount: matches.length,
-      matches: matches.slice(0, 100),
+      matches: matches.slice(0, 40),
-      hint: "Use call_api with method and path from the matches above.",
+      hint: "Use a dedicated tool when one exists; otherwise call_api with method and path from the matches above.",
     },
   };
 }
@@ -471,14 +538,30 @@ async function callApi(
   path: string,
   body?: Record<string, unknown>,
 ): Promise<ApiCallResult> {
-  const response = await fetch(`${origin}${path}`, {
+  const url = `${origin}${path}`;
-    method,
+  const headers: Record<string, string> = {
-    headers: {
+    "Content-Type": "application/json",
-      "Content-Type": "application/json",
+  };
-      cookie: request.headers.get("cookie") ?? "",
+  const cookie = request.headers.get("cookie");
-    },
+  if (cookie) headers.cookie = cookie;
-    body: body !== undefined ? JSON.stringify(body) : undefined,
+  const authorization = request.headers.get("authorization");
-  });
+  if (authorization) headers.authorization = authorization;
+
+  let response: Response;
+  try {
+    response = await fetch(url, {
+      method,
+      headers,
+      body: body !== undefined ? JSON.stringify(body) : undefined,
+    });
+  } catch (err) {
+    const message = err instanceof Error ? err.message : "fetch failed";
+    logger.error(
+      { msg: "agent.tool.fetch_failed", method, url, error: message },
+      "agent tool internal fetch failed",
+    );
+    return { status: 502, body: { error: `Internal API unreachable: ${message}`, url } };
+  }
 
   const text = await response.text();
   let parsed: unknown = null;
@@ -490,5 +573,12 @@ async function callApi(
     }
   }
 
+  if (response.status >= 400) {
+    logger.warn(
+      { msg: "agent.tool.api_error", method, url, status: response.status, body: parsed },
+      "agent tool API error",
+    );
+  }
+
   return { status: response.status, body: parsed };
 }

src/modules/agent/tools.ts

@@ -159,11 +159,16 @@ export const AGENT_TOOLS: AgentToolDefinition[] = [
     type: "function",
     function: {
       name: "create_event",
-      description: "Create a calendar event.",
+      description:
+        "Create a calendar event. Provide calendarId, or calendarName to match by name, or omit both to use the first visible calendar.",
       parameters: {
         type: "object",
         properties: {
-          calendarId: { type: "string" },
+          calendarId: { type: "string", description: "UUID of the calendar" },
+          calendarName: {
+            type: "string",
+            description: "Calendar display name when calendarId is unknown",
+          },
           title: { type: "string" },
           startAt: { type: "string", description: "ISO 8601 start" },
           endAt: { type: "string", description: "ISO 8601 end" },
@@ -175,7 +180,7 @@ export const AGENT_TOOLS: AgentToolDefinition[] = [
             description: "Optional reminder N minutes before start",
           },
         },
-        required: ["calendarId", "title", "startAt", "endAt"],
+        required: ["title", "startAt", "endAt"],
       },
     },
   },
@@ -713,15 +718,16 @@ export const AGENT_TOOLS: AgentToolDefinition[] = [
     function: {
       name: "get_api_docs",
       description:
-        "Read famapp REST API documentation (OpenAPI). Use when unsure which endpoint to call or no dedicated tool exists. Pass search to filter relevant paths.",
+        "Search famapp REST API docs for /api/v1 paths. Always pass search. Returns matching lines only — not the full OpenAPI file.",
       parameters: {
         type: "object",
         properties: {
           search: {
             type: "string",
-            description: "Optional keyword to filter paths (e.g. garden, share, journal)",
+            description: "Keyword to filter paths (e.g. garden, share, journal, events)",
           },
         },
+        required: ["search"],
       },
     },
   },
@@ -762,13 +768,15 @@ export const AGENT_SYSTEM_PROMPT = `You are the famapp household assistant. Help
 
 Use the provided tools to read and update data. Prefer calling tools instead of guessing. Be concise and friendly.
 
-When no dedicated tool fits, or you are unsure how to do something:
+Prefer a dedicated tool when one exists (create_event, add_list_item, create_note, etc.). After a successful write (2xx), stop calling tools and confirm in one short sentence — do not re-list or re-create.
-1. Call get_api_docs with a relevant search term to find the right /api/v1/* endpoint.
+When no dedicated tool fits, or you need an endpoint that is not wrapped yet:
+1. Call get_api_docs with a relevant search term (always pass search; never request the full spec).
 2. Call call_api with the documented method, path, query, and body.
+If a tool call fails, read the error body and fix the arguments before trying a different approach. Do not repeat the exact same tool call.
 
 When the user sends a photo, read dates, times, locations, and action items from it, then use tools to act.
 
-Lists: resolve list ids via list_lists. To complete items, list_list_items then update_list_item with done: true.
+Lists: resolve list ids via list_lists, or pass listType to add_list_item. To complete items, list_list_items then update_list_item with done: true.
 
 Journal: per-user private entries. Valid mood ids: ${JOURNAL_MOOD_IDS}. stress is 1-10. pillsTaken is boolean.
 
@@ -776,4 +784,32 @@ Garden: care types are free text (water, fertilize, prune, etc.). Use list_garde
 
 Sharing: journal entries are not shareable. Shareable types: calendar, calendar.event, list, note, garden.plant, garden.container.
 
-Calendar: use ISO 8601 datetimes. Bang dates use YYYY-MM-DD.`;
+Calendar: use ISO 8601 datetimes with the household timezone below. Pass calendarId, or calendarName, or omit both to use the first visible calendar. Bang dates use YYYY-MM-DD.`;
+
+export function resolveHouseholdTimezone(): string {
+  return process.env.HOUSEHOLD_TIMEZONE?.trim() || process.env.TZ?.trim() || "America/Chicago";
+}
+
+export function appendAgentRuntimeContext(prompt: string, now: Date = new Date()): string {
+  const timeZone = resolveHouseholdTimezone();
+  let localNow: string;
+  try {
+    localNow = new Intl.DateTimeFormat("en-US", {
+      timeZone,
+      weekday: "long",
+      year: "numeric",
+      month: "long",
+      day: "numeric",
+      hour: "numeric",
+      minute: "2-digit",
+      hour12: true,
+      timeZoneName: "short",
+    }).format(now);
+  } catch {
+    localNow = now.toISOString();
+  }
+
+  return `${prompt.trim()}
+
+Current time: ${localNow} (${timeZone}). ISO now: ${now.toISOString()}. Resolve relative dates from this clock.`;
+}

src/modules/garden/components/container-form.tsx

@@ -10,6 +10,8 @@ const CONTAINER_TYPES = [
   { value: "raised-bed", label: "Raised bed" },
   { value: "window-box", label: "Window box" },
   { value: "single-pot", label: "Single pot" },
+  { value: "ikea-cabinet", label: "Ikea Cabinet" },
+  { value: "acrylic-case", label: "Acrylic Case" },
   { value: "outdoor", label: "Outdoor" },
   { value: "other", label: "Other" },
 ];

src/modules/garden/components/plant-form.tsx

@@ -14,6 +14,7 @@ const CATEGORIES = [
   { value: "flower", label: "Flower" },
   { value: "succulent", label: "Succulent" },
   { value: "cactus", label: "Cactus" },
+  { value: "carnivore", label: "Carnivore" },
   { value: "tropical", label: "Tropical" },
   { value: "tree", label: "Tree" },
   { value: "shrub", label: "Shrub" },

src/modules/notes/components/note-editor.tsx

@@ -2,10 +2,9 @@
 
 import dynamic from "next/dynamic";
 import { useRouter } from "next/navigation";
-import { Pin, PinOff, Save, Trash2 } from "lucide-react";
+import { Bell, Pencil, Pin, PinOff, Save, Trash2, X } from "lucide-react";
 import { useState, useTransition } from "react";
 import { EntityComments } from "@/components/comments/entity-comments";
-import { RichTextContent } from "@/components/rich-text";
 import { DetailBackLink } from "@/components/detail-back-link";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
@@ -13,6 +12,7 @@ import { Label } from "@/components/ui/label";
 import { ShareButton } from "@/components/share-button";
 import type { NoteDto } from "../server/queries";
 import { createNote, deleteNote, setNotePinned, updateNote } from "../server/actions";
+import { NoteRichTextBody } from "./note-rich-text-body";
 
 const RichTextEditor = dynamic(
   () => import("@/components/rich-text/rich-text-editor").then((mod) => mod.RichTextEditor),
@@ -29,6 +29,7 @@ const RichTextEditor = dynamic(
 export function NoteEditor({ note, currentUserId }: { note?: NoteDto; currentUserId?: string }) {
   const router = useRouter();
   const [currentNote, setCurrentNote] = useState(note);
+  const [editing, setEditing] = useState(!note);
   const [title, setTitle] = useState(note?.title ?? "");
   const [body, setBody] = useState(note?.body ?? "");
   const [remindAt, setRemindAt] = useState(toLocalDateTimeValue(note?.remindAt ?? null));
@@ -36,6 +37,25 @@ export function NoteEditor({ note, currentUserId }: { note?: NoteDto; currentUse
 
   const pinned = currentNote?.pinned ?? false;
 
+  function beginEdit() {
+    if (!currentNote) return;
+    setTitle(currentNote.title);
+    setBody(currentNote.body);
+    setRemindAt(toLocalDateTimeValue(currentNote.remindAt));
+    setEditing(true);
+  }
+
+  function cancelEdit() {
+    if (!currentNote) {
+      router.push("/notes");
+      return;
+    }
+    setTitle(currentNote.title);
+    setBody(currentNote.body);
+    setRemindAt(toLocalDateTimeValue(currentNote.remindAt));
+    setEditing(false);
+  }
+
   function saveNote() {
     startTransition(async () => {
       if (currentNote) {
@@ -46,6 +66,7 @@ export function NoteEditor({ note, currentUserId }: { note?: NoteDto; currentUse
           remindAt: remindAt ? new Date(remindAt) : null,
         });
         setCurrentNote(updated);
+        setEditing(false);
         return;
       }
 
@@ -73,38 +94,87 @@ export function NoteEditor({ note, currentUserId }: { note?: NoteDto; currentUse
     });
   }
 
+  const displayTitle = currentNote?.title || title || "New note";
+  const updatedLabel = currentNote
+    ? new Date(currentNote.updatedAt).toLocaleDateString(undefined, {
+        year: "numeric",
+        month: "long",
+        day: "numeric",
+      })
+    : null;
+  const reminderLabel = currentNote?.remindAt
+    ? new Date(currentNote.remindAt).toLocaleString(undefined, {
+        year: "numeric",
+        month: "short",
+        day: "numeric",
+        hour: "numeric",
+        minute: "2-digit",
+      })
+    : null;
+
   return (
-    <div className="mx-auto grid w-full max-w-6xl gap-4 min-w-0">
+    <div className="mx-auto grid w-full max-w-3xl gap-4 min-w-0">
       <DetailBackLink href="/notes" label="Notes" />
       <header className="flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between">
-        <div className="flex items-center gap-2 min-w-0 flex-1">
+        <div className="min-w-0 flex-1">
-          {pinned && <Pin className="size-3.5 text-[var(--accent)]" />}
+          <div className="flex items-center gap-2 min-w-0">
-          <h2 className="serif text-[24px] font-medium tracking-tight truncate">
+            {pinned ? <Pin className="size-3.5 shrink-0 text-[var(--accent)]" /> : null}
-            {currentNote ? currentNote.title : "New note"}
+            <h2 className="serif text-[24px] font-medium tracking-tight truncate">
-          </h2>
+              {displayTitle}
+            </h2>
+          </div>
+          {!editing && currentNote ? (
+            <p className="muted text-[13px] mt-1 inline-flex flex-wrap items-center gap-x-2 gap-y-1">
+              {pinned ? <span>Pinned</span> : null}
+              {pinned && updatedLabel ? <span>·</span> : null}
+              {updatedLabel ? <span>Updated {updatedLabel}</span> : null}
+              {reminderLabel ? (
+                <>
+                  <span>·</span>
+                  <span className="inline-flex items-center gap-1">
+                    <Bell className="size-3" />
+                    {reminderLabel}
+                  </span>
+                </>
+              ) : null}
+            </p>
+          ) : null}
         </div>
         <div className="flex flex-wrap gap-2">
           {currentNote ? (
             <Button variant="outline" size="sm" onClick={togglePinned} disabled={isPending}>
               {pinned ? <PinOff className="size-3.5" /> : <Pin className="size-3.5" />}
-              {pinned ? "Unpin note" : "Pin note"}
+              {pinned ? "Unpin" : "Pin"}
             </Button>
           ) : null}
           {currentNote ? <ShareButton entityType="notes.note" entityId={currentNote.id} /> : null}
           {currentNote ? (
             <Button variant="destructive" size="sm" onClick={removeNote} disabled={isPending}>
               <Trash2 className="size-3.5" />
-              Delete note
+              Delete
             </Button>
           ) : null}
-          <Button size="sm" onClick={saveNote} disabled={!title.trim() || isPending}>
+          {editing ? (
-            <Save className="size-3.5" />
+            <>
-            Save note
+              <Button variant="outline" size="sm" onClick={cancelEdit} disabled={isPending}>
-          </Button>
+                <X className="size-3.5" />
+                Cancel
+              </Button>
+              <Button size="sm" onClick={saveNote} disabled={!title.trim() || isPending}>
+                <Save className="size-3.5" />
+                Save
+              </Button>
+            </>
+          ) : (
+            <Button size="sm" onClick={beginEdit}>
+              <Pencil className="size-3.5" />
+              Edit
+            </Button>
+          )}
         </div>
       </header>
 
-      <div className="grid gap-4 lg:grid-cols-[minmax(0,1fr)_minmax(280px,420px)] min-w-0">
+      {editing ? (
         <section
           className="grid gap-4 rounded-[var(--r-lg)] border-[0.5px] bg-[var(--card)] p-4 shadow-[var(--shadow-1)] min-w-0"
           style={{ borderColor: "var(--hair)" }}
@@ -138,16 +208,18 @@ export function NoteEditor({ note, currentUserId }: { note?: NoteDto; currentUse
             />
           </div>
         </section>
-
+      ) : currentNote ? (
-        <aside
+        <section
-          className="rounded-[var(--r-lg)] border-[0.5px] bg-[var(--card)] p-4 text-[var(--ink)] shadow-[var(--shadow-1)] min-w-0"
+          className="rounded-[var(--r-lg)] border-[0.5px] bg-[var(--card)] p-4 shadow-[var(--shadow-1)] min-w-0 text-[var(--ink)]"
           style={{ borderColor: "var(--hair)" }}
-          aria-label="Preview"
         >
-          <div className="eyebrow mb-3">Preview</div>
+          {currentNote.body ? (
-          <RichTextContent html={body} />
+            <NoteRichTextBody noteId={currentNote.id} body={currentNote.body} />
-        </aside>
+          ) : (
-      </div>
+            <p className="text-sm muted">No body text.</p>
+          )}
+        </section>
+      ) : null}
 
       {currentNote && currentUserId ? (
         <EntityComments

tests/e2e/assistant.spec.ts

@@ -1,4 +1,13 @@
-import { expect, test } from "@playwright/test";
+import { expect, test, type Page } from "@playwright/test";
+
+async function ensureSignedIn(page: Page) {
+  await page.goto("/");
+  const devLogin = page.getByRole("button", { name: "Dev login" });
+  if (await devLogin.isVisible().catch(() => false)) {
+    await devLogin.click();
+    await page.waitForURL((url) => !url.pathname.startsWith("/login"));
+  }
+}
 
 test("assistant bubble is hidden until opted in", async ({ page }) => {
   await page.goto("/");
@@ -6,15 +15,35 @@ test("assistant bubble is hidden until opted in", async ({ page }) => {
 });
 
 test("assistant chat smoke after opt-in", async ({ page }) => {
+  await ensureSignedIn(page);
   await page.goto("/settings?s=appearance");
   const assistantSwitch = page.getByRole("switch", { name: "AI assistant" });
   if (!(await assistantSwitch.isChecked())) {
     await assistantSwitch.click();
   }
+  await expect(assistantSwitch).toBeChecked();
+  const routeSelector = page.getByRole("combobox", { name: "Assistant model route" });
+  await expect(routeSelector).toBeVisible();
+  await routeSelector.selectOption("auto");
+  await expect(routeSelector).toHaveValue("auto");
+  await expect(routeSelector).toBeEnabled();
+  await routeSelector.selectOption("uncensored");
+  await expect(routeSelector).toHaveValue("uncensored");
+  await expect(routeSelector).toBeEnabled();
 
   await page.goto("/");
   await page.getByRole("button", { name: "Open assistant" }).click();
   await expect(page.getByRole("dialog", { name: "Assistant" })).toBeVisible();
+  await expect(page.getByRole("combobox", { name: "Assistant model route" })).toHaveCount(0);
+  const modelSelector = page.getByRole("combobox", { name: "Assistant model", exact: true });
+  await expect(modelSelector).toBeVisible();
+  const refreshModels = page.getByRole("button", { name: "Refresh assistant models" });
+  await expect(refreshModels).toBeVisible();
+  await refreshModels.click();
+  await expect.poll(() => modelSelector.evaluate((node) => node.tagName)).toBe("SELECT");
+  await expect
+    .poll(() => modelSelector.evaluate((node) => node.getBoundingClientRect().height))
+    .toBeGreaterThanOrEqual(36);
 
   await page.getByLabel("Message for Assistant").fill("hello assistant");
   await page.getByRole("button", { name: "Send" }).click();

tests/unit/agent-chat.test.ts

@@ -83,4 +83,67 @@ describe("runAgentChat", () => {
     assert.equal(result.message.role, "assistant");
     assert.ok(result.message.content.length > 0);
   });
+
+  it("appends runtime clock context to the system prompt", async () => {
+    const original = process.env.HOUSEHOLD_TIMEZONE;
+    process.env.HOUSEHOLD_TIMEZONE = "America/Chicago";
+
+    let systemContent = "";
+    const result = await runAgentChat({
+      messages: [{ role: "user", content: "hello" }],
+      request: new Request("http://localhost:3000/api/agent/chat"),
+      systemPrompt: "You are a pirate.",
+      llm: {
+        async chatCompletion(request) {
+          const system = request.messages.find((message) => message.role === "system");
+          systemContent = typeof system?.content === "string" ? system.content : "";
+          return {
+            message: { role: "assistant", content: "Ahoy" },
+            finishReason: "stop",
+          };
+        },
+      },
+    });
+
+    assert.equal(result.message.content, "Ahoy");
+    assert.match(systemContent, /^You are a pirate\./);
+    assert.match(systemContent, /Current time:/);
+    assert.match(systemContent, /America\/Chicago/);
+
+    if (original === undefined) delete process.env.HOUSEHOLD_TIMEZONE;
+    else process.env.HOUSEHOLD_TIMEZONE = original;
+  });
+});
+
+it("passes a model override to the OpenAI-compatible client", async () => {
+  const originalBaseUrl = process.env.LLM_BASE_URL;
+  const originalModel = process.env.LLM_MODEL;
+  const originalProvider = process.env.LLM_PROVIDER;
+  const originalFetch = globalThis.fetch;
+  let requestBody: unknown = null;
+
+  process.env.LLM_BASE_URL = "https://llm.example.test/v1";
+  process.env.LLM_MODEL = "llama3.2";
+  delete process.env.LLM_PROVIDER;
+
+  globalThis.fetch = (async (_input: RequestInfo | URL, init?: RequestInit) => {
+    requestBody = JSON.parse(String(init?.body));
+    return Response.json({
+      choices: [{ message: { role: "assistant", content: "done" }, finish_reason: "stop" }],
+    });
+  }) as typeof fetch;
+
+  const { createLlmClient } = await import("../../src/lib/llm/index");
+  const client = createLlmClient({ model: "qwen2.5-coder" });
+  await client.chatCompletion({ messages: [{ role: "user", content: "hello" }] });
+
+  assert.equal((requestBody as { model?: string }).model, "qwen2.5-coder");
+
+  globalThis.fetch = originalFetch;
+  if (originalBaseUrl === undefined) delete process.env.LLM_BASE_URL;
+  else process.env.LLM_BASE_URL = originalBaseUrl;
+  if (originalModel === undefined) delete process.env.LLM_MODEL;
+  else process.env.LLM_MODEL = originalModel;
+  if (originalProvider === undefined) delete process.env.LLM_PROVIDER;
+  else process.env.LLM_PROVIDER = originalProvider;
 });

tests/unit/agent-loop-guards.test.ts

@@ -0,0 +1,152 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import {
+  fingerprintToolCalls,
+  isSuccessfulWrite,
+  summarizeToolTrace,
+  truncateToolResult,
+} from "../../src/modules/agent/server/loop-guards";
+import { runAgentChat } from "../../src/modules/agent/server/run";
+import type {
+  ChatCompletionRequest,
+  ChatCompletionResult,
+  LlmClient,
+} from "../../src/lib/llm/types";
+
+describe("loop-guards", () => {
+  it("fingerprints tool calls stably regardless of key order", () => {
+    const a = fingerprintToolCalls([
+      { name: "create_event", arguments: '{"title":"Dentist","calendarName":"Family"}' },
+    ]);
+    const b = fingerprintToolCalls([
+      { name: "create_event", arguments: '{"calendarName":"Family","title":"Dentist"}' },
+    ]);
+    assert.equal(a, b);
+  });
+
+  it("treats create_event 201 as a successful write", () => {
+    assert.equal(isSuccessfulWrite("create_event", 201), true);
+    assert.equal(isSuccessfulWrite("list_calendars", 200), false);
+    assert.equal(
+      isSuccessfulWrite("call_api", 201, '{"method":"POST","path":"/api/v1/events"}'),
+      true,
+    );
+    assert.equal(
+      isSuccessfulWrite("call_api", 200, '{"method":"GET","path":"/api/v1/events"}'),
+      false,
+    );
+  });
+
+  it("truncates oversized tool results", () => {
+    const result = truncateToolResult("x".repeat(7000), 100);
+    assert.ok(result.length < 200);
+    assert.match(result, /truncated/);
+  });
+
+  it("summarizes tool traces", () => {
+    assert.equal(
+      summarizeToolTrace([
+        { name: "list_calendars", status: 200 },
+        { name: "create_event", status: 201 },
+      ]),
+      "list_calendars→200, create_event→201",
+    );
+  });
+});
+
+describe("runAgentChat loop guards", () => {
+  it("stops after a successful write instead of looping", async () => {
+    let calls = 0;
+    const llm: LlmClient = {
+      async chatCompletion(request: ChatCompletionRequest): Promise<ChatCompletionResult> {
+        calls += 1;
+        if (calls === 1) {
+          return {
+            message: {
+              role: "assistant",
+              content: null,
+              tool_calls: [
+                {
+                  id: "1",
+                  type: "function",
+                  function: {
+                    name: "create_event",
+                    arguments: JSON.stringify({
+                      title: "Dentist",
+                      startAt: "2026-07-10T15:00:00.000Z",
+                      endAt: "2026-07-10T16:00:00.000Z",
+                    }),
+                  },
+                },
+              ],
+            },
+            finishReason: "tool_calls",
+          };
+        }
+
+        assert.equal(request.tools, undefined);
+        return {
+          message: { role: "assistant", content: "Added Dentist to your calendar." },
+          finishReason: "stop",
+        };
+      },
+    };
+
+    const result = await runAgentChat({
+      messages: [{ role: "user", content: "add dentist tomorrow at 10" }],
+      request: new Request("http://localhost:3000/api/agent/chat"),
+      llm,
+      executeTool: async () =>
+        JSON.stringify({ status: 201, body: { id: "evt-1", title: "Dentist" } }),
+    });
+
+    assert.equal(calls, 2);
+    assert.equal(result.toolCalls.length, 1);
+    assert.equal(result.toolCalls[0]?.name, "create_event");
+    assert.match(result.message.content, /Dentist/);
+  });
+
+  it("breaks duplicate identical tool rounds", async () => {
+    let calls = 0;
+    const llm: LlmClient = {
+      async chatCompletion(): Promise<ChatCompletionResult> {
+        calls += 1;
+        if (calls <= 2) {
+          return {
+            message: {
+              role: "assistant",
+              content: null,
+              tool_calls: [
+                {
+                  id: String(calls),
+                  type: "function",
+                  function: {
+                    name: "list_calendars",
+                    arguments: "{}",
+                  },
+                },
+              ],
+            },
+            finishReason: "tool_calls",
+          };
+        }
+        return {
+          message: { role: "assistant", content: "You have one Family calendar." },
+          finishReason: "stop",
+        };
+      },
+    };
+
+    const result = await runAgentChat({
+      messages: [{ role: "user", content: "what calendars do I have?" }],
+      request: new Request("http://localhost:3000/api/agent/chat"),
+      llm,
+      executeTool: async () =>
+        JSON.stringify({ status: 200, body: [{ id: "cal-1", name: "Family" }] }),
+    });
+
+    assert.equal(calls, 3);
+    assert.equal(result.toolCalls.length, 1);
+    assert.match(result.message.content, /Family/);
+  });
+});

tests/unit/agent-messages.test.ts

@@ -25,4 +25,31 @@ describe("clientChatInputSchema", () => {
 
     assert.equal(parsed.success, false);
   });
+
+  it("accepts an optional model ID", () => {
+    const parsed = clientChatInputSchema.safeParse({
+      model: "qwen2.5-coder",
+      messages: [{ role: "user", content: "hello" }],
+    });
+
+    assert.equal(parsed.success, true);
+  });
+
+  it("rejects invalid model IDs", () => {
+    const parsed = clientChatInputSchema.safeParse({
+      model: "bad model",
+      messages: [{ role: "user", content: "hello" }],
+    });
+
+    assert.equal(parsed.success, false);
+  });
+
+  it("rejects whitespace-padded model IDs", () => {
+    const parsed = clientChatInputSchema.safeParse({
+      model: " qwen2.5-coder ",
+      messages: [{ role: "user", content: "hello" }],
+    });
+
+    assert.equal(parsed.success, false);
+  });
 });

tests/unit/agent-models-route.test.ts

@@ -0,0 +1,17 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+
+describe("GET /api/agent/models", () => {
+  it("is dynamic and returns no-store responses", async () => {
+    process.env.DATABASE_URL ??= "postgres://famapp:famapp@localhost:5432/famapp";
+
+    const { GET, dynamic } = await import("../../src/app/api/agent/models/route");
+
+    assert.equal(dynamic, "force-dynamic");
+
+    const response = await GET(new Request("http://localhost/api/agent/models?refresh=1"));
+
+    assert.equal(response.status, 401);
+    assert.equal(response.headers.get("Cache-Control"), "no-store");
+  });
+});

tests/unit/agent-tools-runtime.test.ts

@@ -0,0 +1,171 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { appendAgentRuntimeContext, resolveHouseholdTimezone } from "../../src/modules/agent/tools";
+import {
+  createApiToolExecutor,
+  resolveInternalApiBase,
+} from "../../src/modules/agent/tool-executor";
+
+describe("appendAgentRuntimeContext", () => {
+  it("appends current time and timezone to the prompt", () => {
+    const original = process.env.HOUSEHOLD_TIMEZONE;
+    process.env.HOUSEHOLD_TIMEZONE = "America/Chicago";
+
+    const now = new Date("2026-07-09T14:30:00.000Z");
+    const result = appendAgentRuntimeContext("Be helpful.", now);
+
+    assert.match(result, /^Be helpful\./);
+    assert.match(result, /Current time:/);
+    assert.match(result, /America\/Chicago/);
+    assert.match(result, /2026-07-09T14:30:00\.000Z/);
+    assert.match(result, /Resolve relative dates from this clock/);
+
+    if (original === undefined) delete process.env.HOUSEHOLD_TIMEZONE;
+    else process.env.HOUSEHOLD_TIMEZONE = original;
+  });
+});
+
+describe("resolveHouseholdTimezone", () => {
+  it("prefers HOUSEHOLD_TIMEZONE over TZ", () => {
+    const originalHousehold = process.env.HOUSEHOLD_TIMEZONE;
+    const originalTz = process.env.TZ;
+    process.env.HOUSEHOLD_TIMEZONE = "America/New_York";
+    process.env.TZ = "UTC";
+
+    assert.equal(resolveHouseholdTimezone(), "America/New_York");
+
+    if (originalHousehold === undefined) delete process.env.HOUSEHOLD_TIMEZONE;
+    else process.env.HOUSEHOLD_TIMEZONE = originalHousehold;
+    if (originalTz === undefined) delete process.env.TZ;
+    else process.env.TZ = originalTz;
+  });
+});
+
+describe("resolveInternalApiBase", () => {
+  it("uses loopback instead of the public request origin", () => {
+    const original = process.env.INTERNAL_API_BASE_URL;
+    const originalPort = process.env.PORT;
+    delete process.env.INTERNAL_API_BASE_URL;
+    process.env.PORT = "3000";
+
+    const base = resolveInternalApiBase(new Request("https://fam.ginnoir.com/api/agent/chat"));
+    assert.equal(base, "http://127.0.0.1:3000");
+
+    if (original === undefined) delete process.env.INTERNAL_API_BASE_URL;
+    else process.env.INTERNAL_API_BASE_URL = original;
+    if (originalPort === undefined) delete process.env.PORT;
+    else process.env.PORT = originalPort;
+  });
+
+  it("honors INTERNAL_API_BASE_URL when set", () => {
+    const original = process.env.INTERNAL_API_BASE_URL;
+    process.env.INTERNAL_API_BASE_URL = "http://127.0.0.1:3010/";
+
+    const base = resolveInternalApiBase(new Request("https://fam.ginnoir.com/api/agent/chat"));
+    assert.equal(base, "http://127.0.0.1:3010");
+
+    if (original === undefined) delete process.env.INTERNAL_API_BASE_URL;
+    else process.env.INTERNAL_API_BASE_URL = original;
+  });
+});
+
+describe("create_event calendar resolution", () => {
+  it("uses the first calendar when calendarId and calendarName are omitted", async () => {
+    const originalFetch = globalThis.fetch;
+    const posts: Array<{ path: string; body: unknown }> = [];
+
+    globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => {
+      const url = String(input);
+      if (url.includes("/api/v1/calendars") && (!init?.method || init.method === "GET")) {
+        return Response.json([
+          { id: "cal-1", name: "Family" },
+          { id: "cal-2", name: "Work" },
+        ]);
+      }
+      if (url.includes("/api/v1/events") && init?.method === "POST") {
+        const body = JSON.parse(String(init.body));
+        posts.push({ path: url, body });
+        return Response.json({ id: "evt-1", ...body }, { status: 201 });
+      }
+      return new Response("not found", { status: 404 });
+    }) as typeof fetch;
+
+    const execute = createApiToolExecutor(
+      new Request("https://fam.ginnoir.com/api/agent/chat", {
+        headers: { cookie: "authjs.session-token=test" },
+      }),
+    );
+    const result = JSON.parse(
+      await execute(
+        "create_event",
+        JSON.stringify({
+          title: "Dentist",
+          startAt: "2026-07-10T15:00:00.000Z",
+          endAt: "2026-07-10T16:00:00.000Z",
+        }),
+      ),
+    ) as { status: number; body: { calendarId?: string } };
+
+    assert.equal(result.status, 201);
+    assert.equal(result.body.calendarId, "cal-1");
+    assert.equal(posts.length, 1);
+    assert.match(posts[0]!.path, /^http:\/\/127\.0\.0\.1:3000\/api\/v1\/events/);
+
+    globalThis.fetch = originalFetch;
+  });
+
+  it("matches calendarName case-insensitively", async () => {
+    const originalFetch = globalThis.fetch;
+
+    globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => {
+      const url = String(input);
+      if (url.includes("/api/v1/calendars") && (!init?.method || init.method === "GET")) {
+        return Response.json([
+          { id: "cal-1", name: "Family" },
+          { id: "cal-2", name: "Work" },
+        ]);
+      }
+      if (url.includes("/api/v1/events") && init?.method === "POST") {
+        const body = JSON.parse(String(init.body));
+        return Response.json({ id: "evt-1", ...body }, { status: 201 });
+      }
+      return new Response("not found", { status: 404 });
+    }) as typeof fetch;
+
+    const execute = createApiToolExecutor(new Request("http://localhost:3000/api/agent/chat"));
+    const result = JSON.parse(
+      await execute(
+        "create_event",
+        JSON.stringify({
+          calendarName: "work",
+          title: "Standup",
+          startAt: "2026-07-10T15:00:00.000Z",
+          endAt: "2026-07-10T15:30:00.000Z",
+        }),
+      ),
+    ) as { status: number; body: { calendarId?: string } };
+
+    assert.equal(result.status, 201);
+    assert.equal(result.body.calendarId, "cal-2");
+
+    globalThis.fetch = originalFetch;
+  });
+
+  it("returns a clear error when the internal API is unreachable", async () => {
+    const originalFetch = globalThis.fetch;
+    globalThis.fetch = (async () => {
+      throw new TypeError("fetch failed");
+    }) as typeof fetch;
+
+    const execute = createApiToolExecutor(new Request("https://fam.ginnoir.com/api/agent/chat"));
+    const result = JSON.parse(await execute("list_calendars", "{}")) as {
+      status: number;
+      body: { error?: string };
+    };
+
+    assert.equal(result.status, 502);
+    assert.match(String(result.body.error), /unreachable/i);
+
+    globalThis.fetch = originalFetch;
+  });
+});

tests/unit/llm-models.test.ts

@@ -0,0 +1,241 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import {
+  isValidAssistantModelRoute,
+  isValidLlmModelId,
+  listLlmModels,
+  normalizeLlmModelsPayload,
+  resolveAssistantModel,
+} from "../../src/lib/llm/models";
+import type { LlmConfig } from "../../src/lib/llm/config";
+
+const openAiConfig: LlmConfig = {
+  provider: "openai",
+  baseUrl: "https://llm.example.test/v1",
+  apiKey: "secret",
+  model: "llama3.2",
+};
+
+describe("normalizeLlmModelsPayload", () => {
+  it("normalizes OpenAI-compatible data arrays", () => {
+    const models = normalizeLlmModelsPayload({
+      data: [{ id: "qwen2.5-coder" }, { id: "llama3.2" }, { id: "qwen2.5-coder" }],
+    });
+
+    assert.deepEqual(models, [
+      { id: "llama3.2", label: "llama3.2" },
+      { id: "qwen2.5-coder", label: "qwen2.5-coder" },
+    ]);
+  });
+
+  it("ignores invalid or empty model rows", () => {
+    const models = normalizeLlmModelsPayload({
+      data: [
+        { id: "" },
+        { id: "   " },
+        { id: "bad model" },
+        { id: " llama3.2 " },
+        { object: "model" },
+      ],
+    });
+
+    assert.deepEqual(models, []);
+  });
+});
+
+describe("isValidLlmModelId", () => {
+  it("accepts common provider model IDs", () => {
+    assert.equal(isValidLlmModelId("llama3.2"), true);
+    assert.equal(isValidLlmModelId("qwen2.5-coder:latest"), true);
+    assert.equal(isValidLlmModelId("hf.co/ginnoir/model-v1"), true);
+  });
+
+  it("rejects empty, whitespace, and overlong model IDs", () => {
+    assert.equal(isValidLlmModelId(""), false);
+    assert.equal(isValidLlmModelId("bad model"), false);
+    assert.equal(isValidLlmModelId("x".repeat(129)), false);
+  });
+});
+
+describe("isValidAssistantModelRoute", () => {
+  it("accepts the supported route families", () => {
+    assert.equal(isValidAssistantModelRoute("auto"), true);
+    assert.equal(isValidAssistantModelRoute("uncensored"), true);
+  });
+
+  it("rejects unsupported or padded route families", () => {
+    assert.equal(isValidAssistantModelRoute("bogus"), false);
+    assert.equal(isValidAssistantModelRoute(" uncensored "), false);
+  });
+});
+
+describe("listLlmModels", () => {
+  it("fetches provider models with API key auth when the fallback is advertised", async () => {
+    const requests: Request[] = [];
+    const result = await listLlmModels({
+      config: openAiConfig,
+      fetchImpl: async (input, init) => {
+        requests.push(new Request(input, init));
+        return Response.json({ data: [{ id: "qwen2.5-coder" }, { id: "llama3.2" }] });
+      },
+    });
+
+    assert.equal(requests[0]?.url, "https://llm.example.test/v1/models");
+    assert.equal(requests[0]?.headers.get("authorization"), "Bearer secret");
+    assert.deepEqual(result.models, [
+      { id: "llama3.2", label: "llama3.2" },
+      { id: "qwen2.5-coder", label: "qwen2.5-coder" },
+    ]);
+    assert.equal(result.fallbackModel, "llama3.2");
+    assert.equal(result.degraded, false);
+  });
+
+  it("falls back to LLM_MODEL when provider discovery fails", async () => {
+    const result = await listLlmModels({
+      config: openAiConfig,
+      fetchImpl: async () => new Response("nope", { status: 500 }),
+    });
+
+    assert.deepEqual(result.models, [{ id: "llama3.2", label: "llama3.2" }]);
+    assert.equal(result.fallbackModel, "llama3.2");
+    assert.equal(result.degraded, true);
+  });
+
+  it("fetches the typed uncensored catalog when uncensored is the selected route", async () => {
+    const requests: Request[] = [];
+    const result = await listLlmModels({
+      config: { ...openAiConfig, model: "auto" },
+      route: "uncensored",
+      fetchImpl: async (input, init) => {
+        requests.push(new Request(input, init));
+        return Response.json({
+          data: [
+            { id: "uncensored" },
+            { id: "gemma4-uncensored:26b" },
+            { id: "dolphin-mistral:latest" },
+          ],
+        });
+      },
+    });
+
+    assert.equal(requests[0]?.url, "https://llm.example.test/v1/models?type=uncensored");
+    assert.deepEqual(result.models, [
+      { id: "dolphin-mistral:latest", label: "dolphin-mistral:latest" },
+      { id: "gemma4-uncensored:26b", label: "gemma4-uncensored:26b" },
+      { id: "uncensored", label: "uncensored" },
+    ]);
+    assert.equal(result.fallbackModel, "uncensored");
+    assert.equal(result.route, "uncensored");
+    assert.equal(result.degraded, false);
+  });
+
+  it("fetches the default catalog when auto is selected over an uncensored deployment default", async () => {
+    const requests: Request[] = [];
+    const result = await listLlmModels({
+      config: { ...openAiConfig, model: "uncensored" },
+      route: "auto",
+      fetchImpl: async (input, init) => {
+        requests.push(new Request(input, init));
+        return Response.json({
+          data: [{ id: "auto" }, { id: "qwen3:8b" }],
+        });
+      },
+    });
+
+    assert.equal(requests[0]?.url, "https://llm.example.test/v1/models");
+    assert.deepEqual(result.models, [
+      { id: "auto", label: "auto" },
+      { id: "qwen3:8b", label: "qwen3:8b" },
+    ]);
+    assert.equal(result.fallbackModel, "auto");
+    assert.equal(result.route, "auto");
+    assert.equal(result.degraded, false);
+  });
+
+  it("uses fallback only for mock provider config", async () => {
+    const result = await listLlmModels({
+      config: { provider: "mock", baseUrl: null, apiKey: null, model: "llama3.2" },
+      fetchImpl: async () => {
+        throw new Error("fetch should not run for mock config");
+      },
+    });
+
+    assert.deepEqual(result.models, [{ id: "llama3.2", label: "llama3.2" }]);
+    assert.equal(result.degraded, false);
+  });
+});
+
+describe("resolveAssistantModel", () => {
+  it("uses a valid requested model before saved and fallback values", () => {
+    const resolved = resolveAssistantModel({
+      requestedModel: "qwen2.5-coder",
+      savedModel: "llama3.2",
+      fallbackModel: "llama3.2",
+      models: [
+        { id: "llama3.2", label: "llama3.2" },
+        { id: "qwen2.5-coder", label: "qwen2.5-coder" },
+      ],
+    });
+
+    assert.deepEqual(resolved, { ok: true, model: "qwen2.5-coder" });
+  });
+
+  it("rejects invalid requested models", () => {
+    const resolved = resolveAssistantModel({
+      requestedModel: "bad model",
+      savedModel: null,
+      fallbackModel: "llama3.2",
+      models: [
+        { id: "llama3.2", label: "llama3.2" },
+        { id: "bad model", label: "bad model" },
+      ],
+    });
+
+    assert.deepEqual(resolved, {
+      ok: false,
+      model: "llama3.2",
+      error: "Invalid assistant model",
+    });
+  });
+
+  it("rejects empty requested models", () => {
+    const resolved = resolveAssistantModel({
+      requestedModel: "",
+      savedModel: null,
+      fallbackModel: "llama3.2",
+      models: [{ id: "llama3.2", label: "llama3.2" }],
+    });
+
+    assert.deepEqual(resolved, {
+      ok: false,
+      model: "llama3.2",
+      error: "Invalid assistant model",
+    });
+  });
+
+  it("rejects unavailable requested models", () => {
+    const resolved = resolveAssistantModel({
+      requestedModel: "missing",
+      savedModel: null,
+      fallbackModel: "llama3.2",
+      models: [{ id: "llama3.2", label: "llama3.2" }],
+    });
+
+    assert.deepEqual(resolved, {
+      ok: false,
+      model: "llama3.2",
+      error: "Invalid assistant model",
+    });
+  });
+
+  it("silently falls back when a saved model is gone", () => {
+    const resolved = resolveAssistantModel({
+      requestedModel: null,
+      savedModel: "old-model",
+      fallbackModel: "llama3.2",
+      models: [{ id: "llama3.2", label: "llama3.2" }],
+    });
+
+    assert.deepEqual(resolved, { ok: true, model: "llama3.2" });
+  });
+});