diff --git a/packages/app/src/screens/chat/desktop-chat.test.ts b/packages/app/src/screens/chat/desktop-chat.test.ts
new file mode 100644
index 00000000..f47286b9
--- /dev/null
+++ b/packages/app/src/screens/chat/desktop-chat.test.ts
@@ -0,0 +1,31 @@
+import { describe, expect, it } from "vitest";
+import { createElement } from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { vi } from "vitest";
+
+vi.mock("../../api", () => ({ api: {} }));
+vi.mock("../../shell/nav", () => ({ useNav: () => ({ params: new URLSearchParams(), route: "home" }) }));
+vi.mock("../../state/live", () => ({ useQuery: () => ({ state: "ready", data: { mode: "local" } }) }));
+vi.mock("../../i18n", () => ({ useT: () => (key: string) => key }));
+vi.mock("../../preview", () => ({ isPreview: () => false }));
+vi.mock("./live-chat", () => ({ Home: () => null }));
+vi.mock("./voice", () => ({ Voice: () => null, VOICE_VARIANTS: [] }));
+vi.mock("./canvas", () => ({ Canvas: () => null, CANVAS_VARIANTS: [] }));
+vi.mock("./research", () => ({ SearchResults: () => null, DeepResearch: () => null, SEARCH_VARIANTS: [], DEEP_VARIANTS: [] }));
+vi.mock("./extras", () => ({ ImageGen: () => null, Share: () => null, TempChat: () => null, IMAGE_VARIANTS: [], SHARE_VARIANTS: [], TEMP_VARIANTS: [] }));
+vi.mock("./pages", () => ({ History: () => null, Library: () => null }));
+vi.mock("../../registry", () => ({ Root: ({ children }: { children: React.ReactNode }) => createElement("div", null, children) }));
+import { SCREENS } from "./index";
+
+describe("desktop Chat registration", () => {
+  it("keeps conversation and state samples out of discovery", () => {
+    expect(SCREENS.map(s => s.id)).not.toContain("chat");
+    expect(SCREENS.map(s => s.id)).not.toContain("chat-states");
+  });
+  it.each(["canvas", "search-results", "deep-research", "image-gen", "share", "temp-chat"])("%s direct route shares the local capability state", id => {
+    const screen = SCREENS.find(s => s.id === id)!;
+    const html = renderToStaticMarkup(screen.render());
+    expect(html).toContain('data-testid="chat-capability-empty"');
+    expect(html).toContain("<button");
+  });
+});
diff --git a/packages/app/src/screens/chat/index.tsx b/packages/app/src/screens/chat/index.tsx
index 851fd542..e0942973 100644
--- a/packages/app/src/screens/chat/index.tsx
+++ b/packages/app/src/screens/chat/index.tsx
@@ -1,24 +1,42 @@
+import type { ReactNode } from "react";
 import { Root, type ScreenDef } from "../../registry";
-import { Home, Chat } from "./live-chat";
-import { ChatStates, CHAT_STATE_VARIANTS } from "./states";
+import { Home } from "./live-chat";
 import { Voice, VOICE_VARIANTS } from "./voice";
 import { Canvas, CANVAS_VARIANTS } from "./canvas";
 import { SearchResults, DeepResearch, SEARCH_VARIANTS, DEEP_VARIANTS } from "./research";
 import { ImageGen, Share, TempChat, IMAGE_VARIANTS, SHARE_VARIANTS, TEMP_VARIANTS } from "./extras";
 import { History, Library } from "./pages";
+import { useT } from "../../i18n";
+import { useNav } from "../../shell/nav";
+import { isPreview } from "../../preview";
+import { useQuery } from "../../state/live";
+import { api } from "../../api";
+
+/** Local Chat has no remote feature transport. Direct links explain the missing capability. */
+function CapabilityRoute({ feature, children }: { feature: string; children: ReactNode }) {
+  const t = useT();
+  const { go } = useNav();
+  const connection = useQuery(() => api.connection.get(), []);
+  if (isPreview()) return children;
+  if (connection.state === "loading") return <div role="status">{t("chat.live.loading")}</div>;
+  if (connection.state === "error") return <div className="chat-err" role="alert"><span>{t("chat.err.network.body")}</span><button className="btn secondary" onClick={connection.reload}>{t("common.retry")}</button></div>;
+  if (connection.data.mode !== "local") return children;
+  return <Root id={feature}><div className="empty" data-testid="chat-capability-empty">
+    <h2>{t(`chat.screen.${feature}`)}</h2><p>{t("chat.unavailable.body")}</p>
+    <button className="btn primary" onClick={() => go("providers")}>{t("composer.addProvider")}</button>
+  </div></Root>;
+}
 
 const G = "chat.group";
 export const SCREENS: ScreenDef[] = [
   { id: "home", name: "chat.screen.home", mode: "Cortex", group: G, render: () => <Root id="home"><Home /></Root> },
-  { id: "chat", name: "chat.screen.chat", mode: "Cortex", group: G, render: () => <Root id="chat"><Chat /></Root> },
-  { id: "chat-states", name: "chat.screen.chat-states", mode: "Cortex", group: G, variants: CHAT_STATE_VARIANTS, render: () => <ChatStates /> },
   { id: "voice", name: "chat.screen.voice", mode: "Cortex", group: G, variants: VOICE_VARIANTS, render: () => <Voice /> },
-  { id: "canvas", name: "chat.screen.canvas", mode: "Cortex", group: G, variants: CANVAS_VARIANTS, render: () => <Canvas /> },
-  { id: "search-results", name: "chat.screen.search-results", mode: "Cortex", group: G, variants: SEARCH_VARIANTS, render: () => <SearchResults /> },
-  { id: "deep-research", name: "chat.screen.deep-research", mode: "Cortex", group: G, variants: DEEP_VARIANTS, render: () => <DeepResearch /> },
-  { id: "image-gen", name: "chat.screen.image-gen", mode: "Cortex", group: G, variants: IMAGE_VARIANTS, render: () => <ImageGen /> },
-  { id: "share", name: "chat.screen.share", mode: "Cortex", group: G, variants: SHARE_VARIANTS, render: () => <Share /> },
-  { id: "temp-chat", name: "chat.screen.temp-chat", mode: "Cortex", group: G, variants: TEMP_VARIANTS, render: () => <TempChat /> },
+  { id: "canvas", name: "chat.screen.canvas", mode: "Cortex", group: G, variants: CANVAS_VARIANTS, render: () => <CapabilityRoute feature="canvas"><Canvas /></CapabilityRoute> },
+  { id: "search-results", name: "chat.screen.search-results", mode: "Cortex", group: G, variants: SEARCH_VARIANTS, render: () => <CapabilityRoute feature="search-results"><SearchResults /></CapabilityRoute> },
+  { id: "deep-research", name: "chat.screen.deep-research", mode: "Cortex", group: G, variants: DEEP_VARIANTS, render: () => <CapabilityRoute feature="deep-research"><DeepResearch /></CapabilityRoute> },
+  { id: "image-gen", name: "chat.screen.image-gen", mode: "Cortex", group: G, variants: IMAGE_VARIANTS, render: () => <CapabilityRoute feature="image-gen"><ImageGen /></CapabilityRoute> },
+  { id: "share", name: "chat.screen.share", mode: "Cortex", group: G, variants: SHARE_VARIANTS, render: () => <CapabilityRoute feature="share"><Share /></CapabilityRoute> },
+  { id: "temp-chat", name: "chat.screen.temp-chat", mode: "Cortex", group: G, variants: TEMP_VARIANTS, render: () => <CapabilityRoute feature="temp-chat"><TempChat /></CapabilityRoute> },
   { id: "history", name: "chat.screen.history", mode: "Cortex", group: G, render: () => <Root id="history"><History /></Root> },
   { id: "library", name: "chat.screen.library", mode: "Cortex", group: G, render: () => <Root id="library"><Library /></Root> },
 ];
diff --git a/packages/app/src/screens/chat/live-chat.tsx b/packages/app/src/screens/chat/live-chat.tsx
index b9149955..b20b68a4 100644
--- a/packages/app/src/screens/chat/live-chat.tsx
+++ b/packages/app/src/screens/chat/live-chat.tsx
@@ -1,4 +1,4 @@
-// Home and conversation (design "home", "chat"): live engine path plus the preview transcript.
+// Home and conversation: live engine path plus the preview transcript.
 import * as React from "react";
 import { Collapsible } from "@base-ui/react/collapsible";
 import type { MessageWithParts, Part, ToolPart, FilePart, PromptPartInput } from "@cortex/schema";
@@ -20,42 +20,36 @@ import { RemoteBoundary } from "./remote-chat";
 const KNOWN_ERRORS = ["model_no_image_input", "model_no_pdf_input", "context_window_exceeded", "model_not_found", "provider_key_missing", "provider_auth_failed",
   "provider_rate_limited", "provider_error", "provider_disabled", "provider_unsupported", "session_busy", "aborted", "tool_failed", "permission_rejected",
   "permission_denied", "catalog_unavailable", "network"];
-/** Maps an engine error code to Cortex copy. Raw messages and vendor names never reach the screen. */
 const errKey = (code?: string) => (code && KNOWN_ERRORS.includes(code) ? code : "generic");
 const PROVIDER_ERRORS = ["provider_key_missing", "provider_auth_failed", "provider_disabled", "provider_unsupported", "model_not_found"];
-
 const toParts = (text: string, atts: ComposerAttachment[]): PromptPartInput[] =>
   [{ type: "text", text }, ...atts.map((a): PromptPartInput => ({ type: "file", mime: a.mime, filename: a.name, url: a.dataUrl }))];
 
 function NoProvider() {
   const t = useT();
   const { go } = useNav();
-  return (
-    <div className="banner info chat-banner chat-live-banner" role="status">
-      <Icon name="info" /><span>{t("chat.noProvider.title")}</span><span className="grow">{t("chat.noProvider.body")}</span>
-      <button className="btn secondary" onClick={() => go("settings", { section: "providers" })}>{t("chat.noProvider.cta")}</button>
-    </div>
-  );
+  return <div className="banner info chat-banner chat-live-banner" role="status">
+    <Icon name="info" /><span>{t("chat.noProvider.title")}</span><span className="grow">{t("chat.noProvider.body")}</span>
+    <button className="btn secondary" onClick={() => go("providers")}>{t("composer.addProvider")}</button>
+  </div>;
 }
 
 function ErrorCard({ code, onRetry }: { code?: string; onRetry?: () => void }) {
   const t = useT();
   const { go } = useNav();
   const k = errKey(code);
-  return (
-    <div className="chat-err" role="alert">
-      <Icon name="alert-triangle" />
-      <div className="chat-grow"><b>{code === "not_found" ? t("shell.notFound.title") : t(`chat.err.${k}.title`)}</b><span>{code === "not_found" ? t("shell.notFound.body") : t(`chat.err.${k}.body`)}</span></div>
-      {code && PROVIDER_ERRORS.includes(code)
-        ? <button className="btn secondary" onClick={() => go("settings", { section: "providers" })}>{t("chat.noProvider.cta")}</button>
-        : onRetry && <button className="btn secondary" onClick={onRetry}><Icon name="refresh" size={16} />{t("common.retry")}</button>}
-    </div>
-  );
+  return <div className="chat-err" role="alert">
+    <Icon name="alert-triangle" />
+    <div className="chat-grow"><b>{code === "not_found" ? t("shell.notFound.title") : t(`chat.err.${k}.title`)}</b><span>{code === "not_found" ? t("shell.notFound.body") : t(`chat.err.${k}.body`)}</span></div>
+    {code && PROVIDER_ERRORS.includes(code)
+      ? <button className="btn secondary" onClick={() => go("providers")}>{t("composer.addProvider")}</button>
+      : onRetry && <button className="btn secondary" onClick={onRetry}><Icon name="refresh" size={16} />{t("common.retry")}</button>}
+  </div>;
 }
 
-/* ---------------------------------------------------------------- Home */
 export function Home() {
   const { params, entryKey } = useNav();
+  if (params.has("id")) return <Chat />;
   if (isPreview() || params.has("project")) return <LocalHome />;
   return <RemoteBoundary key={entryKey} local={<LocalHome />} />;
 }
@@ -75,10 +69,6 @@ function LocalHome() {
   const pending = React.useRef(false);
   const owner = React.useRef(false);
   React.useLayoutEffect(() => { owner.current = true; return () => { owner.current = false; }; }, []);
-  const refresh = () => {
-    if (!preview) models.reload();
-    toast.add({ title: t("chat.home.refreshed"), description: t(preview ? "chat.home.refreshedPreview" : "chat.home.draftKept") });
-  };
   const send = async (text: string, atts: ComposerAttachment[], o: SendOptions) => {
     if (!owner.current || pending.current) return false;
     pending.current = true; setSending(true);
@@ -91,7 +81,7 @@ function LocalHome() {
       if (!owner.current) return false;
       await api.sessions.prompt(sessionID.current, { parts: toParts(text, atts), model: o.model, reasoning: o.reasoning, expectedProjectID: projectID ?? null });
       if (!owner.current) return false;
-      go("chat", { id: sessionID.current });
+      go("home", { id: sessionID.current });
       return true;
     } catch (e) {
       const k = errKey((e as { code?: string })?.code);
@@ -99,21 +89,17 @@ function LocalHome() {
       return false;
     } finally { pending.current = false; if (owner.current) setSending(false); }
   };
-  return (<>
-    <div className="content-top"><div className="spacer" /><IconBtn icon="refresh" label={t("chat.refresh")} onClick={refresh} /><IconBtn icon="compose" label={t("chat.newChat")} kbd="⌘N" onClick={() => go("home")} /></div>
-    <div className="home">
-      <h1>{t("chat.home.title")}</h1>
-      {!preview && (noModel || models.state === "error") && <NoProvider />}
-      {preview ? <Composer placeholder={t("composer.placeholder")} onSend={(text, _, model) => startPreviewChat("chat", text, model)} onModelChange={setPreviewModel} />
-        : <ModelComposer placeholder={t("composer.placeholder")} live={models} busy={sending} onNoModel={() => setNoModel(true)} onSend={send} />}
-      {preview && <div className="suggestions">
-        {(fx.home.suggestions as string[][]).map(([g, s], i) => <button key={s} className="suggestion" style={css({ "--i": i })} onClick={() => startPreviewChat("chat", s, previewModel)}><Gel name={g} size={16} />{s}</button>)}
-      </div>}
-    </div>
-  </>);
+  return <div className="home">
+    <h1>{t("chat.home.title")}</h1>
+    {!preview && (noModel || models.state === "error") && <NoProvider />}
+    {preview ? <Composer placeholder={t("composer.placeholder")} onSend={(text, _, model) => startPreviewChat("chat", text, model)} onModelChange={setPreviewModel} />
+      : <ModelComposer placeholder={t("composer.placeholder")} live={models} busy={sending} onStop={() => { if (sessionID.current) void api.sessions.abort(sessionID.current); }} onNoModel={() => setNoModel(true)} onSend={send} />}
+    {preview && <div className="suggestions">
+      {(fx.home.suggestions as string[][]).map(([g, s], i) => <button key={s} className="suggestion" style={css({ "--i": i })} onClick={() => startPreviewChat("chat", s, previewModel)}><Gel name={g} size={16} />{s}</button>)}
+    </div>}
+  </div>;
 }
 
-/* ---------------------------------------------------------------- Chat */
 export function Chat() {
   const { params, go, entryKey } = useNav();
   const id = params.get("id");
@@ -138,8 +124,7 @@ function PreviewChat({ start }: { start: ReturnType<typeof previewChatStart> })
   const [pinned, setPinned] = React.useState(false);
   const [deleted, setDeleted] = React.useState(false);
   const [msgs, setMsgs] = React.useState<{ who: "u" | "b"; text: string; code?: boolean; model?: string; prompt?: string }[]>(start ? [{ who: "u", text: start.text }] : [
-    { who: "u", text: fx.q },
-    { who: "b", text: (fx.reply as string[]).join("\n"), code: true },
+    { who: "u", text: fx.q }, { who: "b", text: (fx.reply as string[]).join("\n"), code: true },
   ]);
   // ponytail: preview-only responses; live conversations use the engine stream below.
   const [queue, setQueue] = React.useState<{ text: string; model: string; replace?: number }[]>(start ? [start] : []);
@@ -163,7 +148,7 @@ function PreviewChat({ start }: { start: ReturnType<typeof previewChatStart> })
   const send = (text: string, _: ComposerAttachment[], model: string) => {
     setDeleted(false); setMsgs((m) => [...m, { who: "u", text }]); setQueue((q) => [...q, { text, model }]);
   };
-  return (<>
+  return <>
     <div className="content-top">
       {editing ? <form style={{ display: "flex", flex: 1, minWidth: 0, gap: 4 }} onSubmit={(e) => {
         e.preventDefault(); const value = String(new FormData(e.currentTarget).get("value") ?? "").trim();
@@ -187,10 +172,7 @@ function PreviewChat({ start }: { start: ReturnType<typeof previewChatStart> })
         ? <div key={i} className="msg-user" style={{ whiteSpace: "pre-wrap", overflowWrap: "anywhere" }}>{m.text}</div>
         : <div key={i} className="msg-bot-row"><Mascot cfg={bot} state={previewBot?.live.on === false ? "asleep" : "idle"} size={22} /><div className="msg-bot" style={{ flex: 1, minWidth: 0, overflowWrap: "anywhere" }}>
             {m.text.split("\n").map((p, j) => <p key={j}>{p}</p>)}
-            {m.code && <>
-              <h4>{fx.h}</h4>
-               <div className="code"><div className="code-head"><span>{fx.file}</span><IconBtn icon="copy" label={t("chat.preview.copyPlanning")} onClick={() => copy(fx.csv, t("chat.preview.planningCopied"))} /></div><pre>{fx.csv}</pre></div>
-            </>}
+            {m.code && <><h4>{fx.h}</h4><div className="code"><div className="code-head"><span>{fx.file}</span><IconBtn icon="copy" label={t("chat.preview.copyPlanning")} onClick={() => copy(fx.csv, t("chat.preview.planningCopied"))} /></div><pre>{fx.csv}</pre></div></>}
             <div className="msg-actions">
               <IconBtn icon="copy" label={t("chat.act.copy")} onClick={() => copy(m.text, t("chat.toast.answerCopied"))} />
               <IconBtn icon="refresh" label={t("chat.act.regen")} onClick={() => setQueue((q) => [...q, { text: m.prompt ?? msgs.slice(0, i).findLast((x) => x.who === "u")?.text ?? title, model: m.model ?? start?.model ?? t("composer.model.fast"), replace: i }])} /><IconBtn icon="share" label={t("chat.act.share")} onClick={() => copy(`${title}\n\n${m.text}`, t("chat.preview.shareCopied"))} />
@@ -201,7 +183,7 @@ function PreviewChat({ start }: { start: ReturnType<typeof previewChatStart> })
       <div ref={end} />
     </div></div>
     <div className="dock">{typing && <button className="btn secondary" onClick={() => { setQueue([]); toast.add({ title: t("chat.preview.stopped"), description: t("chat.preview.messagesKept") }); }}>{t("chat.preview.stop")}</button>}<Composer placeholder={t("chat.reply")} initialModel={start?.model} onSend={send} /><span className="hint">{t(start ? "chat.preview.hint" : "chat.hint")}</span></div>
-  </>);
+  </>;
 }
 
 const textOf = (m: MessageWithParts) => m.parts.filter((p): p is Extract<Part, { type: "text" }> => p.type === "text").map((p) => p.text).join("\n");
@@ -229,17 +211,13 @@ function LiveReasoning({ text, live, secs }: { text: string; live: boolean; secs
   const t = useT();
   const bot = useBotCfg();
   const steps = text.split("\n").map((s) => s.trim()).filter(Boolean);
-  return (
-    <Collapsible.Root className="chat-reason" defaultOpen={live} data-testid="reasoning-block">
-      <Collapsible.Trigger className="chat-reason-t">
-        {live ? <span className="thinking">{t("chat.thinkingName", { name: bot.name })}</span> : secs !== undefined ? <span>{t("chat.thoughtFor", { secs })}</span> : <span>{t("chat.thought")}</span>}
-        <Icon name="chevron-right" size={12} className="chat-chev" />
-      </Collapsible.Trigger>
-      <Collapsible.Panel className="chat-reason-p">
-        <ol>{steps.map((s, i) => <li key={i} style={css({ "--i": i })} data-last={(live && i === steps.length - 1) || undefined}>{s}</li>)}</ol>
-      </Collapsible.Panel>
-    </Collapsible.Root>
-  );
+  return <Collapsible.Root className="chat-reason" defaultOpen={live} data-testid="reasoning-block">
+    <Collapsible.Trigger className="chat-reason-t">
+      {live ? <span className="thinking">{t("chat.thinkingName", { name: bot.name })}</span> : secs !== undefined ? <span>{t("chat.thoughtFor", { secs })}</span> : <span>{t("chat.thought")}</span>}
+      <Icon name="chevron-right" size={12} className="chat-chev" />
+    </Collapsible.Trigger>
+    <Collapsible.Panel className="chat-reason-p"><ol>{steps.map((s, i) => <li key={i} style={css({ "--i": i })} data-last={(live && i === steps.length - 1) || undefined}>{s}</li>)}</ol></Collapsible.Panel>
+  </Collapsible.Root>;
 }
 
 function ToolBlock({ p }: { p: ToolPart }) {
@@ -247,36 +225,26 @@ function ToolBlock({ p }: { p: ToolPart }) {
   const s = p.state;
   const title = toolTitle(t, p);
   const done = s.status === "completed";
-  return (
-    <div className="chat-tool" data-done={done || undefined}>
-      <span className="li-ic"><Icon name={s.status === "error" ? "alert-triangle" : "terminal"} /></span>
-      <div className="chat-grow">
-        <div className="chat-tool-h">
-          {s.status === "pending" || s.status === "running" ? <span className="thinking">{title}</span> : <span>{title}</span>}
-          {done ? <span className="badge ok"><Icon name="check" size={12} />{t("chat.tool.ok")}</span>
-            : s.status === "error" ? <span className="badge err">{t("chat.tool.failed")}</span>
-            : <span className="spin" />}
-        </div>
-        <div className="chat-tool-sub">{toolName(t, p.tool)}</div>
-      </div>
-    </div>
-  );
+  return <div className="chat-tool" data-done={done || undefined}>
+    <span className="li-ic"><Icon name={s.status === "error" ? "alert-triangle" : "terminal"} /></span>
+    <div className="chat-grow"><div className="chat-tool-h">
+      {s.status === "pending" || s.status === "running" ? <span className="thinking">{title}</span> : <span>{title}</span>}
+      {done ? <span className="badge ok"><Icon name="check" size={12} />{t("chat.tool.ok")}</span> : s.status === "error" ? <span className="badge err">{t("chat.tool.failed")}</span> : <span className="spin" />}
+    </div><div className="chat-tool-sub">{toolName(t, p.tool)}</div></div>
+  </div>;
 }
 
 function PermissionCard({ id, tool, input }: { id: string; tool: string; input: string }) {
   const t = useT();
   const [busy, setBusy] = React.useState(false);
   const reply = (r: "once" | "always" | "reject") => { setBusy(true); api.permissions.reply(id, r).catch(() => setBusy(false)); };
-  return (
-    <div className="banner warn" role="alertdialog" aria-label={t("chat.perm.title", { tool: toolName(t, tool) })} style={{ margin: 0, flexWrap: "wrap" }}>
-      <Icon name="shield-check" />
-      <span>{t("chat.perm.title", { tool: toolName(t, tool) })}</span>
-      <span className="grow mono" style={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>{input}</span>
-      <button className="btn secondary" disabled={busy} onClick={() => reply("reject")}>{t("chat.perm.deny")}</button>
-      <button className="btn secondary" disabled={busy} onClick={() => reply("always")}>{t("chat.perm.always")}</button>
-      <button className="btn primary" disabled={busy} onClick={() => reply("once")}>{t("chat.perm.once")}</button>
-    </div>
-  );
+  return <div className="banner warn" role="alertdialog" aria-label={t("chat.perm.title", { tool: toolName(t, tool) })} style={{ margin: 0, flexWrap: "wrap" }}>
+    <Icon name="shield-check" /><span>{t("chat.perm.title", { tool: toolName(t, tool) })}</span>
+    <span className="grow mono" style={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>{input}</span>
+    <button className="btn secondary" disabled={busy} onClick={() => reply("reject")}>{t("chat.perm.deny")}</button>
+    <button className="btn secondary" disabled={busy} onClick={() => reply("always")}>{t("chat.perm.always")}</button>
+    <button className="btn primary" disabled={busy} onClick={() => reply("once")}>{t("chat.perm.once")}</button>
+  </div>;
 }
 
 function LiveChat({ id }: { id: string }) {
@@ -299,9 +267,10 @@ function LiveChat({ id }: { id: string }) {
   const composer = React.useRef<ComposerLeaveGuard>(null);
   const opening = React.useRef(false);
   const [leaving, setLeaving] = React.useState(false);
+  const [sendError, setSendError] = React.useState<string>();
   const atChat = React.useCallback(() => {
     const hash = readHash();
-    return hash.route === "chat" && !hash.params.has("preview") && !hash.params.has("shot") && hash.params.getAll("id").length === 1 && hash.params.get("id") === id;
+    return ["home", "chat"].includes(hash.route) && !hash.params.has("preview") && !hash.params.has("shot") && hash.params.getAll("id").length === 1 && hash.params.get("id") === id;
   }, [id]);
   React.useLayoutEffect(() => {
     const sync = () => { if (opening.current && atChat()) { opening.current = false; setLeaving(false); composer.current?.resume(); } };
@@ -317,7 +286,7 @@ function LiveChat({ id }: { id: string }) {
   const asks = perms.state === "ready" ? perms.data.filter((p) => p.sessionID === id) : [];
   const attachmentBlocked = busy || renaming || renameBusy || !!projectDraft || projectBusy;
   const attachment = (p: FilePart, m: MessageWithParts) => {
-    const valid = route === "chat" && !params.has("preview") && !params.has("shot") && params.getAll("id").length === 1
+    const valid = ["home", "chat"].includes(route) && !params.has("preview") && !params.has("shot") && params.getAll("id").length === 1
       && session.state === "ready" && session.data.id === id && session.data.kind === "chat"
       && m.info.sessionID === id && p.sessionID === id && p.messageID === m.info.id
       && /^ses_[0-9a-f]{32,}$/.test(id) && /^msg_[0-9a-f]{32,}$/.test(m.info.id) && /^prt_[0-9a-f]{32,}$/.test(p.id);
@@ -332,23 +301,23 @@ function LiveChat({ id }: { id: string }) {
     } : undefined} />;
   };
   React.useEffect(() => { end.current?.scrollIntoView({ block: "end" }); }, [msgs, asks.length]);
-
   const title = session.state === "ready" ? session.data.title || t("chat.untitled") : "";
-  const prompt = (parts: PromptPartInput[], o?: SendOptions) =>
-    opening.current ? Promise.resolve(false) : api.sessions.prompt(id, { parts, model: o?.model, reasoning: o?.reasoning, ...(session.state === "ready" && !session.data.parentID ? { expectedProjectID: session.data.projectID ?? null } : {}) }).then(() => true, (e: { code?: string }) => {
-      const k = errKey(e?.code);
-      toast.add({ title: t(`chat.err.${k}.title`), description: t(`chat.err.${k}.body`), data: { icon: "alert-triangle" } });
+  const prompt = (parts: PromptPartInput[], o?: SendOptions) => {
+    setSendError(undefined);
+    return opening.current ? Promise.resolve(false) : api.sessions.prompt(id, { parts, model: o?.model, reasoning: o?.reasoning, ...(session.state === "ready" && !session.data.parentID ? { expectedProjectID: session.data.projectID ?? null } : {}) }).then(() => true, (e: { code?: string }) => {
+      if (owner.current) setSendError(errKey(e?.code));
       return false;
     });
+  };
   const retry = (before: number) => {
     const u = msgs.slice(0, before).reverse().find((m) => m.info.role === "user");
-    if (u) prompt(u.parts.filter((p): p is Extract<Part, { type: "text" | "file" }> => p.type === "text" || p.type === "file"));
+    if (u) void prompt(u.parts.filter((p): p is Extract<Part, { type: "text" | "file" }> => p.type === "text" || p.type === "file"));
   };
   const remove = () => {
     if (opening.current) return;
     let undone = false;
-    toast.add({ title: t("chat.toast.deleted"), description: title, data: { undo: true, icon: "trash", onUndo: () => { undone = true; go("chat", { id }); } },
-      onClose: () => { if (!undone) api.sessions.delete(id).catch(() => { if (readHash().route === "home") go("chat", { id }); toast.add({ title: t("chat.err.generic.title"), data: { icon: "alert-triangle" } }); }); } });
+    toast.add({ title: t("chat.toast.deleted"), description: title, data: { undo: true, icon: "trash", onUndo: () => { undone = true; go("home", { id }); } },
+      onClose: () => { if (!undone) api.sessions.delete(id).catch(() => { if (readHash().route === "home") go("home", { id }); toast.add({ title: t("chat.err.generic.title"), data: { icon: "alert-triangle" } }); }); } });
     go("home");
   };
   const movable = session.state === "ready" && session.data.kind === "chat" && !session.data.parentID;
@@ -365,8 +334,7 @@ function LiveChat({ id }: { id: string }) {
       if (owner.current) toast.add({ title: t(`chat.err.${k}.title`), description: k === "session_busy" ? t(`chat.err.${k}.body`) : undefined, data: { icon: "alert-triangle" } });
     } finally { projectWrite.current = false; if (owner.current) setProjectBusy(false); }
   };
-
-  return (<>
+  return <>
     <div className="content-top" inert={leaving}>
       {projectDraft ? <form style={{ display: "flex", flex: 1, minWidth: 0, gap: 4 }} aria-busy={projectBusy || projects.state === "loading"} onSubmit={(e) => { e.preventDefault(); void move(); }}>
         <select className="input" name="value" aria-label={t("chat.preview.project")} value={projectDraft.value} onChange={(e) => setProjectDraft({ value: e.target.value })} disabled={!movable || projects.state !== "ready"} autoFocus style={{ flex: 1, minWidth: 0 }}>
@@ -377,52 +345,44 @@ function LiveChat({ id }: { id: string }) {
         <button className="btn secondary" type="submit" disabled={projectBusy || !movable || projects.state !== "ready" || projectMissing}>{t("common.save")}</button>
         <IconBtn type="button" icon="close" label={t("common.cancel")} onClick={() => setProjectDraft(null)} />
       </form> : renaming
-        ? <input className="input pg-rename" autoFocus defaultValue={title} aria-label={t("chat.history.newName")}
-            onKeyDown={(e) => { if (e.key === "Enter") e.currentTarget.blur(); if (e.key === "Escape") setRenaming(false); }}
-            onBlur={(e) => { const v = e.currentTarget.value.trim(); if (v && v !== title) { renameWrite.current = true; setRenameBusy(true); api.sessions.update(id, { title: v }).then(session.reload, () => {}).finally(() => { renameWrite.current = false; if (owner.current) setRenameBusy(false); }); } setRenaming(false); }} />
+        ? <input className="input pg-rename" autoFocus defaultValue={title} aria-label={t("chat.history.newName")} onKeyDown={(e) => { if (e.key === "Enter") e.currentTarget.blur(); if (e.key === "Escape") setRenaming(false); }}
+          onBlur={(e) => { const v = e.currentTarget.value.trim(); if (v && v !== title) { renameWrite.current = true; setRenameBusy(true); api.sessions.update(id, { title: v }).then(session.reload, () => {}).finally(() => { renameWrite.current = false; if (owner.current) setRenameBusy(false); }); } setRenaming(false); }} />
         : <span className="title">{title}</span>}
       <Pop trigger={<button className="ibtn" aria-label={t("chat.options")}><Icon name="chevron-down" size={12} /></button>}>
         <MItem icon="edit" onClick={() => { if (!opening.current && !renameWrite.current) { setProjectDraft(null); setRenaming(true); } }}>{t("chat.menu.rename")}</MItem>
         {movable && <MItem icon="folder" onClick={() => { if (!opening.current) { setRenaming(false); setProjectDraft({ value: session.data.projectID ?? "" }); projects.reload(); } }}>{t("chat.menu.move")}</MItem>}<MSep />
         <MItem icon="trash" danger onClick={remove}>{t("chat.menu.delete")}</MItem>
       </Pop>
-      <div className="spacer" /><IconBtn icon="compose" label={t("chat.newChat")} kbd="⌘N" disabled={leaving} onClick={() => { if (!opening.current) go("home", session.state === "ready" && session.data.projectID ? { project: session.data.projectID } : undefined); }} />
     </div>
     <div className="thread"><div className="thread-inner">
       {session.state === "error" && <ErrorCard code={session.code === "not_found" ? "not_found" : "network"} />}
       {projectDraft && projects.state === "loading" && <div className="thinking" role="status">{t("system.variant.loading")}</div>}
       {projectDraft && projects.state === "error" && <ErrorCard code="network" onRetry={projects.reload} />}
+      {sendError && !msgs.some((m) => m.info.error && errKey(m.info.error.code) === sendError) && <ErrorCard code={sendError} />}
       {msgs.map((m, mi) => {
         if (m.info.role === "user") {
           const files = m.parts.filter((p): p is FilePart => p.type === "file");
           const text = textOf(m);
-          return (
-            <div key={m.info.id} className="chat-ucol">
-              {files.length > 0 && <div className="chat-ufiles">{files.map((p) => attachment(p, m))}</div>}
-              {text && <div className="msg-user msg-user-live">{text}</div>}
-            </div>
-          );
+          return <div key={m.info.id} className="chat-ucol">{files.length > 0 && <div className="chat-ufiles">{files.map((p) => attachment(p, m))}</div>}{text && <div className="msg-user msg-user-live">{text}</div>}</div>;
         }
         const isLast = mi === msgs.length - 1;
         const streaming = isLast && busy;
         const secs = m.info.time.completed ? Math.max(1, Math.round((m.info.time.completed - m.info.time.created) / 1000)) : undefined;
         const visible = m.parts.filter((p) => p.type === "text" || p.type === "reasoning" || p.type === "tool" || p.type === "file");
         const lastText = [...visible].reverse().find((p) => p.type === "text");
-        return (
-          <BotRow key={m.info.id} st={m.info.error ? "blocked" : streaming ? (lastText ? "talking" : "thinking") : "idle"}>
-            {visible.length === 0 && streaming && <span className="thinking">{t("chat.thinking")}</span>}
-            {visible.map((p) => {
-              if (p.type === "reasoning") return <LiveReasoning key={p.id} text={p.text} live={streaming && p === visible[visible.length - 1]} secs={secs} />;
-              if (p.type === "tool") return <ToolBlock key={p.id} p={p} />;
-              if (p.type === "file") return attachment(p, m);
-              if (p.type === "text") return <Paras key={p.id} text={p.text} caret={streaming && p === lastText} testId="assistant-text" />;
-              return null;
-            })}
-            {m.info.error && m.info.error.code !== "aborted" && <ErrorCard code={m.info.error.code} onRetry={() => retry(mi)} />}
-            {m.info.error?.code === "aborted" && <div className="chat-note"><Icon name="stop" size={12} />{t("chat.stopped")}</div>}
-            {!streaming && !m.info.error && <Actions text={textOf(m)} regen={() => retry(mi)} />}
-          </BotRow>
-        );
+        return <BotRow key={m.info.id} st={m.info.error ? "blocked" : streaming ? (lastText ? "talking" : "thinking") : "idle"}>
+          {visible.length === 0 && streaming && <span className="thinking">{t("chat.thinking")}</span>}
+          {visible.map((p) => {
+            if (p.type === "reasoning") return <LiveReasoning key={p.id} text={p.text} live={streaming && p === visible[visible.length - 1]} secs={secs} />;
+            if (p.type === "tool") return <ToolBlock key={p.id} p={p} />;
+            if (p.type === "file") return attachment(p, m);
+            if (p.type === "text") return <Paras key={p.id} text={p.text} caret={streaming && p === lastText} testId="assistant-text" />;
+            return null;
+          })}
+          {m.info.error && m.info.error.code !== "aborted" && <ErrorCard code={m.info.error.code} onRetry={() => retry(mi)} />}
+          {m.info.error?.code === "aborted" && <div className="chat-note"><Icon name="stop" size={12} />{t("chat.stopped")}</div>}
+          {!streaming && !m.info.error && <Actions text={textOf(m)} regen={() => retry(mi)} />}
+        </BotRow>;
       })}
       {last?.info.role === "user" && busy && <BotRow st="thinking"><span className="thinking">{t("chat.thinking")}</span></BotRow>}
       {asks.map((p) => <PermissionCard key={p.id} id={p.id} tool={p.tool} input={p.input} />)}
@@ -430,9 +390,8 @@ function LiveChat({ id }: { id: string }) {
     </div></div>
     <div className="dock">
       {(noModel || models.state === "error") && <NoProvider />}
-      <ModelComposer leaveGuard={composer} placeholder={t("chat.reply")} live={models} busy={busy} onStop={() => api.sessions.abort(id).catch(() => {})} onNoModel={() => setNoModel(true)}
-        onSend={(text, atts, o) => prompt(toParts(text, atts), o)} />
+      <ModelComposer leaveGuard={composer} placeholder={t("chat.reply")} live={models} busy={busy} onStop={() => api.sessions.abort(id).catch(() => {})} onNoModel={() => setNoModel(true)} onSend={(text, atts, o) => prompt(toParts(text, atts), o)} />
       <span className="hint">{t("chat.hint")}</span>
     </div>
-  </>);
+  </>;
 }
diff --git a/packages/app/src/screens/chat/model-composer.tsx b/packages/app/src/screens/chat/model-composer.tsx
index da18f5df..132e8424 100644
--- a/packages/app/src/screens/chat/model-composer.tsx
+++ b/packages/app/src/screens/chat/model-composer.tsx
@@ -1,5 +1,4 @@
-// Live composer: same markup as components/composer.tsx, with the configured models,
-// capability badges, the thinking toggle and real file attachments.
+// Live composer: configured models, capability badges and real attachments.
 import * as React from "react";
 import { Menu } from "@base-ui/react/menu";
 import type { ModelInfo, ModelRef } from "@cortex/schema";
@@ -10,7 +9,6 @@ import { api } from "../../api";
 import { useQuery } from "../../state/live";
 import { useNav } from "../../shell/nav";
 import { useI18n } from "../../i18n";
-import { StopBtn } from "./shared";
 import { useSendEnter } from "../../state/send-enter";
 
 const MODEL_KEY = "cortex.model";
@@ -42,11 +40,27 @@ const readFile = (f: File) => new Promise<ComposerAttachment>((ok, ko) => {
   r.readAsDataURL(f);
 });
 
+/** Time is the behavior: mount only for the active run, clean up on settlement. */
+export function BusyStrip({ onStop }: { onStop?: () => void }) {
+  const { t } = useI18n();
+  const [seconds, setSeconds] = React.useState(0);
+  React.useEffect(() => {
+    const start = Date.now();
+    const timer = setInterval(() => setSeconds(Math.floor((Date.now() - start) / 1000)), 250);
+    return () => clearInterval(timer);
+  }, []);
+  return <div data-testid="chat-busy-strip" role="status" style={{ display: "flex", alignItems: "center", gap: 8, height: 28, color: "var(--t2)" }}>
+    <span className="thinking">{t("chat.thinking")}</span>
+    <time data-testid="chat-busy-timer" style={{ fontVariantNumeric: "tabular-nums" }}>{String(Math.floor(seconds / 60)).padStart(2, "0")}:{String(seconds % 60).padStart(2, "0")}</time>
+    <span style={{ flex: 1 }} />
+    {onStop && <button type="button" className="chat-link" onClick={onStop}>{t("composer.stop")}</button>}
+  </div>;
+}
+
 type Props = ModelOptions & {
   placeholder?: string;
   inputTestId?: string;
   onSend: (text: string, attachments: ComposerAttachment[], opts: SendOptions) => Promise<boolean>;
-  /** Called when send is attempted but no provider is configured. */
   onNoModel?: () => void | Promise<void>;
   busy?: boolean;
   onStop?: () => void;
@@ -62,6 +76,8 @@ export function ModelComposer(p: Props) {
 
 function LiveComposer({ placeholder, inputTestId = "composer-input", onSend, onNoModel, busy, onStop, live, initialModel, allowKeyless, strictSelection, leaveGuard }: Props) {
   const { t, locale } = useI18n();
+  const { go, route } = useNav();
+  const code = route === "code" || route === "code-session";
   const toast = useToast();
   const enter = useSendEnter();
   const instructions = enter.value === null ? t("common.sendEnterUnavailable") : enter.value ? t("system.settings.t.general.enterDesc") : t("common.sendEnterOff");
@@ -91,16 +107,12 @@ function LiveComposer({ placeholder, inputTestId = "composer-input", onSend, onN
   const caps = current?.capabilities;
   const ph = placeholder ?? t("composer.placeholder");
   const hasText = !!text.trim();
-  const voice = () => { if (!locked.current && !pending.current) toast.add({ title: t("system.unavailable"), description: t("chat.home.draftKept"), data: { icon: "mic" } }); };
-  const setThinking = (v: boolean) => { if (locked.current || pending.current) return; localStorage.setItem(THINK_KEY, v ? "on" : "off"); setThink(v); };
-
   const send = async () => {
     if (locked.current || !latest.current.text.trim() || latest.current.busy || pending.current || reads.current) return;
-    const reasoning = caps?.reasoning ? think : undefined;
+    if (!current) { if (code) await onNoModel?.(); return; }
     pending.current = true; setSubmitting(true);
     try {
-      if (!current) { await onNoModel?.(); return; }
-      if (await onSend(latest.current.text.trim(), latest.current.files, { model: { providerID: current.providerID, modelID: current.id }, reasoning })) {
+      if (await onSend(latest.current.text.trim(), latest.current.files, { model: { providerID: current.providerID, modelID: current.id }, reasoning: caps?.reasoning ? think : undefined })) {
         latest.current.text = ""; latest.current.files = []; setText(""); setFiles([]);
       }
     } catch {
@@ -118,75 +130,40 @@ function LiveComposer({ placeholder, inputTestId = "composer-input", onSend, onN
     } finally { reads.current--; setReading(reads.current > 0); }
   };
   const groups = [...new Set(models.map((m) => m.providerID))];
-
-  return (
-    <div className="chat-box" inert={leaving}>
-      {files.length > 0 && <div className="chat-attach">{files.map((f, i) => (
-        <div key={i} className="chat-att">
-          {f.mime.startsWith("image/") ? <span className="chat-att-img" style={{ backgroundImage: `url(${f.dataUrl})` }} /> : <span className="chat-att-ic"><Icon name="file" /></span>}
-          <span className="chat-att-txt"><span className="ttl">{f.name}</span><span className="sub">{f.mime}</span></span>
-          <IconBtn icon="close" label={t("chat.att.remove", { name: f.name })} disabled={disabled} size={16} className="chat-att-x" onClick={() => { if (!locked.current && !pending.current) { latest.current.files = latest.current.files.filter((_, k) => k !== i); setFiles(latest.current.files); } }} />
-        </div>
-      ))}</div>}
-      <form className="composer" data-has-text={hasText || undefined} aria-busy={submitting || undefined} onSubmit={(e) => { e.preventDefault(); void send(); }}>
-        <input ref={fileRef} type="file" multiple hidden disabled={disabled} data-testid="attach-input" accept={caps?.imageInput ? undefined : "application/pdf,text/*"} onChange={(e) => { add(e.currentTarget.files); e.currentTarget.value = ""; }} />
-        <Menu.Root>
-          <Menu.Trigger render={<button type="button" className="ibtn round" disabled={disabled} aria-label={t("composer.add")}><Icon name="plus" /></button>} />
-          <Menu.Portal><Menu.Positioner sideOffset={6} side="top" align="start"><Menu.Popup className="popup">
-            <Menu.Item className="mitem" disabled={disabled} onClick={() => { if (!locked.current && !pending.current) fileRef.current?.click(); }}><Icon name="paperclip" /><span>{t("composer.addFiles")}</span></Menu.Item>
-            {caps?.imageInput
-              ? <Menu.Item className="mitem" disabled={disabled} onClick={() => { if (!locked.current && !pending.current && fileRef.current) { fileRef.current.accept = "image/*"; fileRef.current.click(); fileRef.current.accept = ""; } }}><Icon name="image" /><span>{t("chat.model.attachImage")}</span></Menu.Item>
-              : <Tip label={t("chat.model.noImage")} side="right"><Menu.Item className="mitem" disabled aria-disabled style={{ opacity: 0.45 }}><Icon name="image" /><span>{t("chat.model.attachImage")}</span></Menu.Item></Tip>}
-          </Menu.Popup></Menu.Positioner></Menu.Portal>
-        </Menu.Root>
-        <textarea rows={1} {...enter.field} value={text} disabled={disabled} onChange={(e) => { if (!locked.current && !pending.current) { latest.current.text = e.target.value; setText(e.target.value); } }} placeholder={ph} aria-label={ph} aria-description={instructions} data-testid={inputTestId} />
-        {enter.value === null && <span className="composer-storage-error" role="status">{instructions}</span>}
-        <Menu.Root>
-          <Menu.Trigger className="model" type="button" disabled={disabled} data-testid="model-trigger">{current?.name ?? t("chat.model.none")}<Icon name="chevron-down" size={12} /></Menu.Trigger>
-          <Menu.Portal><Menu.Positioner sideOffset={6} align="end" side="top"><Menu.Popup className="popup" style={{ width: 320, maxHeight: 420, overflow: "auto" }}>
-            {models.length === 0 && <div className="chat-mgroup">{t("chat.model.noneHint")}</div>}
-            <Menu.RadioGroup value={current ? key(current) : ""} onValueChange={(v) => { if (!locked.current && !pending.current) pick(v as string); }}>
-              {groups.map((g) => (
-                <React.Fragment key={g}>
-                  <div className="chat-mgroup">{g}</div>
-                  {models.filter((m) => m.providerID === g).map((m) => {
-                    const c = m.capabilities;
-                    return (
-                      <Menu.RadioItem key={key(m)} value={key(m)} disabled={disabled} closeOnClick className="mitem" style={{ padding: "7px 10px" }} data-testid="model-option">
-                        <span style={{ flex: 1, display: "flex", flexDirection: "column" }}>
-                          <span style={{ fontWeight: 500 }}>{m.name}</span>
-                          <span className="chat-mbadges">
-                            {c.reasoning && <span className="badge run">{t("chat.model.reasoning")}</span>}
-                            {c.imageInput && <span className="badge ok">{t("chat.model.image")}</span>}
-                            {c.tools && <span className="badge wait">{t("chat.model.tools")}</span>}
-                            {c.contextWindow > 0 && <span className="badge">{fmtCtx.format(c.contextWindow)}</span>}
-                            {(c.cost.input > 0 || c.cost.output > 0) && <span className="badge">{t("chat.model.cost", { input: fmtCost.format(c.cost.input), output: fmtCost.format(c.cost.output) })}</span>}
-                          </span>
-                        </span>
-                        <Menu.RadioItemIndicator><Icon name="check" /></Menu.RadioItemIndicator>
-                      </Menu.RadioItem>
-                    );
-                  })}
-                </React.Fragment>
-              ))}
-            </Menu.RadioGroup>
-            {caps?.reasoning && (
-              <div className="chat-mthink">
-                <span className="chat-grow"><span style={{ fontWeight: 500 }}>{t("chat.model.thinking")}</span><span className="chat-meta">{t("chat.model.thinkingHint")}</span></span>
-                <span data-testid="thinking-toggle"><Switch checked={think} disabled={disabled} onCheckedChange={setThinking} aria-label={t("chat.model.thinking")} /></span>
-              </div>
-            )}
-          </Menu.Popup></Menu.Positioner></Menu.Portal>
-        </Menu.Root>
-        <IconBtn type="button" icon="mic" label={t("composer.dictate")} className="round" disabled={disabled} onClick={voice} />
-        {busy ? <StopBtn onStop={() => { if (!locked.current) onStop?.(); }} /> : (
-          <Tip label={hasText ? t("composer.send") : t("composer.voice")} kbd={hasText && enter.value === true ? "↵" : undefined}>
-            <button type={hasText ? "submit" : "button"} onClick={hasText ? undefined : voice} className="send" disabled={disabled || reading} data-has-text={hasText ? "" : undefined} aria-label={hasText ? t("composer.send") : t("composer.voice")} data-testid="composer-send">
-              <span className="swap"><Icon name="voice-wave" className="wave" /><Icon name="arrow-up" className="up" /></span>
-            </button>
-          </Tip>
-        )}
-      </form>
-    </div>
-  );
+  return <div className="chat-box" inert={leaving}>
+    {!code && busy && <BusyStrip onStop={onStop} />}
+    {files.length > 0 && <div className="chat-attach">{files.map((f, i) => <div key={i} className="chat-att">
+      {f.mime.startsWith("image/") ? <span className="chat-att-img" style={{ backgroundImage: `url(${f.dataUrl})` }} /> : <span className="chat-att-ic"><Icon name="file" /></span>}<span className="chat-att-txt"><span className="ttl">{f.name}</span><span className="sub">{f.mime}</span></span>
+      <IconBtn icon="close" label={t("chat.att.remove", { name: f.name })} disabled={disabled} size={16} className="chat-att-x" onClick={() => { if (!locked.current && !pending.current) { latest.current.files = latest.current.files.filter((_, k) => k !== i); setFiles(latest.current.files); } }} />
+    </div>)}</div>}
+    <form className="composer" data-has-text={code && hasText || undefined} aria-busy={submitting || undefined} style={code ? undefined : { display: "grid", gridTemplateColumns: "32px minmax(0, 1fr) 32px 36px", alignItems: "end", gap: 4, padding: 10 }} onSubmit={(e) => { e.preventDefault(); void send(); }}>
+      <textarea rows={1} {...enter.field} value={text} disabled={disabled} onChange={(e) => { if (!locked.current && !pending.current) { latest.current.text = e.target.value; setText(e.target.value); } }} placeholder={ph} aria-label={ph} aria-description={instructions} data-testid={inputTestId} style={code ? undefined : { gridColumn: "1 / -1", width: "100%", minHeight: 20, maxHeight: "8lh", lineHeight: "20px", padding: 0, margin: 0, outline: "none", resize: "none", overflowY: "auto", scrollbarWidth: "none" }} />
+      <input ref={fileRef} type="file" multiple hidden disabled={disabled} data-testid="attach-input" accept={caps?.imageInput ? undefined : "application/pdf,text/*"} onChange={(e) => { void add(e.currentTarget.files); e.currentTarget.value = ""; }} />
+      <Menu.Root>
+        <Menu.Trigger render={<button type="button" className="ibtn round" disabled={disabled} aria-label={t("composer.add")}><Icon name="plus" /></button>} />
+        <Menu.Portal><Menu.Positioner sideOffset={6} side="top" align="start"><Menu.Popup className="popup">
+          <Menu.Item className="mitem" disabled={disabled} onClick={() => fileRef.current?.click()}><Icon name="paperclip" /><span>{t("composer.addFiles")}</span></Menu.Item>
+          {caps?.imageInput && <Menu.Item className="mitem" disabled={disabled} onClick={() => { if (!locked.current && !pending.current && fileRef.current) { fileRef.current.accept = "image/*"; fileRef.current.click(); fileRef.current.accept = ""; } }}><Icon name="image" /><span>{t("chat.model.attachImage")}</span></Menu.Item>}
+        </Menu.Popup></Menu.Positioner></Menu.Portal>
+      </Menu.Root>
+      {current ? <Menu.Root>
+        <Menu.Trigger className="model" type="button" disabled={disabled} data-testid="model-trigger" style={code ? undefined : { justifySelf: "start" }}>{current.name}<Icon name="chevron-down" size={12} /></Menu.Trigger>
+        <Menu.Portal><Menu.Positioner sideOffset={8} align={code ? "end" : "start"} side={code ? "top" : "bottom"} collisionPadding={8} collisionAvoidance={code ? undefined : { side: "none", align: "shift", fallbackAxisSide: "none" }}><Menu.Popup className="popup" data-testid="model-picker" style={{ width: "min(360px, calc(100vw - 16px))", maxHeight: "min(420px, var(--available-height))", overflow: "auto" }}>
+          <Menu.RadioGroup value={key(current)} onValueChange={(v) => { if (!locked.current && !pending.current) pick(String(v)); }}>
+            {groups.map((g) => <React.Fragment key={g}><div className="chat-mgroup">{g}</div>{models.filter((m) => m.providerID === g).map((m) => <Menu.RadioItem key={key(m)} value={key(m)} disabled={disabled} closeOnClick className="mitem" data-testid="model-option">
+              <span className="chat-grow"><span className="ttl">{m.name}</span><span className="chat-mbadges">{m.capabilities.reasoning && <span className="badge">{t("chat.model.reasoning")}</span>}{m.capabilities.imageInput && <span className="badge">{t("chat.model.image")}</span>}{m.capabilities.tools && <span className="badge">{t("chat.model.tools")}</span>}{m.capabilities.contextWindow > 0 && <span className="badge">{fmtCtx.format(m.capabilities.contextWindow)}</span>}{(m.capabilities.cost.input > 0 || m.capabilities.cost.output > 0) && <span className="badge">{t("chat.model.cost", { input: fmtCost.format(m.capabilities.cost.input), output: fmtCost.format(m.capabilities.cost.output) })}</span>}</span></span>
+              <Menu.RadioItemIndicator><Icon name="check" /></Menu.RadioItemIndicator>
+            </Menu.RadioItem>)}</React.Fragment>)}
+          </Menu.RadioGroup>
+          {caps?.reasoning && <div className="chat-mthink"><span className="chat-grow">{t("chat.model.thinking")}</span><span data-testid="thinking-toggle"><Switch checked={think} disabled={disabled} onCheckedChange={(v) => { if (!locked.current && !pending.current) { localStorage.setItem(THINK_KEY, v ? "on" : "off"); setThink(v); } }} aria-label={t("chat.model.thinking")} /></span></div>}
+          <Menu.Item className="mitem" onClick={() => go("providers")}>{t("composer.manageProviders")}</Menu.Item>
+        </Menu.Popup></Menu.Positioner></Menu.Portal>
+      </Menu.Root> : code ? <Tip label={t("chat.model.noneHint")}><button type="button" className="model" data-testid="model-trigger" disabled={disabled} onClick={() => go("providers")}>{t("chat.model.none")}<Icon name="chevron-down" size={12} /></button></Tip> : <button type="button" className="model" data-testid="model-trigger" style={{ justifySelf: "start" }} onClick={() => go("providers")}>{t("composer.addProvider")}</button>}
+      <IconBtn type="button" icon="mic" label={t("composer.dictate")} className="round" disabled aria-disabled="true" />
+      {busy ? <button type="button" className="send chat-stop" aria-label={t(code ? "chat.stop" : "composer.stop")} data-testid="stop" onClick={() => { if (!locked.current) onStop?.(); }}><Icon name="stop" size={16} /></button> : <Tip label={hasText ? t("composer.send") : t("composer.voice")} kbd={hasText && enter.value === true ? "↵" : undefined}>
+        <button type="submit" className="send" disabled={disabled || reading || !hasText || !code && !current} aria-disabled={disabled || reading || !hasText || !code && !current} data-has-text={hasText ? "" : undefined} aria-label={hasText ? t("composer.send") : t("composer.voice")} data-testid="composer-send"><span className="swap"><Icon name="voice-wave" className="wave" /><Icon name="arrow-up" className="up" /></span></button>
+      </Tip>}
+    </form>
+    {enter.value === null && <span className="composer-storage-error" role="status">{instructions}</span>}
+  </div>;
 }
diff --git a/packages/i18n/locales/de/composer.json b/packages/i18n/locales/de/composer.json
index 93955c3c..a42bf028 100644
--- a/packages/i18n/locales/de/composer.json
+++ b/packages/i18n/locales/de/composer.json
@@ -1,17 +1,5 @@
 {
-  "placeholder": "Cortex fragen",
-  "add": "Hinzufügen",
-  "addFiles": "Dateien hinzufügen",
-  "createImage": "Bild erstellen",
-  "webSearch": "Websuche",
-  "handToBot": "An deinen Bot übergeben",
-  "model.fast": "Schnell",
-  "model.thinking": "Nachdenken",
-  "model.pro": "Pro",
-  "model.fastHint": "Antwortet sofort",
-  "model.thinkingHint": "Braucht Zeit zum Nachdenken",
-  "model.proHint": "Tiefenrecherche",
-  "dictate": "Diktieren",
-  "send": "Senden",
-  "voice": "Sprachmodus"
+  "placeholder": "Cortex fragen", "add": "Hinzufügen", "addFiles": "Dateien hinzufügen", "createImage": "Bild erstellen", "webSearch": "Websuche", "handToBot": "An deinen Bot übergeben",
+  "model.fast": "Schnell", "model.thinking": "Nachdenken", "model.pro": "Pro", "model.fastHint": "Antwortet sofort", "model.thinkingHint": "Braucht Zeit zum Nachdenken", "model.proHint": "Tiefenrecherche",
+  "dictate": "Diktieren", "send": "Senden", "voice": "Sprachmodus", "addProvider": "Anbieter hinzufügen", "manageProviders": "Anbieter verwalten", "stop": "Stoppen"
 }
diff --git a/packages/i18n/locales/en/composer.json b/packages/i18n/locales/en/composer.json
index 32d8e202..6fa01646 100644
--- a/packages/i18n/locales/en/composer.json
+++ b/packages/i18n/locales/en/composer.json
@@ -1,3 +1,3 @@
 { "placeholder": "Ask Cortex", "add": "Add", "addFiles": "Add files", "createImage": "Create an image", "webSearch": "Web search", "handToBot": "Hand to your Bot",
   "model.fast": "Fast", "model.thinking": "Thinking", "model.pro": "Pro", "model.fastHint": "Answers right away", "model.thinkingHint": "Takes time to reason", "model.proHint": "Deep research",
-  "dictate": "Dictate", "send": "Send", "voice": "Voice mode" }
+  "dictate": "Dictate", "send": "Send", "voice": "Voice mode", "addProvider": "Add a provider", "manageProviders": "Manage providers", "stop": "Stop" }
diff --git a/packages/i18n/locales/es/composer.json b/packages/i18n/locales/es/composer.json
index 4d00814b..01b6cb58 100644
--- a/packages/i18n/locales/es/composer.json
+++ b/packages/i18n/locales/es/composer.json
@@ -1,17 +1,5 @@
 {
-  "placeholder": "Pregúntale a Cortex",
-  "add": "Añadir",
-  "addFiles": "Añadir archivos",
-  "createImage": "Crear una imagen",
-  "webSearch": "Búsqueda web",
-  "handToBot": "Entregar a tu Bot",
-  "model.fast": "Rápido",
-  "model.thinking": "Reflexivo",
-  "model.pro": "Pro",
-  "model.fastHint": "Responde al instante",
-  "model.thinkingHint": "Se toma tiempo para razonar",
-  "model.proHint": "Investigación profunda",
-  "dictate": "Dictar",
-  "send": "Enviar",
-  "voice": "Modo de voz"
+  "placeholder": "Pregúntale a Cortex", "add": "Añadir", "addFiles": "Añadir archivos", "createImage": "Crear una imagen", "webSearch": "Búsqueda web", "handToBot": "Entregar a tu Bot",
+  "model.fast": "Rápido", "model.thinking": "Reflexivo", "model.pro": "Pro", "model.fastHint": "Responde al instante", "model.thinkingHint": "Se toma tiempo para razonar", "model.proHint": "Investigación profunda",
+  "dictate": "Dictar", "send": "Enviar", "voice": "Modo de voz", "addProvider": "Añadir un proveedor", "manageProviders": "Gestionar proveedores", "stop": "Detener"
 }
diff --git a/packages/i18n/locales/fr/composer.json b/packages/i18n/locales/fr/composer.json
index 1f5e91f3..739a9349 100644
--- a/packages/i18n/locales/fr/composer.json
+++ b/packages/i18n/locales/fr/composer.json
@@ -1,17 +1,5 @@
 {
-  "placeholder": "Demander à Cortex",
-  "add": "Ajouter",
-  "addFiles": "Ajouter des fichiers",
-  "createImage": "Créer une image",
-  "webSearch": "Recherche web",
-  "handToBot": "Confier à ton Bot",
-  "model.fast": "Rapide",
-  "model.thinking": "Réflexion",
-  "model.pro": "Pro",
-  "model.fastHint": "Répond tout de suite",
-  "model.thinkingHint": "Prend le temps de raisonner",
-  "model.proHint": "Recherche approfondie",
-  "dictate": "Dicter",
-  "send": "Envoyer",
-  "voice": "Mode vocal"
+  "placeholder": "Demander à Cortex", "add": "Ajouter", "addFiles": "Ajouter des fichiers", "createImage": "Créer une image", "webSearch": "Recherche web", "handToBot": "Confier à ton Bot",
+  "model.fast": "Rapide", "model.thinking": "Réflexion", "model.pro": "Pro", "model.fastHint": "Répond tout de suite", "model.thinkingHint": "Prend le temps de raisonner", "model.proHint": "Recherche approfondie",
+  "dictate": "Dicter", "send": "Envoyer", "voice": "Mode vocal", "addProvider": "Ajouter un fournisseur", "manageProviders": "Gérer les fournisseurs", "stop": "Arrêter"
 }
diff --git a/packages/i18n/locales/ja/composer.json b/packages/i18n/locales/ja/composer.json
index 87464da7..7a88b3d7 100644
--- a/packages/i18n/locales/ja/composer.json
+++ b/packages/i18n/locales/ja/composer.json
@@ -1,17 +1,5 @@
 {
-  "placeholder": "Cortexに聞く",
-  "add": "追加",
-  "addFiles": "ファイルを追加",
-  "createImage": "画像を作成",
-  "webSearch": "ウェブ検索",
-  "handToBot": "Botに引き渡す",
-  "model.fast": "高速",
-  "model.thinking": "思考",
-  "model.pro": "Pro",
-  "model.fastHint": "即座に回答",
-  "model.thinkingHint": "推論に時間をかける",
-  "model.proHint": "詳細な調査",
-  "dictate": "音声入力",
-  "send": "送信",
-  "voice": "ボイスモード"
+  "placeholder": "Cortexに聞く", "add": "追加", "addFiles": "ファイルを追加", "createImage": "画像を作成", "webSearch": "ウェブ検索", "handToBot": "Botに引き渡す",
+  "model.fast": "高速", "model.thinking": "思考", "model.pro": "Pro", "model.fastHint": "即座に回答", "model.thinkingHint": "推論に時間をかける", "model.proHint": "詳細な調査",
+  "dictate": "音声入力", "send": "送信", "voice": "ボイスモード", "addProvider": "プロバイダーを追加", "manageProviders": "プロバイダーを管理", "stop": "停止"
 }
diff --git a/packages/i18n/locales/ko/composer.json b/packages/i18n/locales/ko/composer.json
index a89ac26b..db1e4e48 100644
--- a/packages/i18n/locales/ko/composer.json
+++ b/packages/i18n/locales/ko/composer.json
@@ -1,17 +1,5 @@
 {
-  "placeholder": "Cortex에게 물어보기",
-  "add": "추가",
-  "addFiles": "파일 추가",
-  "createImage": "이미지 만들기",
-  "webSearch": "웹 검색",
-  "handToBot": "Bot에게 넘기기",
-  "model.fast": "빠름",
-  "model.thinking": "생각 중",
-  "model.pro": "프로",
-  "model.fastHint": "바로 답변",
-  "model.thinkingHint": "생각하는 데 시간이 걸림",
-  "model.proHint": "심층 연구",
-  "dictate": "음성 입력",
-  "send": "보내기",
-  "voice": "음성 모드"
+  "placeholder": "Cortex에게 물어보기", "add": "추가", "addFiles": "파일 추가", "createImage": "이미지 만들기", "webSearch": "웹 검색", "handToBot": "Bot에게 넘기기",
+  "model.fast": "빠름", "model.thinking": "생각 중", "model.pro": "프로", "model.fastHint": "바로 답변", "model.thinkingHint": "생각하는 데 시간이 걸림", "model.proHint": "심층 연구",
+  "dictate": "음성 입력", "send": "보내기", "voice": "음성 모드", "addProvider": "제공자 추가", "manageProviders": "제공자 관리", "stop": "중지"
 }
diff --git a/packages/i18n/locales/pt-BR/composer.json b/packages/i18n/locales/pt-BR/composer.json
index f1a34af3..028d1d65 100644
--- a/packages/i18n/locales/pt-BR/composer.json
+++ b/packages/i18n/locales/pt-BR/composer.json
@@ -1,17 +1,5 @@
 {
-  "placeholder": "Pergunte ao Cortex",
-  "add": "Adicionar",
-  "addFiles": "Adicionar arquivos",
-  "createImage": "Criar uma imagem",
-  "webSearch": "Pesquisa na web",
-  "handToBot": "Passar para o seu Bot",
-  "model.fast": "Rápido",
-  "model.thinking": "Pensando",
-  "model.pro": "Pro",
-  "model.fastHint": "Responde imediatamente",
-  "model.thinkingHint": "Leva tempo para raciocinar",
-  "model.proHint": "Pesquisa profunda",
-  "dictate": "Dictar",
-  "send": "Enviar",
-  "voice": "Modo de voz"
+  "placeholder": "Pergunte ao Cortex", "add": "Adicionar", "addFiles": "Adicionar arquivos", "createImage": "Criar uma imagem", "webSearch": "Pesquisa na web", "handToBot": "Passar para o seu Bot",
+  "model.fast": "Rápido", "model.thinking": "Pensando", "model.pro": "Pro", "model.fastHint": "Responde imediatamente", "model.thinkingHint": "Leva tempo para raciocinar", "model.proHint": "Pesquisa profunda",
+  "dictate": "Dictar", "send": "Enviar", "voice": "Modo de voz", "addProvider": "Adicionar um provedor", "manageProviders": "Gerenciar provedores", "stop": "Parar"
 }
diff --git a/packages/i18n/locales/zh-Hans/composer.json b/packages/i18n/locales/zh-Hans/composer.json
index 4536ace6..ba7ab921 100644
--- a/packages/i18n/locales/zh-Hans/composer.json
+++ b/packages/i18n/locales/zh-Hans/composer.json
@@ -1,17 +1,5 @@
 {
-  "placeholder": "问问 Cortex",
-  "add": "添加",
-  "addFiles": "添加文件",
-  "createImage": "创建图片",
-  "webSearch": "网页搜索",
-  "handToBot": "转交给你的 Cortex Bot",
-  "model.fast": "快速",
-  "model.thinking": "思考",
-  "model.pro": "专业",
-  "model.fastHint": "即时回答",
-  "model.thinkingHint": "需要时间推理",
-  "model.proHint": "深度研究",
-  "dictate": "语音输入",
-  "send": "发送",
-  "voice": "语音模式"
+  "placeholder": "问问 Cortex", "add": "添加", "addFiles": "添加文件", "createImage": "创建图片", "webSearch": "网页搜索", "handToBot": "转交给你的 Cortex Bot",
+  "model.fast": "快速", "model.thinking": "思考", "model.pro": "专业", "model.fastHint": "即时回答", "model.thinkingHint": "需要时间推理", "model.proHint": "深度研究",
+  "dictate": "语音输入", "send": "发送", "voice": "语音模式", "addProvider": "添加提供商", "manageProviders": "管理提供商", "stop": "停止"
 }