@adminforth/agent 1.47.2 → 1.48.1

package/agent/middleware/apiBasedTools.ts

@@ -66,10 +66,15 @@ export function createApiBasedToolsMiddleware(
       const tools = [...enabledApiToolNames]
         .filter((toolName) => !alwaysAvailableApiToolNames.has(toolName))
         .map((toolName) => dynamicTools[toolName]);
+      const availableTools = [...request.tools, ...tools];
+
+      logger.info(
+        `AdminForth Agent callable tools: ${availableTools.map((tool) => tool.name).join(", ")}`,
+      );
 
       return handler({
         ...request,
-        tools: [...request.tools, ...tools],
+        tools: availableTools,
       });
     },
     async wrapToolCall(request, handler) {

package/agent/simpleAgent.ts

@@ -230,6 +230,7 @@ export async function callAgent(params: {
   adminforth: IAdminForth;
   apiBasedTools: Record<string, ApiBasedTool>;
   customComponentsDir: string;
+  pluginCustomFolderPaths: string[];
   sessionId: string;
   turnId: string;
   currentPage?: CurrentPageContext;
@@ -249,6 +250,7 @@ export async function callAgent(params: {
     adminforth,
     apiBasedTools,
     customComponentsDir,
+    pluginCustomFolderPaths,
     sessionId,
     turnId,
     currentPage,
@@ -258,7 +260,11 @@ export async function callAgent(params: {
     sequenceDebugSink,
   } = params;
 
-  const tools = await createAgentTools(customComponentsDir, apiBasedTools);
+  const tools = await createAgentTools(
+    customComponentsDir,
+    apiBasedTools,
+    pluginCustomFolderPaths,
+  );
   const apiBasedToolsMiddleware = createApiBasedToolsMiddleware(apiBasedTools, adminforth);
   const sequenceDebugMiddleware = createSequenceDebugMiddleware(
     sequenceDebugSink,

package/agent/skills/registry.ts

@@ -1,16 +1,7 @@
 import { readdir, readFile } from "fs/promises";
 import path from "path";
-import { fileURLToPath } from "url";
 import { parse as parseYaml } from "yaml";
 
-const PLUGIN_SKILLS_DIRECTORY_PATH = fileURLToPath(
-  new URL("../../custom/skills/", import.meta.url),
-);
-const USER_PLUGIN_SKILLS_DIRECTORY_PATH_SEGMENTS = [
-  "plugins",
-  "adminforth-agent",
-  "skills",
-];
 const SKILL_MARKDOWN_FILENAME = "SKILL.md";
 const SKILL_FRONTMATTER_SEPARATOR = "\n---\n";
 
@@ -21,6 +12,13 @@ export interface AgentSkillManifest {
   instructions: string;
 }
 
+function normalizePluginSkillDirectoryPaths(pluginCustomFolderPaths: string[] = []) {
+  return Array.from(new Set(
+    pluginCustomFolderPaths
+      .map((pluginCustomFolderPath) => path.resolve(pluginCustomFolderPath, "skills")),
+  ));
+}
+
 function parseSkillManifest(directoryName: string, markdown: string): AgentSkillManifest {
   const [frontmatterBlock, instructions = ""] = markdown.split("\r\n").join("\n").split(
     SKILL_FRONTMATTER_SEPARATOR,
@@ -83,43 +81,42 @@ export function getProjectSkillsDirectoryPath(customComponentsDir: string) {
   return path.resolve(customComponentsDir, "skills");
 }
 
-export function getProjectPluginSkillsDirectoryPath(customComponentsDir: string) {
-  return path.resolve(
-    customComponentsDir,
-    ...USER_PLUGIN_SKILLS_DIRECTORY_PATH_SEGMENTS,
-  );
-}
-
-function getProjectSkillDirectoryPaths(customComponentsDir: string) {
-  return [
+function getProjectSkillDirectoryPaths(
+  customComponentsDir: string,
+  pluginCustomFolderPaths: string[] = [],
+) {
+  return Array.from(new Set([
     getProjectSkillsDirectoryPath(customComponentsDir),
-    getProjectPluginSkillsDirectoryPath(customComponentsDir),
-  ];
-}
-
-export async function listBundledSkillManifests() {
-  return await listDirectorySkillManifests(PLUGIN_SKILLS_DIRECTORY_PATH);
+    ...normalizePluginSkillDirectoryPaths(pluginCustomFolderPaths),
+  ]));
 }
 
-export async function listProjectSkillManifests(customComponentsDir: string) {
+export async function listProjectSkillManifests(
+  customComponentsDir: string,
+  pluginCustomFolderPaths: string[] = [],
+) {
   return mergeSkillManifests(
     await Promise.all(
-      getProjectSkillDirectoryPaths(customComponentsDir).map(
+      getProjectSkillDirectoryPaths(customComponentsDir, pluginCustomFolderPaths).map(
         listDirectorySkillManifests,
       ),
     ),
   );
 }
 
-export async function listSkillManifests(customComponentsDir: string) {
-  return mergeSkillManifests([
-    await listProjectSkillManifests(customComponentsDir),
-    await listBundledSkillManifests(),
-  ]);
+export async function listSkillManifests(
+  customComponentsDir: string,
+  pluginCustomFolderPaths: string[] = [],
+) {
+  return await listProjectSkillManifests(customComponentsDir, pluginCustomFolderPaths);
 }
 
-export async function loadSkillManifest(skillName: string, customComponentsDir: string) {
-  const manifests = await listSkillManifests(customComponentsDir);
+export async function loadSkillManifest(
+  skillName: string,
+  customComponentsDir: string,
+  pluginCustomFolderPaths: string[] = [],
+) {
+  const manifests = await listSkillManifests(customComponentsDir, pluginCustomFolderPaths);
 
   return (
     manifests.find(
@@ -129,16 +126,23 @@ export async function loadSkillManifest(skillName: string, customComponentsDir:
   );
 }
 
-export async function loadSkillMarkdown(skillName: string, customComponentsDir: string) {
-  const manifest = await loadSkillManifest(skillName, customComponentsDir);
+export async function loadSkillMarkdown(
+  skillName: string,
+  customComponentsDir: string,
+  pluginCustomFolderPaths: string[] = [],
+) {
+  const manifest = await loadSkillManifest(
+    skillName,
+    customComponentsDir,
+    pluginCustomFolderPaths,
+  );
 
   if (!manifest) {
     return null;
   }
 
   const directories = [
-    ...getProjectSkillDirectoryPaths(customComponentsDir),
-    PLUGIN_SKILLS_DIRECTORY_PATH,
+    ...getProjectSkillDirectoryPaths(customComponentsDir, pluginCustomFolderPaths),
   ];
 
   for (const skillsDirectoryPath of directories) {

package/agent/systemPrompt.ts

@@ -1,7 +1,6 @@
 import type { AdminForthResource, AdminUser, IAdminForth } from "adminforth";
 import type { DetectedLanguage } from "./languageDetect.js";
 import {
-  listBundledSkillManifests,
   listProjectSkillManifests,
   type AgentSkillManifest,
 } from "./skills/registry.js";
@@ -96,10 +95,12 @@ export async function buildAgentSystemPrompt(
   hiddenResourceIds: Iterable<string> = [],
 ) {
   const customComponentsDir = adminforth.config.customization.customComponentsDir ?? "custom";
-  const [primarySkills, defaultSkills] = await Promise.all([
-    listProjectSkillManifests(customComponentsDir),
-    listBundledSkillManifests(),
-  ]);
+  const pluginCustomFolderPaths = adminforth.activatedPlugins
+    .map((plugin) => plugin.customFolderPath);
+  const skills = await listProjectSkillManifests(
+    customComponentsDir,
+    pluginCustomFolderPaths,
+  );
   const adminBasePath = adminforth.config.baseUrlSlashed;
   const hiddenResourceIdSet = new Set(hiddenResourceIds);
   const visibleResources = adminforth.config.resources.filter(
@@ -109,11 +110,9 @@ export async function buildAgentSystemPrompt(
     DEFAULT_AGENT_SYSTEM_PROMPT,
     `ADMIN_BASE_PATH: ${adminBasePath}`,
     `List of resources:\n${formatResources(visibleResources)}`,
-    primarySkills.length > 0
-      ? `You have primary skills set:\n${formatSkills(primarySkills, "skill_name")}`
+    skills.length > 0
+      ? `You have skills set:\n${formatSkills(skills, "skill_name")}`
       : "",
-    "You have next default skills which you can fallback to if primary skill set does not provide a good skill:\n" +
-      formatSkills(defaultSkills, "skill_name"),
     "Before using any skill, call fetch_skill to load its full instructions.",
     "The fetched skill response starts with 'Tools mentioned in this skill'. Read that list first.",
     "You can use get_resource immediately to inspect resource structure and column names.",
@@ -123,8 +122,8 @@ export async function buildAgentSystemPrompt(
     "If a fetched skill lists a non-base tool you need, call fetch_tool_schema for it immediately instead of telling the user the tool is unavailable.",
     "For example: for record creation load mutate_data, read its tool list, call fetch_tool_schema for create_record, and then use create_record after confirmation.",
     "When fetch_tool_schema succeeds, that tool becomes available on the next step.",
-    "All admin links must be relative paths and must start with ADMIN_BASE_PATH.",
-    "Build record links as ADMIN_BASE_PATH + resource/{resourceId}/show/{primary key}. Do not prepend any extra slash before resource.",
+    "All admin links must be root-relative and start with '/'.",
+    "Build record links as '/resource/{resourceId}/show/{primary key}'. Never use bare 'resource/{resourceId}/show/{primary key}' without the leading slash.",
     "Try to call as many tools as possible in parallel in one step.",
   ];
 

package/agent/tools/fetchSkill.ts

@@ -21,14 +21,24 @@ function serializeSkillManifests(skillManifests: AgentSkillManifest[]) {
   }));
 }
 
-export async function createFetchSkillTool(customComponentsDir: string) {
-  const availableSkills = await listSkillManifests(customComponentsDir);
+export async function createFetchSkillTool(
+  customComponentsDir: string,
+  pluginCustomFolderPaths: string[] = [],
+) {
+  const availableSkills = await listSkillManifests(
+    customComponentsDir,
+    pluginCustomFolderPaths,
+  );
   const availableSkillNames = availableSkills.map((skill) => skill.name);
 
   return tool(
     async ({ skillName }) => {
       try {
-        const skillMarkdown = await loadSkillMarkdown(skillName, customComponentsDir);
+        const skillMarkdown = await loadSkillMarkdown(
+          skillName,
+          customComponentsDir,
+          pluginCustomFolderPaths,
+        );
 
         if (!skillMarkdown) {
           return [

package/agent/tools/index.ts

@@ -10,6 +10,7 @@ export const ALWAYS_AVAILABLE_API_TOOL_NAMES = ["get_resource"] as const;
 export async function createAgentTools(
   customComponentsDir: string,
   apiBasedTools: Record<string, ApiBasedTool>,
+  pluginCustomFolderPaths: string[] = [],
 ): Promise<ClientTool[]> {
   return [
     ...ALWAYS_AVAILABLE_API_TOOL_NAMES.map((toolName) => {
@@ -22,7 +23,7 @@ export async function createAgentTools(
       return createApiTool(toolName, apiBasedTool);
     }),
     createGetUserLocationTool(),
-    await createFetchSkillTool(customComponentsDir),
+    await createFetchSkillTool(customComponentsDir, pluginCustomFolderPaths),
     await createFetchToolSchemaTool(apiBasedTools),
   ];
 }

package/agentTurnService.ts

@@ -138,6 +138,7 @@ export class AgentTurnService {
       adminforth,
       apiBasedTools,
       customComponentsDir: adminforth.config.customization.customComponentsDir ?? "custom",
+      pluginCustomFolderPaths: adminforth.activatedPlugins.map((plugin) => plugin.customFolderPath),
       sessionId: input.sessionId,
       turnId: input.turnId,
       currentPage: input.currentPage,

package/build.log

@@ -62,5 +62,5 @@ custom/speech_recognition_frontend/voiceActivityDetection.ts
 custom/speech_recognition_frontend/types/
 custom/speech_recognition_frontend/types/voice-activity-detection.d.ts
 
-sent 1,667,711 bytes  received 921 bytes  3,337,264.00 bytes/sec
-total size is 1,663,558  speedup is 1.00
+sent 1,668,700 bytes  received 905 bytes  3,339,210.00 bytes/sec
+total size is 1,664,547  speedup is 1.00

package/custom/composables/agentStore/useAgentSessions.ts

@@ -3,7 +3,7 @@ import { callAdminForthApi } from '@/utils';
 import type { Chat } from '../../chat';
 import type { IAgentSession, ISessionsListItem, IPart } from '../../types';
 import { PRE_SESSION_ID } from './constants';
-import { useI18n } from 'vue-i18n';
+import { i18nInstance } from '@/i18n';
 
 type AdminforthLike = {
   confirm(options: { message: string; yes: string; no: string }): Promise<boolean>;
@@ -42,7 +42,10 @@ export function createAgentSessionManager({
     return [...sessionsListToSort].sort((a: ISessionsListItem, b: ISessionsListItem) => b.timestamp.localeCompare(a.timestamp));
   }
 
-  const { t } = useI18n();
+  function t(key: string) {
+    return i18nInstance?.global.t(key) ?? key;
+  }
+
   function saveCurrentSessionInCache() {
     if (currentSession.value) {
       currentSession.value.messages = currentChat.value?.messages.map((m: any) => ({
@@ -342,4 +345,4 @@ export function createAgentSessionManager({
     setCurrentChatStatus,
     updateLastAgentMessage
   };
-}
+}

package/custom/conversation_area/ConversationArea.vue

@@ -118,10 +118,13 @@ const THRESHOLD_TO_SHOW_BUTTON = 10;
 let messageResizeObserver: ResizeObserver | null = null;
 let observedLastUserMessageElement: HTMLElement | null = null;
 let observedLastAgentMessageElement: HTMLElement | null = null;
+let updateSpacerFrameId: number | null = null;
+let pendingSpacerUpdate: Promise<void> | null = null;
+let spacerUpdateQueued = false;
 
 onMounted(async () => {
   messageResizeObserver = new ResizeObserver(() => {
-    updateSpacerHeight();
+    scheduleSpacerHeightUpdate();
   });
 
   await import('@incremark/theme/styles.css')
@@ -136,6 +139,10 @@ onUnmounted(() => {
 
   stopObservingLastMessages();
   messageResizeObserver?.disconnect();
+  if (updateSpacerFrameId !== null) {
+    cancelAnimationFrame(updateSpacerFrameId);
+    updateSpacerFrameId = null;
+  }
   agentStore.stopPlaceholderAnimation();
 });
 
@@ -221,6 +228,30 @@ async function updateSpacerHeight() {
   spacerHeight.value = Math.max(0, clientHeight - (lastUserMessageHeight + MASK_HEIGHT + lastAgentMessageHeight));
 }
 
+function scheduleSpacerHeightUpdate() {
+  spacerUpdateQueued = true;
+
+  if (updateSpacerFrameId !== null) {
+    return;
+  }
+
+  updateSpacerFrameId = requestAnimationFrame(() => {
+    updateSpacerFrameId = null;
+
+    if (pendingSpacerUpdate) {
+      return;
+    }
+
+    spacerUpdateQueued = false;
+    pendingSpacerUpdate = updateSpacerHeight().finally(() => {
+      pendingSpacerUpdate = null;
+      if (spacerUpdateQueued) {
+        scheduleSpacerHeightUpdate();
+      }
+    });
+  });
+}
+
 function stopObservingLastMessages() {
   if (!messageResizeObserver) {
     return;
@@ -285,4 +316,4 @@ function recalculateScroll() {
   }
 }
 
-</script>
+</script>

package/custom/conversation_area/TextRenderer.vue

@@ -115,7 +115,11 @@
       return `${window.location.pathname}${window.location.search}${href}`;
     }
 
-    const resolvedUrl = new URL(href, window.location.href);
+    const isAbsoluteWithScheme = /^[a-zA-Z][a-zA-Z\d+\-.]*:/.test(href);
+    const baseUrl = isAbsoluteWithScheme
+      ? undefined
+      : `${window.location.origin}/`;
+    const resolvedUrl = new URL(href, baseUrl ?? window.location.href);
     if (resolvedUrl.origin !== window.location.origin) {
       return null;
     }

package/dist/agent/middleware/apiBasedTools.js

@@ -55,7 +55,9 @@ export function createApiBasedToolsMiddleware(apiBasedTools, adminforth) {
                 const tools = [...enabledApiToolNames]
                     .filter((toolName) => !alwaysAvailableApiToolNames.has(toolName))
                     .map((toolName) => dynamicTools[toolName]);
-                return handler(Object.assign(Object.assign({}, request), { tools: [...request.tools, ...tools] }));
+                const availableTools = [...request.tools, ...tools];
+                logger.info(`AdminForth Agent callable tools: ${availableTools.map((tool) => tool.name).join(", ")}`);
+                return handler(Object.assign(Object.assign({}, request), { tools: availableTools }));
             });
         },
         wrapToolCall(request, handler) {

package/dist/agent/simpleAgent.d.ts

@@ -50,6 +50,7 @@ export declare function callAgent(params: {
     adminforth: IAdminForth;
     apiBasedTools: Record<string, ApiBasedTool>;
     customComponentsDir: string;
+    pluginCustomFolderPaths: string[];
     sessionId: string;
     turnId: string;
     currentPage?: CurrentPageContext;

package/dist/agent/simpleAgent.js

@@ -132,8 +132,8 @@ export function createAgentChatModel(params) {
 }
 export function callAgent(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { name, model, summaryModel, modelMiddleware = [], checkpointer, messages, adminUser, adminforth, apiBasedTools, customComponentsDir, sessionId, turnId, currentPage, userTimeZone, abortSignal, emitToolCallEvent, sequenceDebugSink, } = params;
-        const tools = yield createAgentTools(customComponentsDir, apiBasedTools);
+        const { name, model, summaryModel, modelMiddleware = [], checkpointer, messages, adminUser, adminforth, apiBasedTools, customComponentsDir, pluginCustomFolderPaths, sessionId, turnId, currentPage, userTimeZone, abortSignal, emitToolCallEvent, sequenceDebugSink, } = params;
+        const tools = yield createAgentTools(customComponentsDir, apiBasedTools, pluginCustomFolderPaths);
         const apiBasedToolsMiddleware = createApiBasedToolsMiddleware(apiBasedTools, adminforth);
         const sequenceDebugMiddleware = createSequenceDebugMiddleware(sequenceDebugSink);
         const middleware = [

package/dist/agent/skills/registry.d.ts

@@ -5,9 +5,7 @@ export interface AgentSkillManifest {
     instructions: string;
 }
 export declare function getProjectSkillsDirectoryPath(customComponentsDir: string): string;
-export declare function getProjectPluginSkillsDirectoryPath(customComponentsDir: string): string;
-export declare function listBundledSkillManifests(): Promise<AgentSkillManifest[]>;
-export declare function listProjectSkillManifests(customComponentsDir: string): Promise<AgentSkillManifest[]>;
-export declare function listSkillManifests(customComponentsDir: string): Promise<AgentSkillManifest[]>;
-export declare function loadSkillManifest(skillName: string, customComponentsDir: string): Promise<AgentSkillManifest | null>;
-export declare function loadSkillMarkdown(skillName: string, customComponentsDir: string): Promise<string | null>;
+export declare function listProjectSkillManifests(customComponentsDir: string, pluginCustomFolderPaths?: string[]): Promise<AgentSkillManifest[]>;
+export declare function listSkillManifests(customComponentsDir: string, pluginCustomFolderPaths?: string[]): Promise<AgentSkillManifest[]>;
+export declare function loadSkillManifest(skillName: string, customComponentsDir: string, pluginCustomFolderPaths?: string[]): Promise<AgentSkillManifest | null>;
+export declare function loadSkillMarkdown(skillName: string, customComponentsDir: string, pluginCustomFolderPaths?: string[]): Promise<string | null>;

package/dist/agent/skills/registry.js

@@ -9,16 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { readdir, readFile } from "fs/promises";
 import path from "path";
-import { fileURLToPath } from "url";
 import { parse as parseYaml } from "yaml";
-const PLUGIN_SKILLS_DIRECTORY_PATH = fileURLToPath(new URL("../../custom/skills/", import.meta.url));
-const USER_PLUGIN_SKILLS_DIRECTORY_PATH_SEGMENTS = [
-    "plugins",
-    "adminforth-agent",
-    "skills",
-];
 const SKILL_MARKDOWN_FILENAME = "SKILL.md";
 const SKILL_FRONTMATTER_SEPARATOR = "\n---\n";
+function normalizePluginSkillDirectoryPaths(pluginCustomFolderPaths = []) {
+    return Array.from(new Set(pluginCustomFolderPaths
+        .map((pluginCustomFolderPath) => path.resolve(pluginCustomFolderPath, "skills"))));
+}
 function parseSkillManifest(directoryName, markdown) {
     var _a, _b;
     const [frontmatterBlock, instructions = ""] = markdown.split("\r\n").join("\n").split(SKILL_FRONTMATTER_SEPARATOR, 2);
@@ -63,49 +60,37 @@ function mergeSkillManifests(skillGroups) {
 export function getProjectSkillsDirectoryPath(customComponentsDir) {
     return path.resolve(customComponentsDir, "skills");
 }
-export function getProjectPluginSkillsDirectoryPath(customComponentsDir) {
-    return path.resolve(customComponentsDir, ...USER_PLUGIN_SKILLS_DIRECTORY_PATH_SEGMENTS);
-}
-function getProjectSkillDirectoryPaths(customComponentsDir) {
-    return [
+function getProjectSkillDirectoryPaths(customComponentsDir, pluginCustomFolderPaths = []) {
+    return Array.from(new Set([
         getProjectSkillsDirectoryPath(customComponentsDir),
-        getProjectPluginSkillsDirectoryPath(customComponentsDir),
-    ];
+        ...normalizePluginSkillDirectoryPaths(pluginCustomFolderPaths),
+    ]));
 }
-export function listBundledSkillManifests() {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield listDirectorySkillManifests(PLUGIN_SKILLS_DIRECTORY_PATH);
+export function listProjectSkillManifests(customComponentsDir_1) {
+    return __awaiter(this, arguments, void 0, function* (customComponentsDir, pluginCustomFolderPaths = []) {
+        return mergeSkillManifests(yield Promise.all(getProjectSkillDirectoryPaths(customComponentsDir, pluginCustomFolderPaths).map(listDirectorySkillManifests)));
     });
 }
-export function listProjectSkillManifests(customComponentsDir) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return mergeSkillManifests(yield Promise.all(getProjectSkillDirectoryPaths(customComponentsDir).map(listDirectorySkillManifests)));
+export function listSkillManifests(customComponentsDir_1) {
+    return __awaiter(this, arguments, void 0, function* (customComponentsDir, pluginCustomFolderPaths = []) {
+        return yield listProjectSkillManifests(customComponentsDir, pluginCustomFolderPaths);
     });
 }
-export function listSkillManifests(customComponentsDir) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return mergeSkillManifests([
-            yield listProjectSkillManifests(customComponentsDir),
-            yield listBundledSkillManifests(),
-        ]);
-    });
-}
-export function loadSkillManifest(skillName, customComponentsDir) {
-    return __awaiter(this, void 0, void 0, function* () {
+export function loadSkillManifest(skillName_1, customComponentsDir_1) {
+    return __awaiter(this, arguments, void 0, function* (skillName, customComponentsDir, pluginCustomFolderPaths = []) {
         var _a;
-        const manifests = yield listSkillManifests(customComponentsDir);
+        const manifests = yield listSkillManifests(customComponentsDir, pluginCustomFolderPaths);
         return ((_a = manifests.find((manifest) => manifest.name === skillName || manifest.directoryName === skillName)) !== null && _a !== void 0 ? _a : null);
     });
 }
-export function loadSkillMarkdown(skillName, customComponentsDir) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const manifest = yield loadSkillManifest(skillName, customComponentsDir);
+export function loadSkillMarkdown(skillName_1, customComponentsDir_1) {
+    return __awaiter(this, arguments, void 0, function* (skillName, customComponentsDir, pluginCustomFolderPaths = []) {
+        const manifest = yield loadSkillManifest(skillName, customComponentsDir, pluginCustomFolderPaths);
         if (!manifest) {
             return null;
         }
         const directories = [
-            ...getProjectSkillDirectoryPaths(customComponentsDir),
-            PLUGIN_SKILLS_DIRECTORY_PATH,
+            ...getProjectSkillDirectoryPaths(customComponentsDir, pluginCustomFolderPaths),
         ];
         for (const skillsDirectoryPath of directories) {
             try {

package/dist/agent/systemPrompt.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { listBundledSkillManifests, listProjectSkillManifests, } from "./skills/registry.js";
+import { listProjectSkillManifests, } from "./skills/registry.js";
 export const DEFAULT_AGENT_SYSTEM_PROMPT = [
     "You are helpful AI Assistant for Admin Panel.",
     // about admin
@@ -75,10 +75,9 @@ export function buildAgentSystemPrompt(adminforth_1) {
     return __awaiter(this, arguments, void 0, function* (adminforth, hiddenResourceIds = []) {
         var _a;
         const customComponentsDir = (_a = adminforth.config.customization.customComponentsDir) !== null && _a !== void 0 ? _a : "custom";
-        const [primarySkills, defaultSkills] = yield Promise.all([
-            listProjectSkillManifests(customComponentsDir),
-            listBundledSkillManifests(),
-        ]);
+        const pluginCustomFolderPaths = adminforth.activatedPlugins
+            .map((plugin) => plugin.customFolderPath);
+        const skills = yield listProjectSkillManifests(customComponentsDir, pluginCustomFolderPaths);
         const adminBasePath = adminforth.config.baseUrlSlashed;
         const hiddenResourceIdSet = new Set(hiddenResourceIds);
         const visibleResources = adminforth.config.resources.filter((resource) => !hiddenResourceIdSet.has(resource.resourceId));
@@ -86,11 +85,9 @@ export function buildAgentSystemPrompt(adminforth_1) {
             DEFAULT_AGENT_SYSTEM_PROMPT,
             `ADMIN_BASE_PATH: ${adminBasePath}`,
             `List of resources:\n${formatResources(visibleResources)}`,
-            primarySkills.length > 0
-                ? `You have primary skills set:\n${formatSkills(primarySkills, "skill_name")}`
+            skills.length > 0
+                ? `You have skills set:\n${formatSkills(skills, "skill_name")}`
                 : "",
-            "You have next default skills which you can fallback to if primary skill set does not provide a good skill:\n" +
-                formatSkills(defaultSkills, "skill_name"),
             "Before using any skill, call fetch_skill to load its full instructions.",
             "The fetched skill response starts with 'Tools mentioned in this skill'. Read that list first.",
             "You can use get_resource immediately to inspect resource structure and column names.",
@@ -100,8 +97,8 @@ export function buildAgentSystemPrompt(adminforth_1) {
             "If a fetched skill lists a non-base tool you need, call fetch_tool_schema for it immediately instead of telling the user the tool is unavailable.",
             "For example: for record creation load mutate_data, read its tool list, call fetch_tool_schema for create_record, and then use create_record after confirmation.",
             "When fetch_tool_schema succeeds, that tool becomes available on the next step.",
-            "All admin links must be relative paths and must start with ADMIN_BASE_PATH.",
-            "Build record links as ADMIN_BASE_PATH + resource/{resourceId}/show/{primary key}. Do not prepend any extra slash before resource.",
+            "All admin links must be root-relative and start with '/'.",
+            "Build record links as '/resource/{resourceId}/show/{primary key}'. Never use bare 'resource/{resourceId}/show/{primary key}' without the leading slash.",
             "Try to call as many tools as possible in parallel in one step.",
         ];
         return sections.filter(Boolean).join("\n\n");

package/dist/agent/tools/fetchSkill.d.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-export declare function createFetchSkillTool(customComponentsDir: string): Promise<import("langchain").DynamicStructuredTool<z.ZodObject<{
+export declare function createFetchSkillTool(customComponentsDir: string, pluginCustomFolderPaths?: string[]): Promise<import("langchain").DynamicStructuredTool<z.ZodObject<{
     skillName: z.ZodString;
 }, z.core.$strip>, {
     skillName: string;

package/dist/agent/tools/fetchSkill.js

@@ -21,13 +21,13 @@ function serializeSkillManifests(skillManifests) {
         description: skill.description,
     }));
 }
-export function createFetchSkillTool(customComponentsDir) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const availableSkills = yield listSkillManifests(customComponentsDir);
+export function createFetchSkillTool(customComponentsDir_1) {
+    return __awaiter(this, arguments, void 0, function* (customComponentsDir, pluginCustomFolderPaths = []) {
+        const availableSkills = yield listSkillManifests(customComponentsDir, pluginCustomFolderPaths);
         const availableSkillNames = availableSkills.map((skill) => skill.name);
         return tool((_a) => __awaiter(this, [_a], void 0, function* ({ skillName }) {
             try {
-                const skillMarkdown = yield loadSkillMarkdown(skillName, customComponentsDir);
+                const skillMarkdown = yield loadSkillMarkdown(skillName, customComponentsDir, pluginCustomFolderPaths);
                 if (!skillMarkdown) {
                     return [
                         `Skill "${skillName}" not found.`,

package/dist/agent/tools/index.d.ts

@@ -1,4 +1,4 @@
 import type { ClientTool } from "@langchain/core/tools";
 import type { ApiBasedTool } from "../../apiBasedTools.js";
 export declare const ALWAYS_AVAILABLE_API_TOOL_NAMES: readonly ["get_resource"];
-export declare function createAgentTools(customComponentsDir: string, apiBasedTools: Record<string, ApiBasedTool>): Promise<ClientTool[]>;
+export declare function createAgentTools(customComponentsDir: string, apiBasedTools: Record<string, ApiBasedTool>, pluginCustomFolderPaths?: string[]): Promise<ClientTool[]>;

package/dist/agent/tools/index.js

@@ -12,8 +12,8 @@ import { createFetchToolSchemaTool } from "./fetchToolSchema.js";
 import { createApiTool } from "./apiTool.js";
 import { createGetUserLocationTool } from "./getUserLocation.js";
 export const ALWAYS_AVAILABLE_API_TOOL_NAMES = ["get_resource"];
-export function createAgentTools(customComponentsDir, apiBasedTools) {
-    return __awaiter(this, void 0, void 0, function* () {
+export function createAgentTools(customComponentsDir_1, apiBasedTools_1) {
+    return __awaiter(this, arguments, void 0, function* (customComponentsDir, apiBasedTools, pluginCustomFolderPaths = []) {
         return [
             ...ALWAYS_AVAILABLE_API_TOOL_NAMES.map((toolName) => {
                 const apiBasedTool = apiBasedTools[toolName];
@@ -23,7 +23,7 @@ export function createAgentTools(customComponentsDir, apiBasedTools) {
                 return createApiTool(toolName, apiBasedTool);
             }),
             createGetUserLocationTool(),
-            yield createFetchSkillTool(customComponentsDir),
+            yield createFetchSkillTool(customComponentsDir, pluginCustomFolderPaths),
             yield createFetchToolSchemaTool(apiBasedTools),
         ];
     });

package/dist/agentTurnService.js

@@ -86,6 +86,7 @@ export class AgentTurnService {
                 adminforth,
                 apiBasedTools,
                 customComponentsDir: (_f = adminforth.config.customization.customComponentsDir) !== null && _f !== void 0 ? _f : "custom",
+                pluginCustomFolderPaths: adminforth.activatedPlugins.map((plugin) => plugin.customFolderPath),
                 sessionId: input.sessionId,
                 turnId: input.turnId,
                 currentPage: input.currentPage,

package/dist/custom/composables/agentStore/useAgentSessions.ts

@@ -3,7 +3,7 @@ import { callAdminForthApi } from '@/utils';
 import type { Chat } from '../../chat';
 import type { IAgentSession, ISessionsListItem, IPart } from '../../types';
 import { PRE_SESSION_ID } from './constants';
-import { useI18n } from 'vue-i18n';
+import { i18nInstance } from '@/i18n';
 
 type AdminforthLike = {
   confirm(options: { message: string; yes: string; no: string }): Promise<boolean>;
@@ -42,7 +42,10 @@ export function createAgentSessionManager({
     return [...sessionsListToSort].sort((a: ISessionsListItem, b: ISessionsListItem) => b.timestamp.localeCompare(a.timestamp));
   }
 
-  const { t } = useI18n();
+  function t(key: string) {
+    return i18nInstance?.global.t(key) ?? key;
+  }
+
   function saveCurrentSessionInCache() {
     if (currentSession.value) {
       currentSession.value.messages = currentChat.value?.messages.map((m: any) => ({
@@ -342,4 +345,4 @@ export function createAgentSessionManager({
     setCurrentChatStatus,
     updateLastAgentMessage
   };
-}
+}

package/dist/custom/conversation_area/ConversationArea.vue

@@ -118,10 +118,13 @@ const THRESHOLD_TO_SHOW_BUTTON = 10;
 let messageResizeObserver: ResizeObserver | null = null;
 let observedLastUserMessageElement: HTMLElement | null = null;
 let observedLastAgentMessageElement: HTMLElement | null = null;
+let updateSpacerFrameId: number | null = null;
+let pendingSpacerUpdate: Promise<void> | null = null;
+let spacerUpdateQueued = false;
 
 onMounted(async () => {
   messageResizeObserver = new ResizeObserver(() => {
-    updateSpacerHeight();
+    scheduleSpacerHeightUpdate();
   });
 
   await import('@incremark/theme/styles.css')
@@ -136,6 +139,10 @@ onUnmounted(() => {
 
   stopObservingLastMessages();
   messageResizeObserver?.disconnect();
+  if (updateSpacerFrameId !== null) {
+    cancelAnimationFrame(updateSpacerFrameId);
+    updateSpacerFrameId = null;
+  }
   agentStore.stopPlaceholderAnimation();
 });
 
@@ -221,6 +228,30 @@ async function updateSpacerHeight() {
   spacerHeight.value = Math.max(0, clientHeight - (lastUserMessageHeight + MASK_HEIGHT + lastAgentMessageHeight));
 }
 
+function scheduleSpacerHeightUpdate() {
+  spacerUpdateQueued = true;
+
+  if (updateSpacerFrameId !== null) {
+    return;
+  }
+
+  updateSpacerFrameId = requestAnimationFrame(() => {
+    updateSpacerFrameId = null;
+
+    if (pendingSpacerUpdate) {
+      return;
+    }
+
+    spacerUpdateQueued = false;
+    pendingSpacerUpdate = updateSpacerHeight().finally(() => {
+      pendingSpacerUpdate = null;
+      if (spacerUpdateQueued) {
+        scheduleSpacerHeightUpdate();
+      }
+    });
+  });
+}
+
 function stopObservingLastMessages() {
   if (!messageResizeObserver) {
     return;
@@ -285,4 +316,4 @@ function recalculateScroll() {
   }
 }
 
-</script>
+</script>

package/dist/custom/conversation_area/TextRenderer.vue

@@ -115,7 +115,11 @@
       return `${window.location.pathname}${window.location.search}${href}`;
     }
 
-    const resolvedUrl = new URL(href, window.location.href);
+    const isAbsoluteWithScheme = /^[a-zA-Z][a-zA-Z\d+\-.]*:/.test(href);
+    const baseUrl = isAbsoluteWithScheme
+      ? undefined
+      : `${window.location.origin}/`;
+    const resolvedUrl = new URL(href, baseUrl ?? window.location.href);
     if (resolvedUrl.origin !== window.location.origin) {
       return null;
     }

package/dist/surfaces/web-sse/createSseEventEmitter.js

@@ -11,6 +11,7 @@ import { randomUUID } from "crypto";
 function createAgentEventStream(res, options = {}) {
     let isStreamClosed = false;
     let activeBlock = null;
+    const isAiUiMessageStream = options.vercelAiUiMessageStream === true;
     res.writeHead(200, Object.assign({ "Content-Type": "text/event-stream", "Cache-Control": "no-cache", "Connection": "keep-alive" }, (options.vercelAiUiMessageStream
         ? { "x-vercel-ai-ui-message-stream": "v1" }
         : {})));
@@ -89,7 +90,7 @@ function createAgentEventStream(res, options = {}) {
         },
         transcript(text, language) {
             stream.send({
-                type: "transcript",
+                type: isAiUiMessageStream ? "data-transcript" : "transcript",
                 data: {
                     text,
                     language,
@@ -98,7 +99,7 @@ function createAgentEventStream(res, options = {}) {
         },
         response(text, sessionId, turnId) {
             stream.send({
-                type: "response",
+                type: isAiUiMessageStream ? "data-response" : "response",
                 data: {
                     text,
                     sessionId,
@@ -108,7 +109,7 @@ function createAgentEventStream(res, options = {}) {
         },
         speechResponse(transcript, response, sessionId, turnId) {
             stream.send({
-                type: "speech-response",
+                type: isAiUiMessageStream ? "data-speech-response" : "speech-response",
                 data: {
                     transcript,
                     response,
@@ -119,7 +120,7 @@ function createAgentEventStream(res, options = {}) {
         },
         audioStart(mimeType, format, sampleRate, channelCount, bitsPerSample) {
             stream.send({
-                type: "audio-start",
+                type: isAiUiMessageStream ? "data-audio-start" : "audio-start",
                 data: {
                     mimeType,
                     format,
@@ -131,22 +132,25 @@ function createAgentEventStream(res, options = {}) {
         },
         audioDelta(value) {
             stream.send({
-                type: "audio-delta",
+                type: isAiUiMessageStream ? "data-audio-delta" : "audio-delta",
                 data: {
                     base64: Buffer.from(value).toString("base64"),
                 },
             });
         },
         audioDone() {
-            stream.send({
-                type: "audio-done",
-            });
+            stream.send(Object.assign({ type: isAiUiMessageStream ? "data-audio-done" : "audio-done" }, (isAiUiMessageStream ? { data: {} } : {})));
         },
         error(error) {
-            stream.send({
-                type: "error",
-                error,
-            });
+            stream.send(isAiUiMessageStream
+                ? {
+                    type: "error",
+                    errorText: error,
+                }
+                : {
+                    type: "error",
+                    error,
+                });
         },
         end() {
             if (isStreamClosed || res.writableEnded || res.destroyed) {

package/package.json

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

package/surfaces/web-sse/createSseEventEmitter.ts

@@ -22,6 +22,7 @@ function createAgentEventStream(
 ) {
   let isStreamClosed = false;
   let activeBlock: { type: "text" | "reasoning"; id: string } | null = null;
+  const isAiUiMessageStream = options.vercelAiUiMessageStream === true;
 
   res.writeHead(200, {
     "Content-Type": "text/event-stream",
@@ -124,7 +125,7 @@ function createAgentEventStream(
 
     transcript(text: string, language?: string) {
       stream.send({
-        type: "transcript",
+        type: isAiUiMessageStream ? "data-transcript" : "transcript",
         data: {
           text,
           language,
@@ -134,7 +135,7 @@ function createAgentEventStream(
 
     response(text: string, sessionId: string, turnId: string) {
       stream.send({
-        type: "response",
+        type: isAiUiMessageStream ? "data-response" : "response",
         data: {
           text,
           sessionId,
@@ -150,7 +151,7 @@ function createAgentEventStream(
       turnId: string,
     ) {
       stream.send({
-        type: "speech-response",
+        type: isAiUiMessageStream ? "data-speech-response" : "speech-response",
         data: {
           transcript,
           response,
@@ -168,7 +169,7 @@ function createAgentEventStream(
       bitsPerSample: number,
     ) {
       stream.send({
-        type: "audio-start",
+        type: isAiUiMessageStream ? "data-audio-start" : "audio-start",
         data: {
           mimeType,
           format,
@@ -181,7 +182,7 @@ function createAgentEventStream(
 
     audioDelta(value: Uint8Array) {
       stream.send({
-        type: "audio-delta",
+        type: isAiUiMessageStream ? "data-audio-delta" : "audio-delta",
         data: {
           base64: Buffer.from(value).toString("base64"),
         },
@@ -190,15 +191,21 @@ function createAgentEventStream(
 
     audioDone() {
       stream.send({
-        type: "audio-done",
+        type: isAiUiMessageStream ? "data-audio-done" : "audio-done",
+        ...(isAiUiMessageStream ? { data: {} } : {}),
       });
     },
 
     error(error: string) {
-      stream.send({
-        type: "error",
-        error,
-      });
+      stream.send(isAiUiMessageStream
+        ? {
+            type: "error",
+            errorText: error,
+          }
+        : {
+            type: "error",
+            error,
+          });
     },
 
     end() {