@agent-native/core 0.146.4 → 0.146.5

package/corpus/templates/factory/app/root.tsx

@@ -135,7 +135,7 @@ function AppContent() {
             {t("root.commandSearch")}
           </CommandMenu.Item>
           <CommandMenu.Item
-            onSelect={() => navigate("/agent")}
+            onSelect={() => navigate("/settings/agent")}
             keywords={[
               "agent",
               "context",

package/corpus/templates/factory/app/routes/agent.tsx

@@ -1,11 +1,6 @@
-import {
-  AgentChatSurface,
-  AgentTabsPage,
-} from "@agent-native/core/client/agent-chat";
-import { useT } from "@agent-native/core/client/i18n";
-import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
+import { buildLegacyAgentSettingsRoute } from "@agent-native/core/client/navigation";
+import { Navigate, useLocation } from "react-router";
 
-import { resolveAgentPageComponent } from "@/lib/agent-page";
 import { APP_TITLE } from "@/lib/app-config";
 
 export function meta() {
@@ -13,12 +8,12 @@ export function meta() {
 }
 
 export default function AgentRoute() {
-  const t = useT();
-  useSetPageTitle(t("settings.agentTitle"));
+  const location = useLocation();
 
-  const AgentPage = resolveAgentPageComponent({
-    AgentChatSurface,
-    AgentTabsPage,
-  });
-  return <AgentPage appName={APP_TITLE} />;
+  return (
+    <Navigate
+      to={buildLegacyAgentSettingsRoute(location.hash, location.search)}
+      replace
+    />
+  );
 }

package/corpus/templates/forms/app/components/layout/Layout.tsx

@@ -89,7 +89,7 @@ export function Layout({ children }: LayoutProps) {
         ) : (
           <AgentSidebar
             position="right"
-            agentPageHref="/agent"
+            agentPageHref="/settings/agent"
             defaultOpen={false}
             chatViewTransition
             chatViewTransitionHandoff={chatHomeHandoffPending}

package/corpus/templates/forms/app/root.tsx

@@ -244,7 +244,7 @@ function FormsCommandMenu({
         <CommandMenu.Item onSelect={() => {}}>
           {t("root.searchForms")}
         </CommandMenu.Item>
-        <CommandMenu.Item onSelect={() => navigate("/agent")}>
+        <CommandMenu.Item onSelect={() => navigate("/settings/agent")}>
           <IconHierarchy2 size={16} />
           {t("root.openAgent")}
         </CommandMenu.Item>

package/corpus/templates/forms/app/routes/_app.agent.tsx

@@ -1,6 +1,5 @@
-import { AgentTabsPage } from "@agent-native/core/client/agent-chat";
-import { useT } from "@agent-native/core/client/i18n";
-import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
+import { buildLegacyAgentSettingsRoute } from "@agent-native/core/client/navigation";
+import { Navigate, useLocation } from "react-router";
 
 import messages from "@/i18n/en-US";
 
@@ -9,8 +8,11 @@ export function meta() {
 }
 
 export default function AgentRoute() {
-  const t = useT();
-  useSetPageTitle(t("settings.agentTitle"));
-
-  return <AgentTabsPage />;
+  const location = useLocation();
+  return (
+    <Navigate
+      to={buildLegacyAgentSettingsRoute(location.hash, location.search)}
+      replace
+    />
+  );
 }

package/corpus/templates/macros/app/components/layout/AppLayout.tsx

@@ -62,7 +62,9 @@ export function AppLayout({ children }: { children: React.ReactNode }) {
 
   const isAnalytics = location.pathname === "/analytics";
   const isSettings = location.pathname.startsWith("/settings");
-  const isAgent = location.pathname.startsWith("/agent");
+  const isAgent =
+    location.pathname.startsWith("/settings/agent") ||
+    location.pathname.startsWith("/agent");
 
   // Auto-close sidebar on route change (mobile)
   useEffect(() => {
@@ -120,7 +122,7 @@ export function AppLayout({ children }: { children: React.ReactNode }) {
       } else if (cmd.view === "settings") {
         navigate("/settings");
       } else if (cmd.view === "agent") {
-        navigate("/agent");
+        navigate("/settings/agent");
       } else if (cmd.view === "entry") {
         navigate("/");
       }
@@ -144,7 +146,7 @@ export function AppLayout({ children }: { children: React.ReactNode }) {
           t("agent.suggestionMacros"),
           t("agent.suggestionRun"),
         ]}
-        agentPageHref="/agent"
+        agentPageHref="/settings/agent"
       >
         <div className="agent-layout-shell flex flex-1 overflow-hidden">
           {/* Desktop sidebar */}

package/corpus/templates/macros/app/root.tsx

@@ -166,7 +166,7 @@ function MacrosCommandMenu({
           {t("root.search")}
         </CommandMenu.Item>
         <CommandMenu.Item
-          onSelect={() => navigate("/agent")}
+          onSelect={() => navigate("/settings/agent")}
           keywords={["agent", "context", "connections", "jobs", "access"]}
         >
           <IconHierarchy2 size={16} />

package/corpus/templates/macros/app/routes/agent.tsx

@@ -1,6 +1,5 @@
-import { AgentTabsPage } from "@agent-native/core/client/agent-chat";
-import { useT } from "@agent-native/core/client/i18n";
-import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
+import { buildLegacyAgentSettingsRoute } from "@agent-native/core/client/navigation";
+import { Navigate, useLocation } from "react-router";
 
 import messages from "@/i18n/en-US";
 
@@ -9,8 +8,12 @@ export function meta() {
 }
 
 export default function AgentRoute() {
-  const t = useT();
-  useSetPageTitle(t("settings.agentTitle"));
+  const location = useLocation();
 
-  return <AgentTabsPage appName="Macros" />;
+  return (
+    <Navigate
+      to={buildLegacyAgentSettingsRoute(location.hash, location.search)}
+      replace
+    />
+  );
 }

package/corpus/templates/mail/app/components/layout/AppLayout.tsx

@@ -149,6 +149,7 @@ function AccountAvatar({
 function isStandardLayoutPath(pathname: string): boolean {
   return (
     pathname === "/settings" ||
+    pathname.startsWith("/settings/") ||
     pathname === "/agent" ||
     pathname === "/team" ||
     pathname === "/draft-queue" ||
@@ -201,7 +202,7 @@ export function AppLayout({ children }: AppLayoutProps) {
     <AgentSidebar
       position="right"
       defaultOpen={false}
-      agentPageHref="/agent"
+      agentPageHref="/settings/agent"
       emptyStateText={t("agent.emptyState")}
       suggestions={[
         t("agent.suggestionSummarize"),
@@ -2042,7 +2043,12 @@ function StandardLayout({ children }: AppLayoutProps) {
 
   const fallbackTitle = (() => {
     if (location.pathname === "/settings") return t("settings.title");
-    if (location.pathname === "/agent") return t("settings.agentTitle");
+    if (
+      location.pathname === "/agent" ||
+      location.pathname.startsWith("/settings/agent")
+    ) {
+      return t("settings.agentTitle");
+    }
     if (location.pathname === "/team") return t("mail.pages.team");
     if (location.pathname.startsWith("/draft-queue"))
       return t("mail.views.draftQueue");

package/corpus/templates/mail/app/components/layout/CommandPalette.tsx

@@ -79,7 +79,7 @@ const navCommands = [
   {
     labelKey: "settings.openAgentSettings",
     icon: IconHierarchy2,
-    route: "/agent",
+    route: "/settings/agent",
   },
 ];
 

package/corpus/templates/mail/app/routes/agent.tsx

@@ -1,6 +1,5 @@
-import { AgentTabsPage } from "@agent-native/core/client/agent-chat";
-import { useT } from "@agent-native/core/client/i18n";
-import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
+import { buildLegacyAgentSettingsRoute } from "@agent-native/core/client/navigation";
+import { Navigate, useLocation } from "react-router";
 
 import messages from "@/i18n/en-US";
 
@@ -9,8 +8,12 @@ export function meta() {
 }
 
 export default function AgentRoute() {
-  const t = useT();
-  useSetPageTitle(t("settings.agentTitle"));
+  const location = useLocation();
 
-  return <AgentTabsPage appName="Mail" />;
+  return (
+    <Navigate
+      to={buildLegacyAgentSettingsRoute(location.hash, location.search)}
+      replace
+    />
+  );
 }

package/corpus/templates/plan/app/components/layout/Layout.tsx

@@ -211,7 +211,7 @@ export function Layout({ children }: LayoutProps) {
             chatViewTransitionHandoff={chatHomeHandoffPending}
             storageKey="plans"
             openOnChatRunning={chatHomeHandoffActive}
-            agentPageHref="/agent"
+            agentPageHref="/settings/agent"
             emptyStateText={t("agent.emptyState")}
             suggestions={[
               t("agent.suggestionShipped"),

package/corpus/templates/plan/app/root.tsx

@@ -177,7 +177,7 @@ function AppContent() {
             {t("root.openRecaps")}
           </CommandMenu.Item>
           <CommandMenu.Item
-            onSelect={() => go("/agent")}
+            onSelect={() => go("/settings/agent")}
             keywords={["agent", "context", "connections", "jobs", "access"]}
           >
             <IconHierarchy2 size={16} />

package/corpus/templates/plan/app/routes/agent.tsx

@@ -1,6 +1,5 @@
-import { AgentTabsPage } from "@agent-native/core/client/agent-chat";
-import { useT } from "@agent-native/core/client/i18n";
-import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
+import { buildLegacyAgentSettingsRoute } from "@agent-native/core/client/navigation";
+import { Navigate, useLocation } from "react-router";
 
 import messages from "@/i18n/en-US";
 
@@ -9,8 +8,12 @@ export function meta() {
 }
 
 export default function AgentRoute() {
-  const t = useT();
-  useSetPageTitle(t("settings.agentTitle"));
+  const location = useLocation();
 
-  return <AgentTabsPage appName="Plan" />;
+  return (
+    <Navigate
+      to={buildLegacyAgentSettingsRoute(location.hash, location.search)}
+      replace
+    />
+  );
 }

package/corpus/templates/slides/app/components/editor/ImageGenPanel.tsx

@@ -4,7 +4,6 @@ import {
   normalizeReferenceUrls,
 } from "@shared/api";
 import { IconX } from "@tabler/icons-react";
-import { IconLoader2 } from "@tabler/icons-react";
 import { useState, useEffect, useRef } from "react";
 import { createPortal } from "react-dom";
 
@@ -98,7 +97,7 @@ export default function ImageGenPanel({
   const [disabledDefaults, setDisabledDefaults] = useState<Set<number>>(
     new Set(),
   );
-  const { generating, submit: agentSubmit } = useAgentGenerating();
+  const { submit: agentSubmit } = useAgentGenerating();
   const panelRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
@@ -148,6 +147,11 @@ export default function ImageGenPanel({
 
     agentSubmit(label, context);
     setPrompt("");
+    // Generation happens asynchronously in the agent chat, which already
+    // surfaces its own progress/failure state — keeping this popup open with
+    // a separate loading flag risks it getting stuck if the two states
+    // diverge (e.g. the chat run keeps going after this request finishes).
+    onOpenChange(false);
   };
 
   if (!open) return null;
@@ -246,17 +250,9 @@ export default function ImageGenPanel({
         {/* Generate button */}
         <button
           onClick={handleGenerate}
-          disabled={generating}
-          className="w-full px-4 py-2 rounded-lg bg-[#609FF8] hover:bg-[#7AB2FA] disabled:opacity-70 disabled:cursor-not-allowed text-black text-sm font-medium transition-colors flex items-center justify-center gap-2"
+          className="w-full px-4 py-2 rounded-lg bg-[#609FF8] hover:bg-[#7AB2FA] text-black text-sm font-medium transition-colors flex items-center justify-center gap-2"
         >
-          {generating ? (
-            <>
-              <IconLoader2 className="w-4 h-4 animate-spin" />
-              {t("raw.generatingImage")}
-            </>
-          ) : (
-            "Generate"
-          )}
+          Generate
         </button>
       </div>
     </div>,

package/corpus/templates/slides/app/components/editor/SlideEditor.tsx

@@ -17,7 +17,12 @@ import {
 } from "@agent-native/toolkit/collab-ui";
 import { appStateKeyForBrowserTab } from "@shared/app-state-tabs";
 import { hashSlideContent } from "@shared/slide-fit";
-import { IconMaximize, IconZoomIn, IconZoomOut } from "@tabler/icons-react";
+import {
+  IconMaximize,
+  IconX,
+  IconZoomIn,
+  IconZoomOut,
+} from "@tabler/icons-react";
 import {
   useState,
   useCallback,
@@ -136,6 +141,25 @@ import { SlideContextToolbar } from "./SlideContextToolbar";
 import { SlideOverflowWarning } from "./SlideOverflowWarning";
 import { SpeakerNotesPanel } from "./SpeakerNotesPanel";
 
+function ExcalidrawExitButton(props: { onExit: () => void; label: string }) {
+  return (
+    <Tooltip>
+      <TooltipTrigger asChild>
+        <Button
+          variant="ghost"
+          size="icon"
+          className="absolute right-3 top-3 z-20 h-8 w-8 cursor-pointer border border-border bg-popover/95 shadow-lg backdrop-blur"
+          onClick={props.onExit}
+          aria-label={props.label}
+        >
+          <IconX className="h-4 w-4" />
+        </Button>
+      </TooltipTrigger>
+      <TooltipContent side="bottom">{props.label}</TooltipContent>
+    </Tooltip>
+  );
+}
+
 let builderIdCounter = 0;
 const CANVAS_ZOOM_PRESETS = [10, 25, 50, 75, 100, 125, 150, 200] as const;
 
@@ -4184,10 +4208,23 @@ export default function SlideEditor({
       <div className="flex min-h-0 flex-1 overflow-hidden">
         <div className="min-w-0 flex-1 overflow-hidden">
           {slide.excalidrawData ? (
-            <div className="h-full bg-background">
+            <div className="relative h-full bg-background">
+              {!readOnly && (
+                <ExcalidrawExitButton
+                  // JSON.stringify drops `undefined` properties before the patch
+                  // reaches the network request, so the server's
+                  // `fields.excalidrawData !== undefined` merge check never sees
+                  // the clear — the canvas would reappear after reload. "" is a
+                  // serializable value that survives the round trip and is
+                  // already treated as "no data" everywhere excalidrawData is read.
+                  onExit={() => onUpdateSlide({ excalidrawData: "" })}
+                  label={t("raw.exitExcalidrawCanvas")}
+                />
+              )}
               <ExcalidrawSlide
                 initialData={slide.excalidrawData}
                 onChange={(data) => onUpdateSlide({ excalidrawData: data })}
+                readOnly={readOnly}
               />
             </div>
           ) : (

package/corpus/templates/slides/app/components/layout/Layout.tsx

@@ -117,7 +117,7 @@ export function Layout({ children }: LayoutProps) {
         ]}
         scope={deckScope}
         browserTabId={TAB_ID}
-        agentPageHref="/agent"
+        agentPageHref="/settings/agent"
         suppressFirstRunOnboarding={isSlidesEditorRoute(location.pathname)}
         composerSlot={<CreativeContextComposerChip />}
         threadFooterSlot={<GoogleDriveConnectionCta />}

package/corpus/templates/slides/app/i18n/en-US.ts

@@ -77,6 +77,7 @@ const messages = {
     zoomIn: "Zoom in",
     fitSlideToScreen: "Fit slide to screen",
     fitToScreen: "Fit to screen",
+    exitExcalidrawCanvas: "Exit drawing canvas",
     agentWorking: "Agent is working",
     openChat: "Open chat",
     cloudAuthToken: "Auth token",

package/corpus/templates/slides/app/lib/create-deck-generation.ts

@@ -1,4 +1,8 @@
-import { callAction } from "@agent-native/core/client/hooks";
+import {
+  callAction,
+  deleteClientAppState,
+} from "@agent-native/core/client/hooks";
+import { appStateKeyForBrowserTab } from "@shared/app-state-tabs";
 import { extractGoogleDocUrls } from "@shared/google-docs";
 import { flushSync } from "react-dom";
 
@@ -10,6 +14,7 @@ import {
   importUploadedDeckIntoDeck,
   type ImportedSourceDeck,
 } from "@/lib/import-uploaded-deck";
+import { TAB_ID } from "@/lib/tab-id";
 
 interface DesignSystemGenerationContextResult {
   agentContext?: string;
@@ -103,7 +108,7 @@ function describeUploadedFilesForAgent(
     "",
     importedSourceDeck
       ? `The user uploaded ${files.length} file(s). The ${sourceFile?.originalName ?? importedSourceDeck.format.toUpperCase()} source deck has already been imported into target deck ${deckId} with ${importedSourceDeck.slideCount} source slide(s); do not import it again.`
-      : `The user uploaded ${files.length} file(s). These paths are real uploaded files; process them with import actions before using their contents:`,
+      : `The user uploaded ${files.length} file(s). These are mandatory source material, not optional references — process every one of them with the matching import action BEFORE adding the first slide:`,
     fileList,
     "",
     "File handling rules:",
@@ -112,10 +117,11 @@ function describeUploadedFilesForAgent(
       : `- PPTX files: call \`import-pptx --filePath \"<path>\" --deckId ${deckId}\` before adding or editing slides.`,
     importedSourceDeck
       ? "- For a PDF source, keep the original full-page image in every slide and add restrained design-system chrome around it without obscuring source content. Never OCR-reconstruct a source-faithful page from extracted text."
-      : `- PDF and DOCX files: call \`import-file --filePath \"<path>\" --format auto --deckId ${deckId}\` and use the returned extracted text as source material. For a visual PDF whose original layout should be preserved, pass \`--importIntoDeck true\` instead of rebuilding the pages from extracted text.`,
+      : `- PDF and DOCX files: call \`import-file --filePath \"<path>\" --format auto --deckId ${deckId}\` and use the returned extracted text as source material. The returned text is capped for reliability; re-run with maxChars only if more context is needed. For a visual PDF whose original layout should be preserved, pass \`--importIntoDeck true\` instead of rebuilding the pages from extracted text. Do not proceed to add-slide until this call has returned for every PDF/DOCX in the list above.`,
     "- Text-like files: use the uploaded-text-file blocks already included in the prompt; do not call import-file for them.",
-    '- Image files with an embeddable URL can be inserted directly into slide HTML as `<img src="...">` or used as visual references.',
+    '- Image files with an embeddable URL are mandatory assets: if the user specified where to use one (e.g. "on the first and last slide"), embed it there with `<img src="...">` exactly as requested. Do not omit a requested image and continue silently — if it truly cannot be placed, say why in your final chat response.',
     "- Image files without a URL are visual/reference assets only; do not claim to have processed a PPTX/PDF/DOCX unless the relevant import action succeeds.",
+    "- Before your final response, verify every uploaded file above was either imported (PPTX/PDF/DOCX) or placed as requested (images). If any file's content or requested placement is missing from the deck, say so explicitly instead of reporting success.",
   ].join("\n");
 }
 
@@ -351,12 +357,23 @@ export async function startDeckGeneration({
     "",
     "Before generating, if the request or selected references leave a meaningful choice unresolved, use the `ask-question` tool to ask one concise, prompt-specific question in the inline guided-question flow. Generate the question wording and 2 to 4 options from the user's request and selected references, like Claude's design-question flow; do not use a fixed generic questionnaire. Ask only a choice that materially affects the deck, such as audience, tone, structure, or length. If the prompt already makes the choice clear, do not ask it again. Wait for the user's answer or skip before adding slides.",
     sourceModeInstructions,
-    "If the user asked for a specific slide count, keep going sequentially until that count is reached unless a tool error blocks you.",
+    "If the user asked for a specific slide count, keep going sequentially until that count is reached unless a tool error blocks you. If no explicit count was given (including when the guided slide-count question was skipped), infer the count from the distinct topics/sections implied by the request — one slide per section plus a title and closing slide — and add slides for every section before considering the deck done. Do not stop at an arbitrary round number (e.g. 10) if sections remain uncovered, and never call `generate-slides-ai` for this flow; it is a legacy single-shot helper capped at 10 slides.",
     "Every slide is rendered into a fixed native canvas (default 16:9 is 960x540 CSS pixels, with 740x380px available inside standard 80px 110px padding). Keep the main content within that fit budget; split dense source material across more slides instead of packing it tightly. Never use zoom, transform: scale(), clipping, or scroll overflow to hide content overflow, and keep body text at least 16px.",
     "Each slide's --content must be full HTML. Slide HTML templates are in your AGENTS.md.",
     "Do NOT use create-deck (the deck already exists). Do NOT call db-schema, the resources tool, or search-files.",
   ].join("\n");
 
+  // A guided-question card from the previous deck's still-finishing agent run
+  // shares this browser tab's single "guided-questions" slot. Without
+  // clearing it here, a late answer to that stale question can render on top
+  // of the deck we're about to navigate to. Best-effort: if the previous
+  // run's question arrives after this clear, it can still reappear, but this
+  // closes the common case where it's already pending when a new deck starts.
+  deleteClientAppState(
+    appStateKeyForBrowserTab("guided-questions", TAB_ID),
+  ).catch(() => {});
+  deleteClientAppState("guided-questions").catch(() => {});
+
   navigate(`/deck/${deck.id}?generating=1`, {
     replace: true,
     flushSync: true,

package/corpus/templates/slides/app/pages/Index.tsx

@@ -1,10 +1,15 @@
-import { callAction, useSession } from "@agent-native/core/client/hooks";
+import {
+  callAction,
+  deleteClientAppState,
+  useSession,
+} from "@agent-native/core/client/hooks";
 import { useT } from "@agent-native/core/client/i18n";
 import { buildSignInReturnHref } from "@agent-native/core/client/ui";
 import {
   useSetHeaderActions,
   useSetPageTitle,
 } from "@agent-native/toolkit/app-shell";
+import { appStateKeyForBrowserTab } from "@shared/app-state-tabs";
 import { extractGoogleDocUrls } from "@shared/google-docs";
 import {
   IconAlertTriangle,
@@ -61,6 +66,7 @@ import {
   rememberRecentReference,
   type RecentReference,
 } from "@/lib/recent-references";
+import { TAB_ID } from "@/lib/tab-id";
 
 const NEW_DECK_DRAFT_SCOPE = "slides-new-deck";
 const PENDING_PROMPT_KEY = "slides:pending-deck-prompt";
@@ -198,7 +204,7 @@ function describeUploadedFilesForAgent(
     "",
     importedSourceDeck
       ? `The user uploaded ${files.length} file(s). The ${importedSourceDeck.file.originalName} source deck has already been imported into target deck ${deckId} with ${importedSourceDeck.slideCount} source slide(s); do not import it again.`
-      : `The user uploaded ${files.length} file(s). These paths are real uploaded files; process them with import actions before using their contents:`,
+      : `The user uploaded ${files.length} file(s). These are mandatory source material, not optional references — process every one of them with the matching import action BEFORE adding the first slide:`,
     fileList,
     "",
     "File handling rules:",
@@ -207,10 +213,11 @@ function describeUploadedFilesForAgent(
       : `- PPTX files: call \`import-pptx --filePath "<path>" --deckId ${deckId}\` before adding or editing slides.`,
     importedSourceDeck
       ? "- For a PDF source, keep the original full-page image in every slide and add restrained design-system chrome around it without obscuring source content. Never OCR-reconstruct a source-faithful page from extracted text."
-      : `- PDF and DOCX files: call \`import-file --filePath "<path>" --format auto --deckId ${deckId}\` and use the returned extracted text as source material. For a visual PDF whose original layout should be preserved, pass \`--importIntoDeck true\` instead of rebuilding the pages from extracted text.`,
+      : `- PDF and DOCX files: call \`import-file --filePath "<path>" --format auto --deckId ${deckId}\` and use the returned extracted text as source material. The returned text is capped for reliability; re-run with maxChars only if more context is needed. For a visual PDF whose original layout should be preserved, pass \`--importIntoDeck true\` instead of rebuilding the pages from extracted text. Do not proceed to add-slide until this call has returned for every PDF/DOCX in the list above.`,
     "- Text-like files: use the uploaded-text-file blocks already included in the prompt; do not call import-file for them.",
-    '- Image files with an embeddable URL can be inserted directly into slide HTML as `<img src="...">` or used as visual references.',
+    '- Image files with an embeddable URL are mandatory assets: if the user specified where to use one (e.g. "on the first and last slide"), embed it there with `<img src="...">` exactly as requested. Do not omit a requested image and continue silently — if it truly cannot be placed, say why in your final chat response.',
     "- Image files without a URL are visual/reference assets only; do not claim to have processed a PPTX/PDF/DOCX unless the relevant import action succeeds.",
+    "- Before your final response, verify every uploaded file above was either imported (PPTX/PDF/DOCX) or placed as requested (images). If any file's content or requested placement is missing from the deck, say so explicitly instead of reporting success.",
   ].join("\n");
 }
 
@@ -731,12 +738,20 @@ export default function Index() {
       "",
       "Before generating, if the request or selected references leave a meaningful choice unresolved, use the `ask-question` tool to ask one concise, prompt-specific question in the inline guided-question flow. Generate the question wording and 2 to 4 options from the user's request and selected references, like Claude's design-question flow; do not use a fixed generic questionnaire. Ask only a choice that materially affects the deck, such as audience, tone, structure, or length. If the prompt already makes the choice clear, do not ask it again. Wait for the user's answer or skip before adding slides.",
       sourceModeInstructions,
-      "If the user asked for a specific slide count, keep going sequentially until that count is reached unless a tool error blocks you.",
+      "If the user asked for a specific slide count, keep going sequentially until that count is reached unless a tool error blocks you. If no explicit count was given (including when the guided slide-count question was skipped), infer the count from the distinct topics/sections implied by the request — one slide per section plus a title and closing slide — and add slides for every section before considering the deck done. Do not stop at an arbitrary round number (e.g. 10) if sections remain uncovered, and never call `generate-slides-ai` for this flow; it is a legacy single-shot helper capped at 10 slides.",
       "Every slide is rendered into a fixed native canvas (default 16:9 is 960x540 CSS pixels, with 740x380px available inside standard 80px 110px padding). Keep the main content within that fit budget; split dense source material across more slides instead of packing it tightly. Never use zoom, transform: scale(), clipping, or scroll overflow to hide content overflow, and keep body text at least 16px.",
       "Each slide's --content must be full HTML. Slide HTML templates are in your AGENTS.md.",
       "Do NOT use create-deck (the deck already exists). Do NOT call db-schema, the resources tool, or search-files.",
     ].join("\n");
 
+    // See the matching comment in create-deck-generation.ts: clear any
+    // guided-question card left over from the previous deck's still-finishing
+    // run so it can't surface on top of the deck we're navigating to now.
+    deleteClientAppState(
+      appStateKeyForBrowserTab("guided-questions", TAB_ID),
+    ).catch(() => {});
+    deleteClientAppState("guided-questions").catch(() => {});
+
     navigate(`/deck/${deck.id}?generating=1`, {
       replace: true,
       flushSync: true,

package/corpus/templates/slides/app/root.tsx

@@ -229,7 +229,7 @@ function AppContent() {
             {t("root.searchDecks")}
           </CommandMenu.Item>
           <CommandMenu.Item
-            onSelect={() => navigate("/agent")}
+            onSelect={() => navigate("/settings/agent")}
             keywords={["agent", "context", "connections", "jobs", "access"]}
           >
             <IconHierarchy2 size={16} />

package/corpus/templates/slides/app/routes/agent.tsx

@@ -1,7 +1,5 @@
-import { AgentTabsPage } from "@agent-native/core/client/agent-chat";
-import { useT } from "@agent-native/core/client/i18n";
-import { createCreativeContextAgentTab } from "@agent-native/creative-context/client";
-import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
+import { buildLegacyAgentSettingsRoute } from "@agent-native/core/client/navigation";
+import { Navigate, useLocation } from "react-router";
 
 import messages from "@/i18n/en-US";
 
@@ -10,13 +8,12 @@ export function meta() {
 }
 
 export default function AgentRoute() {
-  const t = useT();
-  useSetPageTitle(t("settings.agentTitle"));
+  const location = useLocation();
 
   return (
-    <AgentTabsPage
-      appName="Slides"
-      extraTabFactories={[createCreativeContextAgentTab]}
+    <Navigate
+      to={buildLegacyAgentSettingsRoute(location.hash, location.search)}
+      replace
     />
   );
 }

package/corpus/templates/slides/app/routes/settings.tsx

@@ -9,7 +9,10 @@ import {
   useAgentSettingsTabs,
   type SettingsSearchEntry,
 } from "@agent-native/core/client/settings";
-import { CreativeContextSettingsLink } from "@agent-native/creative-context/client";
+import {
+  CreativeContextSettingsLink,
+  createCreativeContextAgentTab,
+} from "@agent-native/creative-context/client";
 import { useSetPageTitle } from "@agent-native/toolkit/app-shell";
 import { useMemo } from "react";
 import { toast } from "sonner";
@@ -26,7 +29,9 @@ export function meta() {
 
 export default function SettingsRoute() {
   const t = useT();
-  const agentSettingsTabs = useAgentSettingsTabs();
+  const agentSettingsTabs = useAgentSettingsTabs({
+    agentAdditionalTabFactories: [createCreativeContextAgentTab],
+  });
   useSetPageTitle(t("settings.title"));
   const { prefs, loading: prefsLoading, save: savePrefs } = useSlidesPrefs();
 

package/corpus/templates/slides/server/plugins/creative-context.ts

@@ -165,7 +165,7 @@ registerOnboardingStep({
       kind: "link",
       primary: true,
       label: "Open Library",
-      payload: { url: "/agent#library", external: false },
+      payload: { url: "/settings/library", external: false },
     },
   ],
   isComplete: async () => {

package/corpus/templates/tasks/app/components/layout/Layout.tsx

@@ -113,7 +113,7 @@ export function Layout({ children }: LayoutProps) {
           chatViewTransition
           storageKey="tasks"
           browserTabId={TAB_ID}
-          agentPageHref="/agent"
+          agentPageHref="/settings/agent"
           onFullscreenRequest={() => focusAgentChat()}
           emptyStateText={t("agent.emptyState")}
           dynamicSuggestions={false}