@adminforth/agent 1.27.5 → 1.28.0

package/build.log

@@ -38,5 +38,5 @@ custom/skills/fetch_data/SKILL.md
 custom/skills/mutate_data/
 custom/skills/mutate_data/SKILL.md
 
-sent 207,775 bytes  received 558 bytes  416,666.00 bytes/sec
-total size is 205,465  speedup is 0.99
+sent 208,100 bytes  received 562 bytes  417,324.00 bytes/sec
+total size is 205,786  speedup is 0.99

package/custom/ChatSurface.vue

@@ -219,7 +219,7 @@ const isModeMenuOpen = ref(false);
 let startX = 0
 let startWidth = 0
 
-onClickOutside(chatSurface, () => {if (!agentStore.isTeleportedToBody) agentStore.setIsChatOpen(false);});
+onClickOutside(chatSurface, () => {if (!agentStore.isTeleportedToBody && !agentStore.isFullScreen) agentStore.setIsChatOpen(false);});
 onClickOutside(modeMenu, () => { isModeMenuOpen.value = false; });
 
 onMounted(async () => {

package/custom/composables/useAgentStore.ts

@@ -14,6 +14,15 @@ type AgentMode = {
   name: string;
 };
 
+function getCurrentPageContext() {
+  return {
+    path: window.location.pathname,
+    fullPath: `${window.location.pathname}${window.location.search}${window.location.hash}`,
+    title: document.title,
+    url: window.location.href,
+  };
+}
+
 const DEFAULT_TEXTAREA_PLACEHOLDER = 'Type a message...';
 const PLACEHOLDER_TYPING_DELAY_MS = 60;
 const PLACEHOLDER_DELETING_DELAY_MS = 35;
@@ -206,6 +215,7 @@ export const useAgentStore = defineStore('agent', () => {
               sessionId,
               timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
               mode: activeModeName.value,
+              currentPage: getCurrentPageContext(),
             };
 
             return {

package/dist/custom/ChatSurface.vue

@@ -219,7 +219,7 @@ const isModeMenuOpen = ref(false);
 let startX = 0
 let startWidth = 0
 
-onClickOutside(chatSurface, () => {if (!agentStore.isTeleportedToBody) agentStore.setIsChatOpen(false);});
+onClickOutside(chatSurface, () => {if (!agentStore.isTeleportedToBody && !agentStore.isFullScreen) agentStore.setIsChatOpen(false);});
 onClickOutside(modeMenu, () => { isModeMenuOpen.value = false; });
 
 onMounted(async () => {

package/dist/custom/composables/useAgentStore.ts

@@ -14,6 +14,15 @@ type AgentMode = {
   name: string;
 };
 
+function getCurrentPageContext() {
+  return {
+    path: window.location.pathname,
+    fullPath: `${window.location.pathname}${window.location.search}${window.location.hash}`,
+    title: document.title,
+    url: window.location.href,
+  };
+}
+
 const DEFAULT_TEXTAREA_PLACEHOLDER = 'Type a message...';
 const PLACEHOLDER_TYPING_DELAY_MS = 60;
 const PLACEHOLDER_DELETING_DELAY_MS = 35;
@@ -206,6 +215,7 @@ export const useAgentStore = defineStore('agent', () => {
               sessionId,
               timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
               mode: activeModeName.value,
+              currentPage: getCurrentPageContext(),
             };
 
             return {

package/dist/index.js

@@ -46,6 +46,29 @@ function formatAgentError(error) {
     }
     return String(error);
 }
+function formatAdminUserPrompt(adminUser, usernameField) {
+    const dbUser = adminUser.dbUser;
+    const adminUserContext = {
+        id: adminUser.pk,
+        email: dbUser[usernameField],
+    };
+    return [
+        "Current admin user context:",
+        JSON.stringify(adminUserContext, null, 2),
+        "Use this admin user email when the user asks to send information to themselves, the current admin, or the logged-in user.",
+    ].join("\n");
+}
+function formatCurrentPagePrompt(currentPage) {
+    console.log("Current page context:", currentPage);
+    if (!currentPage) {
+        return null;
+    }
+    return [
+        "Current user page context for the latest message:",
+        JSON.stringify(currentPage, null, 2),
+        "When the user says here, this page, current page, or opened page, treat it as this page.",
+    ].join("\n");
+}
 function assertRequiredApiTool(apiBasedTools, toolName) {
     if (toolName in apiBasedTools) {
         return;
@@ -210,6 +233,7 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
                 const messageId = randomUUID();
                 const prompt = body.message;
                 const userTimeZone = (_e = body.timeZone) !== null && _e !== void 0 ? _e : 'UTC';
+                const currentPage = body.currentPage;
                 const sessionId = body.sessionId || (adminUser === null || adminUser === void 0 ? void 0 : adminUser.pk) || (adminUser === null || adminUser === void 0 ? void 0 : adminUser.username) || 'default';
                 const turnId = yield this.createNewTurn(sessionId, prompt);
                 yield this.updateSessionDate(sessionId);
@@ -282,13 +306,17 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
                     const maxTokens = (_f = this.options.maxTokens) !== null && _f !== void 0 ? _f : 10000;
                     const selectedMode = (_g = this.options.modes.find((mode) => mode.name === body.mode)) !== null && _g !== void 0 ? _g : this.options.modes[0];
                     const { model, summaryModel, modelMiddleware } = yield this.getModeModels(selectedMode, maxTokens);
-                    const systemPrompt = yield this.agentSystemPromptPromise;
+                    const systemPrompt = [
+                        yield this.agentSystemPromptPromise,
+                        formatAdminUserPrompt(adminUser, this.adminforth.config.auth.usernameField),
+                    ].join("\n\n");
                     const apiBasedTools = buildApiBasedTools(this.adminforth);
                     for (const toolName of ALWAYS_AVAILABLE_API_TOOL_NAMES) {
                         assertRequiredApiTool(apiBasedTools, toolName);
                     }
                     assertRequiredApiTool(apiBasedTools, "update_record");
                     this.apiBasedTools = apiBasedTools;
+                    const currentPagePrompt = formatCurrentPagePrompt(currentPage);
                     const stream = yield callAgent({
                         name: `adminforth-agent-${this.pluginInstanceId}`,
                         model,
@@ -297,6 +325,7 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
                         checkpointer: this.getCheckpointer(),
                         messages: [
                             new SystemMessage(systemPrompt),
+                            ...(currentPagePrompt ? [new SystemMessage(currentPagePrompt)] : []),
                             new HumanMessage(prompt),
                         ],
                         adminUser,

package/index.ts

@@ -1,4 +1,5 @@
 import type {
+  AdminUser,
   AdminForthResource,
   IAdminForth,
   IHttpServer
@@ -14,7 +15,6 @@ import {
   createAgentChatModel,
   callAgent,
   type AgentChatModel,
-  type AgentModeCompletionAdapter,
 } from "./agent/simpleAgent.js";
 import { AdminForthCheckpointSaver } from "./agent/checkpointer.js";
 import { createSequenceDebugCollector } from "./agent/middleware/sequenceDebug.js";
@@ -30,6 +30,17 @@ import {
 import { ALWAYS_AVAILABLE_API_TOOL_NAMES } from "./agent/tools/index.js";
 import type { ToolCallEvent } from "./agent/toolCallEvents.js";
 
+type CurrentPageRequestBody = {
+  currentPage?: CurrentPageContext;
+};
+
+type CurrentPageContext = {
+  path: string;
+  fullPath: string;
+  title: string;
+  url: string;
+};
+
 function isAggregateErrorLike(
   error: unknown,
 ): error is { errors: unknown[]; message?: string; stack?: string } {
@@ -58,6 +69,33 @@ function formatAgentError(error: unknown) {
   return String(error);
 }
 
+function formatAdminUserPrompt(adminUser: AdminUser, usernameField: string) {
+  const dbUser = adminUser.dbUser as Record<string, unknown>;
+  const adminUserContext = {
+    id: adminUser.pk,
+    email: dbUser[usernameField],
+  };
+
+  return [
+    "Current admin user context:",
+    JSON.stringify(adminUserContext, null, 2),
+    "Use this admin user email when the user asks to send information to themselves, the current admin, or the logged-in user.",
+  ].join("\n");
+}
+
+function formatCurrentPagePrompt(currentPage: CurrentPageContext | undefined) {
+  console.log("Current page context:", currentPage);
+  if (!currentPage) {
+    return null;
+  }
+
+  return [
+    "Current user page context for the latest message:",
+    JSON.stringify(currentPage, null, 2),
+    "When the user says here, this page, current page, or opened page, treat it as this page.",
+  ].join("\n");
+}
+
 function assertRequiredApiTool(
   apiBasedTools: Record<string, ApiBasedTool>,
   toolName: string,
@@ -248,6 +286,7 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
         const messageId = randomUUID();
         const prompt = body.message;
         const userTimeZone = (body.timeZone as string | undefined) ?? 'UTC';
+        const currentPage = (body as CurrentPageRequestBody).currentPage;
         const sessionId = body.sessionId || adminUser?.pk || adminUser?.username || 'default';
         const turnId = await this.createNewTurn(sessionId, prompt);
         await this.updateSessionDate(sessionId);
@@ -340,13 +379,17 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
           const selectedMode = this.options.modes.find((mode) => mode.name === body.mode) ?? this.options.modes[0];
           const { model, summaryModel, modelMiddleware } =
             await this.getModeModels(selectedMode, maxTokens);
-          const systemPrompt = await this.agentSystemPromptPromise;
+          const systemPrompt = [
+            await this.agentSystemPromptPromise,
+            formatAdminUserPrompt(adminUser, this.adminforth.config.auth.usernameField),
+          ].join("\n\n");
           const apiBasedTools = buildApiBasedTools(this.adminforth);
           for (const toolName of ALWAYS_AVAILABLE_API_TOOL_NAMES) {
             assertRequiredApiTool(apiBasedTools, toolName);
           }
           assertRequiredApiTool(apiBasedTools, "update_record");
           this.apiBasedTools = apiBasedTools;
+          const currentPagePrompt = formatCurrentPagePrompt(currentPage);
           const stream = await callAgent({
             name: `adminforth-agent-${this.pluginInstanceId}`,
             model,
@@ -355,6 +398,7 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
             checkpointer: this.getCheckpointer(),
             messages: [
               new SystemMessage(systemPrompt),
+              ...(currentPagePrompt ? [new SystemMessage(currentPagePrompt)] : []),
               new HumanMessage(prompt),
             ],
             adminUser,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/agent",
-  "version": "1.27.5",
+  "version": "1.28.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",