Merge pull request 'fix(ai-chat): resolve current page for agent context (#43, hardness #1)' (#47) from fix/ai-chat-current-page into develop

apps/client/src/features/ai-chat/components/ai-chat-window.tsx

@@ -18,7 +18,7 @@ import {
   IconX,
 } from "@tabler/icons-react";
 import { useAtom, useSetAtom } from "jotai";
-import { useParams } from "react-router-dom";
+import { useMatch } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { useQueryClient } from "@tanstack/react-query";
 import {
@@ -140,13 +140,16 @@ export default function AiChatWindow() {
   const { data: messageRows, isLoading: messagesLoading } =
     useAiChatMessagesQuery(activeChatId ?? undefined);
 
-  // The page the user is currently viewing, derived from the route (same
-  // source the breadcrumb uses). On a non-page route `pageSlug` is undefined,
-  // so the query is disabled and `openPage` is null. This is passed to the
-  // chat thread as context so the agent knows what "this page"/"the current
-  // page" refers to; the agent still reads/writes via its CASL-enforced page
-  // tools using the id.
-  const { pageSlug } = useParams();
+  // The page the user is currently viewing. AiChatWindow lives in a pathless
+  // parent layout route, so useParams() can't see :pageSlug. Match the full
+  // pathname against the authenticated page route instead so "the current page"
+  // resolves regardless of where this component is mounted. On a non-page route
+  // the match is null, so `pageSlug` is undefined, the query is disabled and
+  // `openPage` is null. This is passed to the chat thread as context so the
+  // agent knows what "this page"/"the current page" refers to; the agent still
+  // reads/writes via its CASL-enforced page tools using the id.
+  const pageRouteMatch = useMatch("/s/:spaceSlug/p/:pageSlug");
+  const pageSlug = pageRouteMatch?.params?.pageSlug;
   const { data: openPageData } = usePageQuery({
     pageId: extractPageSlugId(pageSlug),
   });

apps/server/src/core/ai-chat/ai-chat.service.ts

@@ -257,6 +257,9 @@ export class AiChatService {
       sessionId,
       workspace.id,
       chatId,
+      // Same open-page value used by the system prompt above; exposed to the
+      // model via getCurrentPage so page identity survives prompt mangling.
+      body.openPage,
     );
 
     // Merge in admin-configured external MCP tools (web search, etc.; §6.8).

apps/server/src/core/ai-chat/tools/ai-chat-tools.service.ts

@@ -50,6 +50,11 @@ export class AiChatToolsService {
     // agent write (REST + collab) records { actor:'agent', aiChatId } off a
     // SIGNED claim — non-spoofable, never a client body field (§6.5/§6.6).
     aiChatId: string,
+    // The page the user currently has open (from the request context), exposed
+    // to the model via getCurrentPage. Optional and last so existing callers
+    // keep compiling. Kept proxy-robust: the model can CALL for the current
+    // page instead of relying on it surviving in the system prompt text.
+    openedPage?: { id?: string; title?: string } | null,
   ): Promise<Record<string, Tool>> {
     const apiUrl =
       process.env.MCP_DOCMOST_API_URL ||
@@ -210,6 +215,23 @@ export class AiChatToolsService {
         },
       }),
 
+      getCurrentPage: tool({
+        description:
+          'Return the page the user is currently viewing — i.e. what "this page", ' +
+          '"the current page", or "here" refers to. Returns the page id and title, ' +
+          'or null if the user is not currently on a page. Call this first whenever ' +
+          'the user refers to the current page without giving an explicit id.',
+        inputSchema: z.object({}),
+        execute: async () => {
+          if (!openedPage?.id) {
+            return { page: null };
+          }
+          return {
+            page: { id: openedPage.id, title: openedPage.title ?? '' },
+          };
+        },
+      }),
+
       getPage: tool({
         description:
           'Fetch a single page as Markdown by its page id. Returns the page ' +