@adminforth/agent 1.31.0 → 1.32.1

package/agent/systemPrompt.ts

@@ -58,17 +58,24 @@ function formatSkills(skills: AgentSkillManifest[], label: "skill_name" | "tool_
     .join("\n");
 }
 
-export async function buildAgentSystemPrompt(adminforth: IAdminForth) {
+export async function buildAgentSystemPrompt(
+  adminforth: IAdminForth,
+  hiddenResourceIds: Iterable<string> = [],
+) {
   const [primarySkills, defaultSkills] = await Promise.all([
     listProjectSkillManifests(adminforth.config.customization.customComponentsDir),
     listBundledSkillManifests(),
   ]);
   const alwaysAvailableTools = ALWAYS_AVAILABLE_API_TOOL_NAMES.join(", ");
   const adminBasePath = adminforth.config.baseUrlSlashed;
+  const hiddenResourceIdSet = new Set(hiddenResourceIds);
+  const visibleResources = adminforth.config.resources.filter(
+    (resource) => !hiddenResourceIdSet.has(resource.resourceId),
+  );
   const sections = [
     DEFAULT_AGENT_SYSTEM_PROMPT,
     `ADMIN_BASE_PATH: ${adminBasePath}`,
-    `List of resources:\n${formatResources(adminforth.config.resources)}`,
+    `List of resources:\n${formatResources(visibleResources)}`,
     `You have always-available base tools: ${alwaysAvailableTools}.`,
     primarySkills.length > 0
       ? `You have primary skills set:\n${formatSkills(primarySkills, "skill_name")}`

package/apiBasedTools.ts

@@ -58,6 +58,15 @@ function getInputString(inputs: Record<string, unknown> | undefined, key: string
   return typeof value === 'string' && value ? value : undefined;
 }
 
+function isHiddenResourceCall(
+  hiddenResourceIds: ReadonlySet<string>,
+  inputs: Record<string, unknown> | undefined,
+) {
+  const resourceId = getInputString(inputs, 'resourceId');
+
+  return resourceId ? hiddenResourceIds.has(resourceId) : false;
+}
+
 function getInputArrayLength(inputs: Record<string, unknown> | undefined, key: string) {
   const value = inputs?.[key];
 
@@ -721,12 +730,16 @@ async function callOpenApiSchema(params: {
   return parseOpenApiToolResponse(response);
 }
 
-export function prepareApiBasedTools(adminforth: IAdminForth): Record<string, ApiBasedTool> {
+export function prepareApiBasedTools(
+  adminforth: IAdminForth,
+  hiddenResourceIds: Iterable<string> = [],
+): Record<string, ApiBasedTool> {
   const apiBasedTools: Record<string, ApiBasedTool> = {};
   const openApiSchemas = adminforth.openApi.registeredSchemas.filter(
     (schema) => schema.request_schema || schema.response_schema,
   );
   const openApiSchemasByToolName = new Map<string, IRegisteredApiSchema>();
+  const hiddenResourceIdSet = new Set(hiddenResourceIds);
 
   for (const schema of openApiSchemas) {
     const toolName = openApiSchemaPathToToolName(schema.path, adminforth);
@@ -749,6 +762,13 @@ export function prepareApiBasedTools(adminforth: IAdminForth): Record<string, Ap
       input_schma: schema.request_schema,
       output_schema: schema.response_schema,
       call: async ({ adminUser, adminuser, inputs, httpExtra, userTimeZone } = {}) => {
+        if (isHiddenResourceCall(hiddenResourceIdSet, inputs)) {
+          return YAML.stringify({
+            error: 'RESOURCE_NOT_AVAILABLE',
+            message: 'This resource is not available to the agent.',
+          });
+        }
+
         const invokeTool = async (
           nextToolName: string,
           nextParams: ToolOverrideCallParams = {},

package/build.log

@@ -40,5 +40,5 @@ custom/skills/fetch_data/SKILL.md
 custom/skills/mutate_data/
 custom/skills/mutate_data/SKILL.md
 
-sent 208,782 bytes  received 585 bytes  418,734.00 bytes/sec
-total size is 206,372  speedup is 0.99
+sent 209,092 bytes  received 585 bytes  419,354.00 bytes/sec
+total size is 206,682  speedup is 0.99

package/custom/incremark_code_renderers/IncremarkShikiCodeBlock.vue

@@ -39,7 +39,7 @@ import type { Code } from 'mdast';
 import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import embed from 'vega-embed';
 
-import { highlightCodeSnippetHtml, type IncremarkCodeTheme } from './incremarkCodeHighlight';
+import type { IncremarkCodeTheme } from './incremarkCodeHighlight';
 
 const props = withDefaults(defineProps<{
   node: Code;
@@ -67,6 +67,7 @@ let renderRequestId = 0;
 let scheduledFrameId: number | null = null;
 let themeObserver: MutationObserver | null = null;
 let vegaResult: { finalize: () => void } | null = null;
+let highlightModulePromise: Promise<typeof import('./incremarkCodeHighlight')> | null = null;
 
 const sourceCode = computed(() => props.node.value ?? '');
 const language = computed(() => props.node.lang?.trim().toLowerCase() || 'text');
@@ -165,6 +166,14 @@ function scheduleHighlight() {
   });
 }
 
+function loadHighlightModule() {
+  if (!highlightModulePromise) {
+    highlightModulePromise = import('./incremarkCodeHighlight');
+  }
+
+  return highlightModulePromise;
+}
+
 async function renderHighlight() {
   const requestId = ++renderRequestId;
 
@@ -219,6 +228,7 @@ async function renderHighlight() {
   }
 
   try {
+    const { highlightCodeSnippetHtml } = await loadHighlightModule();
     const html = await highlightCodeSnippetHtml(sourceCode.value, language.value, codeTheme.value);
 
     if (requestId === renderRequestId) {

package/dist/agent/systemPrompt.js

@@ -48,18 +48,20 @@ function formatSkills(skills, label) {
         .map((skill) => `- ${label}: ${skill.name}\n  description: ${skill.description}`)
         .join("\n");
 }
-export function buildAgentSystemPrompt(adminforth) {
-    return __awaiter(this, void 0, void 0, function* () {
+export function buildAgentSystemPrompt(adminforth_1) {
+    return __awaiter(this, arguments, void 0, function* (adminforth, hiddenResourceIds = []) {
         const [primarySkills, defaultSkills] = yield Promise.all([
             listProjectSkillManifests(adminforth.config.customization.customComponentsDir),
             listBundledSkillManifests(),
         ]);
         const alwaysAvailableTools = ALWAYS_AVAILABLE_API_TOOL_NAMES.join(", ");
         const adminBasePath = adminforth.config.baseUrlSlashed;
+        const hiddenResourceIdSet = new Set(hiddenResourceIds);
+        const visibleResources = adminforth.config.resources.filter((resource) => !hiddenResourceIdSet.has(resource.resourceId));
         const sections = [
             DEFAULT_AGENT_SYSTEM_PROMPT,
             `ADMIN_BASE_PATH: ${adminBasePath}`,
-            `List of resources:\n${formatResources(adminforth.config.resources)}`,
+            `List of resources:\n${formatResources(visibleResources)}`,
             `You have always-available base tools: ${alwaysAvailableTools}.`,
             primarySkills.length > 0
                 ? `You have primary skills set:\n${formatSkills(primarySkills, "skill_name")}`

package/dist/apiBasedTools.js

@@ -20,6 +20,10 @@ function getInputString(inputs, key) {
     const value = inputs === null || inputs === void 0 ? void 0 : inputs[key];
     return typeof value === 'string' && value ? value : undefined;
 }
+function isHiddenResourceCall(hiddenResourceIds, inputs) {
+    const resourceId = getInputString(inputs, 'resourceId');
+    return resourceId ? hiddenResourceIds.has(resourceId) : false;
+}
 function getInputArrayLength(inputs, key) {
     const value = inputs === null || inputs === void 0 ? void 0 : inputs[key];
     return Array.isArray(value) ? value.length : undefined;
@@ -492,10 +496,11 @@ function callOpenApiSchema(params) {
         return parseOpenApiToolResponse(response);
     });
 }
-export function prepareApiBasedTools(adminforth) {
+export function prepareApiBasedTools(adminforth, hiddenResourceIds = []) {
     const apiBasedTools = {};
     const openApiSchemas = adminforth.openApi.registeredSchemas.filter((schema) => schema.request_schema || schema.response_schema);
     const openApiSchemasByToolName = new Map();
+    const hiddenResourceIdSet = new Set(hiddenResourceIds);
     for (const schema of openApiSchemas) {
         const toolName = openApiSchemaPathToToolName(schema.path, adminforth);
         openApiSchemasByToolName.set(toolName, schema);
@@ -509,6 +514,12 @@ export function prepareApiBasedTools(adminforth) {
             input_schma: schema.request_schema,
             output_schema: schema.response_schema,
             call: (...args_1) => __awaiter(this, [...args_1], void 0, function* ({ adminUser, adminuser, inputs, httpExtra, userTimeZone } = {}) {
+                if (isHiddenResourceCall(hiddenResourceIdSet, inputs)) {
+                    return YAML.stringify({
+                        error: 'RESOURCE_NOT_AVAILABLE',
+                        message: 'This resource is not available to the agent.',
+                    });
+                }
                 const invokeTool = (nextToolName_1, ...args_2) => __awaiter(this, [nextToolName_1, ...args_2], void 0, function* (nextToolName, nextParams = {}) {
                     const nextSchema = openApiSchemasByToolName.get(nextToolName);
                     if (!nextSchema) {

package/dist/custom/incremark_code_renderers/IncremarkShikiCodeBlock.vue

@@ -39,7 +39,7 @@ import type { Code } from 'mdast';
 import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import embed from 'vega-embed';
 
-import { highlightCodeSnippetHtml, type IncremarkCodeTheme } from './incremarkCodeHighlight';
+import type { IncremarkCodeTheme } from './incremarkCodeHighlight';
 
 const props = withDefaults(defineProps<{
   node: Code;
@@ -67,6 +67,7 @@ let renderRequestId = 0;
 let scheduledFrameId: number | null = null;
 let themeObserver: MutationObserver | null = null;
 let vegaResult: { finalize: () => void } | null = null;
+let highlightModulePromise: Promise<typeof import('./incremarkCodeHighlight')> | null = null;
 
 const sourceCode = computed(() => props.node.value ?? '');
 const language = computed(() => props.node.lang?.trim().toLowerCase() || 'text');
@@ -165,6 +166,14 @@ function scheduleHighlight() {
   });
 }
 
+function loadHighlightModule() {
+  if (!highlightModulePromise) {
+    highlightModulePromise = import('./incremarkCodeHighlight');
+  }
+
+  return highlightModulePromise;
+}
+
 async function renderHighlight() {
   const requestId = ++renderRequestId;
 
@@ -219,6 +228,7 @@ async function renderHighlight() {
   }
 
   try {
+    const { highlightCodeSnippetHtml } = await loadHighlightModule();
     const html = await highlightCodeSnippetHtml(sourceCode.value, language.value, codeTheme.value);
 
     if (requestId === renderRequestId) {

package/dist/index.js

@@ -154,6 +154,14 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
             : new MemorySaver();
         return this.checkpointer;
     }
+    getInternalAgentResourceIds() {
+        var _a;
+        return [
+            this.options.sessionResource.resourceId,
+            this.options.turnResource.resourceId,
+            (_a = this.options.checkpointResource) === null || _a === void 0 ? void 0 : _a.resourceId,
+        ].filter((resourceId) => Boolean(resourceId));
+    }
     constructor(options) {
         super(options, import.meta.url);
         this.apiBasedTools = {};
@@ -191,7 +199,7 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
         });
     }
     validateConfigAfterDiscover(adminforth, resourceConfig) {
-        this.agentSystemPromptPromise = buildAgentSystemPrompt(adminforth)
+        this.agentSystemPromptPromise = buildAgentSystemPrompt(adminforth, this.getInternalAgentResourceIds())
             .then((systemPrompt) => appendCustomSystemPrompt(systemPrompt, this.options.systemPrompt));
     }
     instanceUniqueRepresentation(pluginOptions) {
@@ -316,7 +324,7 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
                         formatAdminUserPrompt(adminUser, this.adminforth.config.auth.usernameField),
                         formatLanguagePrompt(userLanguage),
                     ].join("\n\n");
-                    const apiBasedTools = buildApiBasedTools(this.adminforth);
+                    const apiBasedTools = buildApiBasedTools(this.adminforth, this.getInternalAgentResourceIds());
                     for (const toolName of ALWAYS_AVAILABLE_API_TOOL_NAMES) {
                         assertRequiredApiTool(apiBasedTools, toolName);
                     }

package/index.ts

@@ -213,6 +213,14 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
     return this.checkpointer;
   }
 
+  private getInternalAgentResourceIds() {
+    return [
+      this.options.sessionResource.resourceId,
+      this.options.turnResource.resourceId,
+      this.options.checkpointResource?.resourceId,
+    ].filter((resourceId): resourceId is string => Boolean(resourceId));
+  }
+
   constructor(options: PluginOptions) {
     super(options, import.meta.url);
     this.options = options;
@@ -245,7 +253,10 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
   }
   
   validateConfigAfterDiscover(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
-    this.agentSystemPromptPromise = buildAgentSystemPrompt(adminforth)
+    this.agentSystemPromptPromise = buildAgentSystemPrompt(
+      adminforth,
+      this.getInternalAgentResourceIds(),
+    )
       .then((systemPrompt) => appendCustomSystemPrompt(systemPrompt, this.options.systemPrompt));
   }
 
@@ -392,7 +403,10 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
             formatAdminUserPrompt(adminUser, this.adminforth.config.auth.usernameField),
             formatLanguagePrompt(userLanguage),
           ].join("\n\n");
-          const apiBasedTools = buildApiBasedTools(this.adminforth);
+          const apiBasedTools = buildApiBasedTools(
+            this.adminforth,
+            this.getInternalAgentResourceIds(),
+          );
           for (const toolName of ALWAYS_AVAILABLE_API_TOOL_NAMES) {
             assertRequiredApiTool(apiBasedTools, toolName);
           }

package/package.json

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